yf_elsa.cui преди 1 месец
родител
ревизия
825e9b63ad
променени са 29 файла, в които са добавени 39 реда и са изтрити 55 реда
  1. 2 2
      dist/index.html
  2. BIN
      dist/static/css/app.12be670ace020e703d14896efa6d577a.css.gz
  3. 2 2
      dist/static/css/app.12be670ace020e703d14896efa6d577a.css
  4. BIN
      dist/static/css/app.d0885dab72f1714c8fa28004cd583342.css.gz
  5. 1 0
      dist/static/js/19.8dbd10c08108e4091205.js
  6. BIN
      dist/static/js/19.8dbd10c08108e4091205.js.gz
  7. 0 1
      dist/static/js/19.c2536b52e596933da2b7.js
  8. BIN
      dist/static/js/19.c2536b52e596933da2b7.js.gz
  9. 0 1
      dist/static/js/35.51464fc6072ff7c3e3ad.js
  10. BIN
      dist/static/js/35.51464fc6072ff7c3e3ad.js.gz
  11. 1 1
      dist/static/js/36.81ab79df525bab173d70.js
  12. BIN
      dist/static/js/35.aa8451408a3559bf4521.js.gz
  13. 1 0
      dist/static/js/36.55407e34578522aad9ca.js
  14. BIN
      dist/static/js/36.55407e34578522aad9ca.js.gz
  15. BIN
      dist/static/js/36.81ab79df525bab173d70.js.gz
  16. 1 1
      dist/static/js/8.da6999743b55240d347f.js
  17. BIN
      dist/static/js/8.da6999743b55240d347f.js.gz
  18. 1 1
      dist/static/js/app.cb19935434a423422c02.js
  19. BIN
      dist/static/js/app.cb19935434a423422c02.js.gz
  20. BIN
      dist/static/js/manifest.37d65d97830b32f04808.js.gz
  21. 1 1
      dist/static/js/manifest.37d65d97830b32f04808.js
  22. BIN
      dist/static/js/manifest.bf12a4d54bf7e653cedd.js.gz
  23. 2 2
      src/components/Index.vue
  24. 2 1
      src/pages/bigdata/combine/comp/PlowCenter.vue
  25. 5 3
      src/pages/bigdata/combine/comp/ProductIntro.vue
  26. 9 13
      src/pages/bigdata/combine/comp/Weather.vue
  27. 1 8
      src/pages/bigdata/combine/xmgk/index.vue
  28. 10 3
      src/pages/hjjc/zmSys/configManage.vue
  29. 0 15
      src/pages/monitor-dgp/monitorSystem/Monitor.vue

Файловите разлики са ограничени, защото са твърде много
+ 2 - 2
dist/index.html


BIN
dist/static/css/app.12be670ace020e703d14896efa6d577a.css.gz


Файловите разлики са ограничени, защото са твърде много
+ 2 - 2
dist/static/css/app.12be670ace020e703d14896efa6d577a.css


BIN
dist/static/css/app.d0885dab72f1714c8fa28004cd583342.css.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
dist/static/js/19.8dbd10c08108e4091205.js


BIN
dist/static/js/19.8dbd10c08108e4091205.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
dist/static/js/19.c2536b52e596933da2b7.js


BIN
dist/static/js/19.c2536b52e596933da2b7.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
dist/static/js/35.51464fc6072ff7c3e3ad.js


BIN
dist/static/js/35.51464fc6072ff7c3e3ad.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/static/js/36.81ab79df525bab173d70.js


BIN
dist/static/js/35.aa8451408a3559bf4521.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
dist/static/js/36.55407e34578522aad9ca.js


BIN
dist/static/js/36.55407e34578522aad9ca.js.gz


BIN
dist/static/js/36.81ab79df525bab173d70.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/static/js/8.da6999743b55240d347f.js


BIN
dist/static/js/8.da6999743b55240d347f.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/static/js/app.cb19935434a423422c02.js


BIN
dist/static/js/app.cb19935434a423422c02.js.gz


BIN
dist/static/js/manifest.37d65d97830b32f04808.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/static/js/manifest.37d65d97830b32f04808.js


BIN
dist/static/js/manifest.bf12a4d54bf7e653cedd.js.gz


+ 2 - 2
src/components/Index.vue

@@ -55,14 +55,14 @@
                   style="color: #fff; font-size: 18px"
                 ></i>
               </div>
-              <!-- <div class="iconFont">
+              <div class="iconFont">
                 <i
                   title="智慧农业监测一张图"
                   @click="goBigData('/combinedp/xmgk')"
                   class="el-icon-s-platform"
                   style="color: #fff"
                 ></i>
-              </div> -->
+              </div>
               <div class="iconFont">
                 <i
                   title="数字孪生"

+ 2 - 1
src/pages/bigdata/combine/comp/PlowCenter.vue

