瀏覽代碼

fix:天气相关的bug修改

chenzhen2 1 年之前
父節點
當前提交
cbd7a52a58
共有 30 個文件被更改,包括 33 次插入20 次删除
  1. 1 1
      dist/sk/index.html
  2. 0 1
      dist/sk/static/css/chunk-1c6170bb.98078c22.css
  3. 0 1
      dist/sk/static/css/chunk-2bcf5752.677737ac.css
  4. 二進制
      dist/sk/static/css/chunk-2bcf5752.677737ac.css.gz
  5. 1 0
      dist/sk/static/css/chunk-52c1d82a.79345285.css
  6. 1 0
      dist/sk/static/css/chunk-64f296b4.f672fe10.css
  7. 0 1
      dist/sk/static/css/chunk-a39ad442.1cb57b60.css
  8. 1 0
      dist/sk/static/css/chunk-c503e766.9187ba72.css
  9. 二進制
      dist/sk/static/css/chunk-c503e766.9187ba72.css.gz
  10. 二進制
      dist/sk/static/js/app.278f490a.js.gz
  11. 2 2
      dist/sk/static/js/app.278f490a.js
  12. 二進制
      dist/sk/static/js/app.8ea5cff8.js.gz
  13. 1 1
      dist/sk/static/js/app.278f490a.js.map
  14. 0 2
      dist/sk/static/js/chunk-1c6170bb.3f5e02cd.js
  15. 0 1
      dist/sk/static/js/chunk-1c6170bb.3f5e02cd.js.map
  16. 0 2
      dist/sk/static/js/chunk-2bcf5752.b66acf87.js
  17. 二進制
      dist/sk/static/js/chunk-2bcf5752.b66acf87.js.gz
  18. 0 1
      dist/sk/static/js/chunk-2bcf5752.b66acf87.js.map
  19. 2 0
      dist/sk/static/js/chunk-52c1d82a.35154c92.js
  20. 1 0
      dist/sk/static/js/chunk-52c1d82a.35154c92.js.map
  21. 2 0
      dist/sk/static/js/chunk-64f296b4.a67c7fed.js
  22. 1 0
      dist/sk/static/js/chunk-64f296b4.a67c7fed.js.map
  23. 0 2
      dist/sk/static/js/chunk-a39ad442.565ec1b7.js
  24. 0 1
      dist/sk/static/js/chunk-a39ad442.565ec1b7.js.map
  25. 2 0
      dist/sk/static/js/chunk-c503e766.e3730904.js
  26. 二進制
      dist/sk/static/js/chunk-c503e766.e3730904.js.gz
  27. 1 0
      dist/sk/static/js/chunk-c503e766.e3730904.js.map
  28. 1 1
      src/views/home/index.vue
  29. 1 1
      src/views/home/tiantan.vue
  30. 15 2
      src/views/weather/index.vue

文件差異過大導致無法顯示
+ 1 - 1
dist/sk/index.html


文件差異過大導致無法顯示
+ 0 - 1
dist/sk/static/css/chunk-1c6170bb.98078c22.css


文件差異過大導致無法顯示
+ 0 - 1
dist/sk/static/css/chunk-2bcf5752.677737ac.css


二進制
dist/sk/static/css/chunk-2bcf5752.677737ac.css.gz


文件差異過大導致無法顯示
+ 1 - 0
dist/sk/static/css/chunk-52c1d82a.79345285.css


文件差異過大導致無法顯示
+ 1 - 0
dist/sk/static/css/chunk-64f296b4.f672fe10.css


文件差異過大導致無法顯示
+ 0 - 1
dist/sk/static/css/chunk-a39ad442.1cb57b60.css


文件差異過大導致無法顯示
+ 1 - 0
dist/sk/static/css/chunk-c503e766.9187ba72.css


二進制
dist/sk/static/css/chunk-c503e766.9187ba72.css.gz


二進制
dist/sk/static/js/app.278f490a.js.gz


文件差異過大導致無法顯示
+ 2 - 2
dist/sk/static/js/app.278f490a.js


