2022/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/laboratory.vue

@@ -56,10 +56,10 @@
           </el-date-picker>
 
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
-            <el-button type="primary" size="mini" @click="reset"
+            <el-button type="info" size="mini" @click="reset"
               >重置</el-button
             >
           </div>
@@ -411,6 +411,7 @@ export default {
         this.endTime = "";
       }
       this.loading = true;
+      this.page = 1
       this.tableData = [];
       this.tableList();
     },
@@ -896,4 +897,9 @@ export default {
     cursor: pointer;
   }
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/commandCenter/realTime.vue

@@ -23,7 +23,7 @@
           >
           </el-input>
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
           </div>
@@ -1152,4 +1152,9 @@ export default {
     overflow-y: auto;
   }
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/commandCenter/supervise.vue

@@ -55,14 +55,14 @@
           </el-date-picker>
 
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
             <el-button size="mini" @click="reset">重置</el-button>
 
             <el-button
               :disabled="btnShow"
-              type="primary"
+              type="info"
               size="mini"
               @click="exportData"
             >
@@ -406,4 +406,9 @@ export default {
     cursor: pointer;
   }
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/commandCenter/superviseAdmin.vue

@@ -89,7 +89,7 @@
           </el-date-picker>
 
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
             <el-button size="mini" @click="reset">重置</el-button>
@@ -469,4 +469,9 @@ export default {
     cursor: pointer;
   }
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/commandCenter/superviseAdminDetails.vue

@@ -8,7 +8,7 @@
           <div class="list_box">
             <div class="list_tlt">
               <span>任务信息</span>
-              <el-button type="primary" size="mini" @click="overseer"
+              <el-button type="info" size="mini" @click="overseer"
                 >监督</el-button
               >
             </div>
