feat:宁录更新

src/pages/bigdata/combine/comp/PestMonitoring/index.vue

@@ -1,6 +1,23 @@
 <template>
   <div class="pest-monitor-container">
-    <p class="title">虫情监测</p>
+    <p class="title">
+      虫情监测
+      <el-select
+        style="width: 125px; float: right"
+        v-model="selId"
+        size="mini"
+        filterable
+        popper-class="deviceDevNew_faultSelect"
+        @change="baseChange"
+      >
+        <el-option
+          v-for="device in equipList"
+          :key="device.imei"
+          :label="device.device_name"
+          :value="device.imei"
+        ></el-option>
+      </el-select>
+    </p>
     <div class="screen-container">
       <div
         v-loading="photoLoading"
@@ -66,6 +83,8 @@ export default {
   computed: {},
   data() {
     return {
+      equipList: [],
+      selId: '',
       startDate: parseInt((new Date().getTime() - 30 * 24 * 3600 * 1000) / 1000),
       endDate: parseInt(new Date().getTime() / 1000),
       timeVal: [new Date().getTime() - 30 * 24 * 3600 * 1000, new Date().getTime()],
@@ -84,6 +103,9 @@ export default {
     this.getEquipList()
   },
   methods: {
+    baseChange() {
+      this.getEquipList()
+    },
     // 获取设备列表
     getEquipList() {
       this.$axios({
@@ -97,6 +119,7 @@ export default {
       }).then((res) => {
         if (res.data.message == '') {
           const equipList = res.data.data.data
+          this.equipList = equipList
           // 测试数据使用
           this.currentDevice = equipList[0] || {}
           // this.currentDevice = { d_id: '1322488', imei: '860048072577792' }
@@ -107,6 +130,7 @@ export default {
       })
     },
     async getCbdImgs() {
+      if (this.equipList.length == 0) return
       this.photoLoading = true
       this.$axios({
         method: 'post',

src/pages/bigdata/combine/index.vue

@@ -225,7 +225,7 @@ export default {
         })
     },
     handleBack() {
-      this.$router.back()
+      this.$router.push('/index/home')
     },
     initData() {
       this.getweatherinfo()

src/pages/fourMoodBase/baseManage.vue

@@ -327,13 +327,7 @@ export default {
         ],
         cascaderEquipArr: [{ required: true, message: '请选择基地设备', trigger: 'change' }],
         address: [{ required: true, message: '请选择基地地址', trigger: 'change' }],
-        baseIntro: [
-          { max: 700, message: '基地描述不能超过700个字符', trigger: 'blur' },
-          {
-            pattern: /^[A-Za-z0-9\u4e00-\u9fa5_,-.。;!？?]+$/,
-            message: '不允许输入空格等特殊符号'
-          }
-        ]
+        baseIntro: [{ max: 700, message: '基地描述不能超过700个字符', trigger: 'blur' }]
       },
       // 裁剪组件的基础配置option
       option: {