Merge branch 'master' of http://39.104.94.153:3000/yf_zy/MingGao_vue

minggao/config/index.js

@@ -23,7 +23,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.1.4', // can be overwritten by process.env.HOST
+    host: '192.168.1.29', // can be overwritten by process.env.HOST
     port: 8888, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

minggao/src/page/commandCenter/supervise.vue

@@ -50,7 +50,6 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            align="right"
             :editable="false"
           >
           </el-date-picker>
@@ -87,7 +86,11 @@
         <el-table-column prop="ind" label="序号" width="180"> </el-table-column>
         <el-table-column prop="supervisor_user" label="监督人" width="180">
         </el-table-column>
-        <el-table-column prop="actual_supervisor" label="实际监督人" width="180">
+        <el-table-column
+          prop="actual_supervisor"
+          label="实际监督人"
+          width="180"
+        >
         </el-table-column>
         <el-table-column prop="supervisor_type" label="监督形式" width="180">
         </el-table-column>
@@ -142,12 +145,12 @@ export default {
       options: [
         {
           value: "远程监督",
-          label: "远程监督"
+          label: "远程监督",
         },
         {
           value: "现场监督",
-          label: "现场监督"
-        }
+          label: "现场监督",
+        },
       ],
       value: "", // 时间筛选
       startTime: "", // 开始时间
@@ -161,7 +164,7 @@ export default {
       // 分页
       page: 1, // 当期页码
       tableSum: 0, // 总页数
-      btnShow: false // 防止导出数据重复下载
+      btnShow: false, // 防止导出数据重复下载
     };
   },
   //监听属性 类似于data概念
@@ -174,12 +177,12 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件，导致卡顿
           that.timer = false;
         }, 400);
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -198,18 +201,17 @@ export default {
     tableList() {
       this.$axios({
         method: "POST",
-        url:
-          "/api/api_gateway?method=control_center.task.supervisor_record_list",
+        url: "/api/api_gateway?method=control_center.task.supervisor_record_list",
         data: this.qs.stringify({
           page: this.page,
           page_item: "20",
           supervisor_user_id: this.input, // 监督人id
           start_time: this.startTime, // 开始时间
           end_time: this.endTime, // 结束时间
-          supervisor_type: this.input2 // 监督形式
-        })
+          supervisor_type: this.input2, // 监督形式
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data.total_item !== 0) {
             var data = res.data.data;
             this.tableSum = data.total_item;
@@ -222,7 +224,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
         });
     },
@@ -236,14 +238,14 @@ export default {
           user_type: "supervisor", // 用户类型，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;
@@ -252,16 +254,30 @@ export default {
             this.conductorList = list;
           }
         })
-        .catch(err => {});
+        .catch((err) => {});
     },
 
     // 搜索
