Merge branch 'develop_jzl'

gassafety-web/src/components/PopWindowGis/lineInfoWindow.vue

@@ -134,9 +134,10 @@ export default {
     deviceMore() {
       console.log(this.obj.polyline.getExtData().lineData);
       this.obj.polyline.getExtData().class.view.$router.push({
-        path: "/dataMonitoring/realtimedetail",
+        // path: "/dataMonitoring/realtimedetail",
+        path: "/device/pipeDetail",
         query: {
-          deviceId: this.obj.polyline.getExtData().lineData.pipeId,
+          pipeId: this.obj.polyline.getExtData().lineData.pipeId,
           //这里是传数字
           deviceType: "0",
         },

gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue

@@ -87,10 +87,11 @@ export default {
     moment,
     deviceMore() {
       this.data.class.view.$router.push({
-        path: "/dataMonitoring/realtimedetail",
+        // path: "/dataMonitoring/realtimedetail",
+        path: "/device/deviceInfoDetail",
         query: {
           deviceId: this.data.deviceId,
-          deviceType: this.data.deviceType,
+          // deviceType: this.data.deviceType,
         },
       });
     },

gassafety-web/src/components/TopNav/index.vue

@@ -7,7 +7,6 @@
     <template v-for="(item, index) in topMenus">
       <!-- <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" -->
       <el-menu-item
-        :style=""
         :index="item.path"
         :key="index"
         v-if="index < visibleNumber"
@@ -22,7 +21,7 @@
     <!-- 顶部菜单超出数量折叠 -->
     <!-- <div> -->
     <el-submenu
-      class="onlyNavTio"
+      class="onlyNavTio moreLise"
       index="more"
       v-if="topMenus.length > visibleNumber"
     >
@@ -308,4 +307,20 @@ export default {
   color: rgb(5 59 106) !important;
   font-weight: 900 !important;
 }
+.moreLise {
+  // background-image: url("../../assets/logo/item-background.png") !important;
+  // background-size: 100% 123% !important;
+  &.is-active {
+    // background-image: url("../../assets/logo/item-background.png") !important;
+    background-size: 100% 123% !important;
+  }
+  .el-submenu__title {
+    background-image: none !important;
+  }
+  &:hover {
+    background-image: url("../../assets/logo/item-background.png");
+    background-size: 100% 123%;
+  }
+  // height: 100px;
+}
 </style>