Merge remote-tracking branch 'origin/master'

src/router/index.js

@@ -30,18 +30,6 @@ const createRouter = () =>
               import(
                 /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/electronicMap.vue"
               ),
-            // children: [
-            //   // 电子地图
-            //   {
-            //     id: 11,
-            //     path: "electronic-map",
-            //     name: "electronicMap",
-            //     component: () =>
-            //       import(
-            //         /*webpackChunkName:'home-cockpitManage'*/ "../views/admin/cockpitManage/electronicMap.vue"
-            //       ),
-            //   },
-            // ],
           },
           {
             // 电子地图

src/views/home/components/Menu.vue

@@ -20,16 +20,12 @@
             color="#222"
           ></SvgIcons>
         </div>
-        <span
-          v-if="!isCollapse"
-          @click="
-            handleChangeMenuUrl(
-              { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
-              `/home/cockpitManage?name=驾驶舱`
-            )
-          "
-          :class="isCollapse ? 'stop-animation' : 'active-animation'"
-        >
+        <span v-if="!isCollapse" @click="
+          handleChangeMenuUrl(
+            { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
+            `/home/cockpitManage?name=驾驶舱`
+          )
+          " :class="isCollapse ? 'stop-animation' : 'active-animation'">
           风机运行管理平台
         </span>
       </div>
@@ -84,18 +80,10 @@
       </div>
     </el-menu>
     <div class="foldBox flexCenter">
-      <span
-        v-show="isCollapse"
-        class="el-icon-s-unfold icon"
-        @click="debouncedToggleCollapse(false)"
-      >
+      <span v-show="isCollapse" class="el-icon-s-unfold icon" @click="debouncedToggleCollapse(false)">
         展开
       </span>
-      <span
-        v-show="!isCollapse"
-        class="el-icon-s-fold icon"
-        @click="debouncedToggleCollapse(true)"
-      >
+      <span v-show="!isCollapse" class="el-icon-s-fold icon" @click="debouncedToggleCollapse(true)">
         收起
       </span>
     </div>
@@ -390,11 +378,13 @@ export default {
   cursor: pointer;
   color: #666;
   font-size: 14px;
-  margin-right: 8px; /* 调整图标与文字之间的间距 */
+  margin-right: 8px;
+  /* 调整图标与文字之间的间距 */
 }
 
 .foldBox .icon:last-child {
-  margin-right: 0; /* 最后一个图标不设置右边距 */
+  margin-right: 0;
+  /* 最后一个图标不设置右边距 */
 }
 
 ::v-deep .el-submenu__title {