-    searchData() {
+    searchData(e) {
+      console.log(e);
+      if (this.value) {
+        this.startTime = this.tabtime(e[0]);
+        this.endTime = this.tabtime(e[1]);
+      } else {
+        this.startTime = "";
+        this.endTime = "";
+      }
       this.loading = true;
       this.tableData = [];
       this.tableList();
     },
-
+    tabtime(times) {
+      //时间转换
+      var years = times.getFullYear();
+      var month = times.getMonth() + 1;
+      var date = times.getDate();
+      return years + "-" + month + "-" + date;
+    },
     // 重置
     reset() {
       this.input = ""; // 监督人
@@ -281,16 +297,16 @@ export default {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=control_center.task.supervisor_export",
-        responseType: "blob"
+        responseType: "blob",
       })
-        .then(res => {
+        .then((res) => {
           this.downloadFile(res, "监督记录.xls");
           this.loadingShow = false;
           setTimeout(() => {
             this.btnShow = false;
           }, 1500);
         })
-        .catch(err => {
+        .catch((err) => {
           this.loadingShow = false;
           setTimeout(() => {
             this.btnShow = false;
@@ -314,7 +330,7 @@ export default {
     newPage(page) {
       this.page = page;
       this.loading = true;
-      this.tableData = []
+      this.tableData = [];
       this.tableList();
     },
 
@@ -323,10 +339,10 @@ export default {
       this.$router.push({
         path: "/index/superviseDetails",
         query: {
-          id: data.id
-        }
+          id: data.id,
+        },
       });
-    }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
@@ -343,7 +359,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 };
 </script>
 <style lang="less" scoped>

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

@@ -110,7 +110,7 @@
                 </p>
                 <p>
                   <i class="iconfont icon-biaoqian"></i>
-                  所属监测点 : {{ item.point_name}}
+                  所属监测点 : {{ item.point_name }}
                 </p>
                 <p>
                   <i class="iconfont icon-shijian"></i>
@@ -503,8 +503,11 @@
 						</el-select>
 					</el-form-item> -->
           <el-form-item class="handAddFormBtn">
-            <el-button type="primary" size="mini" @click="equipControlSubm()"
-            :disabled="releaseTF"
+            <el-button
+              type="primary"
+              size="mini"
+              @click="equipControlSubm()"
+              :disabled="releaseTF"
               >{{ releaseTF ? "发布中..." : "确定" }}</el-button
             >
             <el-button size="mini" @click="equipControlDialogVisible = false"
@@ -518,7 +521,7 @@
     <el-dialog
       title="测报灯设置"
       :visible.sync="operationDialogVisible"
-      width="30%"
+      width="580px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >
@@ -579,8 +582,11 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="resetForm('ruleForm')" size="mini">取 消</el-button>
-        <el-button type="primary" @click="submitForm('ruleForm')" size="mini"
-        :disabled="releaseTF"
+        <el-button
+          type="primary"
+          @click="submitForm('ruleForm')"
+          size="mini"
+          :disabled="releaseTF"
           >{{ releaseTF ? "发布中..." : "确 定" }}</el-button
         >
       </span>
@@ -793,7 +799,7 @@ export default {
       address: "", //地图上标签地址
       center: [114.05, 22.55],
       content: "",
-      releaseTF:false
+      releaseTF: false,
     };
   },
   created() {
@@ -904,7 +910,7 @@ export default {
       this.device_id = id;
       this.$router.push({
         path: `/index/DataPhotos`,
-        query: { id:id,d_id: d_id, name: name, addr: addr },
+        query: { id: id, d_id: d_id, name: name, addr: addr },
       });
     },
     //设备控制
@@ -968,7 +974,7 @@ export default {
       }
       newForm.st = newForm.st.replace(":00", "");
       this.$delete(newForm, "admin");
-      this.releaseTF = true
+      this.releaseTF = true;
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=monitor_manage.cbd_manage.cbd_device_control",
@@ -979,14 +985,14 @@ export default {
       }).then((res) => {
         if (res.data.message == "") {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message.success("设备控制修改成功");
+            this.$message.success("设备控制修改成功");
           }
         } else {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message.error("设备控制修改失败");
+            this.$message.error("设备控制修改失败");
           }
         }
-        this.releaseTF = false
+        this.releaseTF = false;
         this.equipControlDialogVisible = false;
       });
     },
@@ -1039,27 +1045,27 @@ export default {
           }).then((res) => {
             if (res.data.message == "") {
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                type: "success",
-                message: "修改成功!",
-              });
+                this.$message({
+                  type: "success",
+                  message: "修改成功!",
+                });
               }
             } else {
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                type: "error",
-                message: res.data.message,
-              });
+                this.$message({
+                  type: "error",
+                  message: res.data.message,
+                });
               }
             }
           });
         })
         .catch(() => {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message({
-            type: "info",
-            message: "已取消修改",
-          });
+            this.$message({
+              type: "info",
+              message: "已取消修改",
+            });
           }
         });
     },
@@ -1080,32 +1086,33 @@ export default {
       //   this.ruleForm[key] = e[key];
       // }
       this.ruleForm.org_id = [];
-      for (var i = 0; i < item.org_list.length; i++) {
-        var arr = [item.org_list[i].org_id];
-        this.ruleForm.org_id.push(arr);
-      }
-      this.getmon3(item.d_id);
+
+      this.getmon3(item);
     },
-    getmon3(trap_id) {
+    getmon3(item) {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=sysmenage.usermanager.get_parent_org_list;",
         data: this.qs.stringify({
-          device_id: trap_id,
+          device_id: item.d_id,
         }),
       }).then((res) => {
         // console.log(res.data.data);
-        var orgdatas = res.data.data
+        var orgdatas = res.data.data;
+        for (var i = 0; i < item.org_list.length; i++) {
+          var arr = [item.org_list[i].org_id];
+          this.ruleForm.org_id.push(arr);
+        }
         if (orgdatas.length != 0) {
-          for(var i=0;i<orgdatas.length;i++){
-            if(orgdatas[i].lenngth!=0){
-              for(var j=0;j<orgdatas[i].length;j++){
-                this.ruleForm.org_id[i].unshift(orgdatas[i][j].org_id)
+          for (var i = 0; i < orgdatas.length; i++) {
+            if (orgdatas[i].lenngth != 0) {
+              for (var j = 0; j < orgdatas[i].length; j++) {
+                this.ruleForm.org_id[i].unshift(orgdatas[i][j].org_id);
               }
             }
           }
         }
-        console.log(this.ruleForm.org_id)
+        console.log(this.ruleForm.org_id);
         this.operationDialogVisible = true;
       });
     },
@@ -1163,11 +1170,11 @@ export default {
             }).then((res) => {
               if (res.data.message == "") {
                 if (document.getElementsByClassName("el-message").length == 0) {
-                this.$message.success("提交成功");
+                  this.$message.success("提交成功");
                 }
               } else {
                 if (document.getElementsByClassName("el-message").length == 0) {
-                this.$message.error("提交失败");
+                  this.$message.error("提交失败");
                 }
               }
             });
@@ -1175,11 +1182,11 @@ export default {
           })
           .catch(() => {
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message({
-              type: "info",
-              message: "已取消",
-              duration: 1500,
-            });
+              this.$message({
+                type: "info",
+                message: "已取消",
+                duration: 1500,
+              });
             }
           });
       });
