diff --git a/src/router/index.ts b/src/router/index.ts index d07573a..e08be97 100644 --- a/src/router/index.ts +++ b/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) => { diff --git a/src/views/Mechanics/child/station/components/float.vue b/src/views/Mechanics/child/station/components/float.vue index 851dac4..1429680 100644 --- a/src/views/Mechanics/child/station/components/float.vue +++ b/src/views/Mechanics/child/station/components/float.vue @@ -10,7 +10,7 @@
{{ props.allData.title4 }}
@@ -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; } diff --git a/src/views/Mechanics/child/station/img/j1.png b/src/views/Mechanics/child/station/img/j1.png index ab35da3..ab1dfef 100644 Binary files a/src/views/Mechanics/child/station/img/j1.png and b/src/views/Mechanics/child/station/img/j1.png differ diff --git a/src/views/Mechanics/child/station/img/j2.png b/src/views/Mechanics/child/station/img/j2.png index 0a20f93..19380fe 100644 Binary files a/src/views/Mechanics/child/station/img/j2.png and b/src/views/Mechanics/child/station/img/j2.png differ diff --git a/src/views/Mechanics/child/station/img/j3.png b/src/views/Mechanics/child/station/img/j3.png index efc270b..2688404 100644 Binary files a/src/views/Mechanics/child/station/img/j3.png and b/src/views/Mechanics/child/station/img/j3.png differ diff --git a/src/views/Mechanics/child/station/img/j4.png b/src/views/Mechanics/child/station/img/j4.png index 7b6eb3b..92e770e 100644 Binary files a/src/views/Mechanics/child/station/img/j4.png and b/src/views/Mechanics/child/station/img/j4.png differ diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue index 65458f6..7bdfb29 100644 --- a/src/views/MicroExhibition/index.vue +++ b/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()