ソースを参照

代码更新 2/24

zhangyun 4 年 前
コミット
6670f22d54
28 ファイル変更878 行追加470 行削除
  1. 70 61
      minggao/src/page/commandCenter/laboratory.vue
  2. 53 53
      minggao/src/page/commandCenter/realTime.vue
  3. 9 6
      minggao/src/page/commandCenter/superviseAdminDetails.vue
  4. 108 95
      minggao/src/page/commandCenter/taskRegulator.vue
  5. 34 0
      minggao/src/page/forecasting/cbd/Cbd.vue
  6. 48 23
      minggao/src/page/forecasting/cbd/DataDetails.vue
  7. 20 0
      minggao/src/page/forecasting/cbd/MessageWarn.vue
  8. 4 0
      minggao/src/page/forecasting/cbd/PestsStats.vue
  9. 4 0
      minggao/src/page/forecasting/cbd/PestsStatsNumber.vue
  10. 202 129
      minggao/src/page/forecasting/cbd/cbdDataPhotos.vue
  11. 4 0
      minggao/src/page/forecasting/cbd/deviceTongji.vue
  12. 4 0
      minggao/src/page/forecasting/cbd/tongji.vue
  13. 25 2
      minggao/src/page/forecasting/maintain/maintain.vue
  14. 18 3
      minggao/src/page/forecasting/trap/bait.vue
  15. 43 27
      minggao/src/page/forecasting/trap/fillinrecord.vue
  16. 21 3
      minggao/src/page/forecasting/trap/trap.vue
  17. 6 0
      minggao/src/page/home/index.vue
  18. 7 1
      minggao/src/page/homepage/pestdistribute.vue
  19. 62 0
      minggao/src/page/monitor/Monitor.vue
  20. 4 0
      minggao/src/page/monitor/PhotoView.vue
  21. 5 1
      minggao/src/page/monitoring/monitoringtask.vue
  22. 5 1
      minggao/src/page/monitoring/supervisiontask.vue
  23. 10 0
      minggao/src/page/systemmanger/customsManger.vue
  24. 8 0
      minggao/src/page/systemmanger/harmfulBiology.vue
  25. 4 0
      minggao/src/page/systemmanger/motif.vue
  26. 12 0
      minggao/src/page/systemmanger/role.vue
  27. 86 65
      minggao/src/page/systemmanger/userManger.vue
  28. 2 0
      minggao/src/store/store.js

+ 70 - 61
minggao/src/page/commandCenter/laboratory.vue

@@ -213,9 +213,7 @@
         <li class="fill_listTlt">
           <div class="fill_div">
             <div class="fill_tltie">有害生物</div>
-            <div class="fill_tltie">
-              数量
-            </div>
+            <div class="fill_tltie">数量</div>
           </div>
         </li>
 
@@ -254,7 +252,7 @@
         <!-- 添加 -->
         <li class="fill_list">
           <el-select
-            style="margin: 0 0 0 -8px;"
+            style="margin: 0 0 0 -8px"
             v-model="insectVal"
             size="mini"
             clearable
@@ -314,16 +312,16 @@ export default {
       options: [
         {
           value: "待接收",
-          label: "待接收"
+          label: "待接收",
         },
         {
           value: "已接收",
-          label: "已接收"
+          label: "已接收",
         },
         {
           value: "已填报",
-          lanbel: "已填报"
-        }
+          lanbel: "已填报",
+        },
       ],
       value: "", // 任务状态
       value1: "", // 时间筛选
@@ -352,7 +350,7 @@ export default {
       insectVal: "", // 添加 - 有害生物
       numVal: "", // 添加 - 数量
       loading1: false, // 加载
-      submitBtn: false // 防止弹框确定按钮重复请求
+      submitBtn: false, // 防止弹框确定按钮重复请求
     };
   },
   //监听属性 类似于data概念
@@ -365,7 +363,7 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件,导致卡顿
           that.timer = false;
         }, 400);
@@ -384,7 +382,7 @@ export default {
     // 填报 - 新添加数据
     numValZ(val) {
       console.log(val);
-    }
+    },
   },
   //方法集合
   methods: {
@@ -444,10 +442,10 @@ export default {
           operator_user_id: this.input, // 任务处理人id
           start_time: this.startTime, // 开始时间
           end_time: this.endTime, // 结束时间
-          task_status: this.value // 任务状态
-        })
+          task_status: this.value, // 任务状态
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             this.tableSum = res.data.data.total_item;
             var data = res.data.data.page_list;
@@ -460,7 +458,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
         });
     },
@@ -474,14 +472,14 @@ export default {
           user_type: "operator", // 用户类型,operator(任务处理人), supervisor(任务监督人), owner(任务发布人)
           operator_id: "", // 已经选择的任务处理人id
           supervisor_id: "", // 已经选择的任务监督人id
-          owner_id: "" // 已经选择的任务发布人id
-        })
+          owner_id: "", // 已经选择的任务发布人id
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.length !== 0) {
             var data = res.data.data;
             var list = [];
-            data.forEach(item => {
+            data.forEach((item) => {
               var obj = {};
               obj["value"] = item.user_id;
               obj["label"] = item.real_name;
@@ -490,7 +488,7 @@ export default {
             this.conductorList = list;
           }
         })
-        .catch(err => {});
+        .catch((err) => {});
     },
 
     // 确认接收
@@ -498,37 +496,41 @@ export default {
       this.$confirm("此操作将确认接收, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           this.$axios({
             method: "POST",
             url: "/api/api_gateway?method=control_center.task.discern_modify",
             data: this.qs.stringify({
-              record_id: data.id // 任务id
-            })
+              record_id: data.id, // 任务id
+            }),
           })
-            .then(res => {
+            .then((res) => {
               if (res.data.data == true) {
-                this.$message({
-                  type: "success",
-                  message: "接收成功!",
-                  duration: 1500
-                });
+                if (document.getElementsByClassName("el-message").length == 0) {
+                  this.$message({
+                    type: "success",
+                    message: "接收成功!",
+                    duration: 1500,
+                  });
+                }
                 this.loading = true;
                 this.tableList();
               }
             })
-            .catch(err => {
+            .catch((err) => {
               console.log(err);
             });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消接收",
-            duration: 1500
-          });
+          if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message({
+              type: "info",
+              message: "已取消接收",
+              duration: 1500,
+            });
+          }
         });
     },
 
@@ -539,13 +541,12 @@ export default {
       // 填报记录详情接口
       this.$axios({
         method: "POST",
-        url:
-          "/api/api_gateway?method=control_center.task.trap_pest_record_info",
+        url: "/api/api_gateway?method=control_center.task.trap_pest_record_info",
         data: this.qs.stringify({
-          trap_record_id: data.id // 任务id
-        })
+          trap_record_id: data.id, // 任务id
+        }),
       })
-        .then(res => {
+        .then((res) => {
           var data = res.data.data;
           var list = [];
           var arr = [];
@@ -564,7 +565,7 @@ export default {
           this.dialogVisible = true;
           this.addEditor(); // 新添加 - 编辑接口
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err);
         });
     },
@@ -577,10 +578,10 @@ export default {
         data: this.qs.stringify({
           page: 1, // 页码
           page_item: "1000000000000000000000000000", // 每页条目数,默认10
-          pest_name: "" // 有害生物
-        })
+          pest_name: "", // 有害生物
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             var data = res.data.data;
             var list = [];
@@ -594,7 +595,7 @@ export default {
             this.options2 = list;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           console.log(err);
         });
     },
@@ -623,11 +624,13 @@ export default {
           this.fillList.push(item);
         });
       } else {
-        this.$message({
-          type: "info",
-          message: "请将信息填写完整!",
-          duration: 1500
-        });
+        if (document.getElementsByClassName("el-message").length == 0) {
+          this.$message({
+            type: "info",
+            message: "请将信息填写完整!",
+            duration: 1500,
+          });
+        }
       }
     },
 
@@ -660,16 +663,18 @@ export default {
         url: "/api/api_gateway?method=control_center.task.discern_add",
         data: this.qs.stringify({
           record_id: this.examineObj.id, // 任务id
-          pest_list: JSON.stringify(array) // 害虫数组
-        })
+          pest_list: JSON.stringify(array), // 害虫数组
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.message == "") {
-            this.$message({
-              type: "success",
-              message: "成功!",
-              duration: 1500
-            });
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message({
+                type: "success",
+                message: "成功!",
+                duration: 1500,
+              });
+            }
             this.fillList = [];
             this.models = [];
             this.dialogVisible = false;
@@ -678,7 +683,7 @@ export default {
           this.numVal = "";
           this.submitBtn = false;
         })
-        .catch(err => {
+        .catch((err) => {
           // console.log(err);
           this.submitBtn = false;
         });
@@ -711,17 +716,21 @@ export default {
       var keychar = String.fromCharCode(keynum); //获取键盘码对应的字符
       if (keynum == 189 || keynum == 109) {
         //禁止输入负数
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message.warning("禁止输入负数");
+        }
         e.target.value = 0;
       }
 
       if (String(e.target.value).indexOf("-") == -1) {
       } else {
         //禁止输入负数
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message.warning("禁止输入负数");
+        }
         e.target.value = 0;
       }
-    }
+    },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -738,7 +747,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
 <style lang="less" scoped>

+ 53 - 53
minggao/src/page/commandCenter/realTime.vue

@@ -283,10 +283,7 @@
             </div>
           </div>
           <!-- you -->
-          <div
-            v-else-if="item.is_right == false"
-            class="list_msgBox2"
-          >
+          <div v-else-if="item.is_right == false" class="list_msgBox2">
             <div>
               <img
                 src="../../../static/images/realTime/6.png"
@@ -363,7 +360,7 @@ export default {
       loading2: false,
       defaultProps: {
         children: "childrens",
-        label: "org_name"
+        label: "org_name",
       },
 
       // 分页
@@ -398,12 +395,11 @@ export default {
       input: "", //发送框
       iconShow: true,
       // 文本消息功能
-      url:
-        "ws://192.168.1.17:12345/api/api_gateway?method=control_center.real_time.im_message",
+      url: "ws://192.168.1.17:12345/api/api_gateway?method=control_center.real_time.im_message",
       websock: null,
       getUserObj: {}, // 获取到当前点击的行数据
       msgList: [], //当前点击的账号消息列表
-      userName: ""
+      userName: "",
     };
   },
   //监听属性 类似于data概念
@@ -416,7 +412,7 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件,导致卡顿
           that.timer = false;
         }, 400);
@@ -446,7 +442,7 @@ export default {
         this.notTensile(); // 停止拉流
         this.notLogin(); //退出房间
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -477,7 +473,7 @@ export default {
     changeList(page) {
       this.page = page;
       this.loading = true;
-      this.tableData = []
+      this.tableData = [];
       this.userListData();
     },
 
@@ -490,20 +486,20 @@ export default {
           page: this.page,
           page_item: "100000000",
           org_name: "",
-        })
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.page_list.length !== 0) {
             var obj = {
               org_name: "全部",
-              id: ""
+              id: "",
             };
             var data = res.data.data.page_list;
             this.data = [obj, ...data]; // 左侧组织列表
           }
           this.loading2 = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading2 = false;
         });
     },
@@ -518,10 +514,10 @@ export default {
           page_item: "20",
           real_name: this.nameVal, //用户名称
           mobile: this.phoneVal, // 电话
-          org_id: this.org_id
-        })
+          org_id: this.org_id,
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.page_item !== 0) {
             var data = res.data.data.page_list;
             var list = [];
@@ -534,7 +530,7 @@ export default {
             this.loading = false;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
         });
     },
@@ -551,8 +547,8 @@ export default {
         recv_user_id: data.user_id,
         data: {
           msg_status: false,
-          msg_info: ""
-        }
+          msg_info: "",
+        },
       };
       console.log(data);
       this.websock.send(JSON.stringify(obj));
