From c215c89ecda16e4d32593f3e942fe871898071e9 Mon Sep 17 00:00:00 2001 From: surprise <15810472099@163.com> Date: 星期一, 05 二月 2024 17:51:53 +0800 Subject: [PATCH] 代码提交 --- src/components/navMenu.vue | 63 ++++++++++++++++--------------- 1 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue index ccd3bc1..57b86e2 100644 --- a/src/components/navMenu.vue +++ b/src/components/navMenu.vue @@ -12,7 +12,7 @@ @click="setMenuMove(index, item)" v-for="(item, index) in listMenu" > - <div> + <div style="display: flex;align-items: center"> <div class="ImgMenu"> <div class="menuImage" @@ -42,6 +42,17 @@ </div> </div> <div class="topUser"> + <div class="userLanguage"> + <div + class="userImage theme" + @click="themeChange" + ></div> + <div + class="userImage user2" + @click="switchLang" + ></div> + + </div> <div class="userName"> <div class="userImage user1"></div> <div class="userText"> @@ -52,26 +63,7 @@ class="elLink" >{{ $t('common.logout') }}</el-link> </div> - </div> - <div class="userLanguage"> - <div class="userImage user2"></div> - <div class="TextLanguage"> - <el-link - @click="switchLang" - :underline="false" - class="elLink" - >{{$t("common.language")}}</el-link> - </div> - <div class="TextLanguage"> - <el-link - @click="themeChange" - :underline="false" - class="elLink" - > 涓婚鍒囨崲</el-link> - </div> - </div> - </div> </div> @@ -160,9 +152,19 @@ document.body.addEventListener('click', () => { this.showFlag = null; }, false); + // this.$bus.$on('closeMenuSecond', res => { + // this.showFlag = null; + // }) + window.addEventListener('message', (e) => { + + this.showFlag = null; + }) }, computed: {}, methods: { + closeSecondMenu() { + this.showFlag = null + }, themeChange() { this.$store.state.themeflag = !this.$store.state.themeflag; if (this.$store.state.themeflag == true) { @@ -227,22 +229,23 @@ if (item.url == "Thematic") { this.signInsertOpLog("缁煎悎灞曠ず", item.cnName) } + + this.changeSelectStyle = index; + sessionStorage.setItem('changeSelectStyle', index) } else { if (this.showFlag != index) { this.showFlag = index; - } else { this.showFlag = null; } } - // + // if (index === 4 || index === 5 || index === 6) { sessionStorage.removeItem('changeliSelect') this.$set(this, 'changeliSelect', null) } - sessionStorage.setItem('changeSelectStyle', index) - this.changeSelectStyle = index; + }, closeAllChildren() { var val = this.listMenu @@ -264,15 +267,16 @@ } }, setLiClick(res, index) { + this.changeSelectStyle = index; + sessionStorage.setItem('changeSelectStyle', index) sessionStorage.removeItem('hanleselectmochaitmo') sessionStorage.removeItem('hanleselectindex') // this.signInsertOpLog(this.listMenu[index].cnName, res.cnName) setTimeout(() => { - this.changeliSelect = res.cnName; sessionStorage.setItem('changeliSelect', res.cnName) - if (res.url.indexOf('http') != -1) { + if (res.url.indexOf('{fmeHost}') != -1) { this.$store.reporturl = res.url; sessionStorage.setItem('iframehttpurl', this.$store.reporturl) this.$router.push('/QualityInspection'); @@ -435,8 +439,8 @@ }; Window.ws = null; } - - if (index.indexOf('http') != -1) { +debugger + if (index.indexOf('{fmeHost}') != -1) { this.$router.push('/databaseMonitoring'); this.$store.commit('getIframe', index); } else if (isNaN(Number(index))) { @@ -461,5 +465,4 @@ }, }; </script> - - \ No newline at end of file + -- Gitblit v1.9.3