@@ -1231,10 +1238,10 @@ export default {
         })
         .catch(() => {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message({
-            type: "info",
-            message: "取消输入",
-          });
+            this.$message({
+              type: "info",
+              message: "取消输入",
+            });
           }
         });
     },
@@ -1254,19 +1261,19 @@ export default {
           console.log(res);
           if (res.data == "OK" || res.data == "OK!") {
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message({
-              message: "文件上传成功",
-              type: "success",
-              duration: 1500,
-            });
+              this.$message({
+                message: "文件上传成功",
+                type: "success",
+                duration: 1500,
+              });
             }
           } else {
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message({
-              message: res.data,
-              type: "warning",
-              duration: 1500,
-            });
+              this.$message({
+                message: res.data,
+                type: "warning",
+                duration: 1500,
+              });
             }
           }
         })
@@ -1320,13 +1327,13 @@ export default {
         .catch((err) => {
           console.log(err);
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message.error("操作失败，请重试！");
+            this.$message.error("操作失败，请重试！");
           }
         });
     },
     submitForm(formName) {
       // console.log(isArray(this.ruleForm.org_id));
-      var org_id=[];
+      var org_id = [];
       // if (Array.isArray(this.ruleForm.org_id)) {
       //   org_id = this.ruleForm.org_id[this.ruleForm.org_id.length - 1];
       // } else {
@@ -1343,10 +1350,10 @@ export default {
         org_id = this.ruleForm.org_id;
       }
       org_id = org_id.join("/");
-      console.log(this.ruleForm)
+      console.log(this.ruleForm);
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.releaseTF = true
+          this.releaseTF = true;
           this.$axios({
             method: "POST",
             url: "/api/api_gateway?method=monitor_manage.cbd_manage.add_device_info",
@@ -1369,31 +1376,31 @@ export default {
               //   message = "修改成功！";
               // }
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                showClose: true,
-                message: "修改成功！",
-                type: "success",
-              });
+                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.$message({
+                  showClose: true,
+                  message: "添加失败" + res.data.message,
+                  type: "warning",
+                });
               }
             }
-            this.releaseTF = false
+            this.releaseTF = false;
           });
         } else {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message({
-            message: "请将信息填写完全",
-            type: "warning",
-          });
+            this.$message({
+              message: "请将信息填写完全",
+              type: "warning",
+            });
           }
           return false;
         }
@@ -1411,9 +1418,9 @@ export default {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=sysmenage.usermanager.org_list",
-        data:this.qs.stringify({
+        data: this.qs.stringify({
           page_item: "100000000",
-        })
+        }),
       }).then((res) => {
         console.log(res.data.data);
         this.versionsoptions = res.data.data.page_list; //组织
@@ -1461,7 +1468,7 @@ export default {
           };
         } else {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message.error("根据地址查询位置失败");
+            this.$message.error("根据地址查询位置失败");
           }
         }
       });
@@ -1498,7 +1505,7 @@ export default {
       //点击确定
       this.ruleForm.lng = this.locationForm.lng;
       this.ruleForm.lat = this.locationForm.lat;
-      console.log(this.ruleForm)
+      console.log(this.ruleForm);
       this.addLocationDialogVisible = false;
     },
     addLocationDialogClosed() {
@@ -1516,7 +1523,7 @@ export default {
         marker.setMap(this.map);
       } else {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message.warning("请输入经纬度！");
+          this.$message.warning("请输入经纬度！");
         }
         // return fasle;
       }

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

@@ -375,7 +375,7 @@
     <el-dialog
       title="导出信息"
       :visible.sync="dialogVisible"
-      width="30%"
+      width="500px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >

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

@@ -321,7 +321,7 @@
         </el-card>
 
         <!-- 导出对话框 -->
-        <el-dialog title="导出信息" :visible.sync="dialogVisible" width="30%">
+        <el-dialog title="导出信息" :visible.sync="dialogVisible" width="500px">
           <!-- <span>这是一段信息</span> -->
 
           <!-- 下拉框和输入框 -->
@@ -619,7 +619,7 @@
       :visible.sync="discernVisibleA"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="50%"
+      width="960px"
       :fullscreen="enlargement"
     >
       <div v-loading="loading">
@@ -700,7 +700,7 @@
       :visible.sync="discernVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="30%"
+      width="970px"
       :fullscreen="enlargement"
     >
       <!-- <div v-loading="loading"> -->

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

@@ -284,7 +284,7 @@
     <el-dialog
       title="识别结果"
       :visible.sync="discernVisible"
-      width="30%"
+      width="580px"
       :fullscreen="enlargement"
     >
       <div v-loading="loading" v-if="notAvailableShow">
@@ -384,7 +384,7 @@
       </div>
     </el-dialog>
     <!-- 手动添加对话框 -->
-    <el-dialog :title="this.tltName" :visible.sync="handAddVisible" width="30%">
+    <el-dialog :title="this.tltName" :visible.sync="handAddVisible" width="580px">
       <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