@@ -573,8 +569,8 @@ export default {
         recv_user_id: data.user_id,
         data: {
           msg_status: false,
-          msg_info: ""
-        }
+          msg_info: "",
+        },
       };
       this.websock.send(JSON.stringify(obj));
       // // 登录房间
@@ -640,20 +636,22 @@ export default {
     // 当音视频通话关闭时的回调
     handleClose(done) {
       this.$confirm("目前正在音视频通话中,确认关闭?")
-        .then(_ => {
+        .then((_) => {
           done();
         })
-        .catch(_ => {});
+        .catch((_) => {});
     },
 
     // 发送消息
     async submit() {
       if (this.input.split(" ").join("").length == 0) {
-        this.$message({
-          message: "不能发送空白消息!",
-          type: "warning",
-          duration: 1500
-        });
+        if (document.getElementsByClassName("el-message").length == 0) {
+          this.$message({
+            message: "不能发送空白消息!",
+            type: "warning",
+            duration: 1500,
+          });
+        }
         this.input = "";
       } else {
         try {
@@ -663,8 +661,8 @@ export default {
             recv_user_id: this.getUserObj.user_id,
             data: {
               msg_status: false,
-              msg_info: this.input
-            }
+              msg_info: this.input,
+            },
           };
           var v = JSON.stringify(obj);
           this.websock.send(v);
@@ -701,7 +699,7 @@ export default {
 
     // 文本消息功能初始化
     msgInit() {
-      var that = this
+      var that = this;
       if (typeof WebSocket === "undefined") {
         alert("您的浏览器不支持socket!");
       } else {
@@ -712,11 +710,11 @@ export default {
         );
         // window.s = this.websock
 
-        this.websock.onopen = event => {
+        this.websock.onopen = (event) => {
           console.log("WebSocket:已连接");
           console.log(event);
         };
-        this.websock.onmessage = event => {
+        this.websock.onmessage = (event) => {
           // console.log("WebSocket:消息");
           // console.log(JSON.parse(event.data));
           var data = JSON.parse(event.data);
@@ -742,9 +740,9 @@ export default {
 
               for (var i = 0; i < datArr.length; i++) {
                 if (this.getUserObj.user_id == datArr[i].user_id) {
-                   data.data[i].msg_list = data.data[i].msg_list.reverse();
-                    that.msgList = data.data[i];
-                   console.log(data.data[i])
+                  data.data[i].msg_list = data.data[i].msg_list.reverse();
+                  that.msgList = data.data[i];
+                  console.log(data.data[i]);
                 }
               }
             }
@@ -761,14 +759,14 @@ export default {
               recv_user_id: this.getUserObj.user_id,
               data: {
                 msg_status: false,
-                msg_info: ""
-              }
+                msg_info: "",
+              },
             };
             this.websock.send(JSON.stringify(obj));
           } else if (data.action == "recv_video") {
             // 获取当前点击用户的房间号以及登录房间所需的Token
             // console.log(JSON.parse(event.data));
-            console.log(data)
+            console.log(data);
             var data = JSON.parse(event.data);
             this.RoomID = data.data.room_id; // 房间号
             this.Token = data.data.room_token; // Token
@@ -780,20 +778,20 @@ export default {
                 { userID: this.UserID, userName: this.UserID },
                 { userUpdate: true }
               )
-              .then(result => {
+              .then((result) => {
                 if (result == true) {
-                  console.log('0000000000000000000000000000000000000登录成功')
+                  console.log("0000000000000000000000000000000000000登录成功");
                   this.plugFlow(); //推流
                   this.videoVisible = true;
                 }
               });
           }
         };
-        this.websock.onerror = event => {
+        this.websock.onerror = (event) => {
           console.log("WebSocket:发生错误 ");
           console.log(event);
         };
-        this.websock.onclose = event => {
+        this.websock.onclose = (event) => {
           console.log("WebSocket:已关闭");
           console.log(event);
         };
@@ -820,11 +818,13 @@ export default {
             console.log("房间连接成功");
             //定时器
             timer = setTimeout(() => {
-              this.$message({
-                message: "没人接听,请稍后重试",
-                type: "warning",
-                duration: 2500
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message({
+                  message: "没人接听,请稍后重试",
+                  type: "warning",
+                  duration: 2500,
+                });
+              }
               this.videoVisible = false;
             }, 5000);
             // }, 60000);
@@ -868,7 +868,7 @@ export default {
         }
       );
 
-      this.zg.on("publisherStateUpdate", result => {
+      this.zg.on("publisherStateUpdate", (result) => {
         // 推流状态更新回调
         console.log("推流状态更新");
       });
@@ -905,7 +905,7 @@ export default {
       } else {
         console.log("不兼容");
       }
-    }
+    },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -924,7 +924,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
 <style lang="less" scoped>

+ 9 - 6
minggao/src/page/commandCenter/superviseAdminDetails.vue

@@ -327,11 +327,13 @@ export default {
           })
             .then((res) => {
               if (res.data.data == true) {
-                this.$message({
-                  message: "成功!",
-                  type: "success",
-                  duration: 1500,
-                });
+                if (document.getElementsByClassName("el-message").length == 0) {
+                  this.$message({
+                    message: "成功!",
+                    type: "success",
+                    duration: 1500,
+                  });
+                }
                 this.superviseVisible = false;
                 // this.$router.push({
                 //   path: "/index/superviserec",
@@ -487,6 +489,7 @@ export default {
 
 // 文本域样式更改
 /deep/.el-textarea__inner {
-  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
+    "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
 }
 </style>

+ 108 - 95
minggao/src/page/commandCenter/taskRegulator.vue

@@ -520,24 +520,24 @@ export default {
       options2: [
         {
           value: "未开始",
-          label: "未开始"
+          label: "未开始",
         },
         {
           value: "处理中",
-          label: "处理中"
+          label: "处理中",
         },
         {
           value: "已完成",
-          label: "已完成"
+          label: "已完成",
         },
         {
           value: "未处理",
-          label: "未处理"
+          label: "未处理",
         },
         {
           value: "逾期完成",
-          label: "逾期完成"
-        }
+          label: "逾期完成",
+        },
       ], // 任务状态 - 列表
       value2: "", //时间筛选
       startTime: "", // 开始时间
@@ -555,24 +555,24 @@ export default {
       type_status: [
         {
           name: "未开始",
-          color: "#409EFF"
+          color: "#409EFF",
         },
         {
           name: "处理中",
-          color: "#E6A23C"
+          color: "#E6A23C",
         },
         {
           name: "已完成",
-          color: "#67C23A"
+          color: "#67C23A",
         },
         {
           name: "未处理",
-          color: "#F56C6C"
+          color: "#F56C6C",
         },
         {
           name: "逾期完成",
-          color: "#000"
-        }
+          color: "#000",
+        },
       ],
 
       // 新增任务弹框
@@ -586,48 +586,48 @@ export default {
         endTime: "", // 结束时间
         type: "", // 任务类型
         checkList: [], //诱捕器
-        desc: "" // 任务描述
+        desc: "", // 任务描述
       },
       rules: {
         region: [
-          { required: true, message: "请选择任务处理人", trigger: "blur" }
+          { required: true, message: "请选择任务处理人", trigger: "blur" },
         ],
         overseer: [
-          { required: true, message: "请选择任务监督人", trigger: "blur" }
+          { required: true, message: "请选择任务监督人", trigger: "blur" },
         ],
         date: [{ required: true, message: "请选择任务时间", trigger: "blur" }],
         type: [{ required: true, message: "请选择任务类型", trigger: "blur" }],
         checkList: [
-          { required: true, message: "请选择诱捕器", trigger: "blur" }
-        ]
+          { required: true, message: "请选择诱捕器", trigger: "blur" },
+        ],
         // desc: [{ required: true, message: "请填写任务描述", trigger: "blur" }]
       },
       // 任务类型
       typeList: [
         {
           value: "有害生物监测",
-          label: "有害生物监测"
+          label: "有害生物监测",
         },
         {
           value: "入境口岸监测调查",
-          label: "入境口岸监测调查"
+          label: "入境口岸监测调查",
         },
         {
           value: "外来有害杂草监测",
-          label: "外来有害杂草监测"
+          label: "外来有害杂草监测",
         },
         {
           value: "其他监测任务",
-          label: "其他监测任务"
+          label: "其他监测任务",
         },
         {
           value: "挂放",
-          label: "挂放"
+          label: "挂放",
         },
         {
           value: "维护",
-          label: "维护"
-        }
+          label: "维护",
+        },
       ],
 
       // 选择诱捕器
@@ -636,7 +636,7 @@ export default {
       deviceForm: {
         monitorDot: "", // 监测点
         tissue: "", // 组织
-        serial: "" // 设备编号
+        serial: "", // 设备编号
       },
       loading5: false, // 加载
       page2: 1, //当前页码
@@ -647,7 +647,7 @@ export default {
       taskObj: {}, // 点击编辑获取到的任务数据
       isClick: true, // 防止重复弹框
       btnShow: false, // 防止导出数据重复下载
-      submitBtn: false // 防止弹框确定按钮重复请求
+      submitBtn: false, // 防止弹框确定按钮重复请求
     };
   },
   //监听属性 类似于data概念
@@ -669,7 +669,7 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件,导致卡顿
           that.timer = false;
         }, 400);
@@ -716,7 +716,7 @@ export default {
           }
         }
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -740,7 +740,7 @@ export default {
         this.startTime = "";
         this.endTime = "";
       }
-      this.page = 1
+      this.page = 1;
       this.loading = true;
       this.tableData = [];
       this.tableList();
@@ -778,10 +778,10 @@ export default {
           owner_user_id: this.input2, // 任务发布id
           start_time: this.startTime, // 开始时间
           end_time: this.endTime, // 结束时间
-          task_status: this.value // 任务状态
-        })
+          task_status: this.value, // 任务状态
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             var data = res.data.data.page_list;
             this.tableSum = res.data.data.total_item;
@@ -795,7 +795,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           // console.log(err);
         });
@@ -806,8 +806,8 @@ export default {
       this.$router.push({
         path: "/index/taskRegulatorDetails",
         query: {
-          id: data.task_id
-        }
+          id: data.task_id,
+        },
       });
     },
 
@@ -820,9 +820,9 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=control_center.task.task_info",
         data: this.qs.stringify({
-          task_id: data.task_id
-        })
-      }).then(res => {
+          task_id: data.task_id,
+        }),
+      }).then((res) => {
         var data = res.data.data;
         this.ruleForm.region = data.operator_user; // 任务处理人
         this.ruleForm.overseer = data.supervisor_user; // 任务监督人
@@ -831,7 +831,7 @@ export default {
         this.ruleForm.desc = data.tesk_msg; //任务描述
         this.ybqCheckList = ""; // 诱捕器
         var list = [];
-        data.trap_record_list.forEach(item => {
+        data.trap_record_list.forEach((item) => {
           var obj = {};
           obj["name"] = item.trap_number;
           obj["id"] = item.trap_id;
@@ -848,23 +848,25 @@ export default {
       this.$confirm("此操作将永久删除该条任务, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           this.$axios({
             method: "POST",
             url: "/api/api_gateway?method=control_center.task.task_delete",
             data: this.qs.stringify({
-              task_id: data.task_id
-            })
-          }).then(res => {
+              task_id: data.task_id,
+            }),
+          }).then((res) => {
             // console.log(res);
             if (res.data.data == true) {
-              this.$message({
-                type: "success",
-                message: "删除成功!",
-                duration: 1500
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                  duration: 1500,
+                });
+              }
               this.tableData = [];
               this.loading = true;
               this.tableList();
@@ -872,11 +874,13 @@ export default {
           });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-            duration: 1500
-          });
+          if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+              duration: 1500,
+            });
+          }
         });
     },
 
@@ -889,14 +893,14 @@ export default {
           user_type: type, // 用户类型,operator(任务处理人), supervisor(任务监督人), owner(任务发布人)
           operator_id: a, // 已经选择的任务处理人id
           supervisor_id: b, // 已经选择的任务监督人id
-          owner_id: c // 已经选择的任务发布人id
-        })
+          owner_id: c, // 已经选择的任务发布人id
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.length !== 0) {
             var data = res.data.data;
             var list = [];
-            data.forEach(item => {
+            data.forEach((item) => {
               var obj = {};
               obj["value"] = item.user_id;
               obj["label"] = item.real_name;
@@ -915,7 +919,7 @@ export default {
             }
           }
         })
-        .catch(err => {});
+        .catch((err) => {});
     },
 
     // 筛选列表 - 任务处理人、任务监督人
@@ -945,7 +949,7 @@ export default {
     addTask() {
       this.titleData = "发布任务";
       this.dialogVisible = true;
-      this.ybqCheckList =[]
+      this.ybqCheckList = [];
     },
 
     // 筛选列表 - 任务处理人、任务监督人
@@ -973,7 +977,7 @@ export default {
 
     // 新建任务 、 编辑任务 - 发布
     submitForm(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.submitBtn = true;
           if (this.ruleForm.date) {
@@ -1007,27 +1011,31 @@ export default {
                 last_time: this.ruleForm.endTime, // 任务完成时间
                 task_type: this.ruleForm.type, // 任务类型
                 tesk_msg: this.ruleForm.desc, // 任务描述
-                trap_id_list: JSON.stringify(this.ruleForm.checkList) // 诱捕器id列表
-              })
+                trap_id_list: JSON.stringify(this.ruleForm.checkList), // 诱捕器id列表
+              }),
             })
