feat:宁录更新

src/pages/bigdata/combine/MyMap/index.vue

@@ -341,7 +341,7 @@ export default {
         })
       }).then((res) => {
         if (res.data.message == '') {
-          console.log(res.data.data)
+          console.log(res.data.data, '拿到结果')
           var data = res.data.data
 
           this.massagebox(data[0])
@@ -350,10 +350,13 @@ export default {
     },
     massagebox(info) {
       // 创建信息弹框
-      console.log(info, '--')
+      console.log(info, '--', this.typelist)
       var type = this.typelist.filter((item) => {
         return item.id == info.device_type_id
       })
+      if (type.length == 0) {
+        return
+      }
       console.log(type, 'type--')
       const infoWindow = new AMap.InfoWindow({
         content:
@@ -1194,19 +1197,7 @@ export default {
     handleBack() {
       this.$router.go(-1)
     },
-    updateInfoWindowContent(blockId, infoWindow) {
-      mapService.fetchMapBlockDetail({ blockId }).then((res) => {
-        const { irrgtaskStatus } = res.data
-
-        if (irrgtaskStatus !== TASK_STATUS_TYPE.PENDING) {
-          clearInterval(this.timer)
-        }
-
-        const { content: markerContent } = this.createWindowContent(res.data)
 
-        infoWindow.setContent(markerContent)
-      })
-    },
     locateBlockBySearchVal(val) {
       if (!val || !this.blockList.length) return
       const matchedBlock = this.blockList.find(
@@ -1288,15 +1279,6 @@ export default {
       const infoWindow = this.addMarkerInfoWindow(position, deviceInfo)
       infoWindow.open(this.map)
       window.currentInfoWindow = infoWindow
-    },
-
-    updateIntervalTask(blockId, infoWindow) {
-      this.updateInfoWindowContent(blockId, infoWindow)
-      clearInterval(this.timer)
-
-      this.timer = setInterval(() => {
-        this.updateInfoWindowContent(blockId, infoWindow)
-      }, 10000)
     }
   },
   beforeDestroy() {

src/pages/bigdata/combine/comp/PestMonitoring/components/swiperImg.vue

@@ -1,16 +1,30 @@
 <template>
   <div class="swiper-img-container">
-    <div
-      v-for="(item, index) in swiperItems"
-      :key="index"
-      :class="['swiper-item', item.positionClass]"
-    >
-      <img :src="item.image && item.image.addr" class="swiper-img" />
-    </div>
+    <template v-if="images.length == 3">
+      <div
+        v-for="(item, index) in swiperItems"
+        :key="index"
+        :class="['swiper-item', item.positionClass]"
+      >
+        <img :src="item.image && item.image.addr" class="swiper-img" />
+      </div>
+    </template>
+    <template v-else>
+      <div class="swiper-container" ref="swiperContainer19">
+        <div class="swiper-wrapper">
+          <div class="swiper-slide" v-for="(item, index) in images" :key="index">
+            <img :src="item.addr" class="swiper-img" />
+          </div>
+        </div>
+        <div class="swiper-pagination"></div>
+      </div>
+    </template>
   </div>
 </template>
 
 <script>
+import Swiper from 'swiper'
+import 'swiper/dist/css/swiper.min.css'
 export default {
   props: {
     images: {
@@ -43,12 +57,17 @@ export default {
   },
   methods: {
     initSwiperItems() {
-      if (!this.images || this.images.length === 0) {
-        return
-      }
-      for (let i = 0; i < 3; i++) {
-        if (this.images[i]) {
-          this.swiperItems[i].image = this.images[i]
+      if (!this.images || this.images.length < 3) {
+        this.swiper = new Swiper(this.$refs.swiperContainer19, {
+          pagination: '.swiper-pagination',
+          paginationClickable: true,
+          spaceBetween: 30
+        })
+      } else {
+        for (let i = 0; i < this.images.length; i++) {
+          if (this.images[i]) {
+            this.swiperItems[i].image = this.images[i]
+          }
         }
       }
     },
@@ -90,7 +109,9 @@ export default {
   height: 100%;
   overflow: hidden;
 }
-
+.swiper-container {
+  height: 100%;
+}
 .swiper-item {
   position: absolute;
   border: 4px solid #014f98;

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

@@ -120,12 +120,14 @@ export default {
         if (res.data.message == '') {
           const equipList = res.data.data.data
           this.equipList = equipList
-          // 测试数据使用
-          this.currentDevice = equipList[0] || {}
-          // this.currentDevice = { d_id: '1322488', imei: '860048072577792' }
+          if (equipList.length > 0) {
+            this.selId = equipList[0].imei
+            this.currentDevice = equipList[0] || {}
+            // this.currentDevice = { d_id: '1322488', imei: '860048072577792' }
 
-          this.getCbdImgs()
-          this.getallwormlist()
+            this.getCbdImgs()
+            this.getallwormlist()
+          }
         }
       })
     },

src/pages/bigdata/combine/comp/Qxz.vue

@@ -25,20 +25,20 @@
       </el-select>
     </p>
     <div class="screen-container">
-      <!-- <vue-seamless-scroll :data="equipStatus" class="scrollwarp" :class-option="optionHover"> -->
-      <div class="status-box" v-for="(item, index) in equipStatus" :key="index">
-        <div class="status-item" v-for="(base, j) in item" :key="j">
-          <img class="float-left" :src="require('../assets/' + base.num + '.svg')" alt="" />
-          <p class="clearfix">
-            <span class="text float-left">{{ base.name }}</span>
-            <span class="num float-right"
-              >{{ base.value }}
-              <span class="unit">{{ base.unit }}</span>
-            </span>
-          </p>
+      <vue-seamless-scroll :data="equipStatus" class="scrollwarp" :class-option="optionHover">
+        <div class="status-box" v-for="(item, index) in equipStatus" :key="index">
+          <div class="status-item" v-for="(base, j) in item" :key="j">
+            <img class="float-left" :src="require('../assets/' + base.num + '.svg')" alt="" />
+            <p class="clearfix">
+              <span class="text float-left">{{ base.name }}</span>
+              <span class="num float-right"
+                >{{ base.value }}
+                <span class="unit">{{ base.unit }}</span>
+              </span>
+            </p>
+          </div>
         </div>
-      </div>
-      <!-- </vue-seamless-scroll> -->
+      </vue-seamless-scroll>
     </div>
   </div>
 </template>

src/pages/bigdata/combine/comp/SoilIntro.vue

@@ -214,19 +214,19 @@ export default {
             unit: '°C'
           })
           arry.push({
-            name: '空气温度',
+            name: '大气压强',
             value: this.soilInfo.atm,
-            unit: '%'
+            unit: 'pa'
           })
           arry.push({
-            name: '空气温度',
+            name: '空气湿度',
             value: this.soilInfo.ats,
-            unit: 'hPa'
+            unit: '%'
           })
           arry.push({
-            name: '空气温度',
+            name: '信号强度',
             value: this.soilInfo.csq,
-            unit: 'dB'
+            unit: ''
           })
           this.dataList = this.formateArray(Math.ceil(arry.length / 2), 3, arry)
         })