@@ -468,7 +468,7 @@
       </div>
     </el-dialog>
     <!-- 手动统计对话框 -->
-    <el-dialog title="手动统计" :visible.sync="handAddDataVisible" width="40%">
+    <el-dialog title="手动统计" :visible.sync="handAddDataVisible" width="770px">
       <el-table
         :data="threshold"
         stripe
@@ -591,9 +591,9 @@
     <!-- 查看大图 -->
 
     <!-- 测试 -->
-    <!-- <ul
+    <ul
       class="newImgOperation"
-      style="display: flex;"
+      style="display: flex"
       id="iconBox"
       v-show="iconShow"
     >
@@ -623,7 +623,7 @@
         />
         <span>网格显示</span>
       </li>
-    </ul> -->
+    </ul>
     <!-- 测试 -->
 
     <div id="reseau"></div>
@@ -684,7 +684,7 @@
       :visible.sync="pictureDetails"
       :close-on-press-escape="false"
       :close-on-click-modal="false"
-      width="60%"
+      width="1150px"
       @close="imgclose"
     >
       <ul class="pictureDetails_ul">
@@ -2811,7 +2811,7 @@ export default {
         .catch((err) => {
           console.log(err);
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message.error("操作失败，请重试！");
+            this.$message.error("操作失败，请重试！");
           }
         });
     },
@@ -3280,11 +3280,7 @@ export default {
           this.renderData(JSON.parse(data.mark));
         });
       } else {
-
-        this.$nextTick(() => {
-           this.imgShow = true;
-        });
-        // this.imgShow = true;
+        this.imgShow = true;
         // this.imgDiscern = data.indentify_photo || data.addr;
         // this.imgDiscern = data.addr;
       }

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

@@ -266,7 +266,7 @@ export default {
         data: this.qs.stringify({
           page_size: 20,
           page: this.page,
-          org_name: this.monitorname, //              非必传(string)     诱剂名称 搜索项
+          point_name: this.monitorname, //              非必传(string)     诱剂名称 搜索项
         }),
       }).then((res) => {
         this.loading = false;

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

@@ -168,7 +168,7 @@
       :visible.sync="addtraptf"
       width="580px"
       @close="resetForm('ruleForm')"
-       :close-on-click-modal="false"
+      :close-on-click-modal="false"
     >
       <div>
         <el-form
@@ -216,6 +216,7 @@
               :props="defaultParams"
               :clearable="true"
               placeholder="请选择隶属海关"
+              filterable
             ></el-cascader>
           </el-form-item>
           <el-form-item label="所在监测点" prop="point_id">
@@ -266,7 +267,12 @@
         >
       </span>
     </el-dialog>
-    <el-dialog title="导入诱捕器" :visible.sync="downloadtf" width="480px"  :close-on-click-modal="false">
+    <el-dialog
+      title="导入诱捕器"
+      :visible.sync="downloadtf"
+      width="500px"
+      :close-on-click-modal="false"
+    >
       <div class="downloadbox">
         <div class="downloadbox_item">
           <p class="title">导入诱捕器</p>
@@ -299,7 +305,12 @@
         <el-button type="primary" @click="downloadtf = false">确 定</el-button>
       </span> -->
     </el-dialog>
-    <el-dialog title="导出数据" :visible.sync="deriveVisible" width="400px" :close-on-click-modal="false"	>
+    <el-dialog
+      title="导出数据"
+      :visible.sync="deriveVisible"
+      width="500px"
+      :close-on-click-modal="false"
+    >
       <div class="derivebox">
         <p><span>*</span>文件名称：</p>
         <el-input
@@ -310,9 +321,12 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="deriveVisible = false" size="mini">取 消</el-button>
-        <el-button type="primary" @click="deriveclick" size="mini"
-        :disabled="deriveTF"
-          >{{deriveTF?"导出中...":"确 定"}}</el-button
+        <el-button
+          type="primary"
+          @click="deriveclick"
+          size="mini"
+          :disabled="deriveTF"
+          >{{ deriveTF ? "导出中..." : "确 定" }}</el-button
         >
       </span>
     </el-dialog>
@@ -322,7 +336,7 @@
       :visible.sync="addLocationDialogVisible"
       width="820px"
       @closed="addLocationDialogClosed"
-       :close-on-click-modal="false"
+      :close-on-click-modal="false"
     >
       <el-form
         :inline="true"
@@ -425,7 +439,7 @@ export default {
         trap_number: "", //诱捕器编号
         lat: "", //           必传(string)               纬度
         lng: "", //      必传(string)               经度
-        org_id: "", //     必传(string)               所属海关id
+        org_id: [], //     必传(string)               所属海关id
         inducer_id: "", //     必传(string)               诱剂id
         point_id: "", //     必传(string)               所属监测点id
         trap_status: "", //    必传(string)               设备状态0停用 1正常
@@ -473,7 +487,7 @@ export default {
       center: [114.05, 22.55],
       content: "", //设备列表组织列表
       releaseTF: false,
-      deriveTF:false
+      deriveTF: false,
     };
   },
   //监听属性 类似于data概念
@@ -606,21 +620,21 @@ export default {
                 message = "修改成功！";
               }
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                showClose: true,
-                message: message,
-                type: "success",
-              });
+                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.$message({
+                  showClose: true,
+                  message: "添加失败" + res.data.message,
+                  type: "warning",
+                });
               }
             }
             this.releaseTF = false;
