bug修复 2/25

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/forecasting/cbd/Cbd.vue

@@ -1510,8 +1510,8 @@ export default {
     },
     addLocationDialogClosed() {
       //弹框关闭时
-      this.locationForm = { lat: "", lng: "" };
-      this.center = [];
+      // this.locationForm = { lat: "", lng: "" };
+      this.center = [114.05, 22.55];
       this.map = null;
     },
     locationSearch() {

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

@@ -60,7 +60,7 @@
 					<div class="limitValBox">
 						<div class="limitWormItem">
 							<div class="limitWormItemBox" v-for="(item,index) in planKind" :key="index">
-								<el-select v-model="item.value" placeholder="请选择害虫种类">
+								<el-select v-model="item.value" filterable  placeholder="请选择害虫种类">
 									<el-option v-for="num in cbdPestNum" :key="num" :label="cbdPest[num]" :value="num"></el-option>
 								</el-select>
 								<el-input

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

@@ -2698,8 +2698,9 @@ export default {
         }),
       }).then((res) => {
         if (res.data.message == "") {
-          this.currentImage =
-            res.data.data.indentify_photo || res.data.data.addr;
+          // this.currentImage =
+          //   res.data.data.indentify_photo || res.data.data.addr;
+          this.currentImage = res.data.data.image
           this.tagImgId = this.addFunData.ids;
           // this.mgMark = data.mark;
           // console.log(data);

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

@@ -515,8 +515,8 @@ export default {
     },
     addLocationDialogClosed() {
       //弹框关闭时
-      this.locationForm = { lat: "", lng: "" };
-      this.center = [];
+      // this.locationForm = { lat: "", lng: "" };
+      this.center = [114.05, 22.55];
       this.map = null;
     },
     locationSearch() {
@@ -548,6 +548,7 @@ export default {
           this.center[1] = this.ruleForm.lat;
         }
       }
+      console.log(this.center)
       this.addLocationDialogVisible = true;
       setTimeout(() => {
         // console.log(this.center);

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

@@ -246,7 +246,6 @@ export default {
               data: this.qs.stringify({
                 inducer_id: this.ruleForm.inducer_id,
                 inducer_name: this.ruleForm.inducer_name,
-                expire: Number(this.ruleForm.expire),
                 messages: this.ruleForm.messages,
               }),
             }).then((res) => {
@@ -280,7 +279,6 @@ export default {
               url: "/api/api_gateway?method=monitor_manage.maintain.inducer_add",
               data: this.qs.stringify({
                 inducer_name: this.ruleForm.inducer_name,
-                expire: this.ruleForm.expire,
                 messages: this.ruleForm.messages,
               }),
             }).then((res) => {

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

@@ -16,12 +16,14 @@
         v-model="inoffvalue"
         placeholder="请选择所在监测点"
         size="mini"
+        clearable
+        @change="search"
       >
         <el-option
           v-for="item in inoffoptions"
-          :key="item.point_id"
+          :key="item.point_name"
           :label="item.point_name"
-          :value="item.point_id"
+          :value="item.point_name"
         >
         </el-option>
       </el-select>
@@ -29,6 +31,8 @@
         v-model="versionsvalue2"
         placeholder="请选择隶属海关"
         size="mini"
+        clearable
+        @change="search"
       >
         <el-option
           v-for="item in versionsoptions2"
@@ -116,7 +120,12 @@
       >
       </el-pagination>
     </el-card>
-    <el-dialog title="提示" :visible.sync="deriveVisible" width="400px" :close-on-click-modal="false">
+    <el-dialog
+      title="提示"
+      :visible.sync="deriveVisible"
+      width="400px"
+      :close-on-click-modal="false"
+    >
       <div class="derivebox">
         <p><span>*</span>文件名称：</p>
         <el-input
@@ -234,10 +243,7 @@ export default {
       this.queryInfo.trap_number = this.idinput;
       this.queryInfo.user_name = this.nameinput;
       console.log(this.inoffoptions);
-      if (this.inoffvalue) {
-        this.queryInfo.point_name =
-          this.inoffoptions[this.inoffvalue - 1].point_name;
-      }
+      this.queryInfo.point_name = this.inoffvalue;
       this.queryInfo.org_name = this.versionsvalue2;
       // console.log(this.versionsvalue2)
       this.getcbdlist();
@@ -269,6 +275,11 @@ export default {
       this.timevalue = "";
       this.queryInfo.start_time = "";
       this.queryInfo.end_time = "";
+      for (var key in this.queryInfo) {
+        this.queryInfo[key] = "";
+      }
+      this.queryInfo.page = 1;
+      this.versionsvalue2 = "";
       this.getcbdlist();
     },
     downloadFile(res, name) {

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

@@ -7,7 +7,8 @@
         placeholder="请输入诱捕器编号"
         size="mini"
       ></el-input>
-      <el-select v-model="trapvalue" placeholder="请选择所在监测点" size="mini">
+      <el-select v-model="trapvalue" placeholder="请选择所在监测点" clearable
+        @change="search" size="mini">
         <el-option
           v-for="item in traponsoptions"
           :key="item.point_id"
@@ -20,6 +21,8 @@
         v-model="versionsvalue2"
         placeholder="请选择隶属海关"
         size="mini"
+        clearable
+        @change="search"
       >
         <el-option
           v-for="item in versionsoptions2"
@@ -43,6 +46,8 @@
         v-model="inoffvalue"
         placeholder="请选择诱捕器状态"
         size="mini"
+        clearable
+        @change="search"
       >
         <el-option
           v-for="item in inoffoptions"
@@ -748,6 +753,7 @@ export default {
     handle(ev) {
       this.downloadinput = ev.name;
       var datas = new FormData();
+      var username = localStorage.getItem("usernme")
       datas.append("username", localStorage.getItem("usernme"));
       datas.append("file", ev.raw);
       this.$axios({
@@ -903,8 +909,8 @@ export default {
     },
     addLocationDialogClosed() {
       //弹框关闭时
-      this.locationForm = { lat: "", lng: "" };
-      this.center = [];
+      // this.locationForm = { lat: "", lng: "" };
+      this.center = [114.05, 22.55];
       this.map = null;
     },
     locationSearch() {

minggao/src/page/homepage/facilitydistribute.vue

@@ -106,7 +106,7 @@
           <p>
             <span>设备名称：</span
             ><span>{{
-              baseinfo[0].device_name == "" ? "暂无" : baseinfo[0].device_name
+              baseinfo[0].device_name == "" ? "诱捕器" : baseinfo[0].device_name
             }}</span>
           </p>
           <p>

minggao/src/page/homepage/pestdistribute.vue

@@ -691,9 +691,6 @@ export default {
   beforeMount() {}, //生命周期 - 挂载之前
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    setTimeout(() => {
-      this.init();
-    }, 500);
     this.getwornlist();
     this.getwornlistflex()
     // this.getmon();

minggao/src/page/monitor/Monitor.vue

@@ -2109,8 +2109,8 @@ export default {
     },
     addLocationDialogClosed() {
       //弹框关闭时
-      this.locationForm = { lat: "", lng: "" };
-      this.center = [];
+      // this.locationForm = { lat: "", lng: "" };
+      this.center = [114.05, 22.55];
       this.map = null;
     },
     locationSearch() {

minggao/src/util/http.js

@@ -41,7 +41,7 @@ axios.interceptors.request.use(req => {
   //   }
   // }
   url = req.url.split('=')[1]
-  if (url != 'sysmenage.usermanager.user_login' && url !== 'monitor_manage.cbd_manage.add_img' && url != '/api/trap_export') {
+  if (url !== 'sysmenage.usermanager.user_login' && url !== 'monitor_manage.cbd_manage.add_img' && req.url.indexOf('trap_export') == -1) {
     req.data = req.data ? req.data + '&token=' + session : 'token=' + session;
   }
   return req