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 |   43 ++++++++++++++++++++++---------------------
 1 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 40a0ec5..57b86e2 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -43,22 +43,15 @@
       </div>
       <div class="topUser">
         <div class="userLanguage">
-          <div class="userImage theme" @click="themeChange"></div>
-          <div class="userImage user2" @click="switchLang"></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
+            class="userImage theme"
+            @click="themeChange"
+          ></div>
+          <div
+            class="userImage user2"
+            @click="switchLang"
+          ></div>
+
         </div>
         <div class="userName">
           <div class="userImage user1"></div>
@@ -159,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) {
@@ -264,7 +267,6 @@
       }
     },
     setLiClick(res, index) {
-
       this.changeSelectStyle = index;
       sessionStorage.setItem('changeSelectStyle', index)
       sessionStorage.removeItem('hanleselectmochaitmo')
@@ -272,10 +274,9 @@
 
       // 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');
@@ -438,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))) {

--
Gitblit v1.9.3