代码更新 2/24

minggao/config/index.js

@@ -14,6 +14,7 @@ module.exports = {
       '/api': {
         target: 'http://192.168.1.17:12345', //翟毅飞
         // target: 'http://192.168.1.77:12345', //曹世祥
+        target:"http://114.115.147.140:12345",
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/api' //重写接口

minggao/src/page/commandCenter/supervise.vue

@@ -87,6 +87,8 @@
         <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>
         <el-table-column prop="supervisor_type" label="监督形式" width="180">
         </el-table-column>
         <el-table-column prop="supervisor_depa" label="监督单位" width="180">

minggao/src/page/commandCenter/superviseAdminDetails.vue

@@ -227,20 +227,20 @@ export default {
       ruleForm2: {
         resource: "", // 监督形式
         region: "", // 监督单位
-        desc: "" // 监督情况
+        desc: "", // 监督情况
       },
       rules2: {
         region: [
-          { required: true, message: "请选择活动区域", trigger: "change" }
+          { required: true, message: "请选择活动区域", trigger: "change" },
         ],
         resource: [
-          { required: true, message: "请选择活动资源", trigger: "change" }
+          { required: true, message: "请选择活动资源", trigger: "change" },
         ],
-        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }]
+        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
       },
       loading2: false, //加载
       isClick: true, // 防止重复弹框
-      submitBtn: false // 防止弹框确定按钮重复请求
+      submitBtn: false, // 防止弹框确定按钮重复请求
     };
   },
   //监听属性 类似于data概念
