Merge branch 'dev' of https://gogs.tjp.com.cn/maoming/yjhtgl-web into dev

src/assets/menuIcons/duty_notselect.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>值班值守-未选中</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="值班值守-未选中" transform="translate(0.500000, 0.000000)">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
-            <circle id="椭圆形" fill="#2C81FF" cx="8" cy="5" r="3"></circle>
-            <path d="M3.640625,9.21875 L12.359375,9.21875 C14.0938906,9.21875 15.5,10.6248594 15.5,12.359375 C15.5,14.0938906 14.0938906,15.5 12.359375,15.5 L3.640625,15.5 C1.90610937,15.5 0.5,14.0938906 0.5,12.359375 C0.5,10.6248594 1.90610937,9.21875 3.640625,9.21875 Z" id="形状" fill="#2C81FF" fill-rule="nonzero"></path>
-            <path d="M12.359375,15.5 L3.640625,15.5 C1.908875,15.5 0.5,14.091125 0.5,12.359375 C0.5,10.627625 1.908875,9.21875 3.640625,9.21875 L12.359375,9.21875 C14.091125,9.21875 15.5,10.627625 15.5,12.359375 C15.5,14.091125 14.091125,15.5 12.359375,15.5 Z M3.640625,10.625 C2.68428125,10.625 1.90625,11.4030781 1.90625,12.359375 C1.90625,13.3156719 2.68428125,14.09375 3.640625,14.09375 L12.359375,14.09375 C13.3156719,14.09375 14.09375,13.3156719 14.09375,12.359375 C14.09375,11.4030781 13.3156719,10.625 12.359375,10.625 L3.640625,10.625 Z" id="形状" fill="#2C81FF" fill-rule="nonzero"></path>
-            <rect id="矩形" fill="#FFFFFF" x="8" y="11" width="5" height="2" rx="1"></rect>
-        </g>
-    </g>
-</svg>

src/assets/menuIcons/duty_selected.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>值班值守-选中</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="值班值守-选中" transform="translate(0.500000, 0.000000)">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
-            <circle id="椭圆形" fill="#FFFFFF" cx="8" cy="5" r="3"></circle>
-            <path d="M3.640625,9.21875 L12.359375,9.21875 C14.0938906,9.21875 15.5,10.6248594 15.5,12.359375 C15.5,14.0938906 14.0938906,15.5 12.359375,15.5 L3.640625,15.5 C1.90610937,15.5 0.5,14.0938906 0.5,12.359375 C0.5,10.6248594 1.90610937,9.21875 3.640625,9.21875 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
-            <path d="M12.359375,15.5 L3.640625,15.5 C1.908875,15.5 0.5,14.091125 0.5,12.359375 C0.5,10.627625 1.908875,9.21875 3.640625,9.21875 L12.359375,9.21875 C14.091125,9.21875 15.5,10.627625 15.5,12.359375 C15.5,14.091125 14.091125,15.5 12.359375,15.5 Z M3.640625,10.625 C2.68428125,10.625 1.90625,11.4030781 1.90625,12.359375 C1.90625,13.3156719 2.68428125,14.09375 3.640625,14.09375 L12.359375,14.09375 C13.3156719,14.09375 14.09375,13.3156719 14.09375,12.359375 C14.09375,11.4030781 13.3156719,10.625 12.359375,10.625 L3.640625,10.625 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
-            <rect id="矩形" fill="#2C81FF" x="8" y="11" width="5" height="2" rx="1"></rect>
-        </g>
-    </g>
-</svg>

src/assets/menuIcons/homepage_notselected.svg → src/assets/menuIcons/sy.svg

@@ -3,11 +3,10 @@
     <title>首页-未选中</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="首页-未选中" transform="translate(0.000000, 0.500000)">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
             <g id="编组" transform="translate(1.000000, 0.500000)">
                 <path d="M12.9230769,3.51923077 L8.07692308,0.346153846 C7.38461538,-0.115384615 6.51923077,-0.115384615 5.82692308,0.346153846 L1.03846154,3.46153846 C0.403846154,3.75 0,4.32692308 0,4.96153846 L0,13.3269231 C0,14.25 0.865384615,15 1.84615385,15 L4.61538462,15 C4.96153846,15 5.19230769,14.7692308 5.19230769,14.4230769 L5.19230769,10.5576923 L8.65384615,10.5576923 L8.65384615,14.4230769 C8.65384615,14.7692308 8.88461538,15 9.23076923,15 L12.1153846,15 C13.0961538,15 13.9038462,14.25 13.9038462,13.3846154 L13.9038462,5.25 L13.9038462,5.01923077 C13.9038462,4.38461538 13.5576923,3.80769231 12.9230769,3.51923077 Z" id="形状" fill="#2C81FF" fill-rule="nonzero"></path>
                 <rect id="矩形" fill="#FFFFFF" x="4" y="7" width="6" height="2" rx="1"></rect>
             </g>
         </g>
     </g>
