代码更新 3/3

minggao/config/index.js

@@ -12,8 +12,8 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        // target: 'http://192.168.1.17:12345', //翟毅飞
-        target: 'http://192.168.1.77:12345', //曹世祥
+         target: 'http://192.168.1.17:12345', //翟毅飞
+        //target: 'http://192.168.1.77:12345', //曹世祥
         // target:"http://114.115.147.140:12345",
         changeOrigin: true,
         pathRewrite: {

minggao/src/page/commandCenter/supervise.vue

@@ -83,7 +83,9 @@
         :height="48 * 13"
         style="width: 100%; overflow-y: auto"
       >
-        <el-table-column prop="ind" label="序号" width="180"> </el-table-column>
+        <el-table-column prop="ind" label="序号" width="100"> </el-table-column>
+        <el-table-column prop="task_id" label="任务编号" width="180">
+        </el-table-column>
         <el-table-column prop="supervisor_user" label="监督人" width="180">
         </el-table-column>
         <el-table-column

minggao/src/page/forecasting/cbd/Cbd.vue

@@ -608,6 +608,7 @@
       :visible.sync="addLocationDialogVisible"
       width="820px"
       @closed="addLocationDialogClosed"
+      :close-on-click-modal="false"
     >
       <el-form
         :inline="true"

minggao/src/page/forecasting/cbd/PestsStats.vue

@@ -37,7 +37,7 @@
         ></DateSearch>
 
         <!-- <div v-if="viewSwitch == 1 || contrastShow == true"> -->
-        <div v-if="insectTime" class="viewSwitch">
+        <!-- <div v-if="insectTime" class="viewSwitch">
           <el-button
             type="primary"
             v-if="viewSwitch"
@@ -45,7 +45,6 @@
             size="mini"
             >手动统计</el-button
           >
-
           <el-button
             type="primary"
             v-if="!viewSwitch"
@@ -53,7 +52,7 @@
             size="mini"
             >自动统计</el-button
           >
-        </div>
+        </div> -->
         <!-- </div> -->
       </div>
     </div>

minggao/src/page/forecasting/cbd/cbdDataPhotos.vue

@@ -310,7 +310,7 @@
     <!-- 查看大图 -->
 
     <!-- 测试 -->
-    <ul class="newImgOperation" style="display: flex" id="iconBox" v-show="iconShow">
+    <!-- <ul class="newImgOperation" style="display: flex;" id="iconBox" v-show="iconShow"> -->
       <!-- <li @click="discernFun()" v-if="disable == 1">
         <img src="../../../../static/images/cbdPicture/2.png" alt="" />
         <span>识别统计</span>
@@ -319,23 +319,23 @@
         <img src="../../../../static/images/cbdPicture/4.png" alt="" />
         <span>手动标注</span>
       </li> -->
-      <li @click="handAddFun()">
+      <!-- <li @click="handAddFun()">
         <img src="../../../../static/images/cbdPicture/6.png" alt="" />
         <span>手动添加</span>
       </li>
       <li @click="handAddDataFun()">
         <img src="../../../../static/images/cbdPicture/8.png" alt="" />
         <span>手动统计</span>
-      </li>
-      <li v-if="iconIf" @click="openGridding()">
+      </li> -->
+      <!-- <li v-if="iconIf" @click="openGridding()">
         <img id="iconDom" class="icon1" src="../../../../static/images/cbdPicture/10.png" alt="" />
         <span>网格显示</span>
       </li>
       <li v-else @click="offGridding()">
         <img id="iconDom" class="icon2" src="../../../../static/images/cbdPicture/10.png" alt="" />
         <span>网格显示</span>
-      </li>
-    </ul>
+      </li> -->
+    <!-- </ul> -->
     <!-- 测试 -->
 
     <div id="reseau"></div>
@@ -1157,7 +1157,9 @@ export default {
       if (flag == 1) {
         this.$refs.timeCirculation.num = 1; // 改变子组件data中的num值，以免造成一直重复请求消耗内存
         this.imgListData(); //图片列表数据请求
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message.success("图片刷新成功");
+        }
       }
       if (flag == 2) {
         //批量删除
@@ -1171,7 +1173,9 @@ export default {
       if (flag == 3) {
         //删除
         if (this.idList.length == 0) {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.warning("请选择要删除的图片！");
+          }
         } else {
           this.delImgFun(this.idList);
         }
@@ -1262,7 +1266,9 @@ export default {
         }),
       }).then((res) => {
         if (res.data.message == "") {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.success("指令下发成功!");
+          }
         }
       });
     },
