Browse Source

feat:宁录更新

yf_elsa.cui 1 month ago
parent
commit
41e1cb7a49

File diff suppressed because it is too large
+ 2 - 2
dist/index.html


File diff suppressed because it is too large
+ 1 - 1
dist/static/css/app.695c337691e4a76285f709a84cc0fd32.css


BIN
dist/static/css/app.695c337691e4a76285f709a84cc0fd32.css.gz


File diff suppressed because it is too large
+ 2 - 2
dist/static/js/2.b2bb1f7f57c6b763f1e8.js


BIN
dist/static/js/2.46aa668ebe4bf865f5d3.js.gz


BIN
dist/static/js/2.b2bb1f7f57c6b763f1e8.js.gz


File diff suppressed because it is too large
+ 0 - 1
dist/static/js/25.f2392574e1e90bf2e32f.js


BIN
dist/static/js/25.f2392574e1e90bf2e32f.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/25.f4d71907572ebcf8bb5c.js


BIN
dist/static/js/25.f4d71907572ebcf8bb5c.js.gz


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/5.fbb0d70a2b70b1b9b28d.js


BIN
dist/static/js/5.5327445218284ccfaf46.js.gz


BIN
dist/static/js/5.fbb0d70a2b70b1b9b28d.js.gz


BIN
dist/static/js/manifest.7426657d4169b942c08d.js.gz


File diff suppressed because it is too large
+ 1 - 1
dist/static/js/manifest.7426657d4169b942c08d.js


BIN
dist/static/js/manifest.7b76b93745dee2c76cd1.js.gz


+ 5 - 0
src/pages/bigdata/combine/comp/PestMonitoring/components/swiperImg.vue

@@ -52,6 +52,10 @@ export default {
       ]
     }
   },
+  mounted() {
+    this.initSwiperItems()
+    this.startTimer()
+  },
   beforeDestroy() {
     this.clearTimer()
   },
@@ -64,6 +68,7 @@ export default {
           spaceBetween: 30
         })
       } else {
+        console.log('this.images', this.images)
         for (let i = 0; i < this.images.length; i++) {
           if (this.images[i]) {
             this.swiperItems[i].image = this.images[i]

+ 1 - 1
src/pages/bigdata/combine/comp/PestMonitoring/index.vue

@@ -199,7 +199,7 @@ export default {
     changeDate() {
       if (this.timeVal && this.timeVal.length > 0) {
         this.startDate = parseInt(this.timeVal[0] / 1000)
-        this.endDate = parseInt((this.timeVal[1] + 24 * 3600 * 1000) / 1000)
+        this.endDate = parseInt(this.timeVal[1] / 1000)
       } else {
         this.startDate = ''
         this.endDate = ''

+ 73 - 78
src/pages/equipmanger/FaultList.vue

@@ -6,7 +6,7 @@
     </el-breadcrumb>
     <div class="search-box">
       <div class="filter-box">
-        <el-select
+        <!-- <el-select
           style="margin: 0 4px 0 0"
           size="small"
           v-model="queryInfo.device_type_id"
@@ -22,7 +22,7 @@
           <el-option label="孢子仪" value="7"></el-option>
           <el-option label="性诱设备" value="8"></el-option>
           <el-option label="糖醋测报" value="9"></el-option>
-        </el-select>
+        </el-select> -->
         <el-input
           style="cursor: pointer"
           size="small"
@@ -49,9 +49,7 @@
             <el-button
               size="mini"
               @click="photoshow(scope.$index)"
-              :class="[
-                dataList[scope.$index].errorimg.length > 3 ? 'photoseebtn' : '',
-              ]"
+              :class="[dataList[scope.$index].errorimg.length > 3 ? 'photoseebtn' : '']"
               >故障图片</el-button
             >
             <el-button
@@ -97,129 +95,126 @@ export default {
     return {
       // 动态表头
       tableHeadTxt: [
-        ["设备id", "device_id"],
-        ["设备类型", "device_type"],
-        ["位置", "addr"],
-        ["联系人", "user"],
-        ["联系电话", "userphone"],
-        ["故障原因", "errordesc"],
-        ["上报时间", "uptime"],
+        ['设备id', 'device_id'],
+        ['设备类型', 'device_type'],
+        ['位置', 'addr'],
+        ['联系人', 'user'],
+        ['联系电话', 'userphone'],
+        ['故障原因', 'errordesc'],
+        ['上报时间', 'uptime']
       ],
       dataList: [],
       totalNum: 0,
       page: 1,
       queryInfo: {
-        device_type_id: "",
-        f_id: "",
+        device_type_id: '',
+        f_id: ''
       },
       imageListtstatus: false,
       imageListtData: [],
       videodialogVisible: false,
-      videosrc: "",
-    };
+      videosrc: ''
+    }
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
   beforeMount() {},
   methods: {
     getList() {
       this.$axios({
-        method: "POST",
-        url: "/api/api_gateway?method=after_sale.after_sale_manage.aftersale_info",
+        method: 'POST',
+        url: '/api/api_gateway?method=after_sale.after_sale_manage.aftersale_info',
         data: this.qs.stringify({
           device_type_id: this.queryInfo.device_type_id,
           f_id: this.queryInfo.f_id,
-          page: this.page,
-        }),
+          page: this.page
+        })
       }).then((res) => {
-        if (res.data.message == "") {
-          this.dataList = [];
+        if (res.data.message == '') {
+          this.dataList = []
           res.data.data.data.forEach((item) => {
-            item.device_type = this.equipType(item.device_type);
-            item.addr = item.addr || "--";
-            item.errorimg = item.errorimg || "";
+            item.device_type = this.equipType(item.device_type)
+            item.addr = item.addr || '--'
+            item.errorimg = item.errorimg || ''
             item.uptime = new Date(parseInt(item.uptime) * 1000)
               .toLocaleString()
-              .replace(/:\d{1,2}$/, " ");
-            this.dataList.push(item);
-          });
+              .replace(/:\d{1,2}$/, ' ')
+            this.dataList.push(item)
+          })
           // this.dataList = res.data.data.data
-          this.totalNum = res.data.data.counts;
+          this.totalNum = res.data.data.counts
         }
-      });
+      })
     },
     changePage(val) {
-      this.page = val;
-      this.getList();
+      this.page = val
+      this.getList()
     },
     equipType(value) {
       switch (value) {
-        case "2":
-          return "杀虫灯";
-          break;
-        case "3":
-          return "虫情测报";
-          break;
-        case "7":
-          return "孢子仪";
-          break;
-        case "6":
-          return "监控";
-          break;
-        case "4":
-          return "性诱设备";
-          break;
-        case "5":
-          return "环境监测";
-          break;
-        case "9":
-          return "糖醋测报";
-          break;
+        case '2':
+          return '杀虫灯'
+          break
+        case '3':
+          return '虫情测报'
+          break
+        case '7':
+          return '孢子仪'
+          break
+        case '6':
+          return '监控'
+          break
+        case '4':
+          return '性诱设备'
+          break
+        case '5':
+          return '环境监测'
+          break
+        case '9':
+          return '糖醋测报'
+          break
         default:
-          return "--";
+          return '--'
       }
     },
     searchChange() {
-      this.getList();
+      this.getList()
     },
     photoshow(index) {
-      if (
-        this.dataList[index].errorimg &&
-        this.dataList[index].errorimg.length > 2
-      ) {
-        this.imageListtData = JSON.parse(this.dataList[index].errorimg);
-        this.$viewer.show();
+      if (this.dataList[index].errorimg && this.dataList[index].errorimg.length > 2) {
+        this.imageListtData = JSON.parse(this.dataList[index].errorimg)
+        this.$viewer.show()
       } else {
         this.$message({
-          type: "error",
-          message: "暂无图片",
-        });
+          type: 'error',
+          message: '暂无图片'
+        })
       }
     },
     videoshow(index) {
       if (this.dataList[index].errorvideo) {
-        this.videodialogVisible = true;
-        this.videosrc = this.dataList[index].errorvideo;
+        this.videodialogVisible = true
+        this.videosrc = this.dataList[index].errorvideo
       } else {
         this.$message({
-          type: "error",
-          message: "暂无视频",
-        });
+          type: 'error',
+          message: '暂无视频'
+        })
       }
     },
     inited(viewer) {
-      this.$viewer = viewer;
+      this.$viewer = viewer
     },
     videohandleClose() {
-      this.videodialogVisible = false;
-      this.videosrc = "";
-    },
-  },
-};
+      this.videodialogVisible = false
+      this.videosrc = ''
+    }
+  }
+}
 </script>
 