@@ -33,7 +33,8 @@ export default {
           }
         ]
       },
-      deep: true
+      deep: true,
+      immediate: true
     }
   },
   data() {

+ 5 - 3
src/pages/bigdata/combine/comp/ProductIntro.vue

@@ -93,7 +93,9 @@ export default {
       ]
     },
     baseInfo() {
-      return this.baseList.find((item) => item.id === this.selBaseId) || {}
+      const info = this.baseList.find((item) => item.id === this.selBaseId) || {}
+      this.$emit('baseChange', info)
+      return info
     }
   },
   data() {
@@ -116,8 +118,8 @@ export default {
   methods: {
     baseChange() {
       // console.log(this.selBaseId);
-      let base = this.baseList.find((item) => item.id === this.selBaseId)
-      this.$emit('baseChange', base)
+      // let base = this.baseList.find((item) => item.id === this.selBaseId)
+      // this.$emit('baseChange', base)
     },
     async getBaseList() {
       this.loading = true

+ 9 - 13
src/pages/bigdata/combine/comp/Weather.vue

@@ -81,7 +81,6 @@
             />
 
             <div class="weather">{{ item.wea_day }}</div>
-            <!-- <div class="temp-range">{{ item.high }}℃ / {{ item.low }}℃</div> -->
           </div>
           <div>
             <img
@@ -89,11 +88,7 @@
               :src="$imageURL + '/bigdata_app/img/weather/' + item.wea_night + '.png'"
               alt=""
             />
-            <!-- <img
-              class="weather-img"
-              :src="$imageURL + '/bigdata_app/img/weather/' + '晴.png'"
-              alt=""
-            /> -->
+
             <div class="weather">{{ item.wea_night }}</div>
             <div class="wind">
               <i class="yficonfont icon-fengli1"></i>
@@ -153,11 +148,7 @@ export default {
         humidity: '--',
         win_speed: '--'
       },
-      forecastData: [
-        { low: 1, name: '张三', high: 12 },
-        { low: 3, name: '张三', high: 18 },
-        { low: 2, name: '张三', high: 14 }
-      ],
+      forecastData: [],
       chartWidth: 396, // SVG 画布宽度
       chartHeight: 60 // SVG 画布高度
       // minTemp: 2, // 温度范围最小值(用于坐标映射)
@@ -166,6 +157,10 @@ export default {
   },
   methods: {
     weatherStyle(level) {
+      console.log(level, '---')
+      if (!level) {
+        return {}
+      }
       let style = {}
       if (level.includes('优')) {
         style = {
@@ -362,9 +357,10 @@ export default {
       return y
     }
   },
-  mounted() {
+  created() {
     this.getList()
-  }
+  },
+  mounted() {}
 }
 </script>
 <style scoped lang="less">

+ 1 - 8
src/pages/bigdata/combine/xmgk/index.vue

@@ -74,14 +74,7 @@ export default {
     deviceCount(payload) {
       this.plowData.deviceCount = payload
     },
-    async outSys() {
-      await this.$store.dispatch('loginOut')
-      if (localStorage.getItem('loginIdentification') == null) {
-        this.$router.push(loginPath)
-      } else {
-        window.location.href = 'http://www.zztlskj.com'
-      }
-    },
+
     updateTime() {
       const now = new Date()
 

+ 10 - 3
src/pages/hjjc/zmSys/configManage.vue

@@ -202,10 +202,13 @@ export default {
     },
     datePickerChange(e) {
       if (!e) {
-        return
+        this.start_time = ''
+        this.end_time = ''
+      } else {
+        this.start_time = Math.floor(e[0].getTime() / 1000)
+        this.end_time = Math.floor(e[1].getTime() / 1000)
       }
-      this.start_time = Math.floor(e[0].getTime() / 1000)
-      this.end_time = Math.floor(e[1].getTime() / 1000)
+
       this.getHisDataList()
     },
     setKD() {
@@ -233,6 +236,10 @@ export default {
               if (res.data.data == true) {
                 this.$message.success('指令下发成功')
                 setTimeout(() => {
+                  this.datePickerValue = []
+                  this.start_time = ''
+                  this.end_time = ''
+
                   this.getHisDataList()
                 }, 10)
               } else {

+ 0 - 15
src/pages/monitor-dgp/monitorSystem/Monitor.vue

@@ -1197,21 +1197,6 @@ export default {
               duration: 1500
             })
           }
-          if (res.data.message == '') {
-            // console.log(res.data);
-            this.picUrl = res.data.data.addr
-            // this.takePhotoDialogVisible = true;
-            this.$message({
-              message: '拍照成功',
-              type: 'success'
-            })
-          } else {
-            this.$message({
-              message: res.data.message,
-              type: 'warning',
-              duration: 1500
-            })
-          }
         })
         .catch((err) => {
           // console.log(err);