luyanan 6 years ago
parent
commit
6ac7678d3d

+ 1 - 1
src/components/complexTable/index.vue

7
        :width="item.width ? item.width : ''" align="center" :className="item.active">
7
        :width="item.width ? item.width : ''" align="center" :className="item.active">
8
        <template slot-scope="scope">
8
        <template slot-scope="scope">
9
          <div v-if="scope.row[item.prop]">
9
          <div v-if="scope.row[item.prop]">
10
            <div v-if="item.active" @click.stop="$emit('jump', scope.row.id)">{{scope.row[item.prop]}}</div>
10
            <el-button type="text" v-if="item.active" @click.stop="$emit('jump', scope.row.id)">{{scope.row[item.prop]}}</el-button>
11
            <div v-else> {{scope.row[item.prop]}}</div>
11
            <div v-else> {{scope.row[item.prop]}}</div>
12
          </div>
12
          </div>
13
          <div v-if="item.operate && typeof scope.row === 'object'">
13
          <div v-if="item.operate && typeof scope.row === 'object'">

+ 3 - 1
src/styles/mixin.scss

1
$mainColor:#409eff;
1
@import '../element-variables';
2
3
$mainColor:$--color-primary;
2
$bg:#2d3a4b;
4
$bg:#2d3a4b;
3
$dark_gray:#889aa4;
5
$dark_gray:#889aa4;
4
$light_gray:#eee;
6
$light_gray:#eee;

+ 7 - 0
src/styles/sidebar.scss

76
    .svg-icon {
76
    .svg-icon {
77
      margin-right: 16px;
77
      margin-right: 16px;
78
    }
78
    }
79
    .el-menu{
80
      background-color: $menuBg;
81
    }
79
    .el-menu-sidebar {
82
    .el-menu-sidebar {
80
      border: none;
83
      border: none;
81
      height: 100%;
84
      height: 100%;
82
      width: 100% !important;
85
      width: 100% !important;
83
    }
86
    }
87
    .el-submenu__title{
88
      color:#bfcbd9;
89
    }
84
  }
90
  }
85
  .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
91
  .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
86
  .sidebar-container .el-submenu .el-menu-item {
92
  .sidebar-container .el-submenu .el-menu-item {
87
    min-width: 200px !important;
93
    min-width: 200px !important;
94
    color:#bfcbd9;
88
    background-color: $subMenuBg !important;
95
    background-color: $subMenuBg !important;
89
    &:hover {
96
    &:hover {
90
      background-color: $menuHover !important;
97
      background-color: $menuHover !important;

+ 1 - 3
src/views/layout/components/Sidebar/index.vue

5
      :show-timeout="200"
5
      :show-timeout="200"
6
      :default-active="$route.path"
6
      :default-active="$route.path"
7
      background-color="#20436b"
7
      background-color="#20436b"
8
      text-color="#bfcbd9"
9
      active-text-color="#409EFF"
10
    >
8
      text-color="#bfcbd9">
11
      <sidebar-item v-for="route in permission_routers" :key="permission_routers.name" :item="route" :base-path="route.path"></sidebar-item>
9
      <sidebar-item v-for="route in permission_routers" :key="permission_routers.name" :item="route" :base-path="route.path"></sidebar-item>
12
    </el-menu>
10
    </el-menu>
13
  </el-scrollbar>
11
  </el-scrollbar>