-              .then(res => {
+              .then((res) => {
                 if (res.data.message == "") {
                   this.loading = true;
                   this.tableData = [];
                   this.dialogVisible = false;
                   this.tableList();
-                  this.$message({
-                    type: "success",
-                    message: "新增成功!",
-                    duration: 1500
-                  });
+                  if (
+                    document.getElementsByClassName("el-message").length == 0
+                  ) {
+                    this.$message({
+                      type: "success",
+                      message: "新增成功!",
+                      duration: 1500,
+                    });
+                  }
                   for (var key in this.ruleForm) {
                     this.ruleForm[key] = "";
                   }
                 }
                 this.submitBtn = false;
               })
-              .catch(err => {
+              .catch((err) => {
                 this.submitBtn = false;
               });
           } else if (this.titleData == "编辑任务") {
@@ -1041,24 +1049,28 @@ export default {
                 last_time: this.ruleForm.endTime, // 任务完成时间
                 task_type: this.ruleForm.type, // 任务类型
                 tesk_msg: this.ruleForm.desc, // 任务描述
-                trap_id_list: JSON.stringify(this.ruleForm.checkList) // 诱捕器id列表
-              })
+                trap_id_list: JSON.stringify(this.ruleForm.checkList), // 诱捕器id列表
+              }),
             })
-              .then(res => {
+              .then((res) => {
                 if (res.data.message == "") {
                   this.loading = true;
                   this.tableData = [];
                   this.dialogVisible = false;
                   this.tableList();
-                  this.$message({
-                    type: "success",
-                    message: "编辑成功!",
-                    duration: 1500
-                  });
+                  if (
+                    document.getElementsByClassName("el-message").length == 0
+                  ) {
+                    this.$message({
+                      type: "success",
+                      message: "编辑成功!",
+                      duration: 1500,
+                    });
+                  }
                 }
                 this.submitBtn = false;
               })
-              .catch(err => {
+              .catch((err) => {
                 this.submitBtn = false;
               });
           }
@@ -1101,15 +1113,15 @@ export default {
           org_id: this.deviceForm.tissue, // 设备所属组织id
           trap_status: "", // 诱捕器状态 0停用 1正常
           page: this.page2, // 页码
-          page_size: "36" //每页数量,默认为10
-        })
+          page_size: "36", //每页数量,默认为10
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             var data = res.data.data;
             this.listSum = data.total_item;
             var list = [];
-            data.page_list.forEach(item => {
+            data.page_list.forEach((item) => {
               var obj = {};
               obj["value"] = item.trap_id;
               obj["label"] = item.trap_number;
@@ -1119,7 +1131,7 @@ export default {
           }
           this.loading5 = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading5 = false;
         });
     },
@@ -1128,16 +1140,16 @@ export default {
     ybqScreenList() {
       this.$axios({
         method: "POST",
-        url: "/api/api_gateway?method=monitor_manage.trap_manage.trap_org"
+        url: "/api/api_gateway?method=monitor_manage.trap_manage.trap_org",
       })
-        .then(res => {
+        .then((res) => {
           // console.log(res);
           var data = res.data.data;
 
           // 组织
           if (data.org_data.length !== 0) {
             var list = [];
-            data.org_data.forEach(item => {
+            data.org_data.forEach((item) => {
               var obj = {};
               obj["value"] = item.org_id;
               obj["label"] = item.org_name;
@@ -1149,7 +1161,7 @@ export default {
           // 监测点
           if (data.point_data.length !== 0) {
             var list2 = [];
-            data.point_data.forEach(item => {
+            data.point_data.forEach((item) => {
               var obj = {};
               obj["value"] = item.point_id;
               obj["label"] = item.point_name;
@@ -1158,7 +1170,7 @@ export default {
             this.pointData = list2;
           }
         })
-        .catch(err => {
+        .catch((err) => {
           // console.log(err);
         });
     },
@@ -1225,16 +1237,16 @@ export default {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=control_center.task.task_export",
-        responseType: "blob"
+        responseType: "blob",
       })
-        .then(res => {
+        .then((res) => {
           this.downloadFile(res, "任务列表.xls");
           that.loadingShow = false;
           setTimeout(() => {
             this.btnShow = false;
           }, 1500);
         })
-        .catch(err => {
+        .catch((err) => {
           that.loadingShow = false;
           setTimeout(() => {
             this.btnShow = false;
@@ -1244,7 +1256,7 @@ export default {
 
     downloadFile(res, name) {
       let link = document.createElement("a");
-      console.log(res)
+      console.log(res);
       link.href = window.URL.createObjectURL(new Blob([res.data]));
       link.target = "_blank";
       // 文件名和格式
@@ -1252,7 +1264,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
-    }
+    },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -1261,7 +1273,7 @@ export default {
     this.loading = true;
     this.tableList(); // 表格数据
     // this.conductorAxios(); // 筛选列表 - 任务处理人
-  }
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -1362,6 +1374,7 @@ export default {
 
 // 文本域样式更改
 /deep/.el-textarea__inner {
-  font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
+    "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
 }
 </style>

+ 34 - 0
minggao/src/page/forecasting/cbd/Cbd.vue

@@ -978,9 +978,13 @@ export default {
         }),
       }).then((res) => {
         if (res.data.message == "") {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.success("设备控制修改成功");
+          }
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("设备控制修改失败");
+          }
         }
         this.releaseTF = false
         this.equipControlDialogVisible = false;
@@ -1034,23 +1038,29 @@ export default {
             }),
           }).then((res) => {
             if (res.data.message == "") {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "success",
                 message: "修改成功!",
               });
+              }
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "error",
                 message: res.data.message,
               });
+              }
             }
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "已取消修改",
           });
+          }
         });
     },
     equipOperation(item) {
@@ -1152,19 +1162,25 @@ export default {
               }),
             }).then((res) => {
               if (res.data.message == "") {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message.success("提交成功");
+                }
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message.error("提交失败");
+                }
               }
             });
             this.mqttDialogVisible = false;
           })
           .catch(() => {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               type: "info",
               message: "已取消",
               duration: 1500,
             });
+            }
           });
       });
     },
@@ -1214,10 +1230,12 @@ export default {
           // this.equipBtnControl("imei");
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "取消输入",
           });
+          }
         });
     },
 
@@ -1235,17 +1253,21 @@ export default {
         .then((res) => {
           console.log(res);
           if (res.data == "OK" || res.data == "OK!") {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: "文件上传成功",
               type: "success",
               duration: 1500,
             });
+            }
           } else {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: res.data,
               type: "warning",
               duration: 1500,
             });
+            }
           }
         })
         .catch((err) => {
@@ -1297,7 +1319,9 @@ export default {
         })
         .catch((err) => {
           console.log(err);
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("操作失败,请重试!");
+          }
         });
     },
     submitForm(formName) {
@@ -1344,27 +1368,33 @@ export default {
               // } else if (this.parameter == "modify") {
               //   message = "修改成功!";
               // }
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "修改成功!",
                 type: "success",
               });
+              }
               this.operationDialogVisible = false;
               this.getEquipList();
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "添加失败" + res.data.message,
                 type: "warning",
               });
+              }
             }
             this.releaseTF = false
           });
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             message: "请将信息填写完全",
             type: "warning",
           });
+          }
           return false;
         }
       });
@@ -1430,7 +1460,9 @@ export default {
             lng: lnglat.lng,
           };
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("根据地址查询位置失败");
+          }
         }
       });
     },
@@ -1483,7 +1515,9 @@ export default {
         });
         marker.setMap(this.map);
       } else {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message.warning("请输入经纬度!");
+        }
         // return fasle;
       }
     },

+ 48 - 23
minggao/src/page/forecasting/cbd/DataDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="cursor: default;width:99%;">
+  <div style="cursor: default; width: 99%">
     <el-button type="success" size="small" @click="goBackPage()"
       ><i class="el-icon--left el-icon-d-arrow-left"></i>返回</el-button
     >
@@ -812,8 +812,11 @@ export default {
       }).then((res) => {
         if (res.data.message == "") {
           this.equipStatus = res.data.data;
-          if (res.data.data.dver.indexOf("HK") != "-1" || res.data.data.dver.indexOf('HK') !== "-1") {
-          // if (res.data.data.dver.indexOf("HK") != "-1") {
+          if (
+            res.data.data.dver.indexOf("HK") != "-1" ||
+            res.data.data.dver.indexOf("HK") !== "-1"
+          ) {
+            // if (res.data.data.dver.indexOf("HK") != "-1") {
             //判断版本是否包含HK的
             this.showHksimFlag = true;
           } else {
@@ -968,10 +971,12 @@ export default {
                   }
                 }
               } else {
-                this.$message({
-                  type: "info",
-                  message: "查询失败",
-                });
+                if (document.getElementsByClassName("el-message").length == 0) {
+                  this.$message({
+                    type: "info",
+                    message: "查询失败",
+                  });
+                }
               }
             } else if (res.data.data.code == 1) {
               // 企鹏
@@ -1063,25 +1068,31 @@ export default {
                   }
                 }
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
+                  this.$message({
+                    type: "info",
+                    message: "查询失败",
+                  });
+                }
+              }
+            } else if (res.data.data.code == 3) {
+              if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   type: "info",
                   message: "查询失败",
                 });
               }
-            } else if (res.data.data.code == 3) {
-              this.$message({
-                type: "info",
-                message: "查询失败",
-              });
               // this.simCodeVisible = false;
             }
             this.simLoading = false;
           });
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "查询失败",
           });
+          }
           // this.simCodeVisible = false;
         }
         this.simLoading = false;
@@ -1111,18 +1122,24 @@ export default {
           this.hksiminp = "";
           if (res.data.data == "1") {
             // this.lookSIMCode("hksim");
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               type: "success",
               message: "绑定成功",
             });
+            }
             this.simSet(this.simID, "hksim");
             this.lookSIMCode("hksim");
-          }else{
-            this.$message.error(res.data.message)
+          } else {
+            if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message.error(res.data.message);
+            }
           }
         });
-      }else{
-        this.$message.error("ICCID不能为空!")
+      } else {
+        if (document.getElementsByClassName("el-message").length == 0) {
+        this.$message.error("ICCID不能为空!");
+        }
       }
     },
     //刷新按钮
@@ -1137,9 +1154,13 @@ export default {
         }),
       }).then((res) => {
         if (res.data.message == "") {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.success("刷新成功");
+          }
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.err("刷新失败");
+          }
         }
       });
     },