@@ -638,6 +652,7 @@ export default {
     },
     resetForm(formName) {
       this.addtraptf = false;
+      this.releaseTF = false;
       this.$refs[formName].resetFields();
       for (var key in this.ruleForm) {
         this.ruleForm[key] = "";
@@ -654,25 +669,25 @@ export default {
       this.ruleForm.trap_status = this.ruleForm.trap_status.toString();
       this.parameter = "modify";
       this.ruleForm.org_id = [];
-      for (var i = 0; i < e.org_list.length; i++) {
-        var arr = [e.org_list[i].org_id];
-        this.ruleForm.org_id.push(arr);
-      }
-      this.getmon3(e.trap_id);
+      this.getmon3(e);
     },
-    getmon3(trap_id) {
+    getmon3(e) {
       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({
-          device_id: trap_id,
+          device_id: e.trap_id,
         }),
       }).then((res) => {
         // console.log(res.data.data);
         var orgdatas = res.data.data;
+        for (var i = 0; i < e.org_list.length; i++) {
+            var arr = [e.org_list[i].org_id];
+            this.ruleForm.org_id.push(arr);
+          }
         if (orgdatas.length != 0) {
           for (var i = 0; i < orgdatas.length; i++) {
-            if (orgdatas[i].lenngth != 0) {
+            if (orgdatas[i].length != 0) {
               for (var j = 0; j < orgdatas[i].length; j++) {
                 this.ruleForm.org_id[i].unshift(orgdatas[i][j].org_id);
               }
@@ -703,30 +718,30 @@ export default {
             console.log(res);
             if (res.data.data) {
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                showClose: true,
-                message: "删除成功!",
-                type: "success",
-              });
+                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",
-              });
+                this.$message({
+                  showClose: true,
+                  message: "删除失败，" + res.data.message,
+                  type: "warning",
+                });
               }
             }
           });
         })
         .catch(() => {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
           }
         });
     },
@@ -762,20 +777,20 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
-       this.deriveTF = false
+      this.deriveTF = false;
     },
     deriveclick() {
       // this.deriveVisible = false;
       if (this.derivefilename == "") {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message({
-                showClose: true,
-                message: "请输入文件名称",
-                type: "warning",
-              });
+          this.$message({
+            showClose: true,
+            message: "请输入文件名称",
+            type: "warning",
+          });
         }
       } else {
-        this.deriveTF = true
+        this.deriveTF = true;
         this.$axios({
           method: "POST",
           url: "api/trap_list_export",
@@ -847,7 +862,7 @@ export default {
           };
         } else {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message.error("根据地址查询位置失败");
+            this.$message.error("根据地址查询位置失败");
           }
         }
       });
@@ -901,7 +916,7 @@ export default {
         marker.setMap(this.map);
       } else {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message.warning("请输入经纬度！");
+          this.$message.warning("请输入经纬度！");
         }
         // return fasle;
       }
@@ -1029,7 +1044,7 @@ export default {
     width: 250px;
     margin-right: 15px;
   }