@@ -1385,29 +1391,35 @@ export default {
               return num;
             });
             this.pictureDetailsFunDataObj = obj;
+            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",
             });
+            }
           }
         })
         .catch((err) => {
           that.loading = false;
           console.log(err);
           // 识别失败
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             showClose: true,
             message: "识别失败！",
             type: "warning",
           });
+          }
         });
     },
 
@@ -1482,18 +1494,22 @@ export default {
             this.pictureDetailsFunDataObj = {};
             this.pictureDetailsFunDataObj = obj;
             // console.log(this.pictureDetailsFunDataObj.indentify_photo);
+            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",
             });
+            }
           }
         })
         .catch((err) => {
@@ -1547,7 +1563,9 @@ export default {
           }
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("获取数据失败!");
+          }
         });
     },
     // 手动控制弹框
@@ -1602,30 +1620,38 @@ export default {
               var data = res.data.data;
               if (data == true && res.data.message == "") {
                 //成功
+                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 !== "") {
                 //失败
+                if (document.getElementsByClassName("el-message").length == 0) {
                 this.$message.error({
                   message: res.data.message,
                   duration: 1500,
                 });
+                }
               }
             })
             .catch((err) => {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message.error(err);
+              }
             });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           that.$message({
             type: "info",
             message: "已取消删除",
           });
+          }
         });
     },
     //图片列表数据请求
@@ -1751,11 +1777,13 @@ export default {
       let that = this;
       console.log(that.addFunData);
       if (!this.form.pest_name || !this.form.pest_num) {
+        if (document.getElementsByClassName("el-message").length == 0) {
         this.$message({
           message: "请将数据填写完整",
           type: "error",
           duration: 1500,
         });
+        }
         return false;
       }
       if (that.tltName == "编辑") {
@@ -1779,20 +1807,24 @@ export default {
             var data = res.data.data;
             if (data == true && res.data.message == "") {
               //成功
+              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 !== "") {
               //失败
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message.error({
                 message: res.data.message,
                 duration: 1500,
               });
+              }
             }
           })
           .catch((err) => {
@@ -1818,19 +1850,23 @@ export default {
             var data = res.data.data;
             if (data == true && res.data.message == "") {
               //成功
+              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 !== "") {
               //失败
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message.error({
                 message: res.data.message,
                 duration: 1500,
               });
+              }
             }
           })
           .catch((err) => {
@@ -1849,10 +1885,12 @@ export default {
       let that = this;
       //判断值是否为空
       if (that.selectItem == "") {
+        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",
@@ -1869,16 +1907,20 @@ export default {
             var data = res.data.data;
             if (data !== null && res.data.message == "") {
               that.selectItem = "";
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 message: "添加成功",
                 type: "success",
                 duration: 1500,
               });
+              }
             } else if (data == null && res.data.message !== "") {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message.error({
                 message: res.data.message,
                 duration: 1500,
               });
+              }
             }
           })
           .catch((err) => {
@@ -1926,18 +1968,22 @@ export default {
         .then((res) => {
           var data = res.data.data;
           if (data && res.data.message == "") {
+            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 == "删除失败") {
+            if (document.getElementsByClassName("el-message").length == 0) {
             this.$message.error({
               message: "删除失败",
               duration: 1500,
             });
+            }
           }
         })
         .catch((err) => {
@@ -1998,20 +2044,24 @@ export default {
             }),
           }).then((res) => {
             if (res.data.message == "") {
+              if (document.getElementsByClassName("el-message").length == 0) {
               this.$message({
                 type: "success",
                 message: "删除成功!",
               });
+              }
               this.equipStatusCheck("4");
               this.imgListData(); //图片列表数据请求
             }
           });
         })
         .catch(() => {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message({
             type: "info",
             message: "已取消删除",
           });
+          }
         });
     },
     //返回上一页