@@ -1156,13 +1177,15 @@ export default {
     addData() {
       var that = this;
       console.log(this.value1);
-      if (that.value == ""|| that.value1 == "") {
+      if (that.value == "" || that.value1 == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "请将必填项填写完整",
           type: "warning",
           duration: 1500,
         });
-      } else{
+        }
+      } else {
         var begin = "";
         var end = "";
         // if (that.value1 == "") {
@@ -1174,15 +1197,15 @@ export default {
         //   begin = "";
         //   end = "";
         // }
-        if (that.value1=="选项2") {
+        if (that.value1 == "选项2") {
           begin = this.queryInfo.begin;
           end = this.queryInfo.end;
-        } else if(that.value1=="选项1"){
+        } else if (that.value1 == "选项1") {
           begin = "";
           end = "";
         }
-        var username = localStorage.getItem("cUsername")
-        console.log(1111)
+        var username = localStorage.getItem("cUsername");
+        console.log(1111);
         window.location.href =
           this.$deriveData +
           // "http://192.168.1.77:8002"+
@@ -1194,7 +1217,7 @@ export default {
           begin +
           "&end_time=" +
           end +
-          "&device_type=3"+
+          "&device_type=3" +
           "&username=" +
           username;
       }
@@ -1253,7 +1276,9 @@ export default {
       //   this.hksiminp = "";
       // }
       if (!/^[0-9][a-z][A-Z]+$/.test(this.accountName)) {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message.error("只能输入数字及英文");
+        }
       }
     },
   },

+ 20 - 0
minggao/src/page/forecasting/cbd/MessageWarn.vue

@@ -253,10 +253,12 @@ export default {
 		switch1Fun() {
 			console.log(this.switch1)
 			if (this.switch1 && !this.input1) {
+				if (document.getElementsByClassName("el-message").length == 0) {
 				this.$message({
 					message: '请将数据填写完整,再进行操作',
 					type: 'warning'
 				})
+				}
 				this.$refs.input.focus()
 				this.switch1 = false
 			}
@@ -270,10 +272,12 @@ export default {
 					"'}种,请注意防范(详情请登录<span>www.yfzhwlw.com</span>查看)"
 				this.dialogHtml = html
 			} else {
+				if (document.getElementsByClassName("el-message").length == 0) {
 				this.$message({
 					message: '请将数据填写完整,再进行查看',
 					type: 'warning'
 				})
+				}
 				this.$refs.input.focus()
 			}
 		},
@@ -288,10 +292,12 @@ export default {
 			var len = this.planKind.length
 			for (var i = 0; i < len; i++) {
 				if (!(planKind[i].value && planKind[i].nums != 0)) {
+					if (document.getElementsByClassName("el-message").length == 0) {
 					this.$message({
 						message: '请将数据填写完整,再进行添加',
 						type: 'warning'
 					})
+					}
 					return false
 				}
 				if (i == len - 1) {
@@ -318,18 +324,22 @@ export default {
 				this.dialogHtml = html
 				this.dialogVisible = true
 			} else {
+				if (document.getElementsByClassName("el-message").length == 0) {
 				this.$message({
 					message: '请将数据填写完整,再进行查看',
 					type: 'warning'
 				})
+				}
 			}
 		},
 		switch2Fun() {
 			if (!this.reversedMessage) {
+				if (document.getElementsByClassName("el-message").length == 0) {
 				this.$message({
 					message: '请将数据填写完整,再进行操作',
 					type: 'warning'
 				})
+				}
 				this.switch2 = false
 			}
 		},
@@ -342,10 +352,12 @@ export default {
 		switch3Fun() {
 			console.log(this.switch1)
 			if (this.switch3 && !this.input3) {
+				if (document.getElementsByClassName("el-message").length == 0) {
 				this.$message({
 					message: '请将数据填写完整,再进行操作',
 					type: 'warning'
 				})
+				}
 				this.$refs.input3.focus()
 				this.switch3 = false
 			}
@@ -359,10 +371,12 @@ export default {
 					"'},请注意防范(详情请登录<span>www.yfzhwlw.com</span>查看)"
 				this.dialogHtml = html
 			} else {
+				if (document.getElementsByClassName("el-message").length == 0) {
 				this.$message({
 					message: '请将数据填写完整,再进行查看',
 					type: 'warning'
 				})
+				}
 				this.$refs.input3.focus()
 			}
 		},
@@ -383,10 +397,12 @@ export default {
 		telRegular() {
 			if (this.input5) {
 				if (!/^1[3456789]\d{9}$/.test(this.input5)) {
+					if (document.getElementsByClassName("el-message").length == 0) {
 					this.$message({
 						message: '手机号码有误,请重填',
 						type: 'warning'
 					})
+					}
 					this.$refs.tel.focus()
 					return false
 				}
@@ -433,19 +449,23 @@ export default {
 				})
 				.then((res) => {
 					if (res.data.data == true && res.data.message == '') {
+						if (document.getElementsByClassName("el-message").length == 0) {
 						that.$message({
 							showClose: true,
 							message: '设置成功',
 							type: 'success',
 							duration: 1500
 						})
+						}
 					} else {
+						if (document.getElementsByClassName("el-message").length == 0) {
 						that.$message({
 							showClose: true,
 							message: '设置失败',
 							type: 'error',
 							duration: 1500
 						})
+						}
 					}
 				})
 				.catch((err) => {

+ 4 - 0
minggao/src/page/forecasting/cbd/PestsStats.vue

@@ -1993,11 +1993,13 @@ export default {
       console.log(999999999999999999999);
       var that = this;
       if (that.value == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "请将必填项填写完整",
           type: "warning",
           duration: 1500
         });
+        }
       } else if (
         that.value !== "" &&
         (that.value1 == "选项1" || that.value1 == "")
@@ -2241,12 +2243,14 @@ export default {
           })
           .then(res => {
             if (res.data.data.nums == 0) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               //没有数据
               this.$message({
                 message: "暂无此虫害的信息",
                 type: "warning",
                 duration: 1500
               });
+              }
             } else if (res.data.data.data.length !== 0) {
               //有数据
               that.insectAxios(res.data.data.data[0].id);

+ 4 - 0
minggao/src/page/forecasting/cbd/PestsStatsNumber.vue

@@ -1603,11 +1603,13 @@ export default {
       console.log(999999999999999999999);
       var that = this;
       if (that.value == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "请将必填项填写完整",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (
         that.value !== "" &&
         (that.value1 == "选项1" || that.value1 == "")
@@ -1810,11 +1812,13 @@ export default {
           .then((res) => {
             if (res.data.data.nums == 0) {
               //没有数据
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "暂无此虫害的信息",
                 type: "warning",
                 duration: 1500,
               });
+              }
             } else if (res.data.data.data.length !== 0) {
               //有数据
               that.insectAxios(res.data.data.data[0].id);

+ 202 - 129
minggao/src/page/forecasting/cbd/cbdDataPhotos.vue

@@ -386,14 +386,8 @@
     <!-- 手动添加对话框 -->
     <el-dialog :title="this.tltName" :visible.sync="handAddVisible" width="30%">
       <div class="handAddBtn" v-show="handAddState == 1">
-        <i
-          class="el-icon-circle-plus-outline"
-          @click="handAddState = 2"
-        ></i>
-        <i
-          class="el-icon-remove-outline"
-          @click="handAddState = 3"
-        ></i>xie
+        <i class="el-icon-circle-plus-outline" @click="handAddState = 2"></i>
+        <i class="el-icon-remove-outline" @click="handAddState = 3"></i>xie
       </div>
       <div class="handAddForm" v-show="handAddState == 1">
         <el-form ref="ruleForm" :model="form" label-width="80px">
@@ -691,6 +685,7 @@
       :close-on-press-escape="false"
       :close-on-click-modal="false"
       width="60%"
+      @close="imgclose"
     >
       <ul class="pictureDetails_ul">
         <!-- 识别结果 -->
@@ -1470,7 +1465,7 @@ export default {
       // if (val == false) {
       //   this.addFunData = {}
       // }
-    }
+    },
   },
 
   methods: {
@@ -1519,7 +1514,9 @@ export default {
       if (flag == 3) {
         //删除
         if (this.idList.length == 0) {
-          this.$message.warning("请选择要删除的图片!");
+          if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message.warning("请选择要删除的图片!");
+          }
         } else {
           this.delImgFun(this.idList);
         }
@@ -1538,7 +1535,7 @@ export default {
         this.delImgFun("");
       }
       if (flag == 6) {
-        this.$router.push(`/index/messageWarn?id=`+this.id);
+        this.$router.push(`/index/messageWarn?id=` + this.id);
       }
       if (flag == 7) {
         this.downBtnState = !this.downBtnState;
@@ -1634,6 +1631,7 @@ export default {
 
     //改变page
     changePage(val) {
+      this.checkAll = false;
       this.listIndex = null;
       this.queryInfo.page = val;
       // this.imgListData(val)
@@ -1734,29 +1732,35 @@ export default {
               return num;
             });
             this.pictureDetailsFunDataObj = obj;
-            this.$message({
-              showClose: true,
-              message: "识别成功!",
-              type: "success",
-            });
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message({
+                showClose: true,
+                message: "识别成功!",
+                type: "success",
+              });
+            }
           } else {
             // 识别失败
-            this.$message({
-              showClose: true,
-              message: res.data.message,
-              type: "warning",
-            });
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message({
+                showClose: true,
+                message: res.data.message,
+                type: "warning",
+              });
+            }
           }
         })
         .catch((err) => {
           that.loading = false;
           console.log(err);
           // 识别失败
-          this.$message({
-            showClose: true,
-            message: "识别失败!",
-            type: "warning",
-          });
+          if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message({
+              showClose: true,
+              message: "识别失败!",
+              type: "warning",
+            });
+          }
         });
     },
 
@@ -1819,7 +1823,7 @@ export default {
             for (var i = 0; i < dar.length; i++) {
               arr.push({
                 data: [dar[i].number, dar[i].nums],
-                name:dar[i].result_list,
+                name: dar[i].result_list,
                 index: i,
               });
             }
@@ -1832,18 +1836,22 @@ export default {
             this.pictureDetailsFunDataObj = {};
             this.pictureDetailsFunDataObj = obj;
             // console.log(this.pictureDetailsFunDataObj.indentify_photo);
-            this.$message({
-              showClose: true,
-              message: "识别成功!",
-              type: "success",
-            });
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message({
+                showClose: true,
+                message: "识别成功!",
+                type: "success",
+              });
+            }
           } else {
             // 识别失败
-            this.$message({
-              showClose: true,
-              message: res.data.message,
-              type: "warning",
-            });
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message({
+                showClose: true,
+                message: res.data.message,
+                type: "warning",
+              });
+            }
           }
         })
         .catch((err) => {
@@ -1897,7 +1905,9 @@ export default {
           }
         })
         .catch(() => {
-          this.$message.error("获取数据失败!");
+          if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message.error("获取数据失败!");
+          }
         });
     },
     // 手动控制弹框
@@ -1952,30 +1962,38 @@ export default {
               var data = res.data.data;
               if (data == true && res.data.message == "") {
                 //成功
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                  duration: 1500,
-                });
+                if (document.getElementsByClassName("el-message").length == 0) {
+                  this.$message({
+                    message: "删除成功",
+                    type: "success",
+                    duration: 1500,
+                  });
+                }
                 // that.resetField('ruleForm')
                 that.statisticsData(that.addFunData.ids);
               } else if (data == null && res.data.message !== "") {
                 //失败
-                this.$message.error({
-                  message: res.data.message,
-                  duration: 1500,
-                });
+                if (document.getElementsByClassName("el-message").length == 0) {
+                  this.$message.error({
+                    message: res.data.message,
+                    duration: 1500,
+                  });
+                }
               }
             })
             .catch((err) => {
-              this.$message.error(err);
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message.error(err);
+              }
             });
         })
         .catch(() => {
-          that.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          if (document.getElementsByClassName("el-message").length == 0) {
+            that.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          }
         });
     },
     //图片列表数据请求