-</svg>
+</svg>

src/assets/menuIcons/homepage_selected.svg → src/assets/menuIcons/syActive.svg

@@ -3,11 +3,10 @@
     <title>首页-选中</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="首页-选中" transform="translate(0.000000, 0.500000)">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
             <g id="编组" transform="translate(1.000000, 0.500000)">
                 <path d="M12.9230769,3.51923077 L8.07692308,0.346153846 C7.38461538,-0.115384615 6.51923077,-0.115384615 5.82692308,0.346153846 L1.03846154,3.46153846 C0.403846154,3.75 0,4.32692308 0,4.96153846 L0,13.3269231 C0,14.25 0.865384615,15 1.84615385,15 L4.61538462,15 C4.96153846,15 5.19230769,14.7692308 5.19230769,14.4230769 L5.19230769,10.5576923 L8.65384615,10.5576923 L8.65384615,14.4230769 C8.65384615,14.7692308 8.88461538,15 9.23076923,15 L12.1153846,15 C13.0961538,15 13.9038462,14.25 13.9038462,13.3846154 L13.9038462,5.25 L13.9038462,5.01923077 C13.9038462,4.38461538 13.5576923,3.80769231 12.9230769,3.51923077 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
                 <rect id="矩形" fill="#2C81FF" x="4" y="7" width="6" height="2" rx="1"></rect>
             </g>
         </g>
     </g>
-</svg>
+</svg>

src/assets/menuIcons/system_management_notselected.svg → src/assets/menuIcons/xtgl.svg

@@ -6,7 +6,6 @@
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="系统管理-未选中">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
             <g id="矩形" transform="translate(1.203807, 1.203977)">
                 <mask id="mask-2" fill="white">
                     <use xlink:href="#path-1"></use>
@@ -17,4 +16,4 @@
             <path d="M8,11.5 C6.070125,11.5 4.5,9.9299375 4.5,8 C4.5,6.070125 6.070125,4.5 8,4.5 C9.9299375,4.5 11.5,6.070125 11.5,8 C11.5,9.9299375 9.9299375,11.5 8,11.5 Z M8,6.5 C7.17292308,6.5 6.5,7.17292308 6.5,8 C6.5,8.82713462 7.17292308,9.5 8,9.5 C8.82713462,9.5 9.5,8.82713462 9.5,8 C9.5,7.17292308 8.82713462,6.5 8,6.5 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
         </g>
     </g>
-</svg>
+</svg>

src/assets/menuIcons/system management_selected.svg → src/assets/menuIcons/xtglActive.svg

@@ -6,7 +6,6 @@
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="系统管理-选中">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
             <g id="矩形" transform="translate(1.203807, 1.203977)">
                 <mask id="mask-2" fill="white">
                     <use xlink:href="#path-1"></use>
@@ -18,4 +17,4 @@
             <path d="M8.0000752,10.6283669 C6.5508189,10.6283669 5.37171997,9.44931487 5.37171997,8.00001163 C5.37171997,6.55075534 6.5508189,5.37165641 8.0000752,5.37165641 C9.44937843,5.37165641 10.6284304,6.55075534 10.6284304,8.00001163 C10.6284304,9.44931487 9.44937843,10.6283669 8.0000752,10.6283669 Z M8.0000752,6.77970385 C7.32721626,6.77970385 6.77976741,7.3271527 6.77976741,8.00001163 C6.77976741,8.67291751 7.32721626,9.22031942 8.0000752,9.22031942 C8.67298107,9.22031942 9.22038298,8.67291751 9.22038298,8.00001163 C9.22038298,7.3271527 8.67298107,6.77970385 8.0000752,6.77970385 Z" id="形状" fill="#2C81FF" fill-rule="nonzero"></path>
         </g>
     </g>
-</svg>
+</svg>

src/assets/menuIcons/organize_user_management_notselect.svg → src/assets/menuIcons/yhgl.svg