@@ -492,4 +492,9 @@ export default {
   font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
     "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/commandCenter/superviseLog.vue

@@ -37,13 +37,13 @@
           </el-date-picker>
 
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
             <el-button size="mini" @click="reset">重置</el-button>
             <el-button
               :disabled="btnShow"
-              type="primary"
+              type="info"
               size="mini"
               @click="exportData"
             >
@@ -274,7 +274,7 @@ export default {
     // 下页
     newPage(page) {
       this.page = page;
-      this.loadingShow = true;
+      this.loading = true;
       this.tableData = [];
       this.tableList();
     },
@@ -393,4 +393,9 @@ export default {
 /deep/.el-table .cell {
   text-align: center;
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/commandCenter/taskRegulator.vue

@@ -78,18 +78,18 @@
           </el-date-picker>
 
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
             <el-button size="mini" @click="reset">重置</el-button>
 
-            <el-button type="primary" size="mini" @click="addTask"
+            <el-button type="info" size="mini" @click="addTask"
               >新增任务</el-button
             >
 
             <el-button
               :disabled="btnShow"
-              type="primary"
+              type="info"
               size="mini"
               @click="exportData"
             >
@@ -722,11 +722,11 @@ export default {
     },
 
     "ruleForm.type"(newVal, oldVal) {
-      if (newVal == '有害生物监测' && oldVal !== "") {
+      if (newVal == "有害生物监测" && oldVal !== "") {
         this.ybqCheckList = []; // 清空
-        this.checkList = []
+        this.checkList = [];
       }
-    }
+    },
   },
   //方法集合
   methods: {
@@ -766,7 +766,7 @@ export default {
       this.endTime = ""; // 结束时间
       this.loading = true;
       this.tableData = [];
-      this.page = 1
+      this.page = 1;
       this.tableList();
     },
 
@@ -1256,11 +1256,11 @@ export default {
 
     // 导出数据
     exportData() {
-      console.log(this.input)
-      console.log(this.input2)
-      console.log(this.startTime)
-      console.log(this.endTime)
-      console.log(this.value)
+      console.log(this.input);
+      console.log(this.input2);
+      console.log(this.startTime);
+      console.log(this.endTime);
+      console.log(this.value);
       var that = this;
       this.loadingShow = true;
       this.btnShow = true;
@@ -1414,4 +1414,9 @@ export default {
   font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
     "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

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

@@ -92,7 +92,7 @@
                   <i class="iconfont icon-yonghu"></i>
                   隶属海关组织 :
                   <span v-if="item.org_list.length == 1">{{
-                    item.org_name
+                    item.org_list[0].org_name
                   }}</span>
                   <el-popover
                     ref="popover"

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

@@ -1146,7 +1146,8 @@ export default {
     refresh() {
       this.$axios({
         method: "POST",
-        url: "/api/api_gateway?method=monitor_manage.cbd_manage.cbd_device_control",
+        // url: "/api/api_gateway?method=monitor_manage.cbd_manage.cbd_device_control",
+        url: "/api/api_gateway?method=monitor_manage.cbd_manage.get_device_config",
         data: this.qs.stringify({
           device_type_id: 3,
           d_id: this.queryInfo.d_id,

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

@@ -802,122 +802,122 @@ Viewer.setDefaults({
   // transition: false, //使用 CSS3 过度
   fullscreen: false, //播放时是否全屏
   keyboard: true, //是否支持键盘
-  ready: function(e) {
-    // console.log(e.type, '组件以初始化')
-  },
-  show: function(e) {
-    // console.log(e.type, '图片显示开始')
-    var iconBox = document.getElementById("iconBox");
-    iconBox.style.display = "block";
-  },
-  shown: function(e) {
-    // console.log(e.type, '图片显示结束')
-  },
-  hide: function(e) {
-    // console.log(e.type, '图片隐藏完成')
-    var domData = document.getElementById("reseau");
-    var html = "";
-    domData.innerHTML = html;
-    var iconBox = document.getElementById("iconBox");
-    iconBox.style.display = "none";
-  },
-  hidden: function(e) {
-    // console.log(e.type, '图片隐藏结束')
-  },
-  view: function(e) {
-    // console.log(e.type, "视图开始");
-  },
-  viewed: function(e) {
-    var iconDom = document.getElementById("iconDom");
-    var j = JSON.stringify(iconDom);
-    var g = j.indexOf("icon2");
-    if (g !== -1) {
-      var b;
-      var c;
-      var a;
-      // var a = e.path[0].ownerDocument.images[20].outerHTML
-      var arr = [];
-      arr = e.path[0].ownerDocument.images;
-      for (var i = 0; i < arr.length; i++) {
-        var k = arr[i].outerHTML.indexOf('style="');
-        var j = arr[i].outerHTML.indexOf("margin-top:");
-        if (k !== -1 && k !== -1) {
-          a = arr[i].outerHTML;
-        }
-      }
-      b = a.split('style="');
-      c = b[1].split('">');
-      var f = c[0];
-      var t = f.replace("margin-top", "top");
-      var y = t.replace("margin-left", "left");
-      var x = y + "z-index:10000;";
-      var domData = document.getElementById("reseau");
-      var html =
-        '<div class="griddingLine" v-show="iconShow">' +
-        '<img src="../../../../static/images/gridding.png" alt="" class="" ' +
-        'style="' +
-        x +
-        '"' +
-        " />" +
-        "</div>";
-      domData.innerHTML = html;
-    }
-  },
-  zoom: function(e) {
-    // console.log(e.type, '图片缩放开始')
-    var iconDom = document.getElementById("iconDom");
-    var j = JSON.stringify(iconDom);
-    var g = j.indexOf("icon2");
-    console.log(g);
-    if (g !== -1) {
-      var b;
-      var c;
-      var a = e.detail.originalEvent.path[0].outerHTML;
-      b = a.split('style="');
-      c = b[1].split('">');
-      var f = c[0];
-      var t = f.replace("margin-top", "top");
-      var y = t.replace("margin-left", "left");
-      var x = y + "z-index:10000;";
-      var domData = document.getElementById("reseau");
-      var html =
-        '<div class="griddingLine" v-show="iconShow">' +
-        '<img src="../../../../static/images/gridding.png" alt="" class="" ' +
-        'style="' +
-        x +
-        '"' +
-        " />" +
-        "</div>";
-      domData.innerHTML = html;
-    }
-  },
-  zoomed: function(e) {
-    var iconDom = document.getElementById("iconDom");
-    var j = JSON.stringify(iconDom);
-    var g = j.indexOf("icon2");
-    // console.log(g)
-    if (g !== -1) {
-      var b;
-      var c;
-      var a = e.detail.originalEvent.path[0].outerHTML;
-      b = a.split('style="');
-      c = b[1].split('">');
-      var f = c[0];
-      var t = f.replace("margin-top", "top");
-      var y = t.replace("margin-left", "left");
-      var x = y + "z-index:10000;";
-      var domData = document.getElementById("reseau");
-      var html =
-        '<div class="griddingLine" v-show="iconShow">' +
-        '<img src="../../../../static/images/gridding.png" alt="" class="" ' +
-        'style="' +
-        x +
-        '"' +
-        " />" +
-        "</div>";
-      domData.innerHTML = html;
-    }
-  }
+  // ready: function(e) {
+  //   // console.log(e.type, '组件以初始化')
+  // },
+  // show: function(e) {
+  //   // console.log(e.type, '图片显示开始')
+  //   var iconBox = document.getElementById("iconBox");
+  //   iconBox.style.display = "block";
+  // },
+  // shown: function(e) {
+  //   // console.log(e.type, '图片显示结束')
+  // },
+  // hide: function(e) {
+  //   // console.log(e.type, '图片隐藏完成')
+  //   var domData = document.getElementById("reseau");
+  //   var html = "";
+  //   domData.innerHTML = html;
+  //   var iconBox = document.getElementById("iconBox");
+  //   iconBox.style.display = "none";
+  // },
+  // hidden: function(e) {
+  //   // console.log(e.type, '图片隐藏结束')
+  // },
+  // view: function(e) {
+  //   // console.log(e.type, "视图开始");
+  // },
+  // viewed: function(e) {
+  //   var iconDom = document.getElementById("iconDom");
+  //   var j = JSON.stringify(iconDom);
+  //   var g = j.indexOf("icon2");
+  //   if (g !== -1) {
+  //     var b;
+  //     var c;
+  //     var a;
+  //     // var a = e.path[0].ownerDocument.images[20].outerHTML
+  //     var arr = [];
+  //     arr = e.path[0].ownerDocument.images;
+  //     for (var i = 0; i < arr.length; i++) {
+  //       var k = arr[i].outerHTML.indexOf('style="');
+  //       var j = arr[i].outerHTML.indexOf("margin-top:");
+  //       if (k !== -1 && k !== -1) {
+  //         a = arr[i].outerHTML;
+  //       }
+  //     }
+  //     b = a.split('style="');
+  //     c = b[1].split('">');
+  //     var f = c[0];
+  //     var t = f.replace("margin-top", "top");
+  //     var y = t.replace("margin-left", "left");
+  //     var x = y + "z-index:10000;";
+  //     var domData = document.getElementById("reseau");
+  //     var html =
+  //       '<div class="griddingLine" v-show="iconShow">' +
+  //       '<img src="../../../../static/images/gridding.png" alt="" class="" ' +
+  //       'style="' +
+  //       x +
+  //       '"' +
+  //       " />" +
+  //       "</div>";
+  //     domData.innerHTML = html;
+  //   }
+  // },
+  // zoom: function(e) {
+  //   // console.log(e.type, '图片缩放开始')
+  //   var iconDom = document.getElementById("iconDom");
+  //   var j = JSON.stringify(iconDom);
+  //   var g = j.indexOf("icon2");
+  //   console.log(g);
+  //   if (g !== -1) {
+  //     var b;
+  //     var c;
+  //     var a = e.detail.originalEvent.path[0].outerHTML;
+  //     b = a.split('style="');
+  //     c = b[1].split('">');
+  //     var f = c[0];
+  //     var t = f.replace("margin-top", "top");
+  //     var y = t.replace("margin-left", "left");
+  //     var x = y + "z-index:10000;";
+  //     var domData = document.getElementById("reseau");
+  //     var html =
+  //       '<div class="griddingLine" v-show="iconShow">' +
+  //       '<img src="../../../../static/images/gridding.png" alt="" class="" ' +
+  //       'style="' +
+  //       x +
+  //       '"' +
+  //       " />" +
+  //       "</div>";
+  //     domData.innerHTML = html;
+  //   }
+  // },
+  // zoomed: function(e) {
+  //   var iconDom = document.getElementById("iconDom");
+  //   var j = JSON.stringify(iconDom);
+  //   var g = j.indexOf("icon2");
+  //   // console.log(g)
+  //   if (g !== -1) {
+  //     var b;
+  //     var c;
+  //     var a = e.detail.originalEvent.path[0].outerHTML;
+  //     b = a.split('style="');
+  //     c = b[1].split('">');
+  //     var f = c[0];
+  //     var t = f.replace("margin-top", "top");
+  //     var y = t.replace("margin-left", "left");
+  //     var x = y + "z-index:10000;";
+  //     var domData = document.getElementById("reseau");
+  //     var html =
+  //       '<div class="griddingLine" v-show="iconShow">' +
+  //       '<img src="../../../../static/images/gridding.png" alt="" class="" ' +
+  //       'style="' +
+  //       x +
+  //       '"' +
+  //       " />" +
+  //       "</div>";
+  //     domData.innerHTML = html;
+  //   }
+  // }
 });
 
 export default {

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

@@ -1121,6 +1121,11 @@ export default {
       // if (val == false) {
       //   this.addFunData = {}
       // }
+
+      if (val == false) {
+        this.imgDiscern = ""
+        this.imgShow = true // 将识别后的图片进行展示，目的是为了销毁手动标注组件。让其重新加载
+      }
     },
   },
 
@@ -2282,7 +2287,10 @@ export default {
         }),
       }).then((res) => {
         if (res.data.message == "") {
-          console.log(res.data.data)
+          // console.log(res.data.data)
+          // console.log('---------------------------')
+          // console.log(this.addFunData)
+          // console.log('---------------------------')
           this.currentImage = res.data.data.image;
           this.tagImgId = this.addFunData.ids;
           // this.mgMark = data.mark;
@@ -2290,10 +2298,13 @@ export default {
           // console.log(data.mark);
           this.$viewer.hide();
           this.imgTagDataVisible = true;
-          this.$nextTick(() => {
-            console.log(this.addFunData.mark);
-            // this.renderData(JSON.parse(this.addFunData.mark));
-          });
+          // this.$nextTick(() => {
+          //   // console.log(this.addFunData.mark);
+          //   this.renderData(JSON.parse(this.addFunData.mark));
+          // });
+          setTimeout(() => {
+            this.renderData(JSON.parse(this.addFunData.mark));
+          }, 100)
         } else {
           this.$message.warning(res.data.message);
           this.currentImage =
@@ -2319,10 +2330,14 @@ export default {
     renderData(data) {
       console.log(123);
       console.log(data);
-      this.$nextTick(() => {
+      // this.$nextTick(() => {
+      //   this.$refs["aiPanel-editor"].getMarker().clearData(data);
+      //   this.$refs["aiPanel-editor"].getMarker().renderData(data);
+      // });
+      setTimeout(() => {
         this.$refs["aiPanel-editor"].getMarker().clearData(data);
         this.$refs["aiPanel-editor"].getMarker().renderData(data);
-      });
+      }, 100)
     },
     saveTag() {
       let data = this.$refs["aiPanel-editor"].getMarker().getData();
@@ -2361,7 +2376,8 @@ export default {
         this.pictureDetailsFunDataObj.indentify_photo = "";
         this.pictureDetails = false
         this.imgTagDataVisible = false;
-        this.reload() //局部刷新
+        // this.reload() //局部刷新
+        location.reload(); // 强制刷新
         this.imgListData();
         var obj = {
           ids: this.addFunData.ids,
@@ -2790,13 +2806,14 @@ export default {
     },
     // 图片详情
     pictureDetailsFun(data) {
-      // console.log(data.mark);
+      this.addFunData = null
       this.$viewer.hide();
+      this.loading = true
       this.pictureDetailsFunDataObj.indentify_photo = "";
       this.loading = true;
       this.pictureDetails = true;
       this.addFunData = JSON.parse(JSON.stringify(data));
-      // console.log(this.addFunData.indentify_photo)
+      console.log(this.addFunData.mark)
       if (this.addFunData.indentify_photo == "") {
         // 标识后的图片没值
         this.addFunData.indentify_photo = this.addFunData.addr;

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/trap.vue

@@ -204,7 +204,11 @@
             >
           </div>
           <el-form-item label="所在城市" prop="basecity">
-            <el-input v-model="ruleForm.basecity" disabled style="width:217px"></el-input>
+            <el-input
+              v-model="ruleForm.basecity"
+              disabled
+              style="width: 217px"
+            ></el-input>
           </el-form-item>
           <el-form-item label="隶属海关" prop="org_id">
             <!-- <el-select v-model="ruleForm.org_id" placeholder="请选择隶属海关">
@@ -269,7 +273,7 @@
           @click="submitForm('ruleForm')"
           size="mini"
           :disabled="releaseTF"
-          >{{ releaseTF ? "发布中..." : "确 定" }}</el-button
+          >{{ releaseTF == true ? "发布中..." : "确 定" }}</el-button
         >
       </span>
     </el-dialog>
@@ -449,7 +453,7 @@ export default {
         inducer_id: "", //     必传(string)               诱剂id
         point_id: "", //     必传(string)               所属监测点id
         trap_status: "", //    必传(string)               设备状态0停用 1正常
-        basecity:""
+        basecity: "",
       },
       rules: {
         trap_number: [
@@ -586,23 +590,38 @@ export default {
     },
     submitForm(formName) {
       console.log(this.ruleForm);
-      var org_id = [];
-      if (Array.isArray(this.ruleForm.org_id)) {
-        for (var i = 0; i < this.ruleForm.org_id.length; i++) {
-          org_id.push(
-            this.ruleForm.org_id[i][this.ruleForm.org_id[i].length - 1]
-          );
-        }
-      } else {
-        org_id = this.ruleForm.org_id;
-      }
-      if (org_id.length > 0) {
-        org_id = org_id.join("/");
-      }
-      console.log(org_id);
-      this.releaseTF = true;
+      // var org_id = [];
+      // if (Array.isArray(this.ruleForm.org_id)) {
+      //   for (var i = 0; i < this.ruleForm.org_id.length; i++) {
+      //     org_id.push(
+      //       this.ruleForm.org_id[i][this.ruleForm.org_id[i].length - 1]
+      //     );
+      //   }
+      // } else {
+      //   org_id = this.ruleForm.org_id;
+      // }
+      // if (org_id.length > 0) {
+      //   org_id = org_id.join("/");
+      // }
+      // console.log(org_id);
+      // this.releaseTF = true;
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          var org_id = [];
+          if (Array.isArray(this.ruleForm.org_id)) {
+            for (var i = 0; i < this.ruleForm.org_id.length; i++) {
+              org_id.push(
+                this.ruleForm.org_id[i][this.ruleForm.org_id[i].length - 1]
+              );
+            }
+          } else {
+            org_id = this.ruleForm.org_id;
+          }
+          if (org_id.length > 0) {
+            org_id = org_id.join("/");
+          }
+          console.log(org_id);
+          this.releaseTF = true;
           this.$axios({
             method: "POST",
             url: "/api/api_gateway?method=monitor_manage.trap_manage.add_trap",
@@ -616,7 +635,7 @@ export default {
               point_id: this.ruleForm.point_id, //                  必传(string)               所属监测点id
               trap_status: this.ruleForm.trap_status, //               必传(string)               设备状态0停用 1正常
               parameter: this.parameter,
-              city:this.ruleForm.basecity
+              city: this.ruleForm.basecity,
             }),
           }).then((res) => {
             console.log(res);
@@ -683,8 +702,8 @@ export default {
       this.ruleForm.trap_status = this.ruleForm.trap_status.toString();
       this.parameter = "modify";
       this.ruleForm.org_id = [];
-      console.log(this.ruleForm)
-      this.city(e.lat,e.lng)
+      console.log(this.ruleForm);
+      this.city(e.lat, e.lng);
       this.getmon3(e);
     },
     getmon3(e) {
@@ -837,7 +856,7 @@ export default {
       this.queryInfo.trap_status = "";
       this.versionsvalue2 = "";
       this.versionsvalue = [];
-      this.queryInfo.page = 1
+      this.queryInfo.page = 1;
       this.getcbdlist();
     },
     init() {
@@ -918,14 +937,13 @@ export default {
       this.ruleForm.lng = this.locationForm.lng;
       this.ruleForm.lat = this.locationForm.lat;
       this.addLocationDialogVisible = false;
-      this.city(this.ruleForm.lat,this.ruleForm.lng)
+      this.city(this.ruleForm.lat, this.ruleForm.lng);
     },
     addLocationDialogClosed() {
       //弹框关闭时
       // this.locationForm = { lat: "", lng: "" };
       this.center = [114.05, 22.55];
       this.map = null;
-      
     },
     locationSearch() {
       if (this.locationForm.lat && this.locationForm.lng) {
@@ -1030,7 +1048,7 @@ export default {
       }
       this.content = str;
     },
-    city(lat,lng) {
+    city(lat, lng) {
       $.ajax({
         url: "https://restapi.amap.com/v3/geocode/regeo",
         type: "get",
@@ -1040,22 +1058,22 @@ export default {
           key: "78ce288400f4fc6d9458989875c833c2",
           extensions: "base",
         }),
-        success: (res)=> {
+        success: (res) => {
           console.log(res);
-          this.ruleForm.basecity = res.regeocode.addressComponent.city
-          console.log(this.ruleForm)
+          this.ruleForm.basecity = res.regeocode.addressComponent.city;
+          console.log(this.ruleForm);
         },
         error: function (err) {
-          alert("服务端错误，请刷新浏览器后重试")
-        }
-      })
+          alert("服务端错误，请刷新浏览器后重试");
+        },
+      });
       // return arr;
     },
-    latblur(){
-      if(this.ruleForm.lat!=""&&this.ruleForm.lng!=""){
-        this.city(this.ruleForm.lat,this.ruleForm.lng)
+    latblur() {
+      if (this.ruleForm.lat != "" && this.ruleForm.lng != "") {
+        this.city(this.ruleForm.lat, this.ruleForm.lng);
       }
-    }
+    },
   },
   beforeCreate() {}, //生命周期 - 创建之前
   //生命周期 - 创建完成（可以访问当前this实例）

minggao/src/page/home/index.vue

@@ -244,7 +244,14 @@ export default {
         this.imgurl = res.data.data.theme_info.logo_url;
         this.headline = res.data.data.theme_info.sys_name;
         this.routerdata = JSON.parse(JSON.stringify(res.data.data.children));
-        this.infodata = res.data.data.children;
+        var titleList = []
+        res.data.data.children.forEach((item) => {
+          if (item.purview_name !== 'APP') {
+            titleList.push(item)
+          }
+        })
+        // this.infodata = res.data.data.children;
+        this.infodata = titleList;
         console.log(this.routerdata);
         // this.infodata.shift();
         localStorage.setItem("userID", res.data.data.im_user_id); // 存储当前登录账号的ID

minggao/src/page/monitor/PhotoView.vue

@@ -24,12 +24,11 @@
       </el-date-picker>
     </div>
     <el-row :gutter="20">
-      <viewer :images="images" class="images clearfix">
-        <template slot-scope="scope">
-          <el-col :span="6" v-for="(src, index) in scope.images" :key="index">
+      <!-- <viewer :images="images" class="images"> -->
+        <!-- <template slot-scope="scope"> -->
+          <el-col :span="6" v-for="(src, index) in images" :key="index">
             <el-card style="height: 272px">
-              <!-- <img :src="src.addr" class="image" /> -->
-              <img v-lazy="src.addr" id="viewerDom" v-viewer class="image" />
+              <img v-lazy="src.addr" @click="imgOpen(src, index)" id="viewerDom" v-viewer class="image" />
               <span class="time">{{ (src.addtime * 1000) | formatTime }}</span>
               <!-- <span
                 class="del iconfont icon-shanchu"
@@ -41,8 +40,8 @@
               </div> -->
             </el-card>
           </el-col>
-        </template>
-      </viewer>
+        <!-- </template> -->
+      <!-- </viewer> -->
 
       <!-- 暂无数据 -->
       <div class="expertDiagnosis_referral_units_not" v-if="images.length <= 0">
@@ -64,10 +63,37 @@
       :page-size="12"
       @current-change="changePage"
     ></el-pagination>
+
+
+    <!-- 查看大图插件 -->
+    <viewer :images="imgArray" ref="viewer" @inited="inited"  v-show="imgList" class="images">
+      <img v-for="(src, index) in imgArray" :src="src" class="image" :key="index" style="width: 100px; height: auto; display: none;" />
+    </viewer>
+    <!-- 查看大图插件 -->
   </div>
 </template>
 
 <script>
+import Vue from "vue";
+import Viewer from "v-viewer";
+import "viewerjs/dist/viewer.css";
+Vue.use(Viewer)
+Viewer.setDefaults({
+  inline: false,
+  button: true, //右上角按钮
+  navbar: false, //底部缩略图
+  title: false, //当前图片标题
+  toolbar: false, //底部工具栏
+  tooltip: true, //显示缩放百分比
+  movable: true, //是否可以移动
+  zoomable: true, //是否可以缩放
+  rotatable: true, //是否可旋转
+  scalable: true, //是否可翻转
+  // transition: false, //使用 CSS3 过度
+  fullscreen: false, //播放时是否全屏
+  keyboard: true, //是否支持键盘
+})
+
 export default {
   data() {
     return {
@@ -81,6 +107,9 @@ export default {
 
       // 分页
       total: null,
+
+      imgList: false, // 查看大图插件显示隐藏
+      imgArray: [], // 插件使用的数组，内只有图片url
     };
   },
   computed: {
@@ -186,6 +215,25 @@ export default {
       this.page = val;
       this.getImageList();
     },
+
+    // 打开查看大图插件
+    imgOpen(data, index) {
+      this.imgArray = []
+      if (this.images.length !== 0) {
+        this.images.forEach((item) => {
+          this.imgArray.push(item.addr)
+        });
+        this.imgList = true
+        this.imgIndexNumber = index
+      } else {
+        this.imgList = false
+      }
+    },
+    // 查看大图插件初始化
+    inited(viewer) {
+      this.$viewer = viewer;
+      this.$viewer.view(this.imgIndexNumber);
+    },
   },
 };
 </script>

minggao/src/page/superviseModule/superviseModule.vue

@@ -57,12 +57,12 @@
             </el-date-picker>
 
             <div class="btn_box">
-              <el-button type="primary" size="mini" @click="searchData"
+              <el-button type="info" size="mini" @click="searchData"
                 >搜索</el-button
               >
               <el-button size="mini" @click="reset">重置</el-button>
 
-              <el-button type="primary" size="mini" @click="exportData">
+              <el-button type="info" size="mini" @click="exportData">
                 <i v-if="loadingShow" class="el-icon-loading"></i>
                 导出数据</el-button
               >
@@ -392,4 +392,9 @@ export default {
     cursor: pointer;
   }
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/systemmanger/customsManger.vue

@@ -15,10 +15,10 @@
           >
           </el-input>
           <div class="btn_box">
-            <el-button type="primary" size="mini" @change="searchData"
+            <el-button type="info" size="mini" @change="searchData"
               >搜索</el-button
             >
-            <el-button type="primary" size="mini" @click="addrUser"
+            <el-button type="info" size="mini" @click="addrUser"
               >添加组织</el-button
             >
           </div>
@@ -453,4 +453,9 @@ export default {
     margin: 0 0 0 15px;
   }
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/systemmanger/dayRecord.vue

@@ -35,10 +35,10 @@
           >
           </el-date-picker>
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
-            <el-button type="primary" size="mini" @click="reset"
+            <el-button type="info" size="mini" @click="reset"
               >重置</el-button
             >
           </div>
@@ -279,4 +279,8 @@ export default {
     cursor: pointer;
   }
 }
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/systemmanger/harmfulBiology.vue

@@ -15,10 +15,10 @@
           >
           </el-input>
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
-            <el-button type="primary" size="mini" @click="addrHarmfulBiology"
+            <el-button type="info" size="mini" @click="addrHarmfulBiology"
               >添加有害生物</el-button
             >
           </div>
@@ -516,4 +516,9 @@ export default {
 /deep/.el-textarea__inner {
   font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/systemmanger/role.vue

@@ -15,10 +15,10 @@
           >
           </el-input>
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
-            <el-button type="primary" size="mini" @click="addrRole"
+            <el-button type="info" size="mini" @click="addrRole"
               >添加角色</el-button
             >
           </div>
@@ -608,4 +608,9 @@ export default {
 /deep/.el-textarea__inner {
   font-family:  "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>

minggao/src/page/systemmanger/userManger.vue

@@ -23,10 +23,10 @@
           >
           </el-input>
           <div class="btn_box">
-            <el-button type="primary" size="mini" @click="searchData"
+            <el-button type="info" size="mini" @click="searchData"
               >搜索</el-button
             >
-            <el-button type="primary" size="mini" @click="addrRole"
+            <el-button type="info" size="mini" @click="addrRole"
               >添加用户</el-button
             >
           </div>
@@ -970,4 +970,9 @@ export default {
     width: 80%;
   }
 }
+
+/deep/.el-button--info {
+  background-color: #409eff;
+  border-color: #409eff;
+}
 </style>