feat:宁录更新

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

@@ -183,14 +183,16 @@ export default {
 
     initMapData() {
       this.map.remove(this.polygonList)
+      this.getItemsList()
       switch (this.activeRouterName) {
         case 'xmgk':
           this.getBaseList()
-          this.getItemsList()
+
           break
         case 'znjc':
           this.getbasetype()
           this.getlocalDevice()
+
           break
       }
     },
@@ -552,8 +554,6 @@ export default {
         method: 'POST',
         url: '/api/v2/home/project/list/?page_size=1000&page_num=1'
       }).then((res) => {
-        // console.log("项目列表");
-        // console.log(res);
         const data = res.data.data.items
         if (data.length > 0) {
           const polygons = data[0].area ? JSON.parse(data[0].area) : '[]'

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

@@ -35,7 +35,7 @@
       />
 
       <div class="screen-container">
-        <div id="ninglu-player" ref="videoContainer"></div>
+        <div id="ninglu-player" ref="videoContainer1"></div>
       </div>
     </div>
     <my-empty v-else class="empty" :style="{ height: 'calc(100% - 40px)' }">
@@ -137,14 +137,14 @@ export default {
     },
     renderVideo(resData) {
       this.showStop = false
-      const container = this.$refs.videoContainer
+      const container = this.$refs.videoContainer1
       this.player = new EZUIKit.EZUIKitPlayer({
         id: 'ninglu-player',
         autoPlay: false,
         url: this.videoUrl,
         accessToken: this.accessToken,
         width: container ? container.clientWidth : '100%',
-        height: container.clientHeight,
+        height: 246,
         template: 'pcLive',
         handleError: (err) => {
           console.log('监控播放失败了！！！', err)

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

@@ -1,5 +1,11 @@
 <template>
-  <div class="qxz screen-content-box">
+  <div
+    class="qxz screen-content-box"
+    v-loading="loading"
+    element-loading-text="加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.6)"
+  >
     <p class="title">
       气象监测
       <el-select
@@ -49,7 +55,8 @@ export default {
     return {
       selId: '',
       equipList: [],
-      equipStatus: []
+      equipStatus: [],
+      loading: false
     }
   },
   computed: {
@@ -126,31 +133,36 @@ export default {
         data: this.qs.stringify({
           device_id: this.selId
         })
-      }).then((res) => {
-        this.loading = false
-        if (res.data.message === '') {
-          const { dat, conf } = res.data.data
-          // console.log(dat, conf, 'resent, compare')
-          let recent = []
-          Object.keys(conf).forEach((key) => {
-            if (conf[key]) {
-              let item = conf[key].split('#')
-              let val = dat[key].split('#')
+      })
+        .then((res) => {
+          this.loading = false
+          if (res.data.message === '') {
+            const { dat, conf } = res.data.data
+            // console.log(dat, conf, 'resent, compare')
+            let recent = []
+            Object.keys(conf).forEach((key) => {
+              if (conf[key]) {
+                let item = conf[key].split('#')
+                let val = dat[key].split('#')
 
-              recent.push({
-                num: val[1],
-                value: val[0] || '--',
-                unit: item[1],
-                name: item[0]
-              })
-            }
-          })
+                recent.push({
+                  num: val[1],
+                  value: val[0] || '--',
+                  unit: item[1],
+                  name: item[0]
+                })
+              }
+            })
 
-          this.equipStatus = this.formateArray(Math.ceil(recent.length / 2), 2, recent)
-        } else {
-          this.$message.error(res.data.message)
-        }
-      })
+            this.equipStatus = this.formateArray(Math.ceil(recent.length / 2), 2, recent)
+          } else {
+            this.$message.error(res.data.message)
+          }
+        })
+        .catch((err) => {
+          this.loading = false
+          console.log(err)
+        })
     }
   },
   components: {}

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

@@ -1,5 +1,11 @@
 <template>
-  <div class="screen-content-box">
+  <div
+    class="screen-content-box"
+    v-loading="loading"
+    element-loading-text="加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.6)"
+  >
     <p class="title">天气预报</p>
     <div class="screen-container">
       <!-- 顶部今日天气区域 -->
@@ -168,7 +174,8 @@ export default {
       },
       forecastData: [],
       chartWidth: 396, // SVG 画布宽度
-      chartHeight: 60 // SVG 画布高度
+      chartHeight: 60, // SVG 画布高度
+      loading: false
     }
   },
   methods: {
@@ -210,6 +217,7 @@ export default {
       return style
     },
     getWeatherData() {
+      this.loading = true
       this.$axios({
         method: 'POST',
         url: '/api/api_gateway?method=home.screen.seven_day_weather',
@@ -218,6 +226,7 @@ export default {
           lat: this.lat
         })
       }).then((res) => {
+        this.loading = false
         if (res.data.message == '') {
           const equipList = res.data.data.content
           const forecastData = equipList.data.map((item) => {

src/pages/bigdata/combine/index.vue

@@ -464,10 +464,11 @@ export default {
       background-size: 100% 100%;
       vertical-align: middle;
       line-height: 25px;
-      padding-left: 20px;
+      padding-left: 26px;
       box-sizing: border-box;
       font-size: 14px;
       cursor: pointer;
+      overflow: hidden;
     }
     .logout {
       color: #1671f8;