update

src/router/index.ts

@@ -407,16 +407,23 @@ router.beforeEach(async (to: any, from, next) => {
     'legionProducts', 'devItem', 'tufting', 'Winding', 'Large_Format',
     'GetonAgain', 'OffsiteDevList', 'Mechanicschild', 'Mechanicsson', 'historyData', 'jixieHistoryData'
   ]
-  if (lang && languageHash(lang) && languageHash(lang) != getStoredLanguage()) {
-    saveStoredLanguage(languageHash(lang))
-    window.location.reload()
-    return false
-  }
+  
   // 返回 false 以取消导航
   if (to.path == "/") {
     sessionStorage.setItem("screen_hash", to.query.hash);
     next();
-  } else if (arr.includes(address)) {
+  }  else {
+    if (lang && languageHash(lang) && languageHash(lang) != getStoredLanguage()) {
+      saveStoredLanguage(languageHash(lang))
+      window.location.reload()
+      return false
+    }
+    next();
+  }
+  
+  
+  /*
+  else if (arr.includes(address)) {
     next();
   } else {
     let res: any = await selectPermission({ address, hash })
@@ -432,7 +439,7 @@ router.beforeEach(async (to: any, from, next) => {
     }
 
   }
-
+*/
 })
 
 // router.beforeEach(async (to: any, from, next) => {

src/views/Mechanics/child/station/components/float.vue

@@ -10,7 +10,7 @@
   <div class="float">
     <div class="floating1" id="floating">
       <div class="roate">
-        <div class="roate-item" id="roate-item">
+        <div class="roate-item1" id="roate-item">
           <span class="data">{{ props.allData.data1 }}%</span>
         </div>
       </div>
@@ -47,7 +47,7 @@
     <div class="floating4" id="floating">
       <div class="roate">
         <div class="roate-item4" id="roate-item">
-          <span class="data" style="margin: 20px 15px 0 0">{{ props.allData.data4 }}</span>
+          <span class="data">{{ props.allData.data4 }}</span>
         </div>
       </div>
       <p class="title">{{ props.allData.title4 }}</p>
@@ -102,7 +102,7 @@ const getData2Style = (data2Value: string) => {
   position: relative;
 }
 
-.roate-item {
+.roate-item1 {
   bottom: 70%;
   background: url(./../img/j1.png) no-repeat center;
   animation: roate 6s linear infinite;
@@ -171,7 +171,6 @@ const getData2Style = (data2Value: string) => {
 }
 
 .data {
-  margin: 20px 0 0 10px;
   font-size: 28px;
   font-weight: 700;
 }

src/views/MicroExhibition/index.vue

@@ -282,7 +282,9 @@ function errWebsocket(val) {
 
 
 onMounted(() => {
-
+    if (thisLang != "简体中文") {
+        videoUrl.value = "https://d.tufting222.cn/video/yzy/micor_edos_english.mp4"
+    }
 
     getDeviceProduction()
     getmDevList()