二進制
dist/sk/static/js/app.8ea5cff8.js.gz


文件差異過大導致無法顯示
+ 1 - 1
dist/sk/static/js/app.278f490a.js.map


文件差異過大導致無法顯示
+ 0 - 2
dist/sk/static/js/chunk-1c6170bb.3f5e02cd.js


文件差異過大導致無法顯示
+ 0 - 1
dist/sk/static/js/chunk-1c6170bb.3f5e02cd.js.map


文件差異過大導致無法顯示
+ 0 - 2
dist/sk/static/js/chunk-2bcf5752.b66acf87.js


二進制
dist/sk/static/js/chunk-2bcf5752.b66acf87.js.gz


文件差異過大導致無法顯示
+ 0 - 1
dist/sk/static/js/chunk-2bcf5752.b66acf87.js.map


文件差異過大導致無法顯示
+ 2 - 0
dist/sk/static/js/chunk-52c1d82a.35154c92.js


文件差異過大導致無法顯示
+ 1 - 0
dist/sk/static/js/chunk-52c1d82a.35154c92.js.map


文件差異過大導致無法顯示
+ 2 - 0
dist/sk/static/js/chunk-64f296b4.a67c7fed.js


文件差異過大導致無法顯示
+ 1 - 0
dist/sk/static/js/chunk-64f296b4.a67c7fed.js.map


文件差異過大導致無法顯示
+ 0 - 2
dist/sk/static/js/chunk-a39ad442.565ec1b7.js


文件差異過大導致無法顯示
+ 0 - 1
dist/sk/static/js/chunk-a39ad442.565ec1b7.js.map


文件差異過大導致無法顯示
+ 2 - 0
dist/sk/static/js/chunk-c503e766.e3730904.js


二進制
dist/sk/static/js/chunk-c503e766.e3730904.js.gz


文件差異過大導致無法顯示
+ 1 - 0
dist/sk/static/js/chunk-c503e766.e3730904.js.map


+ 1 - 1
src/views/home/index.vue

@@ -56,7 +56,7 @@
         <img
           id="slogan24"
           class="slogan24"
-          src="/sk/skImage/word/E.png"
+          src="/sk/skImage/word/e.png"
           alt=""
         />
         <img

+ 1 - 1
src/views/home/tiantan.vue

@@ -64,7 +64,7 @@
         <img
           id="slogan24"
           class="slogan24"
-          src="/sk/skImage/word/E.png"
+          src="/sk/skImage/word/e.png"
           alt=""
         />
         <img

+ 15 - 2
src/views/weather/index.vue

@@ -134,6 +134,17 @@ export default defineComponent({
     snow,
     sunny,
   },
+  beforeRouteEnter(to, from, next) {
+    console.log("to===");
+    console.log(from);
+    if (from.name == "tiantan") {
+      next();
+    } else {
+      next((e: any) => {
+        e.pathUrl = "/sk/index";
+      });
+    }
+  },
   setup(props) {
     const router = useRouter();
     let weatherData: any = [
@@ -173,6 +184,7 @@ export default defineComponent({
       envObj: envObj,
       temperature: "",
       weatherKey: "",
+      pathUrl: "/sk/home",
       logonIcon: "阴.png",
       currentData: currentData,
       nowTime: formatEnergyDate()[2],
@@ -271,8 +283,9 @@ export default defineComponent({
         proxyData.times = setTimeout(() => {
           clearTimeout(proxyData.times);
           // router.push({ path: "/home" });
-          window.location.href = "/sk/home";
+          window.location.href = proxyData.pathUrl;
         }, 300000);
+        // 300000
       },
     });
     onBeforeUnmount(() => {
@@ -445,7 +458,7 @@ export default defineComponent({
           display: block;
           height: 1.67vh;
           // width: 1px;
-          border: 1px solid rgba(240, 240, 240, 1);            ;
+          border: 1px solid rgba(240, 240, 240, 1);
           // background: rgba(240, 240, 240, 1);
           &:nth-child(2) {
             margin-top: 0.925vh;