@@ -2200,7 +2250,9 @@ export default {
       console.log(this.imgDataList[0].name);
       let that = this;
       let id = that.$route.query.id;
+      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 = "";
@@ -2295,7 +2347,9 @@ export default {
             // this.renderData(JSON.parse(this.addFunData.mark));
           });
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.warning(res.data.message);
+          }
           this.currentImage =
             this.pictureDetailsFunDataObj.indentify_photo ||
             this.pictureDetailsFunDataObj.addr;
@@ -2351,12 +2405,16 @@ export default {
         }),
       }).then((res) => {
         if (res.data.data) {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.success("提交成功！");
+          }
           this.$nextTick(() => {
             this.renderData(JSON.parse(res.data.data));
           });
         } else {
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.warning(res.data.message);
+          }
         }
         this.pictureDetailsFunDataObj.indentify_photo = "";
         this.pictureDetails = false
@@ -2390,7 +2448,9 @@ export default {
         })
         .catch((err) => {
           console.log(err);
+          if (document.getElementsByClassName("el-message").length == 0) {
           this.$message.error("操作失败，请重试！");
+          }
         });
     },
 
@@ -3371,12 +3431,12 @@ table {
   position: absolute;
   bottom: 2.2%;
   // right: 6.9rem;
-  right: 28%;
-  width: 42%;
+  left: 28%;
+  width: 10%;
   color: #fff;
   li {
     border-right: 1px solid #fff;
-    width: 15%;
+    width: 100%;
     // border: 1px solid rgb(248, 123, 123);
     img {
       width: 20px;

minggao/src/page/forecasting/maintain/maintain.vue

@@ -59,7 +59,7 @@
         :total="total"
         :page-size="20"
         @current-change="pageChange"
-        :current-page="queryInfo.page"
+        :current-page="page"
       >
       </el-pagination>
     </el-card>
@@ -285,7 +285,7 @@ export default {
     pageChange(e) {
       //当页码更改时
       // console.log(e)
-      this.queryInfo.page = e;
+      this.page = e;
       this.getmaintainlist();
     },
     submitForm(formName) {

minggao/src/page/forecasting/trap/fillinrecord.vue

@@ -18,6 +18,7 @@
         size="mini"
         clearable
         @change="search"
+        filterable 
       >
         <el-option
           v-for="item in inoffoptions"
@@ -33,6 +34,7 @@
         size="mini"
         clearable
         @change="search"
+        filterable 
       >
         <el-option
           v-for="item in versionsoptions2"
@@ -138,7 +140,8 @@
       <span slot="footer" class="dialog-footer">
         <el-button @click="deriveVisible = false" size="mini">取 消</el-button>
         <el-button type="primary" @click="deriveclick" size="mini"
-          >确 定</el-button
+          :disabled="deriveTF"
+          >{{ deriveTF ? "导出中..." : "确 定" }}</el-button
         >
       </span>
     </el-dialog>
@@ -184,6 +187,7 @@ export default {
         children: "childrens",
       },
       content: "",
+      deriveTF:false
     };
   },
   //监听属性 类似于data概念
@@ -255,6 +259,7 @@ export default {
       console.log(e);
       this.queryInfo.start_time = this.tabtime(e[0]);
       this.queryInfo.end_time = this.tabtime(e[1]);
+      this.search()
     },
     tabtime(times) {
       //时间转换
@@ -293,6 +298,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
+      this.deriveTF = false
     },
     deriveclick() {
       // this.deriveVisible = false;
@@ -305,6 +311,7 @@ export default {
           });
         }
       } else {
+        this.deriveTF = true
         this.$axios({
           method: "POST",
           url: "/api/pest_export",

minggao/src/page/forecasting/trap/trap.vue

@@ -13,6 +13,7 @@
         clearable
         @change="search"
         size="mini"
+        filterable 
       >
         <el-option
           v-for="item in traponsoptions"
@@ -28,6 +29,7 @@
         size="mini"
         clearable
         @change="search"
+        filterable 
       >
         <el-option
           v-for="item in versionsoptions2"
@@ -53,6 +55,7 @@
         size="mini"
         clearable
         @change="search"
+        filterable 
       >
         <el-option
           v-for="item in inoffoptions"
@@ -808,6 +811,7 @@ export default {
         }
       } else {
         this.deriveTF = true;
+        console.log(this.ruleForm)
         this.$axios({
           method: "POST",
           url: "api/trap_list_export",

minggao/src/page/monitor/Monitor.vue

@@ -164,7 +164,7 @@
       </div>
     </div>
     <!-- 拍照 -->
-    <el-dialog
+    <!-- <el-dialog
       title="手动下载"
       :visible.sync="takePhotoDialogVisible"
       width="30%"
@@ -174,7 +174,7 @@
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="copyPicUrl">复制</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
     <!-- 查看回放 -->
     <el-dialog
       title="查看回放"
@@ -716,6 +716,7 @@
       :visible.sync="addLocationDialogVisible"
       width="820px"
       @closed="addLocationDialogClosed"
+      :close-on-click-modal="false"
     >
       <el-form
         :inline="true"
@@ -2448,12 +2449,12 @@ export default {
         }
         .leftCtr {
           top: 50%;
-          left: 28px;
+          left: 90px;
           margin-top: -25px;
         }
         .rightCtr {
           top: 50%;
-          right: 28px;
+          right: 90px;
           margin-top: -25px;
         }
         .cameraCtr {

minggao/src/page/monitoring/monitoringtask.vue

@@ -26,12 +26,16 @@
         end-placeholder="结束月份"
         size="mini"
         :editable="false"
+        @change="pickerchange"
       >
       </el-date-picker>
       <el-button type="info" size="mini" @click="searchchilk">搜索</el-button>
-      <el-button type="warning" size="mini" @click="download"
+      <el-button
+        type="warning"
+        size="mini"
+        @click="download"
         :disabled="disabled"
-        >{{disabled?'下载中...':'下载统计结果'}}</el-button
+        >{{ disabled ? "下载中..." : "下载统计结果" }}</el-button
       >
     </div>
     <el-card class="box-card">
@@ -56,7 +60,7 @@ export default {
       monvalue: "", //月份
       useroptions: [], //监测人员名单
       uservalue: [],
-      disabled:false
+      disabled: false,
     };
   },
   //监听属性 类似于data概念
@@ -178,7 +182,7 @@ export default {
             fontSize: 14,
             interval: 0,
           },
-          
+
           data: categoryData,
           type: "category",
         },
@@ -260,6 +264,9 @@ export default {
       };
       echarts.init(document.getElementById("mychartpie")).setOption(option);
     },
+    pickerchange() {
+      this.searchchilk();
+    },
     searchchilk() {
       //   console.log(this.monvalue, this.uservalue);
       var start_time = this.timetag(0);
@@ -268,22 +275,25 @@ export default {
     },
     timetag(i) {
       var time = "";
-      if (this.monvalue.length != 0) {
-        time =
-          this.monvalue[i].getFullYear() +
-          "-" +
-          (this.monvalue[i].getMonth() + 1 < 10
-            ? "0" + (this.monvalue[i].getMonth() + 1)
-            : this.monvalue[i].getMonth() + 1);
+      if (this.monvalue) {
+        if (this.monvalue.length != 0) {
+          time =
+            this.monvalue[i].getFullYear() +
+            "-" +
+            (this.monvalue[i].getMonth() + 1 < 10
+              ? "0" + (this.monvalue[i].getMonth() + 1)
+              : this.monvalue[i].getMonth() + 1);
+        }
       }
+
       return time;
     },
     download(start_time, end_time) {
-    //   var operator_user_id_list = "";
-    //   if (this.uservalue.length != 0) {
-    //     operator_user_id_list = JSON.stringify(this.uservalue);
-    //   }
-      this.disabled = true
+      //   var operator_user_id_list = "";
+      //   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",
@@ -307,7 +317,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
-      this.disabled = false
+      this.disabled = false;
     },
   },
   beforeCreate() {}, //生命周期 - 创建之前
@@ -368,9 +378,9 @@ export default {
     // }
   }
 }
-/deep/.el-date-editor{
+/deep/.el-date-editor {
   cursor: pointer;
-  .el-range-input{
+  .el-range-input {
     cursor: pointer;
   }
 }

minggao/src/page/monitoring/supervisiontask.vue

@@ -5,7 +5,7 @@
       <el-select
         v-model="uservalue"
         multiple
-        filterable 
+        filterable
         placeholder="请选择任务监测人"
         size="mini"
         collapse-tags
@@ -26,12 +26,16 @@
         end-placeholder="结束月份"
         size="mini"
         :editable="false"
+        @change="pickerchange"
       >
       </el-date-picker>
       <el-button type="info" size="mini" @click="searchchilk">搜索</el-button>
-      <el-button type="warning" size="mini" @click="download"
+      <el-button
+        type="warning"
+        size="mini"
+        @click="download"
         :disabled="disabled"
-        >{{disabled?'下载中...':'下载统计结果'}}</el-button
+        >{{ disabled ? "下载中..." : "下载统计结果" }}</el-button
       >
     </div>
     <el-card class="box-card">
@@ -56,7 +60,7 @@ export default {
       monvalue: "", //月份
       useroptions: [], //监测人员名单
       uservalue: [],
-      disabled:false
+      disabled: false,
     };
   },
   //监听属性 类似于data概念
@@ -127,7 +131,7 @@ export default {
         legend: {
           show: true,
           top: "8%",
-          selectedMode:false,//取消图例上的点击事件
+          selectedMode: false, //取消图例上的点击事件
         },
         grid: {
           left: "3%",
@@ -272,6 +276,9 @@ export default {
       };
       echarts.init(document.getElementById("mychartpie")).setOption(option);
     },
+    pickerchange() {
+      this.searchchilk();
+    },
     searchchilk() {
       //   console.log(this.monvalue, this.uservalue);
       var start_time = this.timetag(0);
@@ -280,13 +287,15 @@ export default {
     },
     timetag(i) {
       var time = "";
-      if (this.monvalue.length != 0) {
-        time =
-          this.monvalue[i].getFullYear() +
-          "-" +
-          (this.monvalue[i].getMonth() + 1 < 10
-            ? "0" + (this.monvalue[i].getMonth() + 1)
-            : this.monvalue[i].getMonth() + 1);
+      if (this.monvalue) {
+        if (this.monvalue.length != 0) {
+          time =
+            this.monvalue[i].getFullYear() +
+            "-" +
+            (this.monvalue[i].getMonth() + 1 < 10
+              ? "0" + (this.monvalue[i].getMonth() + 1)
+              : this.monvalue[i].getMonth() + 1);
+        }
       }
       return time;
     },
@@ -295,7 +304,7 @@ export default {
       if (this.uservalue.length != 0) {
         operator_user_id_list = JSON.stringify(this.uservalue);
       }
-      this.disabled=true
+      this.disabled = true;
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=data_report.report.task_export",
@@ -306,8 +315,8 @@ export default {
         }),
         responseType: "blob",
       }).then((res) => {
-          console.log(res.data.data);
-          this.downloadFile(res,"监测任务统计.xls");
+        console.log(res.data.data);
+        this.downloadFile(res, "监测任务统计.xls");
       });
     },
     downloadFile(res, name) {
@@ -319,7 +328,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
-      this.disabled=false
+      this.disabled = false;
     },
   },
   beforeCreate() {}, //生命周期 - 创建之前
@@ -380,9 +389,9 @@ export default {
     // }
   }
 }
-/deep/.el-date-editor{
+/deep/.el-date-editor {
   cursor: pointer;
-  .el-range-input{
+  .el-range-input {
     cursor: pointer;
   }
 }

minggao/src/page/superviseModule/superviseModule.vue

@@ -256,7 +256,7 @@ export default {
     searchData(e) {
       if (this.value) {
         this.startTime = this.tabtime(e[0]);
-        this.startTime = this.tabtime(e[1]);
+        this.endTime = this.tabtime(e[1]);
       } else {
         this.startTime = "";
         this.endTime = "";
@@ -296,7 +296,7 @@ export default {
         data: this.qs.stringify({
           supervisor_user_id: this.input, //                      非必填                   监督人id
           start_time: this.startTime, //                               非必填                     开始时间
-          end_time: this.startTime, //                                 非必填                     结束时间
+          end_time: this.endTime, //                                 非必填                     结束时间
           supervisor_type: this.input2, //                          非必填                     监督形式
         }),
       })