@@ -2000,11 +2018,11 @@ export default {
           this.disableVal = res.data.data.disable; // 该设备是否有识别功能 0 没有  1有
           if (res.data.data.data.length !== 0 && res.data.data.num !== 0) {
             // 有数据
-            this.$message({
-                showClose: true,
-                message: "数据获取成功",
-                type: "success",
-              });
+            // this.$message({
+            //     showClose: true,
+            //     message: "数据获取成功",
+            //     type: "success",
+            //   });
             var data = res.data.data.data;
             this.totalNum = res.data.data.num;
             var arr = [];
@@ -2083,7 +2101,9 @@ export default {
             this.imgListShow = true;
 
             if (res.data.message == "") {
-              this.$message.success("图片刷新成功");
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message.success("图片刷新成功");
+              }
             }
           } else {
             // 没数据
@@ -2110,11 +2130,13 @@ export default {
       let that = this;
       console.log(that.addFunData);
       if (!this.form.pest_name || !this.form.pest_num) {
-        this.$message({
-          message: "请将数据填写完整",
-          type: "error",
-          duration: 1500,
-        });
+        if (document.getElementsByClassName("el-message").length == 0) {
+          this.$message({
+            message: "请将数据填写完整",
+            type: "error",
+            duration: 1500,
+          });
+        }
         return false;
       }
       if (that.tltName == "编辑") {
@@ -2138,20 +2160,24 @@ export default {
             var data = res.data.data;
             if (data == true && res.data.message == "") {
               //成功
-              this.$message({
-                message: "修改成功",
-                type: "success",
-                duration: 1500,
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message({
+                  message: "修改成功",
+                  type: "success",
+                  duration: 1500,
+                });
+              }
               that.handAddVisible = false;
               // that.resetField('ruleForm')
               that.statisticsData(that.addFunData.ids);
             } else if (data == null && res.data.message !== "") {
               //失败
-              this.$message.error({
-                message: res.data.message,
-                duration: 1500,
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message.error({
+                  message: res.data.message,
+                  duration: 1500,
+                });
+              }
             }
           })
           .catch((err) => {
@@ -2177,19 +2203,23 @@ export default {
             var data = res.data.data;
             if (data == true && res.data.message == "") {
               //成功
-              this.$message({
-                message: "添加成功",
-                type: "success",
-                duration: 1500,
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message({
+                  message: "添加成功",
+                  type: "success",
+                  duration: 1500,
+                });
+              }
               that.handAddVisible = false;
               that.resetField("ruleForm");
             } else if (data == null && res.data.message !== "") {
               //失败
-              this.$message.error({
-                message: res.data.message,
-                duration: 1500,
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message.error({
+                  message: res.data.message,
+                  duration: 1500,
+                });
+              }
             }
           })
           .catch((err) => {
@@ -2208,10 +2238,12 @@ export default {
       let that = this;
       //判断值是否为空
       if (that.selectItem == "") {
-        this.$message.error({
-          message: "害虫名称不能为空!!",
-          duration: 1500,
-        });
+        if (document.getElementsByClassName("el-message").length == 0) {
+          this.$message.error({
+            message: "害虫名称不能为空!!",
+            duration: 1500,
+          });
+        }
       } else if (that.selectItem !== "") {
         let postData = that.qs.stringify({
           ret: "add_pest",
@@ -2228,16 +2260,22 @@ export default {
             var data = res.data.data;
             if (data !== null && res.data.message == "") {
               that.selectItem = "";
-              this.$message({
-                message: "添加成功",
-                type: "success",
-                duration: 1500,
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message({
+                  message: "添加成功",
+                  type: "success",
+                  duration: 1500,
+                });
+              }
             } else if (data == null && res.data.message !== "") {
-              this.$message.error({
-                message: res.data.message,
-                duration: 1500,
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                if (document.getElementsByClassName("el-message").length == 0) {
+                  this.$message.error({
+                    message: res.data.message,
+                    duration: 1500,
+                  });
+                }
+              }
             }
           })
           .catch((err) => {
@@ -2285,18 +2323,22 @@ export default {
         .then((res) => {
           var data = res.data.data;
           if (data && res.data.message == "") {
-            this.$message({
-              message: "删除成功",
-              type: "success",
-              duration: 1500,
-            });
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message({
+                message: "删除成功",
+                type: "success",
+                duration: 1500,
+              });
+            }
             that.handAddState = 1;
             that.getBack(); //重新请求害虫名称数据
           } else if (data == null && res.data.message == "删除失败") {
-            this.$message.error({
-              message: "删除失败",
-              duration: 1500,
-            });
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message.error({
+                message: "删除失败",
+                duration: 1500,
+              });
+            }
           }
         })
         .catch((err) => {
@@ -2357,20 +2399,24 @@ export default {
             }),
           }).then((res) => {
             if (res.data.message == "") {
-              this.$message({
-                type: "success",
-                message: "删除成功!",
-              });
+              if (document.getElementsByClassName("el-message").length == 0) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+              }
               this.equipStatusCheck("4");
               this.imgListData(); //图片列表数据请求
             }
           });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          }
         });
     },
     //返回上一页
@@ -2559,7 +2605,9 @@ export default {
       console.log(this.imgDataList[0].name);
       let that = this;
       let id = that.$route.query.id;
-      this.$message.success("图片下载中!");
+      if (document.getElementsByClassName("el-message").length == 0) {
+        this.$message.success("图片下载中!");
+      }
       var idList = JSON.stringify(id_list.length == 0 ? "" : id_list);
       var timeList = JSON.stringify(time_list.length == 0 ? "" : time_list);
       var file_path = "";
@@ -2637,11 +2685,12 @@ export default {
         url: "/api/api_gateway?method=monitor_manage.cbd_manage.cbd_photo_discern",
         data: this.qs.stringify({
           img_id: this.addFunData.ids,
-         ret:"see",
+          ret: "see",
         }),
       }).then((res) => {
         if (res.data.message == "") {
-          this.currentImage = res.data.data.indentify_photo || res.data.data.addr;
+          this.currentImage =
+            res.data.data.indentify_photo || res.data.data.addr;
           this.tagImgId = this.addFunData.ids;
           // this.mgMark = data.mark;
           // console.log(data);
@@ -2653,8 +2702,12 @@ export default {
             this.renderData(JSON.parse(this.addFunData.mark));
           });
         } else {
-          this.$message.warning(res.data.message);
-          this.currentImage = this.pictureDetailsFunDataObj.indentify_photo || this.pictureDetailsFunDataObj.addr;
+          if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message.warning(res.data.message);
+          }
+          this.currentImage =
+            this.pictureDetailsFunDataObj.indentify_photo ||
+            this.pictureDetailsFunDataObj.addr;
           this.imgTagDataVisible = true;
         }
       });
@@ -2702,23 +2755,29 @@ export default {
         data: this.qs.stringify({
           img_id: this.addFunData.ids,
           mark: JSON.stringify(this.setdata),
-          device_type:"cbd"
+          device_type: "cbd",
         }),
       }).then((res) => {
         if (res.data.data) {
-          this.$message.success("提交成功!");
+          if (document.getElementsByClassName("el-message").length == 0) {
+            this.$message.success("提交成功!");
+          }
           this.$nextTick(() => {
             this.renderData(JSON.parse(res.data.data));
           });
         } else {
-          this.$message.warning(res.data.message);
+          if (document.getElementsByClassName("el-message").length == 0) {
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message.warning(res.data.message);
+            }
+          }
         }
         this.imgTagDataVisible = false;
         this.imgListData();
-        var obj={
-          ids:this.addFunData.ids
-        }
-        this.pictureDetailsFunAxios(obj)
+        var obj = {
+          ids: this.addFunData.ids,
+        };
+        this.pictureDetailsFunAxios(obj);
       });
     },
 
@@ -2742,7 +2801,9 @@ export default {
         })
         .catch((err) => {
           console.log(err);
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("操作失败,请重试!");
+          }
         });
     },
 
@@ -2758,7 +2819,7 @@ export default {
           method: "POST",
           url: "/api/api_gateway?method=monitor_manage.cbd_manage.cbd_control_info",
           data: that.qs.stringify({
-            d_id:that.$route.query.d_id,
+            d_id: that.$route.query.d_id,
           }),
         })
         .then((res) => {
@@ -3081,9 +3142,15 @@ export default {
           });
       }
     },
+    imgclose() {
+      // console.log(1)
+      // this.pictureDetailsFunDataObj= {}
+      // this.pictureDetailsFunDataObj.indentify_photo = ""
+    },
     // 图片详情
     pictureDetailsFun(data) {
       // console.log(data.mark);
+      this.pictureDetailsFunDataObj = {};
       this.$viewer.hide();
       this.loading = true;
       this.pictureDetails = true;
@@ -3105,7 +3172,7 @@ export default {
     pictureDetailsFunAxios(data) {
       var postData = this.qs.stringify({
         img_id: data.ids,
-        cmd:"cbd"
+        cmd: "cbd",
       });
       this.$axios({
         method: "POST",
@@ -3153,7 +3220,7 @@ export default {
 
     pictureDetailsFunData(data) {
       // 处理mark中的列表数据
-      if (data&&data.mark) {
+      if (data && data.mark) {
         var list = JSON.parse(data.mark);
         var arr = [];
         if (isArray(list)) {
@@ -3192,7 +3259,12 @@ export default {
       }
 
       // 判断当前是否有手动标注数据
-      if (data &&data.mark !== null && data.mark !== undefined && data.mark !== "") {
+      if (
+        data &&
+        data.mark !== null &&
+        data.mark !== undefined &&
+        data.mark !== ""
+      ) {
         this.imgShow = false;
         this.imgDiscern = data.indentify_photo || data.addr;
         this.$nextTick(() => {
@@ -3204,8 +3276,9 @@ export default {
         // this.imgDiscern = data.addr;
       }
       this.pictureDetailsFunDataObj = data;
-      if(this.pictureDetailsFunDataObj.indentify_photo==""){
-          this.pictureDetailsFunDataObj.indentify_photo = this.pictureDetailsFunDataObj.addr
+      if (this.pictureDetailsFunDataObj.indentify_photo == "") {
+        this.pictureDetailsFunDataObj.indentify_photo =
+          this.pictureDetailsFunDataObj.addr;
       }
       console.log(this.pictureDetailsFunDataObj);
       // console.log(this.pictureDetailsFunDataObj.indentify_photo);

+ 4 - 0
minggao/src/page/forecasting/cbd/deviceTongji.vue

@@ -413,11 +413,13 @@ export default {
         .then((res) => {
           if (res.data.data.nums == 0) {
             //没有数据
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: "暂无此虫害的信息",
               type: "warning",
               duration: 1500,
             });
+            }
           } else if (res.data.data.data.length !== 0) {
             //有数据
             this.insectAxios(res.data.data.data[0].id);
@@ -838,11 +840,13 @@ export default {
             console.log(res.data.data.data[0].id);
             that.seekPlantId(res.data.data.data[0].id);
           } else {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: "没有查询到该害虫的相关详情",
               type: "error",
               duration: 1500,
             });
+            }
           }
         })
         .catch((err) => {

+ 4 - 0
minggao/src/page/forecasting/cbd/tongji.vue

@@ -541,11 +541,13 @@ export default {
         .then((res) => {
           if (res.data.data.nums == 0) {
             //没有数据
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: "暂无此虫害的信息",
               type: "warning",
               duration: 1500,
             });
+            }
           } else if (res.data.data.data.length !== 0) {
             //有数据
             this.insectAxios(res.data.data.data[0].id);
@@ -732,11 +734,13 @@ export default {
     addData() {
       var that = this;
       if (that.derivevalue == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "请将必填项填写完整",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (
         that.derivevalue1 !== ""
       ) {

+ 25 - 2
minggao/src/page/forecasting/maintain/maintain.vue

@@ -65,8 +65,9 @@
     <el-dialog
       :title="addtitle"
       :visible.sync="addtraptf"
-      width="30%"
+      width="580px"
       @close="resetForm('ruleForm')"
+      :close-on-click-modal="false"
     >
       <div>
         <el-form
@@ -117,6 +118,7 @@
       :visible.sync="addLocationDialogVisible"
       width="820px"
       @closed="addLocationDialogClosed"
+      :close-on-click-modal="false"
     >
       <el-form
         :inline="true"
@@ -154,7 +156,7 @@
         >
       </span>
     </el-dialog>
-    <el-dialog title="导入监测点" :visible.sync="downloadtf" width="25%">
+    <el-dialog title="导入监测点" :visible.sync="downloadtf" width="500px" :close-on-click-modal="false">
       <div class="downloadbox">
         <div class="downloadbox_item">
           <p class="title">导入监测点</p>
@@ -303,19 +305,23 @@ export default {
             }).then((res) => {
               console.log(res);
               if (res.data.data) {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   showClose: true,
                   message: "添加成功!",
                   type: "success",
                 });
+                }
                 this.addtraptf = false;
                 this.getmaintainlist();
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   showClose: true,
                   message: "添加失败" + res.data.message,
                   type: "warning",
                 });
+                }
               }
               this.releaseTF = false
             });
@@ -334,28 +340,34 @@ export default {
             }).then((res) => {
               console.log(res);
               if (res.data.data) {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   showClose: true,
                   message: "修改成功!",
                   type: "success",
                 });
+                }
                 this.addtraptf = false;
                 this.getmaintainlist();
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   showClose: true,
                   message: "修改失败" + res.data.message,
                   type: "warning",
                 });
+                }
               }
               this.releaseTF = false
             });
           }
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             message: "请将信息填写完全",
             type: "warning",
           });
+          }
           return false;
         }
       });
