Browse Source

fix:mac的bug修改

chenzhen2 1 year ago
parent
commit
38ecb1f961
30 changed files with 66 additions and 59 deletions
  1. 1 1
      dist/sgipad/index.html
  2. 1 1
      dist/sgipad/static/css/chunk-8b0e5b02.eae3e953.css
  3. BIN
      dist/sgipad/static/css/chunk-44fc4020.ec45131f.css.gz
  4. BIN
      dist/sgipad/static/css/chunk-8b0e5b02.eae3e953.css.gz
  5. BIN
      dist/sgipad/static/css/chunk-acd74bd6.9ede0127.css.gz
  6. 1 1
      dist/sgipad/static/css/chunk-acd74bd6.9ede0127.css
  7. BIN
      dist/sgipad/static/css/chunk-baa675e2.759844ea.css.gz
  8. 2 0
      dist/sgipad/static/js/app.14eea00e.js
  9. BIN
      dist/sgipad/static/js/app.14eea00e.js.gz
  10. 1 0
      dist/sgipad/static/js/app.14eea00e.js.map
  11. 0 2
      dist/sgipad/static/js/app.55f5689b.js
  12. BIN
      dist/sgipad/static/js/app.55f5689b.js.gz
  13. 0 1
      dist/sgipad/static/js/app.55f5689b.js.map
  14. 1 1
      dist/sgipad/static/js/chunk-2b270b5e.d161d32f.js
  15. 1 1
      dist/sgipad/static/js/chunk-2b270b5e.d161d32f.js.map
  16. 2 0
      dist/sgipad/static/js/chunk-44fc4020.0e7793ff.js
  17. BIN
      dist/sgipad/static/js/chunk-44fc4020.0e7793ff.js.gz
  18. 1 0
      dist/sgipad/static/js/chunk-44fc4020.0e7793ff.js.map
  19. 0 2
      dist/sgipad/static/js/chunk-8b0e5b02.92a8133a.js
  20. BIN
      dist/sgipad/static/js/chunk-8b0e5b02.92a8133a.js.gz
  21. 0 1
      dist/sgipad/static/js/chunk-8b0e5b02.92a8133a.js.map
  22. 0 23
      dist/sgipad/static/js/chunk-acd74bd6.21d49d9e.js
  23. BIN
      dist/sgipad/static/js/chunk-acd74bd6.21d49d9e.js.gz
  24. 0 1
      dist/sgipad/static/js/chunk-acd74bd6.21d49d9e.js.map
  25. 23 0
      dist/sgipad/static/js/chunk-baa675e2.1db5b019.js
  26. BIN
      dist/sgipad/static/js/chunk-baa675e2.1db5b019.js.gz
  27. 1 0
      dist/sgipad/static/js/chunk-baa675e2.1db5b019.js.map
  28. 6 2
      src/views/envmonitor/components/Light/index.vue
  29. 25 17
      src/views/envmonitor/index.vue
  30. 0 5
      src/views/home/index.vue

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


File diff suppressed because it is too large
+ 1 - 1
dist/sgipad/static/css/chunk-8b0e5b02.eae3e953.css


BIN
dist/sgipad/static/css/chunk-44fc4020.ec45131f.css.gz


BIN
dist/sgipad/static/css/chunk-8b0e5b02.eae3e953.css.gz


BIN
dist/sgipad/static/css/chunk-acd74bd6.9ede0127.css.gz


File diff suppressed because it is too large
+ 1 - 1
dist/sgipad/static/css/chunk-acd74bd6.9ede0127.css


BIN
dist/sgipad/static/css/chunk-baa675e2.759844ea.css.gz


File diff suppressed because it is too large
+ 2 - 0
dist/sgipad/static/js/app.14eea00e.js


BIN
dist/sgipad/static/js/app.14eea00e.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/sgipad/static/js/app.14eea00e.js.map


File diff suppressed because it is too large
+ 0 - 2
dist/sgipad/static/js/app.55f5689b.js


BIN
dist/sgipad/static/js/app.55f5689b.js.gz


File diff suppressed because it is too large
+ 0 - 1
dist/sgipad/static/js/app.55f5689b.js.map


File diff suppressed because it is too large
+ 1 - 1
dist/sgipad/static/js/chunk-2b270b5e.d161d32f.js


File diff suppressed because it is too large
+ 1 - 1
dist/sgipad/static/js/chunk-2b270b5e.d161d32f.js.map


File diff suppressed because it is too large
+ 2 - 0
dist/sgipad/static/js/chunk-44fc4020.0e7793ff.js


BIN
dist/sgipad/static/js/chunk-44fc4020.0e7793ff.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/sgipad/static/js/chunk-44fc4020.0e7793ff.js.map


File diff suppressed because it is too large
+ 0 - 2
dist/sgipad/static/js/chunk-8b0e5b02.92a8133a.js


BIN
dist/sgipad/static/js/chunk-8b0e5b02.92a8133a.js.gz


File diff suppressed because it is too large
+ 0 - 1
dist/sgipad/static/js/chunk-8b0e5b02.92a8133a.js.map


File diff suppressed because it is too large
+ 0 - 23
dist/sgipad/static/js/chunk-acd74bd6.21d49d9e.js


