Merge branch 'master' of http://223.75.76.159:9090/xiao547607/smart-community-server-portal

src/views/base/personDeviceRelation-BoundList.vue

@@ -171,13 +171,14 @@ export default {
     handleRemoveAll() {
       var self = this;
 
-      this.$confirm("是否绑定？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
+      // this.$confirm("是否绑定？", "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      //   distinguishCancelAndClose: true
+      // })
+      //   .then(() => {
+        if(confirm("是否绑定？")){
           self.loading = true;
           var formData = new FormData();
           formData.append("personId", self.personId);
@@ -201,11 +202,12 @@ export default {
                 });
               }
             });
-        })
-        .catch(error => {
-          self.loading = false;
-          // self.$message.error(error + "");
-        });
+        }
+        // })
+        // .catch(error => {
+        //   self.loading = false;
+        //   // self.$message.error(error + "");
+        // });
     },
     onDetailModalClose(refreshed) {
       //保存成功后回调

src/views/base/personDeviceRelation-list.vue

@@ -134,7 +134,7 @@ export default {
         .isUnbindDeviceList(formData)
         .then(function(response) {
           self.loading = false;
-          
+
           var jsonData = response.data.data;
 
           self.tableData = jsonData.data;
@@ -170,7 +170,7 @@ export default {
       //   distinguishCancelAndClose: true
       // })
       //   .then(() => {
-      if(confirm("是否绑定？")){
+      if (confirm("是否绑定？")) {
         self.formModel.personId = self.personId;
         self.formModel.deviceId = record.id;
 
@@ -195,12 +195,12 @@ export default {
               });
             }
           });
-        }
-        // })
-        // .catch(error => {
-        //   self.loading = false;
-        //   // self.$message.error(error + "");
-        // });
+      }
+      // })
+      // .catch(error => {
+      //   self.loading = false;
+      //   // self.$message.error(error + "");
+      // });
     },
     handleBatchBound() {
       var self = this;
@@ -208,41 +208,45 @@ export default {
         return record.id;
       });
 
-      this.$confirm("是否绑定选中项？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          self.loading = true;
-          var formData = new FormData();
+      // this.$confirm("是否绑定选中项？", "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   type: "warning",
+      //   distinguishCancelAndClose: true
+      // })
+      //   .then(() => {
+      if (confirm("是否绑定？")) {
+        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) {
-              var jsonData = response.data;
-              self.changePage(self.pageIndex);
-              if (jsonData.result) {
-                self.$message({
-                  type: "success",
-                  message: "绑定成功!"
-                });
-              } else {
-                self.$message({
-                  type: "error",
-                  message: jsonData.message
-                });
-              }
-            });
-        })
-        .catch(error => {
-          self.loading = false;
-          // self.$message.error(error + "");
-        });
+        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 + "");
+      // });
     },
     onDetailModalClose(refreshed) {
       //保存成功后回调

src/views/base/personInfo-list.vue

@@ -182,7 +182,7 @@
           <el-row>
             <el-col :span="10" v-if="row.popedom.indexOf('1')!= -1">个人用户</el-col>
             <el-col :span="10" v-if="row.popedom.indexOf('2')!= -1">单位管理员</el-col>
-            <el-col :span="10" v-if="row.popedom.indexOf('3')!= -1">监管人员</el-col>
+            <el-col :span="10" v-if="row.popedom.indexOf('3')!= -1">监管专员</el-col>
           </el-row>
         </template>
       </el-table-column>
@@ -674,7 +674,7 @@ export default {
       var self = this;
       self.xlsLoading = false;
       if (response.result) {
-        this.$message.success(response.message);
+        self.$message.success(response.message);
         this.batchImportFileList = [];
         this.changePage(1);
         this.uploadCompanyId = "";
@@ -690,7 +690,7 @@ export default {
         if (response.data != null) {
           //下载有错误信息提示的报表
           //window.open(response.data);
-          this.$message({
+          self.$message({
             showClose: true,
             dangerouslyUseHTMLString: true,
             message:
@@ -791,10 +791,10 @@ export default {
           }
         })
         .catch(() => {
-         // self.loading = false;
-          if(row.faceEnabled){
+          // self.loading = false;
+          if (row.faceEnabled) {
             row.faceEnabled = false;
-          }else{
+          } else {
             row.faceEnabled = true;
           }
         });
@@ -917,8 +917,10 @@ export default {
             });
           } else {
             self.$message({
-              type: "warning",
-              message: jsonData.message
+              showClose: true,
+              dangerouslyUseHTMLString: true,
+              message:`<a href="${jsonData.message}" target="_blank">点击下载错误信息报表</a>&nbsp;`,
+              duration: 30000
             });
           }
         });