@@ -3,9 +3,8 @@
     <title>组织用户管理-未选中</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="组织用户管理-未选中" transform="translate(0.000000, 0.500000)">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
             <path d="M6.84397009,7.53672216 C8.16642696,7.53672216 9.35855183,6.73976786 9.86406989,5.51774345 C10.3695879,4.29571904 10.0888597,2.88948793 9.15287974,1.9552322 C8.21689983,1.02097646 6.81015351,0.742841459 5.58906325,1.25061183 C4.36797299,1.7583822 3.57322034,2.95197447 3.57565086,4.27442909 C3.57897719,6.07711724 5.04127887,7.53672216 6.84397009,7.53672216 Z M9.11630815,14.6493127 L7.76855881,12.1989375 C7.73767075,12.1414727 7.73767075,12.0723448 7.76855881,12.0148799 L8.97869494,9.81650892 C9.07078049,9.63810469 9.06787745,9.42553745 8.9709542,9.24971453 C8.86148658,9.07934958 8.67535372,8.97358497 8.47296641,8.96674737 L5.99936903,8.96674737 C4.1837348,8.96674737 3.27290739,8.96674737 2.49109236,9.36496559 C1.80645796,9.71967738 1.24960816,10.2792333 0.898219505,10.9655792 C0.500000643,11.7465341 0.500000643,12.6582216 0.500000643,14.4661151 L0.500000643,14.9253992 C0.499772563,15.0778454 0.560230316,15.2241136 0.668026177,15.3319094 C0.775822037,15.4397053 0.922090229,15.5001631 1.07453642,15.4999677 L8.61832036,15.4999677 C8.80132648,15.5019451 8.97340134,15.4130075 9.07760444,15.2625515 C9.18680972,15.1140435 9.21875021,14.9224005 9.16361269,14.746502 C9.14727112,14.7181193 9.13178964,14.6802757 9.11630815,14.6493127 L9.11630815,14.6493127 Z" id="形状" fill="#2C81FF" fill-rule="nonzero"></path>
             <path d="M15.2561453,11.4326028 L14.3676801,9.90079582 C14.1254893,9.48802275 13.6825673,9.23464386 13.2039884,9.23509135 L11.4038357,9.23509135 C10.9277875,9.23651524 10.4880411,9.48976207 10.2478847,9.90079582 L9.35425897,11.4326028 C9.11684588,11.8507931 9.11684588,12.3630219 9.35425897,12.7812122 L10.250465,14.3130192 C10.4906214,14.724053 10.9303678,14.9772998 11.4064159,14.9787237 L13.2065687,14.9787237 C13.6851476,14.9791712 14.1280696,14.7257923 14.3702603,14.3130192 L15.2587256,12.7812122 C15.5029921,12.3646056 15.5020042,11.8482717 15.2561453,11.4326028 L15.2561453,11.4326028 Z M13.8821341,12.2161293 L13.15419,13.4603408 C13.1224872,13.5064334 13.0704065,13.5342966 13.0144694,13.5350913 L11.5550882,13.5350913 C11.5024497,13.5338336 11.4541566,13.5055967 11.4272439,13.4603408 L10.6992997,12.2161293 C10.668499,12.166494 10.668499,12.1036887 10.6992997,12.0540534 L11.4272439,10.8098418 C11.4546754,10.7637468 11.5042435,10.7353843 11.5578826,10.7350913 L13.0200582,10.7350913 C13.0759953,10.7358861 13.128076,10.7637493 13.1597788,10.8098418 L13.8877229,12.0540534 C13.9104664,12.1061439 13.9084117,12.1657292 13.8821341,12.2161293 L13.8821341,12.2161293 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
         </g>
     </g>
-</svg>
+</svg>

src/assets/menuIcons/zbzs.svg

@@ -3,11 +3,10 @@
     <title>值班值守-选中</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="值班值守-选中" transform="translate(0.500000, 0.000000)">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
             <circle id="椭圆形" fill="#FFFFFF" cx="8" cy="5" r="3"></circle>
             <path d="M3.640625,9.21875 L12.359375,9.21875 C14.0938906,9.21875 15.5,10.6248594 15.5,12.359375 C15.5,14.0938906 14.0938906,15.5 12.359375,15.5 L3.640625,15.5 C1.90610937,15.5 0.5,14.0938906 0.5,12.359375 C0.5,10.6248594 1.90610937,9.21875 3.640625,9.21875 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
             <path d="M12.359375,15.5 L3.640625,15.5 C1.908875,15.5 0.5,14.091125 0.5,12.359375 C0.5,10.627625 1.908875,9.21875 3.640625,9.21875 L12.359375,9.21875 C14.091125,9.21875 15.5,10.627625 15.5,12.359375 C15.5,14.091125 14.091125,15.5 12.359375,15.5 Z M3.640625,10.625 C2.68428125,10.625 1.90625,11.4030781 1.90625,12.359375 C1.90625,13.3156719 2.68428125,14.09375 3.640625,14.09375 L12.359375,14.09375 C13.3156719,14.09375 14.09375,13.3156719 14.09375,12.359375 C14.09375,11.4030781 13.3156719,10.625 12.359375,10.625 L3.640625,10.625 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
             <rect id="矩形" fill="#2C81FF" x="8" y="11" width="5" height="2" rx="1"></rect>
         </g>
     </g>