@@ -382,6 +394,7 @@ export default {
       this.$confirm(str, "删除监测点", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
+        closeOnClickModal: false,
       })
         .then(() => {
           this.$axios({
@@ -393,26 +406,32 @@ export default {
           }).then((res) => {
             console.log(res);
             if (res.data.data) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "删除成功!",
                 type: "success",
               });
+              }
               this.getmaintainlist();
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "删除失败," + res.data.message,
                 type: "warning",
               });
+              }
             }
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "已取消删除",
           });
+          }
         });
     },
     init() {
@@ -454,7 +473,9 @@ export default {
             lng: lnglat.lng,
           };
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("根据地址查询位置失败");
+          }
         }
       });
     },
@@ -506,7 +527,9 @@ export default {
         });
         marker.setMap(this.map);
       } else {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message.warning("请输入经纬度!");
+        }
         // return fasle;
       }
     },

+ 18 - 3
minggao/src/page/forecasting/trap/bait.vue

@@ -62,8 +62,9 @@
     <el-dialog
       :title="addtitle"
       :visible.sync="addtraptf"
-      width="30%"
+      width="500px"
       @close="resetForm('ruleForm')"
+      :close-on-click-modal="false"
     >
       <div>
         <el-form
@@ -129,14 +130,14 @@ export default {
       },
       rules: {
         inducer_name: [
-          { required: true, message: "请输入活动名称", trigger: "blur" },
+          { required: true, message: "请输入诱剂名称", trigger: "blur" },
         ],
         expire: [
           { required: true, message: "请输入活动名称", trigger: "blur" },
           { validator: checklnglat, trigger: "blur" },
         ],
         messages: [
-          { required: true, message: "请输入活动名称", trigger: "blur" },
+          { required: true, message: "请输入诱剂描述", trigger: "blur" },
         ],
       },
       addtitle: "新增诱剂",
@@ -205,26 +206,32 @@ export default {
           }).then((res) => {
             console.log(res);
             if (res.data.data) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "删除成功!",
                 type: "success",
               });
+              }
               this.getcbdlist();
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "删除失败," + res.data.message,
                 type: "warning",
               });
+              }
             }
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "已取消删除",
           });
+          }
         });
     },
     submitForm(formName) {
@@ -245,20 +252,24 @@ export default {
             }).then((res) => {
               console.log(res);
               if (res.data.data) {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   showClose: true,
                   message: "修改成功!",
                   type: "success",
                 });
+                }
                 this.addtraptf = false;
                 this.getcbdlist();
                 this.$refs[formName].resetFields();
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   showClose: true,
                   message: "修改失败" + res.data.message,
                   type: "warning",
                 });
+                }
               }
               this.releaseTF = false
             });
@@ -275,20 +286,24 @@ export default {
             }).then((res) => {
               console.log(res);
               if (res.data.data) {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   showClose: true,
                   message: "新增成功!",
                   type: "success",
                 });
+                }
                 this.addtraptf = false;
                 this.getcbdlist();
                 this.$refs[formName].resetFields();
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   showClose: true,
                   message: "添加失败" + res.data.message,
                   type: "warning",
                 });
+                }
               }
               this.releaseTF = false
             });

+ 43 - 27
minggao/src/page/forecasting/trap/fillinrecord.vue

@@ -66,8 +66,14 @@
     </div>
     <el-card class="box-card" style="margin-top: 15px">
       <div class="cbdboxs_table" v-loading="loading">
-        <el-table :data="tableData" style="width: 100%" :stripe="true" :height="48*13">
-          <el-table-column prop="index" label="序号" width="60px"> </el-table-column>
+        <el-table
+          :data="tableData"
+          style="width: 100%"
+          :stripe="true"
+          :height="48 * 13"
+        >
+          <el-table-column prop="index" label="序号" width="60px">
+          </el-table-column>
           <el-table-column prop="trap_number" label="编号"></el-table-column>
           <el-table-column prop="org_name" label="组织">
             <template slot-scope="scope">
@@ -84,7 +90,7 @@
               >
                 <div class="popover-content" v-html="content"></div>
                 <span @mouseover="orglisthover(scope.row)" slot="reference"
-                  >{{ scope.row.org_name.split(',')[0] }}...</span
+                  >{{ scope.row.org_name.split(",")[0] }}...</span
                 >
               </el-popover>
             </template>
@@ -110,7 +116,7 @@
       >
       </el-pagination>
     </el-card>
-    <el-dialog title="提示" :visible.sync="deriveVisible" width="30%">
+    <el-dialog title="提示" :visible.sync="deriveVisible" width="400px" :close-on-click-modal="false">
       <div class="derivebox">
         <p><span>*</span>文件名称:</p>
         <el-input
@@ -167,7 +173,7 @@ export default {
         value: "id",
         children: "childrens",
       },
-      content:""
+      content: "",
     };
   },
   //监听属性 类似于data概念
@@ -277,35 +283,45 @@ export default {
     },
     deriveclick() {
       // this.deriveVisible = false;
-      this.$axios({
-        method: "POST",
-        url: "/api/pest_export",
-        data: this.qs.stringify({
-          trap_number: this.queryInfo.trap_number,
-          point_name: this.queryInfo.point_name,
-          org_name: this.queryInfo.org_name,
-          trap_status: this.queryInfo.trap_status,
-          file_name: this.derivefilename,
-          start_time: this.queryInfo.start_time,
-          end_time: this.queryInfo.end_time,
-          user_name: this.queryInfo.user_name,
-          user: localStorage.getItem("usernme"),
-        }),
-        responseType: "blob",
-      }).then((res) => {
-        console.log(res);
-        this.downloadFile(res, this.derivefilename + ".xls");
-      });
+      if (this.derivefilename == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
+          this.$message({
+            showClose: true,
+            message: "请填写文件名称",
+            type: "warning",
+          });
+        }
+      } else {
+        this.$axios({
+          method: "POST",
+          url: "/api/pest_export",
+          data: this.qs.stringify({
+            trap_number: this.queryInfo.trap_number,
+            point_name: this.queryInfo.point_name,
+            org_name: this.queryInfo.org_name,
+            trap_status: this.queryInfo.trap_status,
+            file_name: this.derivefilename,
+            start_time: this.queryInfo.start_time,
+            end_time: this.queryInfo.end_time,
+            user_name: this.queryInfo.user_name,
+            user: localStorage.getItem("usernme"),
+          }),
+          responseType: "blob",
+        }).then((res) => {
+          console.log(res);
+          this.downloadFile(res, this.derivefilename + ".xls");
+        });
+      }
     },
-    orglisthover(e){
+    orglisthover(e) {
       console.log(e.org_name);
-      var data = e.org_name.split(',')
+      var data = e.org_name.split(",");
       var str = ``;
       for (var i = 0; i < data.length; i++) {
         str += `<p>` + data[i] + `</p>`;
       }
       this.content = str;
-    }
+    },
   },
   beforeCreate() {}, //生命周期 - 创建之前
   //生命周期 - 创建完成(可以访问当前this实例)

+ 21 - 3
minggao/src/page/forecasting/trap/trap.vue

@@ -166,8 +166,9 @@
     <el-dialog
       :title="addtitle"
       :visible.sync="addtraptf"
-      width="30%"
+      width="580px"
       @close="resetForm('ruleForm')"
+       :close-on-click-modal="false"
     >
       <div>
         <el-form
@@ -265,7 +266,7 @@
         >
       </span>
     </el-dialog>
-    <el-dialog title="导入诱捕器" :visible.sync="downloadtf" width="25%">
+    <el-dialog title="导入诱捕器" :visible.sync="downloadtf" width="480px"  :close-on-click-modal="false">
       <div class="downloadbox">
         <div class="downloadbox_item">
           <p class="title">导入诱捕器</p>
@@ -298,7 +299,7 @@
         <el-button type="primary" @click="downloadtf = false">确 定</el-button>
       </span> -->
     </el-dialog>
-    <el-dialog title="导出数据" :visible.sync="deriveVisible" width="30%">
+    <el-dialog title="导出数据" :visible.sync="deriveVisible" width="400px" :close-on-click-modal="false"	>
       <div class="derivebox">
         <p><span>*</span>文件名称:</p>
         <el-input
@@ -321,6 +322,7 @@
       :visible.sync="addLocationDialogVisible"
       width="820px"
       @closed="addLocationDialogClosed"
+       :close-on-click-modal="false"
     >
       <el-form
         :inline="true"
@@ -603,19 +605,23 @@ export default {
               } else if (this.parameter == "modify") {
                 message = "修改成功!";
               }
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: message,
                 type: "success",
               });
+              }
               this.addtraptf = false;
               this.getcbdlist();
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "添加失败" + res.data.message,
                 type: "warning",
               });
+              }
             }
             this.releaseTF = false;
           });
@@ -696,26 +702,32 @@ export default {
           }).then((res) => {
             console.log(res);
             if (res.data.data) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "删除成功!",
                 type: "success",
               });
+              }
               this.getcbdlist();
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "删除失败," + res.data.message,
                 type: "warning",
               });
+              }
             }
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "已取消删除",
           });
+          }
         });
     },
     handle(ev) {
@@ -755,11 +767,13 @@ export default {
     deriveclick() {
       // this.deriveVisible = false;
       if (this.derivefilename == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
                 showClose: true,
                 message: "请输入文件名称",
                 type: "warning",
               });
+        }
       } else {
         this.deriveTF = true
         this.$axios({
@@ -832,7 +846,9 @@ export default {
             lng: lnglat.lng,
           };
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("根据地址查询位置失败");
+          }
         }
       });
     },
@@ -884,7 +900,9 @@ export default {
         });
         marker.setMap(this.map);
       } else {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message.warning("请输入经纬度!");
+        }
         // return fasle;
       }
     },

+ 6 - 0
minggao/src/page/home/index.vue

