Browse Source

BUG修复

Koishi 4 days atrás
parent
commit
576df85b78
2 changed files with 23 additions and 17 deletions
  1. 19 16
      src/App.vue
  2. 4 1
      src/views/economicsOperation/nxfHomePage/index.vue

+ 19 - 16
src/App.vue

@@ -99,7 +99,9 @@
             >
               <div class="elMenuTitle elMenuTitleAll" v-if="!isCollapse">
                 <!-- <div v-html="menu.svg" class="svgSty"></div> -->
-                <span class="titspan" :class="getSelectState(menu.index)">{{ menu.name }}</span>
+                <span class="titspan" :class="getSelectState(menu.index)">{{
+                  menu.name
+                }}</span>
               </div>
               <div class="elMenuTitle" v-else>
                 <div v-html="menu.svg" style="display: flex"></div>
@@ -664,7 +666,10 @@ export default {
     },
 
     switchTabShow() {
-      return window.location.href.indexOf("#/integratedAlarm") === -1;
+      return (
+        window.location.href.indexOf("#/integratedAlarm") === -1 &&
+        window.location.href.indexOf("#/nxreport") === -1
+      );
     },
 
     getSelectState(idx) {
@@ -1304,7 +1309,7 @@ body {
         margin: 0 5px;
 
         .el-sub-menu__title {
-            // height: 1px !important;
+          // height: 1px !important;
           background: none;
 
           .elGrounpTitleAll {
@@ -1354,7 +1359,7 @@ body {
 
         .el-menu {
           border-radius: 0 0 8px 8px;
-        //   padding: 10px 0 10px 0;
+          //   padding: 10px 0 10px 0;
           background: #132444;
 
           .elsubMenu {
@@ -1384,7 +1389,6 @@ body {
                 left: -30px;
               }
             }
-            
 
             // .is-active {
             //     max-width: 160px !important;
@@ -1404,14 +1408,13 @@ body {
               color: #a5b7df;
             }
           }
-          
-            .elsubMenu:hover{
-                background: #1c69bb;
-                .grounpItemSpan {
-                color: #a5b7df;
-                }
+
+          .elsubMenu:hover {
+            background: #1c69bb;
+            .grounpItemSpan {
+              color: #a5b7df;
             }
-          
+          }
         }
       }
 
@@ -1454,10 +1457,10 @@ body {
             position: relative;
             top: 5px;
           }
-            .titspan:hover{
-                padding: 0 10px;
-                background: #1c69bb;
-            }
+          .titspan:hover {
+            padding: 0 10px;
+            background: #1c69bb;
+          }
           .isSelect {
             background: #1c69bb;
             padding: 0 10px;

+ 4 - 1
src/views/economicsOperation/nxfHomePage/index.vue

@@ -408,7 +408,10 @@ export default {
 
   methods: {
     switchTabShow() {
-      return window.location.href.indexOf("#/integratedAlarm") === -1;
+      return (
+        window.location.href.indexOf("#/integratedAlarm") === -1 &&
+        window.location.href.indexOf("#/nxreport") === -1
+      );
     },
 
     selectTab(index, item) {