BIN
dist/sgipad/static/js/chunk-acd74bd6.21d49d9e.js.gz


File diff suppressed because it is too large
+ 0 - 1
dist/sgipad/static/js/chunk-acd74bd6.21d49d9e.js.map


File diff suppressed because it is too large
+ 23 - 0
dist/sgipad/static/js/chunk-baa675e2.1db5b019.js


BIN
dist/sgipad/static/js/chunk-baa675e2.1db5b019.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/sgipad/static/js/chunk-baa675e2.1db5b019.js.map


+ 6 - 2
src/views/envmonitor/components/Light/index.vue

@@ -107,6 +107,7 @@ import { Switch, Toast } from "vant";
 import { getLampHttp, getStatusHttp, setallLampHttp } from "@/apis/envmonitor";
 import { parseImgUrl } from "@/utils";
 import { type } from "os";
+import { onDeactivated } from "vue";
 
 export default defineComponent({
   props: {
@@ -518,14 +519,17 @@ export default defineComponent({
       startLightsStatusTimer(timerLen: any = 2000) {
         proxyData.clearLightStatusTimer();
         proxyData.lightsStatusTimer = setTimeout(() => {
-          proxyData.getLampList();
           proxyData.clearLightStatusTimer();
+          proxyData.getLampList();
         }, timerLen);
       },
     });
     const isShowChildLight = computed(() => {
       return proxyData.lampList.length && proxyData.lampList.length > 1;
     });
+    // onDeactivated(()=>{
+    //   destroyWatch()
+    // })
     watch(
       props,
       (newProps: any) => {
@@ -549,7 +553,7 @@ export default defineComponent({
       }
     );
     onBeforeUnmount(() => {
-      console.log("灯的组件销毁了--")
+      console.log("灯的组件销毁了--");
       proxyData.clearLightStatusTimer();
     });
     onMounted(() => {});

+ 25 - 17
src/views/envmonitor/index.vue

@@ -420,6 +420,7 @@ export default defineComponent({
   },
   beforeRouteEnter(to, from, next) {
     try {
+      // debugger;
       let mac: any = getCookieMac();
       if (mac && mac != "null") {
         next();
@@ -977,23 +978,30 @@ export default defineComponent({
       },
       // 设置天气icon
       getWeatherIcon(text: string) {
-        if (text && text.indexOf("晴") > -1) {
-          proxyData.outWeather.imgname = parseImgUrl("weather", "sun.png");
-        } else if (text && text.indexOf("雨") > -1) {
-          proxyData.outWeather.imgname = parseImgUrl("weather", "rain.png");
-        } else if (
-          (text && text.indexOf("阴") > -1) ||
-          text.indexOf("云") > -1
-        ) {
-          proxyData.outWeather.imgname = parseImgUrl("weather", "cloudy.png");
-        } else if (text && text.indexOf("霾") > -1) {
-          proxyData.outWeather.imgname = parseImgUrl("weather", "mai.png");
-        } else if (text && text.indexOf("雾") > -1) {
-          proxyData.outWeather.imgname = parseImgUrl("weather", "fog.png");
-        } else if (text && text.indexOf("风") > -1) {
-          proxyData.outWeather.imgname = parseImgUrl("weather", "wind.png");
-        } else if (text && text.indexOf("雷") > -1) {
-          proxyData.outWeather.imgname = parseImgUrl("weather", "thunder.png");
+        if (text) {
+          if (text && text.indexOf("晴") > -1) {
+            proxyData.outWeather.imgname = parseImgUrl("weather", "sun.png");
+          } else if (text && text.indexOf("雨") > -1) {
+            proxyData.outWeather.imgname = parseImgUrl("weather", "rain.png");
+          } else if (
+            (text && text.indexOf("阴") > -1) ||
+            text.indexOf("云") > -1
+          ) {
+            proxyData.outWeather.imgname = parseImgUrl("weather", "cloudy.png");
+          } else if (text && text.indexOf("霾") > -1) {
+            proxyData.outWeather.imgname = parseImgUrl("weather", "mai.png");
+          } else if (text && text.indexOf("雾") > -1) {
+            proxyData.outWeather.imgname = parseImgUrl("weather", "fog.png");
+          } else if (text && text.indexOf("风") > -1) {
+            proxyData.outWeather.imgname = parseImgUrl("weather", "wind.png");
+          } else if (text && text.indexOf("雷") > -1) {
+            proxyData.outWeather.imgname = parseImgUrl(
+              "weather",
+              "thunder.png"
+            );
+          } else {
+            proxyData.outWeather.imgname = parseImgUrl("weather", "sun.png");
+          }
         } else {
           proxyData.outWeather.imgname = parseImgUrl("weather", "sun.png");
         }

+ 0 - 5
src/views/home/index.vue

@@ -101,11 +101,6 @@ export default defineComponent({
     vanButton: Button,
   },
   beforeRouteEnter(to, from, next) {
-    // 不能获取组件实例
-    // 因为当守卫执行前,组件实例还没被创建
-    console.log("路由导航首位---");
-    console.log(to);
-    console.log(from);
     try {
       let mac: any = getCookieMac();
       if (mac && mac != "null") {