@@ -286,23 +286,29 @@ export default {
           }).then((res) => {
             if (res.data.data) {
               this.alterpassTF = false;
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "修改成功!",
                 type: "success",
               });
+              }
               this.outsystem();
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "修改失败!" + res.data.data.message,
                 type: "error",
               });
+              }
             }
           });
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             message: "请完成信息填写!",
             type: "warning",
           });
+          }
           return false;
         }
       });

+ 7 - 1
minggao/src/page/homepage/pestdistribute.vue

@@ -88,7 +88,7 @@
         element-loading-background="rgba(0, 0, 0, 0.8)"
       ></div>
     </div>
-    <el-dialog title="设置" :visible.sync="dialogVisible" width="450px">
+    <el-dialog title="设置" :visible.sync="dialogVisible" width="450px" :close-on-click-modal="false">
       <div class="shezhibox">
         <el-form
           :model="ruleForm"
@@ -650,26 +650,32 @@ export default {
           }).then((res) => {
             if (res.data.data) {
               this.dialogVisible = false;
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "设置成功",
                 type: "success",
               });
+              }
               this.getwornlist()
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "设置失败",
                 type: "success",
               });
+              }
             }
           });
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             showClose: true,
             message: "设置失败" + res.data.message,
             type: "warning",
           });
+          }
           // return false;
         }
       });

+ 62 - 0
minggao/src/page/monitor/Monitor.vue

@@ -1198,7 +1198,9 @@ export default {
             this.picUrl = data.data.picUrl;
             this.takePhotoDialogVisible = true;
           } else {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message.error(data.msg);
+            }
           }
         });
       } else {
@@ -1234,11 +1236,13 @@ export default {
             this.picUrl = res.data.data.addr;
             this.takePhotoDialogVisible = true;
           } else {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: res.data.message,
               type: "warning",
               duration: 1500,
             });
+            }
           }
         })
         .catch((err) => {
@@ -1327,23 +1331,29 @@ export default {
     //添加设备
     addConfirm() {
       if (this.equipmentID == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "设备ID不能为空",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.equipmentNumber == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "通道号不能为空",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.FluoriteClouduserID == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "萤石云账号ID不能为空",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.equipmentID !== "" && this.equipmentNumber !== "") {
         this.$axios({
           method: "POST",
@@ -1357,11 +1367,13 @@ export default {
         }).then((res) => {
           if (res.data.message == "") {
             console.log(456);
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: "添加成功",
               type: "success",
               duration: 1500,
             });
+            }
             this.equipmentID = "";
             this.equipmentNumber = "";
             this.playback = false;
@@ -1406,17 +1418,21 @@ export default {
       console.log(this.bangDsimId);
       console.log(this.bangDsimoptions);
       if (this.bangDsimId == null) {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "设备ID不能为空",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.equipmentValue == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "iccid不能为空",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.bangDsimId !== "" && this.equipmentValue !== "") {
         this.$axios({
           method: "POST",
@@ -1429,30 +1445,36 @@ export default {
           .then((res) => {
             console.log(res);
             if (res.data.data == true) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "success",
                 message: "sim卡绑定成功",
                 duration: 1500,
               });
+              }
               this.bangDsimId = "";
               this.equipmentValue = "";
               this.playback = false;
               this.addEquipmentA = false;
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "error",
                 message: res.data.message,
                 duration: 1500,
               });
+              }
             }
           })
           .catch((err) => {
             console.log(err);
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               type: "error",
               message: "sim卡绑定失败",
               duration: 1500,
             });
+            }
           });
       }
       console.log(this.equipmentID + "设备ID");
@@ -1464,10 +1486,12 @@ export default {
       this.equipmentID = "";
       this.equipmentValue = "";
       this.playback = false;
+      if (document.getElementsByClassName("el-message").length == 0) {
       this.$message({
         type: "info",
         message: "取消添加",
       });
+      }
       this.input3 = "";
     },
 
@@ -1631,10 +1655,12 @@ export default {
     // 确定
     addEquipmentBfirm() {
       if (this.equipmentValue == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           type: "info",
           message: "请输入正确的iccid",
         });
+        }
       } else {
         var postData = this.qs.stringify({
           iccid: this.equipmentValue,
@@ -1673,10 +1699,12 @@ export default {
                 }
                 this.sim.deviceStatus = a;
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   type: "info",
                   message: "查询失败",
                 });
+                }
               }
               this.simCodeVisible = true;
             } else if (res.data.data.code == 2) {
@@ -1719,23 +1747,29 @@ export default {
                   };
                   console.log(this.sim);
                 } else {
+                  if (document.getElementsByClassName("el-message").length == 0) {
                   this.$message({
                     type: "info",
                     message: "查询失败",
                   });
+                  }
                 }
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   type: "info",
                   message: "查询失败",
                 });
+                }
               }
               this.simCodeVisible = true;
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "info",
                 message: "暂无查询数据",
               });
+              }
             }
 
             // if (res.data.message == "") {
@@ -1764,35 +1798,45 @@ export default {
     // 萤石云账号添加
     FluoriteClouduserAdd() {
       if (this.FluoriteClouduser == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "萤石云账号不能为空,请填写!",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.salesman == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "业务员不能为空,请填写!",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.tokenData == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "token不能为空,请填写!",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.secretKey == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "appkey不能为空,请填写!",
           type: "warning",
           duration: 1500,
         });
+        }
       } else if (this.furtiveData == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "appSecret不能为空,请填写!",
           type: "warning",
           duration: 1500,
         });
+        }
       } else {
         var postData = this.qs.stringify({
           account: this.FluoriteClouduser, // 萤石云账号
@@ -1809,27 +1853,33 @@ export default {
           .then((res) => {
             console.log(res);
             if (res.data.data == true) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "添加萤石云账号成功!",
                 type: "success",
                 duration: 1500,
               });
+              }
               this.addEquipment = false;
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "添加萤石云账号失败",
                 type: "warning",
                 duration: 1500,
               });
+              }
             }
           })
           .catch((err) => {
             console.log(err);
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: "添加萤石云账号失败",
               type: "warning",
               duration: 1500,
             });
+            }
           });
       }
     },
@@ -1886,10 +1936,12 @@ export default {
       //SIM卡绑定 设备id切换
       this.equipmentValue = this.bangDsimoptions[e].iccid;
       if (this.bangDsimoptions[e].iccid == "") {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "该设备尚未绑定sim卡!",
           type: "warning",
         });
+        }
       }
     },
     submitForm(formName) {
@@ -1928,26 +1980,32 @@ export default {
               // } else if (this.parameter == "modify") {
               //   message = "修改成功!";
               // }
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "设置成功",
                 type: "success",
               });
+              }
               this.operationDialogVisible = false;
               this.getJkList();
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 showClose: true,
                 message: "添加失败" + res.data.message,
                 type: "warning",
               });
+              }
             }
           });
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             message: "请将信息填写完全",
             type: "warning",
           });
+          }
           return false;
         }
       });
@@ -2013,7 +2071,9 @@ export default {
             lng: lnglat.lng,
           };
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("根据地址查询位置失败");
+          }
         }
       });
     },
@@ -2065,7 +2125,9 @@ export default {
         });
         marker.setMap(this.map);
       } else {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message.warning("请输入经纬度!");
+        }
         // return fasle;
       }
     },

+ 4 - 0
minggao/src/page/monitor/PhotoView.vue

@@ -161,19 +161,23 @@ export default {
             data: postData,
           })
             .then((res) => {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "success",
                 message: "删除成功!",
               });
+              }
               this.images = [];
               this.getImageList();
             })
             .catch((err) => {
               console.log(err);
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "info",
                 message: "已取消删除",
               });
+              }
             });
         })
         .catch(() => {});

+ 5 - 1
minggao/src/page/monitoring/monitoringtask.vue

@@ -30,7 +30,8 @@
       </el-date-picker>
       <el-button type="info" size="mini" @click="searchchilk">搜索</el-button>
       <el-button type="warning" size="mini" @click="download"
-        >下载统计结果</el-button
+        :disabled="disabled"
+        >{{disabled?'下载中...':'下载统计结果'}}</el-button
       >
     </div>
     <el-card class="box-card">
@@ -55,6 +56,7 @@ export default {
       monvalue: "", //月份
       useroptions: [], //监测人员名单
       uservalue: [],
+      disabled:false
     };
   },
   //监听属性 类似于data概念
@@ -296,6 +298,7 @@ export default {
     //   if (this.uservalue.length != 0) {
     //     operator_user_id_list = JSON.stringify(this.uservalue);
     //   }
+      this.disabled = true
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=data_report.report.supervisor_export",
@@ -319,6 +322,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
+      this.disabled = false
     },
   },
   beforeCreate() {}, //生命周期 - 创建之前

+ 5 - 1
minggao/src/page/monitoring/supervisiontask.vue

@@ -30,7 +30,8 @@
       </el-date-picker>
       <el-button type="info" size="mini" @click="searchchilk">搜索</el-button>
       <el-button type="warning" size="mini" @click="download"
-        >下载统计结果</el-button
+        :disabled="disabled"
+        >{{disabled?'下载中...':'下载统计结果'}}</el-button
       >
     </div>
     <el-card class="box-card">
@@ -55,6 +56,7 @@ export default {
       monvalue: "", //月份
       useroptions: [], //监测人员名单
       uservalue: [],
+      disabled:false
     };
   },
   //监听属性 类似于data概念
@@ -293,6 +295,7 @@ export default {
       if (this.uservalue.length != 0) {
         operator_user_id_list = JSON.stringify(this.uservalue);
       }
+      this.disabled=true
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=data_report.report.task_export",
@@ -316,6 +319,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
+      this.disabled=false
     },
   },
   beforeCreate() {}, //生命周期 - 创建之前

+ 10 - 0
minggao/src/page/systemmanger/customsManger.vue

@@ -224,18 +224,22 @@ export default {
           })
             .then(res => {
               if (res.data.data == true) {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   message: "删除成功了",
                   type: "success",
                   duration: 1500
                 });
+                }
                 this.tabListData();
               } else {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   message: "删除失败",
                   type: "error",
                   duration: 1500
                 });
+                }
               }
               // console.log(res);
             })
@@ -244,10 +248,12 @@ export default {
             });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "已取消删除"
           });
+          }
         });
 
       // this.$axios({
@@ -304,11 +310,13 @@ export default {
       var that = this;
       if (this.form.name == "") {
         if (document.getElementsByClassName("el-message").length == 0) {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             message: "请填写组织名称!",
             type: "warning",
             duration: 1500
           });
+          }
         }
       } else if (this.form.name.split(" ").join("").length == 0) {
         if (document.getElementsByClassName("el-message").length == 0) {
@@ -344,11 +352,13 @@ export default {
         })
           .then(res => {
             if (res.data.data == true) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "成功!",
                 type: "success",
                 duration: 1500
               });
+              }
               this.addrUserVisible = false;
               this.tabListData();
             }

+ 8 - 0
minggao/src/page/systemmanger/harmfulBiology.vue

@@ -329,26 +329,32 @@ export default {
           }).then(res => {
             console.log(res.data.data);
             if (res.data.data == true) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "success",
                 message: "成功",
                 duration: 1500
               });
+              }
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "error",
                 message: "失败",
                 duration: 1500
               });
+              }
             }
             this.harmfulBiologyList();
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "已取消删除"
           });
+          }
         });
     },
 
@@ -382,11 +388,13 @@ export default {
           })
             .then(res => {
               if (res.data.message == "") {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   type: "success",
                   message: "成功",
                   duration: 1500
                 });
+                }
               }
 
               this.$refs["form"].resetFields();

+ 4 - 0
minggao/src/page/systemmanger/motif.vue