-</svg>
+</svg>

src/assets/menuIcons/zbzsActive.svg

@@ -3,11 +3,10 @@
     <title>值班值守-未选中</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="值班值守-未选中" transform="translate(0.500000, 0.000000)">
-            <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="16" height="16"></rect>
             <circle id="椭圆形" fill="#2C81FF" cx="8" cy="5" r="3"></circle>
             <path d="M3.640625,9.21875 L12.359375,9.21875 C14.0938906,9.21875 15.5,10.6248594 15.5,12.359375 C15.5,14.0938906 14.0938906,15.5 12.359375,15.5 L3.640625,15.5 C1.90610937,15.5 0.5,14.0938906 0.5,12.359375 C0.5,10.6248594 1.90610937,9.21875 3.640625,9.21875 Z" id="形状" fill="#2C81FF" fill-rule="nonzero"></path>
             <path d="M12.359375,15.5 L3.640625,15.5 C1.908875,15.5 0.5,14.091125 0.5,12.359375 C0.5,10.627625 1.908875,9.21875 3.640625,9.21875 L12.359375,9.21875 C14.091125,9.21875 15.5,10.627625 15.5,12.359375 C15.5,14.091125 14.091125,15.5 12.359375,15.5 Z M3.640625,10.625 C2.68428125,10.625 1.90625,11.4030781 1.90625,12.359375 C1.90625,13.3156719 2.68428125,14.09375 3.640625,14.09375 L12.359375,14.09375 C13.3156719,14.09375 14.09375,13.3156719 14.09375,12.359375 C14.09375,11.4030781 13.3156719,10.625 12.359375,10.625 L3.640625,10.625 Z" id="形状" fill="#2C81FF" fill-rule="nonzero"></path>
             <rect id="矩形" fill="#FFFFFF" x="8" y="11" width="5" height="2" rx="1"></rect>
         </g>
     </g>
-</svg>
+</svg>

src/assets/styles/sidebar.scss

@@ -25,7 +25,7 @@
     overflow: hidden;
     -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
     box-shadow: 2px 0 6px rgba(0, 21, 41, 0.35);
-
+    border-top-right-radius: 16px;
     // reset element-ui css
     .horizontal-collapse-transition {
       transition:
@@ -78,6 +78,45 @@
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
     }
+    .el-menu-item {
+      &:hover {
+        color: #ffffff;
+        background-color: #2c81ff;
+      }
+    }
+    .el-menu-item.is-active {
+      color: #ffffff;
+      background-color: #2c81ff;
+      position: relative;
+      &::before {
+        content: '';
+        width: 4px;
+        height: 100%;
+        background-color: #fff;
+        position: absolute;
+        top: 0;
+        left: 0;
+      }
+    }
+    .el-sub-menu .el-menu-item.is-active {
+      background-color: #2c81ff;
+      position: relative;
+      &::before {
+        content: '';
+        width: 4px;
+        height: 100%;
+        background-color: #fff;
+        position: absolute;
+        top: 0;
+        left: 0;
+      }
+    }
+
+    .is-opened {
+      :deep(.el-sub-menu__title) {
+        color: #fff !important;
+      }
+    }
 
     .el-menu-item .el-menu-tooltip__trigger {
       display: inline-block !important;
@@ -87,6 +126,7 @@
     .theme-dark .sub-menu-title-noDropdown,
     .theme-dark .el-sub-menu__title {
       &:hover {
+        color: #fff !important;
         background-color: $base-sub-menu-title-hover !important;
       }
     }
@@ -115,8 +155,13 @@
 
       &:hover {
         background-color: $base-sub-menu-hover !important;
+        color: #fff;
       }
     }
