Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

zhanghua

2023-03-18 b8f5f6cdf5c26db929b7cda0188c587eb8d66c1d

 src/views/layout/components/Menu/index.vue

@@ -38,7 +38,11 @@
                    :key="thirdMenu.id"
                    :index="`${thirdMenu.id}`"
                    :route="{ name: thirdMenu.url }"
                    >{{ thirdMenu.title }}</el-menu-item
                    v-if="thirdMenu.id!='65'"
                    >
                    <template>
                      {{thirdMenu.title }}
                    </template></el-menu-item
                  >
                </el-submenu>
                <el-menu-item
@@ -90,7 +94,8 @@
      const userName = sessionStorage.getItem('name');
      users.getMenu({ name: userName })
          .then(res => {
            console.log(res)
            // console.log(res)
            // debugger
            this.menuList = res.menus;
            sessionStorage.setItem('user', JSON.stringify(res));
          })
@@ -111,14 +116,12 @@
    height: 36px;
  }
}

.el-aside {
  background: #313350;
  color: #e9eef3;
  text-align: center;
  box-sizing: border-box;
  position: relative;

  //    固定标题
  .siderbar-title {
    position: fixed;
@@ -132,12 +135,10 @@
    z-index: 999;
    cursor: pointer;
  }

  .el-scrollbar {
    height: calc(100vh - 66px);
    margin-top: 66px;
    box-sizing: border-box;

    .el-menu {
      background: linear-gradient(#313350, #0f2b56);
      border: 0;
@@ -156,7 +157,6 @@
        }
        &:hover .fisrtSpan {
          color: #22d3eb;

        }
        span,
        span {
@@ -177,7 +177,7 @@
          color: #e9eef3;
          background-color: #313350;
          font-size: 16px;
          border-bottom: 1px solid #ccc;
          // border-bottom: 0.5px solid #7c7979;
        }
        .el-menu-item:hover {
          background-color: #409EFF;
@@ -190,27 +190,23 @@
        }
        .secondMenu{
          //border-bottom:1px solid #ccc ;

          .is-active {
            background-color: #409EFF;
            color: #22d3eb;
          }
        }
      }

      .secondMenu {

        &:hover > .el-submenu__title {
          background-color: #092c4a;
        }
          .secondSpan{

          }
        &:hover .secondSpan {
          color: #22d3eb;
        }
        .is-opened{

          .el-submenu__title{
            background-color: #fff;
          }
@@ -220,7 +216,6 @@
          color: #fff;
        }
      }

      .thirdMenu {
        &:hover > .el-submenu__title {
          background-color: #092c4a;
@@ -235,7 +230,6 @@
        background-color: #092c4a;
      }
    }

    .el-scrollbar__wrap {
      overflow-x: hidden;
    }