@@ -253,7 +253,7 @@ export default {
         this.fullHeight = val;
         this.timer = true;
         let that = this;
-        setTimeout(function() {
+        setTimeout(function () {
           //防止过度调用监测事件，导致卡顿
           that.timer = false;
         }, 400);
@@ -264,7 +264,7 @@ export default {
       if (val == false) {
         this.superviseSubmitForm("ruleForm2");
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -285,10 +285,10 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=control_center.task.task_info",
         data: this.qs.stringify({
-          task_id: this.$route.query.id
-        })
+          task_id: this.$route.query.id,
+        }),
       })
-        .then(res => {
+        .then((res) => {
           if (res.data.data) {
             var data = res.data.data;
             data.img_list = JSON.parse(data.img_list);
@@ -297,7 +297,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
         });
     },
@@ -312,7 +312,7 @@ export default {
     // 监督
     superviseAxiso(formName) {
       this.loading2 = true;
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.submitBtn = true;
           this.$axios({
@@ -322,22 +322,25 @@ export default {
               task_id: this.$route.query.id, //任务id
               supervisor_type: this.ruleForm2.resource, // 监督类型
               supervisor_depa: this.ruleForm2.region, // 监督部门
-              supervisor_msg: this.ruleForm2.desc // 监督内容
-            })
+              supervisor_msg: this.ruleForm2.desc, // 监督内容
+            }),
           })
-            .then(res => {
+            .then((res) => {
               if (res.data.data == true) {
                 this.$message({
                   message: "成功！",
                   type: "success",
-                  duration: 1500
+                  duration: 1500,
                 });
                 this.superviseVisible = false;
+                // this.$router.push({
+                //   path: "/index/superviserec",
+                // });
               }
               this.loading2 = false;
               this.submitBtn = false;
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading2 = false;
               this.submitBtn = false;
             });
@@ -352,13 +355,14 @@ export default {
 
     // 监督 - 取消
     superviseSubmitForm(formName) {
+      this.superviseVisible = false;
       this.$refs[formName].resetFields();
     },
 
     // 监督 - 弹框
     overseer() {
       this.superviseVisible = true;
-    }
+    },
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
@@ -374,7 +378,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 };
 </script>
 <style lang="less" scoped>

minggao/src/page/commandCenter/superviseDetails.vue

@@ -13,7 +13,7 @@
             <ul class="list_ul">
               <li class="list_li">
                 <div class="list_div">
-                  <span class="list_div_tlt">督查人：</span>
+                  <span class="list_div_tlt">实际监督人：</span>
                   <span class="list_div_val">{{
                     taskObj.actual_supervisor
                   }}</span>
@@ -96,6 +96,11 @@
                 </div>
 
                 <div class="list_div">
+                  <span class="list_div_tlt">实际处理人：</span>
+                  <span class="list_div_val">{{ taskObj.actual_operator==''?"无":taskObj.actual_operator }}</span>
+                </div>
+
+                <div class="list_div">
                   <span class="list_div_tlt">任务状态：</span>
                   <span class="list_div_val">{{ taskObj.task_status }}</span>
                 </div>
@@ -124,7 +129,7 @@
                       v-for="(item, index) in taskObj.img_list"
                       :key="index"
                     >
-                      <img v-viewer :src="item" alt="" />
+                      <img v-viewer :src="item.indexOf('http') == -1 ? (DOMIN + item) : item" alt="" />
                     </span>
                   </p>
                   <span v-else>暂无签到图片</span>
@@ -214,6 +219,7 @@
 </template>
 
 <script>
+import DOMIN from "../../util/server"
 export default {
   //import引入的组件需要注入到对象中才能使用
   components: {},

minggao/src/page/commandCenter/superviseLogDetails.vue

@@ -7,7 +7,7 @@
         <el-col :span="24">
           <div class="list_box">
             <div class="list_tlt">
-              <span>监督信息</span>
+              <span>监测信息</span>
             </div>
 
             <ul class="list_ul">

minggao/src/page/commandCenter/taskRegulator.vue

@@ -740,7 +740,7 @@ export default {
         this.startTime = "";
         this.endTime = "";
       }
-
+      this.page = 1
       this.loading = true;
       this.tableData = [];
       this.tableList();
@@ -945,6 +945,7 @@ export default {
     addTask() {
       this.titleData = "发布任务";
       this.dialogVisible = true;
+      this.ybqCheckList =[]
     },
 
     // 筛选列表 - 任务处理人、任务监督人
@@ -1148,10 +1149,10 @@ export default {
           // 监测点
           if (data.point_data.length !== 0) {
             var list2 = [];
-            data.org_data.forEach(item => {
+            data.point_data.forEach(item => {
               var obj = {};
-              obj["value"] = item.org_id;
-              obj["label"] = item.org_name;
+              obj["value"] = item.point_id;
+              obj["label"] = item.point_name;
               list2.push(obj);
             });
             this.pointData = list2;

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

@@ -19,9 +19,9 @@
       <el-button type="primary" size="mini" @click="$throttle(refresh, 2000)"
         >刷新</el-button
       >
-      <el-button type="primary" size="mini" @click="lookSIMCode('sim')"
+      <!-- <el-button type="primary" size="mini" @click="lookSIMCode('sim')"
         >SIM 卡</el-button
-      >
+      > -->
     </div>
     <!-- 统计图 -->
     <el-row :gutter="10">

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

@@ -872,11 +872,16 @@ export default {
       }
     },
     dingwei() {
+      console.log(this.ruleForm)
       if (this.ruleForm.lng != "" && this.ruleForm.lng != 0) {
         this.center[0] = this.ruleForm.lng;
+      }else{
+        this.center = [114.05, 22.55]
       }
       if (this.ruleForm.lat != "" && this.ruleForm.lat != 0) {
         this.center[1] = this.ruleForm.lat;
+      }else{
+        this.center = [114.05, 22.55]
       }
       this.addLocationDialogVisible = true;
       setTimeout(() => {

minggao/src/page/home/index.vue

@@ -45,14 +45,6 @@
           active-text-color="#409EFF"
           :unique-opened="true"
         >
-          <!-- <el-menu-item
-            index="/index/home"
-            class="firstmenu"
-            @click="skip('/index/home')"
-          >
-            <i class="el-icon-collection-tag"></i>
-            <span slot="title">首页</span>
-          </el-menu-item> -->
           <el-submenu
             v-for="item in infodata"
             :key="item.pur_id"
@@ -180,7 +172,7 @@ export default {
       ruleForm: {
         oldpass: "",
         newpass: "",
-        newpasstrue: ""
+        newpasstrue: "",
       },
       rules: {
         oldpass: [
@@ -189,8 +181,8 @@ export default {
             min: 6,
             max: 15,
             message: "长度在 6 到 15 个字符",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
         newpass: [
           { required: true, message: "请输入新密码", trigger: "blur" },
@@ -198,8 +190,8 @@ export default {
             min: 6,
             max: 15,
             message: "长度在 6 到 15 个字符",
-            trigger: "blur"
-          }
+            trigger: "blur",
+          },
         ],
         newpasstrue: [
           { required: true, message: "请再次输入新密码", trigger: "blur" },
@@ -207,24 +199,24 @@ export default {
             min: 6,
             max: 15,
             message: "长度在 6 到 15 个字符",
-            trigger: "blur"
+            trigger: "blur",
           },
-          { validator: validatePass, trigger: "blur" }
-        ]
+          { validator: validatePass, trigger: "blur" },
+        ],
       },
       indexloading: false,
-      perm_id: ""
+      pur_id: "",
     };
   },
   //监听属性 类似于data概念
   computed: {},
   //监控data中的数据变化
   watch: {
-    "$route.path": function(newVal) {
+    "$route.path": function (newVal) {
       console.log(newVal);
       this.routemap(this.routerdata);
       // this.menuActiveId = this.$route.path;
-    }
+    },
   },
   //方法集合
   methods: {
@@ -238,8 +230,8 @@ export default {
       this.indexloading = true;
       this.$axios({
         method: "POST",
-        url: "/api/api_gateway?method=sysmenage.usermanager.user_info"
-      }).then(res => {
+        url: "/api/api_gateway?method=sysmenage.usermanager.user_info",
+      }).then((res) => {
         this.indexloading = false;
         this.imgurl = res.data.data.theme_info.logo_url;
         this.headline = res.data.data.theme_info.sys_name;
@@ -265,8 +257,8 @@ export default {
     outsystem() {
       this.$axios({
         method: "POST",
-        url: "/api/api_gateway?method=sysmenage.usermanager.user_logout"
-      }).then(res => {
+        url: "/api/api_gateway?method=sysmenage.usermanager.user_logout",
+      }).then((res) => {
         if (res.data.data) {
           localStorage.removeItem("session");
           localStorage.removeItem("username");
@@ -281,7 +273,7 @@ export default {
       }
     },
     submitForm(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.$axios({
             method: "POST",
@@ -289,27 +281,27 @@ export default {
             data: this.qs.stringify({
               old_password: this.ruleForm.oldpass, //                必传      旧密码
               new_password: this.ruleForm.newpass, //                必传      新密码
-              confirm_password: this.ruleForm.newpasstrue //            必传      再次确认新密码
-            })
-          }).then(res => {
+              confirm_password: this.ruleForm.newpasstrue, //            必传      再次确认新密码
+            }),
+          }).then((res) => {
             if (res.data.data) {
               this.alterpassTF = false;
               this.$message({
                 message: "修改成功！",
-                type: "success"
+                type: "success",
               });
               this.outsystem();
             } else {
               this.$message({
                 message: "修改失败！" + res.data.data.message,
-                type: "error"
+                type: "error",
               });
             }
           });
         } else {
           this.$message({
             message: "请完成信息填写！",
-            type: "warning"
+            type: "warning",
           });
           return false;
         }
@@ -321,10 +313,14 @@ export default {
     },
     routemap(routerdata) {
       var newrouter = this.$route.path;
-      var tf = routerdata.filter(item => {
+      var tf = routerdata.filter((item) => {
         if (item.menu != "") {
           if (newrouter.indexOf(item.menu) != -1) {
-            //第一层菜单是否包含当前路由
+            // 第一层菜单是否包含当前路由
+            // var arr = [item.menu,item.pur_id]
+            // console.log(item.pur_id)
+            // return arr
+            // var a = '111111111'
             return [item.menu, item.pur_id];
           } else {
             if (item.children) {
@@ -339,21 +335,40 @@ export default {
       });
       // console.log(tf)
       if (tf.length != 0) {
-        this.menuActiveId = tf[0].pur_id.toString();
+        console.log(tf);
+        // this.menuActiveId = tf[0].pur_id.toString();
         this.routerinfo = [];
         this.routerinfo.unshift(tf[0]);
-        var newpath = this.routerdata.filter(item => {
+        var newpath = this.routerdata.filter((item) => {
           // console.log(item)
           if (item.pur_id == tf[0].parent_perm_id) {
             return item.pur_id == tf[0].parent_perm_id;
           } else {
-            var newpath2 = item.children.filter(items => {
+            var newpath2 = item.children.filter((items) => {
               if (items.pur_id == tf[0].parent_perm_id) {
                 return items.pur_id == tf[0].parent_perm_id;
               } else {
                 if (items.children) {
-                  var newpath3 = items.children.filter(itemsa => {
-                    return itemsa.pur_id == tf[0].parent_perm_id;
+                  var newpath3 = items.children.filter((itemsa) => {
+                    // console.log(itemsa.pur_id,tf[0].parent_perm_id)
+                    if (itemsa.pur_id == tf[0].parent_perm_id) {
+                      return itemsa.pur_id == tf[0].parent_perm_id;
+                    } else {
+                      // console.log(itemsa)
+                      if (itemsa.children) {
+                        var newpath4 = itemsa.children.filter((itemsaa) => {
+                          if (itemsaa.pur_id == tf[0].parent_perm_id) {
+                            return itemsaa.pur_id == tf[0].parent_perm_id;
+                          } else {
+                          }
+                        });
+                        console.log(newpath4);
+                        if (newpath4.length != 0) {
+                          this.routerinfo.unshift(newpath4[0]);
+                          return newpath4;
+                        }
+                      }
+                    }
                   });
                   if (newpath3.length != 0) {
                     this.routerinfo.unshift(newpath3[0]);
@@ -369,15 +384,16 @@ export default {
             }
           }
         });
+        // console.log(newpath)
         this.routerinfo.unshift(newpath[0]);
-        // console.log(this.routerinfo);
+        console.log(this.routerinfo);
       } else {
         // console.log(this.routerinfo);
         var obj = {
           menu: "",
           parent_perm_id: "88",
           pur_id: "88",
-          purview_name: "查看详情"
+          purview_name: "查看详情",
         };
         if (this.routerinfo[1] && !this.routerinfo[2]) {
           if (this.$route.path == "/index/taskRegulatorDetails") {
@@ -391,7 +407,7 @@ export default {
           }
         }
       }
-    }
+    },
   },
   beforeCreate() {}, //生命周期 - 创建之前
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -406,7 +422,7 @@ export default {
   updated() {}, //生命周期 - 更新之后
   beforeDestroy() {}, //生命周期 - 销毁之前
   destroyed() {}, //生命周期 - 销毁完成
-  activated() {} //如果页面有keep-alive缓存功能，这个函数会触发
+  activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 };
 </script>
 <style lang="less" scoped>

minggao/src/page/homepage/facilitydistribute.vue

@@ -86,7 +86,7 @@
           pietf ? 'iconbox el-icon-arrow-right' : 'iconbox el-icon-arrow-left'
         "
         @click="pietf = !pietf"
-        style="cursor: pointer;"
+        style="cursor: pointer"
       ></p>
       <div class="tishi" :style="{ width: width }" v-if="baseinfo.length == 0">
         <p>请点击设备标点，查看设备详情</p>
@@ -104,7 +104,10 @@
         <div class="infobox">
           <h3>设备信息</h3>
           <p>
-            <span>设备名称：</span><span>{{ baseinfo[0].device_name==""?"暂无":baseinfo[0].device_name }}</span>
+            <span>设备名称：</span
+            ><span>{{
+              baseinfo[0].device_name == "" ? "暂无" : baseinfo[0].device_name
+            }}</span>
           </p>
           <p>
             <span>设备编号：</span><span>{{ baseinfo[0].device_id }}</span>
@@ -128,6 +131,7 @@
               <span>{{ item.pest_name }}</span
               ><span>{{ item.sum }}</span>
             </p>
+            <p style="color: #fff; width: 100%; text-align: center">暂无数据</p>
           </div>
         </div>
         <div class="cbdinfobox" v-if="device_type_id == 3">
@@ -287,7 +291,7 @@ export default {
           this.device_type_id = params.value[2];
           this.pietf = true;
           // if(this.device_type_id == 6){
-            this.getbaseinfo(params.name);
+          this.getbaseinfo(params.name);
           // }
         }
       });
@@ -460,9 +464,9 @@ export default {
       this.$axios({
         method: "POST",
         url: "/api/api_gateway?method=monitor_manage.trap_manage.trap_org",
-        data:this.qs.stringify({
-          page_item:"1000000"
-        })
+        data: this.qs.stringify({
+          page_item: "1000000",
+        }),
       }).then((res) => {
         console.log(res.data.data);
         this.versionsoptions2 = res.data.data.org_data;
@@ -504,8 +508,8 @@ export default {
             }, 150);
           });
         } else {
-          var dom = document.getElementById("myPlayer")
-          dom.style.display = "none"
+          var dom = document.getElementById("myPlayer");
+          dom.style.display = "none";
         }
       });
     },
@@ -522,8 +526,16 @@ export default {
   },
   beforeUpdate() {}, //生命周期 - 更新之前
   updated() {}, //生命周期 - 更新之后
-  beforeDestroy() {}, //生命周期 - 销毁之前
-  destroyed() {}, //生命周期 - 销毁完成
+  beforeDestroy() {
+    if (this.myVideo2[`myPlayer`]) {
+      this.myVideo2[`myPlayer`].stop();
+    }
+  }, //生命周期 - 销毁之前
+  destroyed() {
+    if (this.myVideo2[`myPlayer`]) {
+      this.myVideo2[`myPlayer`].stop();
+    }
+  }, //生命周期 - 销毁完成
   activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
 };
 </script>
@@ -640,6 +652,7 @@ export default {
         .wornbox_item {
           display: flex;
           flex-wrap: wrap;
+
           p {
             width: 40%;
             margin-bottom: 15px;

minggao/src/page/homepage/pestdistribute.vue

@@ -517,7 +517,7 @@ export default {
               distanceToLabelLine: 0,
               borderRadius: 2.5,
               padding: [2.5, -2.5, 2.5, -2.5],
-              formatter: "{a|{b}：}{b|{c}}",
+              formatter: "{a|{b} }",
               rich: {
                 a: {
                   padding: [0, 0, 0, 10],

minggao/src/util/server.js

@@ -21,7 +21,8 @@ var DOMIN = ""; //服务端接口访问跟路径
 var mapJson = "";
 const origin = location.origin //当前访问域名
 mapJson = origin
-DOMIN = 'http://192.168.1.17' + ':12345'
+DOMIN = 'http://114.115.147.140' + ':12345'
+// DOMIN = origin
 export {
   DOMIN,
   mapJson