+    & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
+    & .theme-dark .el-sub-menu .el-menu-item.is-active {
+      background-color: $base-sub-menu-hover !important;
+    }
 
     & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
     & .theme-dark .el-menu-item {

src/assets/styles/variables.module.scss

@@ -3,12 +3,12 @@
   --menuBg: #304156;
   --menuColor: #bfcbd9;
   --menuActiveText: #f4f4f5;
-  --menuHover: #263445;
+  --menuHover: #2c81ff;
 
-  --subMenuBg: #1f2d3d;
+  --subMenuBg: #0f2942;
   --subMenuActiveText: #f4f4f5;
-  --subMenuHover: #001528;
-  --subMenuTitleHover: #293444;
+  --subMenuHover: #2c81ff;
+  --subMenuTitleHover: #2c81ff;
 
   --fixedHeaderBg: #ffffff;
   --tableHeaderBg: #f8f8f9;
@@ -26,12 +26,12 @@ html.dark {
   --menuBg: #1d1e1f;
   --menuColor: #bfcbd9;
   --menuActiveText: #f4f4f5;
-  --menuHover: #171819;
+  --menuHover: #2c81ff;
 
-  --subMenuBg: #1d1e1f;
+  --subMenuBg: #0f2942;
   --subMenuActiveText: #1d1e1f;
-  --subMenuHover: #171819;
-  --subMenuTitleHover: #171819;
+  --subMenuHover: #2c81ff;
+  --subMenuTitleHover: #2c81ff;
 
   --fixedHeaderBg: #171819;
   --tableHeaderBg: var(--el-bg-color);

src/layout/components/Navbar.vue

@@ -207,14 +207,36 @@ watch(
 }
 
 .navbar {
-  height: 58px;
+  height: 50px;
   overflow: hidden;
   position: relative;
-  background: url('@/assets/images/header.png') no-repeat;
-  background-size: 100% 100%;
+  //background: url('@/assets/images/header.png') no-repeat;
+  //background-size: 100% 100%;
+  background-image: linear-gradient(to bottom #e6e6e6 0%, #e0e3e7 100%);
   box-shadow: 0 1px 6px rgba(0, 21, 41, 0.12);
+  position: relative;
+  &::before {
+    content: '';
+    width: 163px;
+    height: 34px;
+    background: url('@/assets/images/city.png') no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+  }
+  &::after {
+    content: '';
+    width: 163px;
+    height: 34px;
+    background: url('@/assets/images/city.png') no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+  }
   .hamburger-container {
-    line-height: 58px;
+    line-height: 50px;
     height: 100%;
     float: left;
     cursor: pointer;

src/layout/components/Sidebar/Logo.vue

@@ -51,8 +51,8 @@ const sideTheme = computed(() => settingsStore.sideTheme);
 .sidebar-logo-container {
   position: relative;
   width: 200px;
-  height: 58px;
-  line-height: 58px;
+  height: 50px;
+  line-height: 50px;
   text-align: center;
   overflow: hidden;
   float: left;
@@ -73,7 +73,7 @@ const sideTheme = computed(() => settingsStore.sideTheme);
       margin: 0;
       color: #fff;
       font-weight: 600;
-      line-height: 58px;
+      line-height: 50px;
       font-size: 18px;
       font-family:
         Avenir,

src/layout/components/Sidebar/SidebarItem.vue

@@ -3,7 +3,7 @@
     <template v-if="hasOneShowingChild(item, item.children) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
       <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }">
-          <svg-icon :icon-class="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" />
+          <svg-icon :icon-class="getIconClass(onlyOneChild)" />
           <template #title>
             <span class="menu-title" :title="hasTitle(onlyOneChild.meta.title)">{{ onlyOneChild.meta.title }}</span>
           </template>
@@ -34,6 +34,7 @@ import AppLink from './Link.vue';
 import { getNormalPath } from '@/utils/ruoyi';
 import { RouteRecordRaw } from 'vue-router';
 
+const rootMenu = inject('rootMenu');
 const props = defineProps({
   item: {
     type: Object as PropType<RouteRecordRaw>,
@@ -102,7 +103,8 @@ const hasTitle = (title: string | undefined): string => {
 
 const getIconClass = (item) => {
   let res = '';
-  if (subMenu.value && !!subMenu.value.opened) {
+// || (subMenu.value && !!subMenu.value.opened)
+  if (rootMenu.activeIndex === item.path) {
     res = item.meta.icon + 'Active';
   } else if (item.meta && item.meta.icon) {
     res = item.meta.icon;

src/router/index.ts

@@ -71,7 +71,7 @@ export const constantRoutes: RouteRecordRaw[] = [
         path: '/index',
         component: () => import('@/views/index.vue'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+        meta: { title: '首页', icon: 'sy', affix: true }
       }
     ]
   },

src/types/components.d.ts

@@ -25,6 +25,8 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapse: typeof import('element-plus/es')['ElCollapse']
+    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']