-  .el-cascader {
+  /deep/.el-cascader {
     width: 250px;
     margin-right: 15px;
   }

minggao/src/page/home/index.vue

@@ -109,7 +109,7 @@
     <el-dialog
       title="提示"
       :visible.sync="alterpassTF"
-      width="30%"
+      width="500px"
       :before-close="handleClose"
     >
       <div>

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" :close-on-click-modal="false">
+    <el-dialog title="设置" :visible.sync="dialogVisible" width="500px" :close-on-click-modal="false">
       <div class="shezhibox">
         <el-form
           :model="ruleForm"

minggao/src/page/login/login.vue

@@ -128,6 +128,7 @@ export default {
   height: 100vh;
   background: url("../../assets/loginbg.png");
   background-color: #fff;
+  background-size:100%;
 }
 .loginbox {
   width: 20%;

minggao/src/page/monitor/Monitor.vue

@@ -63,9 +63,7 @@
             @click="selectEquip(item.device_id, item.jktype, index)"
           >
             <p class="dot">
-              <span
-                :class="item.status == 1 ? 'onLine' : 'outLine'"
-              ></span>
+              <span :class="item.status == 1 ? 'onLine' : 'outLine'"></span>
             </p>
             <!-- <span :title="item.device_id + (item.device_name !== '' ? item.device_name : '暂无设备名称')">{{ item | formatName }}</span> -->
             <!-- <span
@@ -76,14 +74,10 @@
               >{{ item | formatName }}</span
             > -->
             <div class="nameandid">
-              <p>{{ item.device_name== ''?"暂无":item.device_name }}</p>
+              <p>{{ item.device_name == "" ? "暂无" : item.device_name }}</p>
               <p>{{ item.device_id }}</p>
             </div>
-            <span
-              @click.stop="monset(item)"
-              class="viewPhoto"
-              >设置</span
-            >
+            <span @click.stop="monset(item)" class="viewPhoto">设置</span>
             <span
               @click.stop="viewPhoto(item.device_id)"
               class="viewPhoto"
@@ -644,9 +638,9 @@
       </div>
     </el-dialog>
     <el-dialog
-      title="测报灯设置"
+      title="监控设置"
       :visible.sync="operationDialogVisible"
-      width="30%"
+      width="580px"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
     >
@@ -981,7 +975,7 @@ export default {
       VideoList: [], // 视频直播列表
       loading: false,
       //监控设置属性
-      operationDialogVisible:false,
+      operationDialogVisible: false,
       versionsoptions: [], //组织
       traponsoptions: [], //监测点
       defaultParams: {
@@ -998,8 +992,8 @@ export default {
         point_id: "",
         lng: "",
         lat: "",
-        device_name:"",
-        device_id:"",
+        device_name: "",
+        device_id: "",
       },
       rules: {
         device_name: [
@@ -1067,7 +1061,7 @@ export default {
     },
   },
   mounted() {
-    this.getmon()
+    this.getmon();
     if (this.$route.query.id !== undefined) {
       this.idName = this.$route.query.id;
     }
@@ -1084,42 +1078,42 @@ export default {
     viewPhoto(id) {
       this.$router.push("/index/photoView/" + id);
     },
-    monset(e){
-      console.log(e)
-      
+    monset(e) {
+      console.log(e);
+
       // this.ruleForm.device_id = item.device_id
       // this.ruleForm.device_name = item.device_name
       for (var key in this.ruleForm) {
         this.ruleForm[key] = e[key];
       }
       this.ruleForm.org_id = [];
-      for (var i = 0; i < e.temp_org_list.length; i++) {
-        var arr = [e.temp_org_list[i].org_id];
-        this.ruleForm.org_id.push(arr);
-      }
-      this.getmon3(e.d_id)
+      this.getmon3(e.d_id);
     },
-    getmon3(trap_id) {
+    getmon3(e) {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=sysmenage.usermanager.get_parent_org_list;",
         data: this.qs.stringify({
-          device_id: trap_id,
+          device_id: e.d_id,
         }),
       }).then((res) => {
         // console.log(res.data.data);
-        var orgdatas = res.data.data
+        var orgdatas = res.data.data;
+        for (var i = 0; i < e.temp_org_list.length; i++) {
+          var arr = [e.temp_org_list[i].org_id];
+          this.ruleForm.org_id.push(arr);
+        }
         if (orgdatas.length != 0) {
-          for(var i=0;i<orgdatas.length;i++){
-            if(orgdatas[i].lenngth!=0){
-              for(var j=0;j<orgdatas[i].length;j++){
-                this.ruleForm.org_id[i].unshift(orgdatas[i][j].org_id)
+          for (var i = 0; i < orgdatas.length; i++) {
+            if (orgdatas[i].lenngth != 0) {
+              for (var j = 0; j < orgdatas[i].length; j++) {
+                this.ruleForm.org_id[i].unshift(orgdatas[i][j].org_id);
               }
             }
           }
         }
-        console.log(this.ruleForm.org_id)
-        this.operationDialogVisible = true
+        console.log(this.ruleForm.org_id);
+        this.operationDialogVisible = true;
       });
     },
     //获取视频列表
@@ -1199,7 +1193,7 @@ export default {
             this.takePhotoDialogVisible = true;
           } else {
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message.error(data.msg);
+              this.$message.error(data.msg);
             }
           }
         });
@@ -1237,11 +1231,11 @@ export default {
             this.takePhotoDialogVisible = true;
           } else {
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message({
-              message: res.data.message,
-              type: "warning",
-              duration: 1500,
-            });
+              this.$message({
+                message: res.data.message,
+                type: "warning",
+                duration: 1500,
+              });
             }
           }
         })
@@ -1332,27 +1326,27 @@ export default {
     addConfirm() {
       if (this.equipmentID == "") {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message({
-          message: "设备ID不能为空",
-          type: "warning",
-          duration: 1500,
-        });
+          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,
-        });
+          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,
-        });
+          this.$message({
+            message: "萤石云账号ID不能为空",
+            type: "warning",
+            duration: 1500,
+          });
         }
       } else if (this.equipmentID !== "" && this.equipmentNumber !== "") {
         this.$axios({
@@ -1368,11 +1362,11 @@ export default {
           if (res.data.message == "") {
             console.log(456);
             if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message({
-              message: "添加成功",
-              type: "success",
-              duration: 1500,
-            });
+              this.$message({
+                message: "添加成功",
+                type: "success",
+                duration: 1500,
+              });
             }
             this.equipmentID = "";
             this.equipmentNumber = "";
@@ -1419,19 +1413,19 @@ export default {
       console.log(this.bangDsimoptions);
       if (this.bangDsimId == null) {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message({
-          message: "设备ID不能为空",
-          type: "warning",
-          duration: 1500,
-        });
+          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,
-        });
+          this.$message({
+            message: "iccid不能为空",
+            type: "warning",
+            duration: 1500,
+          });
         }
       } else if (this.bangDsimId !== "" && this.equipmentValue !== "") {
         this.$axios({
@@ -1446,11 +1440,11 @@ export default {
             console.log(res);
             if (res.data.data == true) {
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                type: "success",
-                message: "sim卡绑定成功",
-                duration: 1500,
-              });
+                this.$message({
+                  type: "success",
+                  message: "sim卡绑定成功",
+                  duration: 1500,
+                });
               }
               this.bangDsimId = "";
               this.equipmentValue = "";
@@ -1458,22 +1452,22 @@ export default {
               this.addEquipmentA = false;
             } else {
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                type: "error",
-                message: res.data.message,
-                duration: 1500,
-              });
+                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,
-            });
+              this.$message({
+                type: "error",
+                message: "sim卡绑定失败",
+                duration: 1500,
+              });
             }
           });
       }
