.env.development

@@ -4,4 +4,4 @@ VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/
 VUE_APP_COMPANY_HEALTH_PC_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
-VUE_APP_COMPANY_HEALTH_WECHAR_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html
+VUE_APP_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 

.env.production

@@ -2,4 +2,4 @@ VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
 VUE_APP_IMAGE_URL=http://wisdomhouseadmin.sudaonline.net
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 VUE_APP_COMPANY_HEALTH_PC_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall_pc.html
-VUE_APP_COMPANY_HEALTH_WECHAR_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html
+VUE_APP_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html

src/views/base/companyInfo-list.vue

@@ -289,7 +289,7 @@ export default {
     openQRCode(record) {
       document.getElementById(record.id).innerHTML = "";
       var self = this;
-      var qrtext = process.env.VUE_APP_COMPANY_HEALTH_WECHAR_URL + "?companyId=" + record.id;
+      var qrtext = process.env.VUE_APP_COMPANY_HEALTH_WECHAT_URL + "?companyId=" + record.id;
       var qr = new QRCode(record.id, {
         text: qrtext,
         width: 300,

src/views/base/personDeviceRelation-list.vue

@@ -24,6 +24,13 @@
           :disabled="multipleSelection.length==0"
           @click="handleBatchBound"
         >批量绑定</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-remove"
+          @click="handleRemoveAll"
+        >解绑所有设备</el-button>
       </el-row>
       <el-table
         :data="tableData"
@@ -36,7 +43,18 @@
         <el-table-column type="selection" :selectable="disableSelect" width="55"></el-table-column>
         <el-table-column prop="deviceNo" label="设备编号" width="220"></el-table-column>
         <el-table-column prop="aliasName" label="设备名称" width="180"></el-table-column>
-        <el-table-column prop="typeN" label="类型" width="120"></el-table-column>
+        <el-table-column prop="isOnline" label="运行状态" width="80">
+          <template slot-scope="{row}">
+            <div
+              v-if="row.isOnline"
+              style="border-radius: 30px;background-color:#67C23A;width:20px;height:20px;"
+            ></div>
+            <div
+              v-if="!row.isOnline"
+              style="border-radius: 30px;background-color:#F56C6C;width:20px;height:20px;"
+            ></div>
+          </template>
+        </el-table-column>
         <el-table-column prop="isBindPerson" label="绑定状态" width="120">
           <template slot-scope="{row}">{{row.isBindPerson ? "已绑定" : "未绑定"}}</template>
         </el-table-column>
@@ -45,6 +63,9 @@
             <span v-if="!row.isBindPerson">
               <el-button size="mini" type="success" @click="handleBound(row)">绑定设备</el-button>
             </span>
+            <span v-else>
+              <el-button size="mini" type="danger" @click="handleDelete(row)">解除绑定</el-button>
+            </span>
           </template>
         </el-table-column>
       </el-table>
@@ -164,42 +185,43 @@ export default {
     },
     handleBound(record) {
       var self = this;
-      self.$confirm("是否绑定？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        distinguishCancelAndClose: true
-      })
+      self
+        .$confirm("是否绑定？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+          distinguishCancelAndClose: true
+        })
         .then(() => {
-        self.formModel.personId = self.personId;
-        self.formModel.deviceId = record.id;
+          self.formModel.personId = self.personId;
+          self.formModel.deviceId = record.id;
 
-        self.loading = true;
+          self.loading = true;
 
-        return personDeviceRelationApi
-          .add(self.formModel)
-          .then(function(response) {
-            self.loading = false;
+          return personDeviceRelationApi
+            .add(self.formModel)
+            .then(function(response) {
+              self.loading = false;
 
-            var jsonData = response.data;
-            self.changePage(self.pageIndex);
-            if (jsonData.result) {
-              self.$message({
-                message: "绑定成功!",
-                type: "success"
-              });
-            } else {
-              self.$message({
-                message: jsonData.message + "",
-                type: "warning"
-              });
-            }
-          });
-      })
-      .catch(error => {
-        self.loading = false;
-        // self.$message.error(error + "");
-      });
+              var jsonData = response.data;
+              self.changePage(self.pageIndex);
+              if (jsonData.result) {
+                self.$message({
+                  message: "绑定成功!",
+                  type: "success"
+                });
+              } else {
+                self.$message({
+                  message: jsonData.message + "",
+                  type: "warning"
+                });
+              }
+            });
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
     },
     handleBatchBound() {
       var self = this;
@@ -214,36 +236,106 @@ export default {
         distinguishCancelAndClose: true
       })
         .then(() => {
-        self.loading = true;
-        var formData = new FormData();
+          self.loading = true;
+          var formData = new FormData();
 
-        formData.append("personId", self.personId);
-        formData.append("devices", idList);
+          formData.append("personId", self.personId);
+          formData.append("devices", idList);
 
-        personDeviceRelationApi
-          .batchBindDevice(formData)
-          .then(function(response) {
+          personDeviceRelationApi
+            .batchBindDevice(formData)
+            .then(function(response) {
+              var jsonData = response.data;
+              self.changePage(self.pageIndex);
+              if (jsonData.result) {
+                self.$message({
+                  type: "success",
+                  message: "绑定成功!"
+                });
+              } else {
+                self.$message({
+                  showClose: true,
+                  dangerouslyUseHTMLString: true,
+                  message: `有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
+                  duration: 30000
+                });
+              }
+            });
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    handleDelete(record) {
+      var self = this;
+      this.$confirm("是否解除绑定？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          self.loading = true;
+
+          personDeviceRelationApi.remove(record.id).then(function(response) {
             var jsonData = response.data;
-            self.changePage(self.pageIndex);
+            self.loading = false;
             if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
               self.$message({
                 type: "success",
-                message: "绑定成功!"
-              });
-            } else {
-              self.$message({
-                showClose: true,
-                dangerouslyUseHTMLString: true,
-                message: `有部分人员绑定失败,<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
-                duration: 30000
+                message: "解绑成功!"
               });
             }
           });
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    handleRemoveAll() {
+      var self = this;
+
+      this.$confirm("是否解除绑定？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        distinguishCancelAndClose: true
       })
-      .catch(error => {
-        self.loading = false;
-        // self.$message.error(error + "");
-      });
+        .then(() => {
+          self.loading = true;
+          var formData = new FormData();
+          formData.append("personId", self.personId);
+
+          personDeviceRelationApi
+            .unbindDevice(formData)
+            .then(function(response) {
+              var jsonData = response.data;
+              self.loading = false;
+              if (jsonData.result) {
+                self.changePage(self.pageIndex);
+
+                self.$message({
+                  type: "success",
+                  message: "解绑成功!"
+                });
+              } else {
+                self.$message({
+                  type: "warning",
+                  message: jsonData.message
+                });
+              }
+            });
+        })
+        .catch(error => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
     },
     onDetailModalClose(refreshed) {
       //保存成功后回调

src/views/base/personInfo-list.vue

@@ -772,10 +772,16 @@ export default {
       //导出
       var self = this;
       var formData = new FormData();
-      formData.append("companyId", self.queryModel.companyId);
+
+      formData.append("companyCode", self.queryModel.companyCode);
+      formData.append("subordinate", self.queryModel.subordinate);
+
       formData.append("name", self.queryModel.name);
       formData.append("phone", self.queryModel.phone);
       formData.append("idCard", self.queryModel.idCard);
+      formData.append("faceBound", self.queryModel.faceBound);
+      formData.append("isUploadPhoto", self.queryModel.isUploadPhoto);
+
 
       self.xlsLoading = true;