-<style lang='less' scoped>
+<style lang="less" scoped>
 .search-box {
   margin-bottom: 20px;
   .el-input {
@@ -257,4 +252,4 @@ export default {
 /deep/.el-table .cell {
   text-align: center;
 }
-</style>
+</style>

+ 4 - 2
src/pages/forecasting/xycb/xycb.vue

@@ -656,7 +656,7 @@
     >
       <div style="position: relative; padding-bottom: 65px; padding-top: 20px">
         <p class="dialog-title">
-          <span>1号诱捕器</span>
+          <span v-if="ybqNum">{{ ybqNum }}号诱捕器</span>
           <el-button
             type="primary"
             size="small"
@@ -827,7 +827,8 @@ export default {
         name: [{ required: true, message: '请输入诱芯名称', trigger: 'blur' }]
       },
       selectDevId: '',
-      setBhDialogVisible: false
+      setBhDialogVisible: false,
+      ybqNum: ''
     }
   },
   created() {
@@ -1004,6 +1005,7 @@ export default {
     },
     yxRecord(row) {
       this.selectDevId = row.imei
+      this.ybqNum = row.serial_id
       this.yxRecordVisible = true
       this.getYxList()
     },

+ 2 - 1
src/pages/forecasting/xycb/xydatainfo.vue

@@ -146,7 +146,8 @@
         <div class="chart-title">
           {{ (this.start_time * 1000) | formatTime('yyyy-MM-dd') }}至{{
             (this.end_time * 1000) | formatTime('yyyy-MM-dd')
-          }}{{ this.baseinfo.serial_id }}诱捕器{{ this.baseinfo.decoy }}诱虫趋势图
+          }}
+          &nbsp; {{ this.baseinfo.serial_id }}号诱捕器 &nbsp; {{ this.baseinfo.decoy }}诱虫趋势图
         </div>
         <base-chart height="300px" :option="options2"></base-chart>
         <!-- <highcharts :options="options2" class="highcharts"></highcharts> -->