@@ -1487,10 +1481,10 @@ export default {
       this.equipmentValue = "";
       this.playback = false;
       if (document.getElementsByClassName("el-message").length == 0) {
-      this.$message({
-        type: "info",
-        message: "取消添加",
-      });
+        this.$message({
+          type: "info",
+          message: "取消添加",
+        });
       }
       this.input3 = "";
     },
@@ -1656,10 +1650,10 @@ export default {
     addEquipmentBfirm() {
       if (this.equipmentValue == "") {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message({
-          type: "info",
-          message: "请输入正确的iccid",
-        });
+          this.$message({
+            type: "info",
+            message: "请输入正确的iccid",
+          });
         }
       } else {
         var postData = this.qs.stringify({
@@ -1700,10 +1694,10 @@ export default {
                 this.sim.deviceStatus = a;
               } else {
                 if (document.getElementsByClassName("el-message").length == 0) {
-                this.$message({
-                  type: "info",
-                  message: "查询失败",
-                });
+                  this.$message({
+                    type: "info",
+                    message: "查询失败",
+                  });
                 }
               }
               this.simCodeVisible = true;
@@ -1747,28 +1741,30 @@ export default {
                   };
                   console.log(this.sim);
                 } else {
-                  if (document.getElementsByClassName("el-message").length == 0) {
-                  this.$message({
-                    type: "info",
-                    message: "查询失败",
-                  });
+                  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.$message({
+                    type: "info",
+                    message: "查询失败",
+                  });
                 }
               }
               this.simCodeVisible = true;
             } else {
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                type: "info",
-                message: "暂无查询数据",
-              });
+                this.$message({
+                  type: "info",
+                  message: "暂无查询数据",
+                });
               }
             }
 
@@ -1799,43 +1795,43 @@ export default {
     FluoriteClouduserAdd() {
       if (this.FluoriteClouduser == "") {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message({
-          message: "萤石云账号不能为空，请填写！",
-          type: "warning",
-          duration: 1500,
-        });
+          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,
-        });
+          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,
-        });
+          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,
-        });
+          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,
-        });
+          this.$message({
+            message: "appSecret不能为空，请填写！",
+            type: "warning",
+            duration: 1500,
+          });
         }
       } else {
         var postData = this.qs.stringify({
@@ -1854,31 +1850,31 @@ export default {
             console.log(res);
             if (res.data.data == true) {
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                message: "添加萤石云账号成功！",
-                type: "success",
-                duration: 1500,
-              });
+                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,
-              });
+                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,
-            });
+              this.$message({
+                message: "添加萤石云账号失败",
+                type: "warning",
+                duration: 1500,
+              });
             }
           });
       }
@@ -1937,10 +1933,10 @@ export default {
       this.equipmentValue = this.bangDsimoptions[e].iccid;
       if (this.bangDsimoptions[e].iccid == "") {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message({
-          message: "该设备尚未绑定sim卡！",
-          type: "warning",
-        });
+          this.$message({
+            message: "该设备尚未绑定sim卡！",
+            type: "warning",
+          });
         }
       }
     },
@@ -1966,9 +1962,9 @@ export default {
               org_id: org_id, //                  非必传(num)                诱捕器id 修改项
               point_id: this.ruleForm.point_id, //               必传(string)               设备编号
               lat: this.ToDigital(this.ruleForm.lat), //                       必传(string)               纬度
-              lng: this.ToDigital(this.ruleForm.lng), //  
-              device_id:this.ruleForm.device_id,
-              device_name:this.ruleForm.device_name,
+              lng: this.ToDigital(this.ruleForm.lng), //
+              device_id: this.ruleForm.device_id,
+              device_name: this.ruleForm.device_name,
             }),
           }).then((res) => {
             console.log(res);
@@ -1981,30 +1977,30 @@ export default {
               //   message = "修改成功！";
               // }
               if (document.getElementsByClassName("el-message").length == 0) {
-              this.$message({
-                showClose: true,
-                message: "设置成功",
-                type: "success",
-              });
+                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",
-              });
+                this.$message({
+                  showClose: true,
+                  message: "添加失败" + res.data.message,
+                  type: "warning",
+                });
               }
             }
           });
         } else {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message({
-            message: "请将信息填写完全",
-            type: "warning",
-          });
+            this.$message({
+              message: "请将信息填写完全",
+              type: "warning",
+            });
           }
           return false;
         }