@@ -189,10 +189,12 @@ export default {
             that.imageSrc = res.data.data.src;
             that.form.img = res.data.data.src;
           } else {
+            if (document.getElementsByClassName("el-message").length == 0) {
             that.$message.error({
               message: "上传图片失败,请重试",
               duration: 1500
             });
+            }
           }
         })
         .catch(err => {
@@ -243,11 +245,13 @@ export default {
           })
             .then(res => {
               if (res.data.data == true) {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   message: "成功!",
                   type: "success",
                   duration: 1500
                 });
+                }
                 this.motifAxios();
               }
               this.submitBtn = false;

+ 12 - 0
minggao/src/page/systemmanger/role.vue

@@ -324,11 +324,13 @@ export default {
       })
         .then(res => {
           if (res.data.data == true) {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: "成功!",
               type: "success",
               duration: 1500
             });
+            }
             this.addrUserVisible = false;
             this.tabListData();
           }
@@ -354,11 +356,13 @@ export default {
       })
         .then(res => {
           if (res.data.data == true) {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message({
               message: "成功!",
               type: "success",
               duration: 1500
             });
+            }
             this.addrUserVisible = false;
             this.tabListData();
           }
@@ -388,7 +392,9 @@ export default {
               this.limitsList(); //获取当前角色的权限
             } else {
               this.rightsList = [];
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message.error("获取权限列表失败!");
+              }
             }
             setTimeout(() => {
               that.isClick = true;
@@ -460,7 +466,9 @@ export default {
       })
         .then(res => {
           if (res.data.message == "") {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message.success("分配权限成功!");
+            }
             that.setRightDialogVisible = false;
             that.tabListData();
           }
@@ -488,21 +496,25 @@ export default {
           })
             .then(res => {
               if (res.data.message == "") {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   type: "success",
                   message: "删除成功!",
                   duration: 1500
                 });
+                }
               }
               this.tabListData();
             })
             .catch(err => {});
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "已取消删除"
           });
+          }
         });
     }
   },

+ 86 - 65
minggao/src/page/systemmanger/userManger.vue

@@ -56,7 +56,7 @@
             v-loading="loading2"
             stripe
             :height="48 * 13"
-            style="width: 100%; overflow-y: auto;"
+            style="width: 100%; overflow-y: auto"
           >
             <el-table-column prop="ind" label="序号" width="90">
             </el-table-column>
@@ -215,7 +215,7 @@
               label: 'org_name',
               value: 'id',
               children: 'childrens',
-              checkStrictly: true
+              checkStrictly: true,
             }"
             :clearable="true"
             placeholder="请选择隶属海关"
@@ -235,7 +235,7 @@
               label: 'role_name',
               multiple: true,
               emitPath: false,
-              checkStrictly: true
+              checkStrictly: true,
             }"
             :clearable="true"
             placeholder="请选择角色"
@@ -332,7 +332,7 @@ export default {
       data: [],
       defaultProps: {
         children: "childrens",
-        label: "org_name"
+        label: "org_name",
       },
 
       // 搜索
@@ -357,34 +357,39 @@ export default {
         role: [], //角色
         phone: "", // 手机号码
         mailbox: "", //邮箱
-        state: "" // 账号状态
+        state: "", // 账号状态
       },
       rules: {
         user: [
           { required: true, message: "请输入账号", trigger: "blur" },
-          { min: 3, max: 20, message: "长度在 3 到 20 位之间", trigger: "blur" }
+          {
+            min: 3,
+            max: 20,
+            message: "长度在 3 到 20 位之间",
+            trigger: "blur",
+          },
         ],
         password: [
-          { required: true, validator: checkPath, trigger: "blur" }
+          { required: true, validator: checkPath, trigger: "blur" },
           // { validator: checkPath, trigger: "blur" }
         ],
         name: [
-          { required: true, message: "请输入姓名", trigger: "blur" }
+          { required: true, message: "请输入姓名", trigger: "blur" },
           //   { min: 3, max: 5, message: "长度在 1 到 15 个字符", trigger: "blur" },
         ],
         judge: [
-          { required: true, message: "隶属海关,可多选", trigger: "change" }
+          { required: true, message: "隶属海关,可多选", trigger: "change" },
           //   { min: 3, max: 5, message: "长度在 1 到 15 个字符", trigger: "blur" },
         ],
         role: [
           {
             required: true,
             message: "请选择角色,可多选",
-            trigger: "change"
-          }
+            trigger: "change",
+          },
           //   { min: 3, max: 5, message: "长度在 1 到 30 个字符", trigger: "blur" },
         ],
-        phone: [{ required: true, validator: checkphone, trigger: "blur" }]
+        phone: [{ required: true, validator: checkphone, trigger: "blur" }],
       },
       roleData: [], // 角色下拉框
       refreshItem: 0, //清除角色、组织值
@@ -393,7 +398,7 @@ export default {
       org_id: "", //组织id
 
       isClick: true, // 防止重复弹框
-      submitBtn: false // 防止弹框确定按钮重复请求
+      submitBtn: false, // 防止弹框确定按钮重复请求
     };
   },
   //监听属性 类似于data概念
@@ -406,7 +411,7 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件,导致卡顿
           that.timer = false;
         }, 400);
@@ -422,7 +427,7 @@ export default {
         }
         this.refreshItem++;
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -462,12 +467,11 @@ export default {
       var list = this.form.judge; // 组织
       this.$axios({
         method: "POST",
-        url:
-          "/api/api_gateway?method=sysmenage.usermanager.get_parent_org_list",
+        url: "/api/api_gateway?method=sysmenage.usermanager.get_parent_org_list",
         data: this.qs.stringify({
-          user_id: e.user_id
-        })
-      }).then(res => {
+          user_id: e.user_id,
+        }),
+      }).then((res) => {
         var orgdatas = res.data.data;
         if (orgdatas.length != 0) {
           for (var i = 0; i < e.org_list.length; i++) {
@@ -498,7 +502,7 @@ export default {
           judge: list,
           phone: e.mobile,
           mailbox: e.email,
-          state: e.state
+          state: e.state,
         };
         this.userVisible = true;
       }, 1000);
@@ -513,7 +517,8 @@ export default {
       this.$confirm("此操作将" + msg + "该账号, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
+        closeOnClickModal: false,
       })
         .then(() => {
           this.$axios({
@@ -521,24 +526,28 @@ export default {
             url: "/api/api_gateway?method=sysmenage.usermanager.user_disable",
             data: this.qs.stringify({
               user_id: data.user_id,
-              state: msg == "启用" ? 1 : 4
-            })
-          }).then(res => {
+              state: msg == "启用" ? 1 : 4,
+            }),
+          }).then((res) => {
             if (res.data.data == true) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "success",
                 message: "成功",
-                duration: 1500
+                duration: 1500,
               });
+              }
               this.userListData();
             }
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
-            message: "已取消"
+            message: "已取消",
           });
+          }
         });
     },
 
@@ -549,7 +558,8 @@ export default {
         cancelButtonText: "取消",
         // inputPlaceholder: "默认密码为@12345678",
         inputErrorMessage: "新密码格式不正确",
-        inputValidator: val => {
+        closeOnClickModal: false,
+        inputValidator: (val) => {
           if (val) {
             if (escape(val).indexOf("%u") != -1) {
               return "不能输入汉字!";
@@ -561,33 +571,36 @@ export default {
           } else {
             return "请输入密码!";
           }
-        }
+        },
       })
         .then(({ value }) => {
           this.$axios({
             method: "POST",
-            url:
-              "/api/api_gateway?method=sysmenage.usermanager.password_modify",
+            url: "/api/api_gateway?method=sysmenage.usermanager.password_modify",
             data: this.qs.stringify({
               user_id: data.user_id,
-              password: value == null ? "@12345678" : value
-            })
-          }).then(res => {
+              password: value == null ? "@12345678" : value,
+            }),
+          }).then((res) => {
             if (res.data.data == true) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "成功!",
                 type: "success",
-                duration: 1500
+                duration: 1500,
               });
+              }
             }
             this.userListData();
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
-            message: "取消输入"
+            message: "取消输入",
           });
+          }
         });
     },
 
@@ -596,38 +609,44 @@ export default {
       this.$confirm("此操作将永久删除该账号, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           this.$axios({
             method: "POST",
             url: "/api/api_gateway?method=sysmenage.usermanager.user_delete",
             data: this.qs.stringify({
-              user_id: data.user_id
-            })
-          }).then(res => {
+              user_id: data.user_id,
+            }),
+          }).then((res) => {
             if (res.data.data == true) {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "成功!",
                 type: "success",
-                duration: 1500
+                duration: 1500,
               });
+              }
             } else {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "失败!",
                 type: "error",
-                duration: 1500
+                duration: 1500,
               });
+              }
             }
             this.loading2 = true;
             this.userListData();
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
-            message: "已取消删除"
+            message: "已取消删除",
           });
+          }
         });
     },
 
@@ -653,7 +672,7 @@ export default {
     // 添加 - 编辑 确定
     submitForm() {
       var that = this;
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           this.submitBtn = true;
           // 处理隶属海关、角色
@@ -680,7 +699,7 @@ export default {
               role_id_list: JSON.stringify(roleList), // 角色id数组 必
               state: this.form.state, //用户状态
               mobile: this.form.phone, // 手机号
-              email: this.form.mailbox //邮箱地址
+              email: this.form.mailbox, //邮箱地址
             });
             var url = "/api/api_gateway?method=sysmenage.usermanager.user_add";
           } else if (this.tltData == "编辑用户") {
@@ -690,7 +709,7 @@ export default {
               org_id_list: JSON.stringify(orgList), //组织id数组 必
               role_id_list: JSON.stringify(roleList), //角色id数组 必
               mobile: this.form.phone, //手机号
-              email: this.form.mailbox //邮箱地址
+              email: this.form.mailbox, //邮箱地址
             });
             var url =
               "/api/api_gateway?method=sysmenage.usermanager.user_modify";
@@ -699,22 +718,24 @@ export default {
           this.$axios({
             method: "POST",
             url,
-            data: postData
+            data: postData,
           })
-            .then(res => {
+            .then((res) => {
               if (res.data.data == true) {
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message({
                   message: "成功!",
                   type: "success",
-                  duration: 1500
+                  duration: 1500,
                 });
+                }
                 this.$refs["form"].resetFields();
                 this.userVisible = false;
                 this.userListData();
               }
               this.submitBtn = false;
             })
-            .catch(err => {
+            .catch((err) => {
               this.submitBtn = false;
             });
         } else {
@@ -740,10 +761,10 @@ export default {
           page_item: "20",
           real_name: this.nameVal, // 用户名称
           mobile: this.phoneVal, //电话
-          org_id: this.org_id
-        })
+          org_id: this.org_id,
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.page_item !== 0) {
             var data = res.data.data.page_list;
             var list = [];
@@ -756,7 +777,7 @@ export default {
           }
           this.loading2 = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading2 = false;
         });
     },
@@ -769,14 +790,14 @@ export default {
         data: this.qs.stringify({
           page: this.page,
           page_item: "100000000",
-          org_name: ""
-        })
+          org_name: "",
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.page_list.length !== 0) {
             var obj = {
               org_name: "全部",
-              id: ""
+              id: "",
             };
             var list = res.data.data.page_list;
             this.tissueList = list; // 弹框组织列表
@@ -785,7 +806,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
         });
     },
@@ -798,22 +819,22 @@ export default {
         data: this.qs.stringify({
           page: this.page,
           page_item: "10000000",
-          role_name: ""
-        })
+          role_name: "",
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             this.roleData = res.data.data.page_list;
           }
         })
-        .catch(err => {});
+        .catch((err) => {});
     },
     judgeData(item) {
       this.form.judge = item;
     },
     roleChange(item) {
       this.form.role = item;
-    }
+    },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {},
@@ -831,7 +852,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能,这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
 };
 </script>
 <style lang="less" scoped>

+ 2 - 0
minggao/src/store/store.js

@@ -99,7 +99,9 @@ const store = new Vuex.Store({
             commit('SET_USERINFO', response.data.data)
             resolve()
           } else {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message.error(response.data.message);
+            }
             reject()
           }
         }).catch(error => {