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 |  107 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 6b07d55..57b86e2 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="NavBox">
+  <div
+    class="NavBox"
+    @click.stop
+  >
     <div class="topBox">
       <div class="topTitle"></div>
       <div class="topMenu">
@@ -9,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"
@@ -39,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">
@@ -49,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>
 
@@ -154,9 +149,22 @@
       this.$set(this, 'changeliSelect', sessionStorage.getItem('changeliSelect'))
       // this.changeliSelect = sessionStorage.getItem('changeliSelect')
     }
+    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) {
@@ -187,6 +195,9 @@
       this.$router.push('/');
     },
     getTimeCookies() {
+      if (!localStorage.getItem('LFToken')) {
+        return false
+      }
       var time1 = new Date(JSON.parse(localStorage.getItem('LFToken')).time);
       var time2 = new Date();
       if (time2 > time1) {
@@ -195,8 +206,8 @@
         return true;
       }
     },
- 
- //涓婚鍒囨崲
+
+    //涓婚鍒囨崲
     setThemeColors() { },
     async signInsertOpLog(m1, m2) {
       var obj = {
@@ -207,31 +218,34 @@
     },
     //榧犳爣绉诲叆鑿滃崟浜嬩欢
     setMenuMove(index, item) {
-      if (item.perms != null) {
+
+      if (item.perms != null && item.perms != "") {
         this.$router.push(item.url);
         if (this.showFlag != null) {
 
           this.changeliSelect = '%%';
           this.showFlag = null;
         }
-          if (item.url == "Thematic") {
+        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
@@ -253,15 +267,19 @@
       }
     },
     setLiClick(res, index) {
-        this.signInsertOpLog(this.listMenu[index].cnName, res.cnName)
-      setTimeout(() => {
+      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) {
-            this.$store.reporturl = res.url;
-            sessionStorage.setItem('iframehttpurl', this.$store.reporturl)
-            this.$router.push('/QualityInspection');
+        if (res.url.indexOf('{fmeHost}') != -1) {
+          this.$store.reporturl = res.url;
+          sessionStorage.setItem('iframehttpurl', this.$store.reporturl)
+          this.$router.push('/QualityInspection');
           // if (location.href.indexOf('/WareInspection') == -1) {
           //   this.$store.reporturl = res.url;
           //   this.$router.push('/WareInspection');
@@ -307,13 +325,18 @@
       for (var i in res) {
         res[i].checkClass = res[i].css + '1';
         res[i].show = false; //鎺у埗鏄鹃殣
-        if (res[i].perms == null) {
+
+        if (res[i].perms == null || res[i].perms == "") {
           const result = await selectMenuRecursive({ id: res[i].id });
 
           if (result.code == 200) {
+
             res[i].children = result.result.filter((value) => {
-              return value.pid == res[i].id;
-            });
+              return value.isShow == 1;
+            })
+              .filter((value) => {
+                return value.pid == res[i].id;
+              });
 
           }
           this.listMenu.push(res[i]);
@@ -329,6 +352,7 @@
           // } else {
           //   this.changeSelectStyle = this.listMenu.length - 1;
           // }
+
           this.changeSelectStyle = sessionStorage.getItem('changeSelectStyle')
           // var strartMneu = res[i].children[0];
           // this.$store.commit('currentPerms', strartMneu.perms);
@@ -415,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))) {
@@ -441,5 +465,4 @@
   },
 };
 </script>
- 
- 
\ No newline at end of file
+

--
Gitblit v1.9.3