@@ -2022,9 +2018,9 @@ export default {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=sysmenage.usermanager.org_list",
-        data:this.qs.stringify({
+        data: this.qs.stringify({
           page_item: "100000000",
-        })
+        }),
       }).then((res) => {
         console.log(res.data.data);
         this.versionsoptions = res.data.data.page_list; //组织
@@ -2072,7 +2068,7 @@ export default {
           };
         } else {
           if (document.getElementsByClassName("el-message").length == 0) {
-          this.$message.error("根据地址查询位置失败");
+            this.$message.error("根据地址查询位置失败");
           }
         }
       });
@@ -2126,7 +2122,7 @@ export default {
         marker.setMap(this.map);
       } else {
         if (document.getElementsByClassName("el-message").length == 0) {
-        this.$message.warning("请输入经纬度！");
+          this.$message.warning("请输入经纬度！");
         }
         // return fasle;
       }
@@ -2148,7 +2144,7 @@ export default {
       if (typeof val == "undefined" || val == "" || isNaN(val)) {
         return val;
       }
-      val = val.toString()
+      val = val.toString();
       var A = "";
       if (type == "lng") {
         A = val > 0 ? "E" : "W";
@@ -2180,15 +2176,15 @@ export default {
       if (!isNaN(lnglat)) {
         return lnglat;
       }
-      console.log(lnglat)
-      lnglat = lnglat.toString()
-      var strDu,strFen,strMiao;
-      var duindex = lnglat.indexOf("°")//字符度的下标
-      var fenindex = lnglat.indexOf("′")//字符分的下标
-      var miaoindex = lnglat.indexOf("″")//字符秒的下标
-      strDu = lnglat.slice(0,duindex)
-      strFen = lnglat.slice(duindex+1,fenindex)
-      strMiao = lnglat.slice(fenindex+1,miaoindex)
+      console.log(lnglat);
+      lnglat = lnglat.toString();
+      var strDu, strFen, strMiao;
+      var duindex = lnglat.indexOf("°"); //字符度的下标
+      var fenindex = lnglat.indexOf("′"); //字符分的下标
+      var miaoindex = lnglat.indexOf("″"); //字符秒的下标
+      strDu = lnglat.slice(0, duindex);
+      strFen = lnglat.slice(duindex + 1, fenindex);
+      strMiao = lnglat.slice(fenindex + 1, miaoindex);
       // len = len > 6 || typeof len == "undefined" ? 6 : len; //精确到小数点后最多六位
       strDu =
         typeof strDu == "undefined" || strDu == "" ? 0 : parseFloat(strDu);
@@ -2548,7 +2544,7 @@ export default {
 .buttonbox {
   margin-bottom: 23px;
   padding-left: 100px;
-  /deep/.el-button{
+  /deep/.el-button {
     background-color: #409eff;
     border-color: #409eff;
   }

minggao/src/page/monitor/PhotoView.vue

@@ -95,16 +95,6 @@ export default {
   methods: {
     // 请求图片列表数据
     getImageList() {
-      // this.$axios({
-      //     method:'POST',
-      //     url:'jk_image',
-      //     data:this.qs.stringify({
-      //         imei:this.imei,
-      //         page:this.page
-      //     })
-      // }).then((res)=>{
-
-      // })
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=monitor_manage.camera_manage.camera_photo",
@@ -116,9 +106,18 @@ export default {
       })
         .then((res) => {
           if (res.data.data !== null) {
+            if (document.getElementsByClassName("el-message").length == 0) {
+              this.$message({
+                showClose: true,
+                message: "获取图片数据成功!",
+                type: "success",
+              });
+              }
             this.total = res.data.data.counts;
             this.images = res.data.data.data;
+
           }
+
         })
         .catch((err) => {
           console.log(err);

minggao/src/page/superviseModule/superviseModule.vue

@@ -249,12 +249,25 @@ export default {
     },
 
     // 搜索
-    searchData() {
+    searchData(e) {
+      if (this.value) {
+        this.startTime = this.tabtime(e[0]);
+        this.endTime = this.tabtime(e[1]);
+      } else {
+        this.startTime = "";
+        this.endTime = "";
+      }
       this.loading = true;
       this.tableData = [];
       this.tableList();
     },
-
+    tabtime(times) {
+      //时间转换
+      var years = times.getFullYear();
+      var month = times.getMonth() + 1;
+      var date = times.getDate();
+      return years + "-" + month + "-" + date;
+    },
     // 重置
     reset() {
       this.input = ""; // 监督人