Merge remote-tracking branch 'origin/master'

src/components/steps/index.vue

@@ -323,9 +323,9 @@ watchEffect(() => {
   cursor: not-allowed;
 }
 .is-active {
-  color: #BEA266;
-}
-.is-end {
   color: #67c23a;
 }
+.is-end {
+  color: #BEA266;
+}
 </style>

src/layout/navbar/Hamburger.vue

@@ -1,4 +1,5 @@
 <template>
+  <span class="sys-name">科技创新项目管理平台</span>
   <div class="toggle" @click="toggleClick">
     <component :is="siderbarStore.getSiderBarStatus() ? 'Fold' : 'Expand'" class="icon"></component>
   </div>
@@ -13,6 +14,10 @@ const toggleClick = () => {
 </script>
 
 <style lang="scss" scoped>
+.sys-name {
+  padding-left: 10px;
+  font-weight: bold;
+}
 .toggle{
   line-height: 65px;
   border-top-left-radius: 10px;

src/layout/siderbar/MenuItem.vue

@@ -17,7 +17,9 @@
           </a>
         </div>
         <div v-else>
-          <svg-icon :name="item.icon"/>
+          <el-icon>
+            <svg-icon :name="item.icon" class="menu-item-icon"/>
+          </el-icon>
           <span>{{ item.title }}</span>
         </div>
       </template>
@@ -60,3 +62,10 @@ const checkMenuItem = (item) => {
 
 </script>
 
+<!-- <style lang="scss" scoped>
+.menu-item-icon {
+  width: 18px !important;
+  height: 18px !important;
+  margin-left: 0;
+}
+</style> -->

src/views/project-management/mobledetail/StepsMoblie.vue

@@ -323,9 +323,9 @@ watchEffect(() => {
   cursor: not-allowed;
 }
 .is-active {
-  color: #BEA266;
-}
-.is-end {
   color: #67c23a;
 }
+.is-end {
+  color: #BEA266;
+}
 </style>