Browse Source

fix:pad的白屏幕

chenzhen2 1 year ago
parent
commit
d523334396

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-44fc4020.ec45131f.css


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


File diff suppressed because it is too large
+ 1 - 1
dist/sgipad/static/css/chunk-baa675e2.759844ea.css


BIN
dist/sgipad/static/css/chunk-6371650e.ac9112dd.css.gz


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


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


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


BIN
dist/sgipad/static/js/app.c1b54197.js.gz


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


File diff suppressed because it is too large
+ 2 - 0
dist/sgipad/static/js/chunk-3251fe8f.1ae445ec.js


BIN
dist/sgipad/static/js/chunk-3251fe8f.1ae445ec.js.gz


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


File diff suppressed because it is too large
+ 0 - 2
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
+ 0 - 1
dist/sgipad/static/js/chunk-44fc4020.0e7793ff.js.map


File diff suppressed because it is too large
+ 23 - 0
dist/sgipad/static/js/chunk-6371650e.eee40947.js


BIN
dist/sgipad/static/js/chunk-6371650e.eee40947.js.gz


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


File diff suppressed because it is too large
+ 0 - 23
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
+ 0 - 1
dist/sgipad/static/js/chunk-baa675e2.1db5b019.js.map


+ 4 - 11
src/views/envmonitor/index.vue

@@ -419,19 +419,12 @@ export default defineComponent({
     VanIcon: Icon,
   },
   beforeRouteEnter(to, from, next) {
-    try {
-      // debugger;
-      let mac: any = getCookieMac();
-      if (mac && mac != "null") {
-        next();
-      } else {
-        next("/error");
-      }
-    } catch {
+    let mac: any = getCookieMac();
+    if (mac && mac != "null") {
+      next();
+    } else {
       next("/error");
     }
-
-    // next()
   },
   setup() {
     const proxyGlobal: any = getCurrentInstance();

+ 17 - 23
src/views/home/index.vue

@@ -101,33 +101,27 @@ export default defineComponent({
     vanButton: Button,
   },
   beforeRouteEnter(to, from, next) {
-    try {
-      let mac: any = getCookieMac();
-      if (mac && mac != "null") {
-        if (to.query.type !== "logoOut") {
-          next((e: any) => {
-            console.log(e);
-            e.queryWorkSpace();
-          });
-        } else {
-          next((e: any) => {
-            e.showLogin = true;
-            let mac: any = getCookieMac();
-            console.log(mac);
-            // to.query = { mac: mac};
-            console.log(to);
-            // console.log( e.showLogin )
-            // router.push({ name: "home", query: { mac: mac } });
-          });
-        }
+    let mac: any = getCookieMac();
+    if (mac && mac != "null") {
+      if (to.query.type !== "logoOut") {
+        next((e: any) => {
+          console.log(e);
+          e.queryWorkSpace();
+        });
       } else {
-        next("/error");
+        next((e: any) => {
+          e.showLogin = true;
+          let mac: any = getCookieMac();
+          console.log(mac);
+          // to.query = { mac: mac};
+          console.log(to);
+          // console.log( e.showLogin )
+          // router.push({ name: "home", query: { mac: mac } });
+        });
       }
-    } catch (e: any) {
+    } else {
       next("/error");
     }
-
-    // next()
   },
   setup(props) {
     let router: any = useRouter();