Ver Fonte

Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/qiaobi into dev

xiexiang há 10 meses atrás
pai
commit
c256e0b741
5 ficheiros alterados com 29 adições e 21 exclusões
  1. 1 0
      src/icons/svg/人员.svg
  2. 1 1
      src/icons/svg/审核.svg
  3. 14 14
      src/router/index.js
  4. 12 4
      src/styles/sidebar.scss
  5. 1 2
      src/utils/axios.js

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
src/icons/svg/人员.svg


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
src/icons/svg/审核.svg


+ 14 - 14
src/router/index.js

@@ -74,20 +74,20 @@ export const backStageManageRouterItem = [
         path: 'personnel',
         name: 'Administrator_personnel',
         component: () => import('@/views/backStageManage/organization/personnel/index.vue'),
-        meta: {title: '人员清单',icon: '账号'},
-      },
-      {
-        path: 'personnel',
-        name: 'Administrator_personnel',
-        component: () => import('@/views/backStageManage/organization/personnel/index.vue'),
-        meta: {title: '部门管理',icon: '部门'},
-      },
-      {
-        path: 'personnel',
-        name: 'Administrator_personnel',
-        component: () => import('@/views/backStageManage/organization/personnel/index.vue'),
-        meta: {title: '职位管理',icon: '职位'},
+        meta: {title: '人员清单',icon: '人员'},
       },
+      // {
+      //   path: 'personnel',
+      //   name: 'Administrator_personnel',
+      //   component: () => import('@/views/backStageManage/organization/personnel/index.vue'),
+      //   meta: {title: '部门管理',icon: '部门'},
+      // },
+      // {
+      //   path: 'personnel',
+      //   name: 'Administrator_personnel',
+      //   component: () => import('@/views/backStageManage/organization/personnel/index.vue'),
+      //   meta: {title: '职位管理',icon: '职位'},
+      // },
     ]
   },
 
@@ -95,7 +95,7 @@ export const backStageManageRouterItem = [
     path: '/administrator',
     name: 'Administrator_application',
     component: administrator_layout,
-    redirect: '/administrator/apply',
+    redirect: '/administrator/vision',
     meta: { title: '应用管理', icon: 'application' },
     children: [
       // {

+ 12 - 4
src/styles/sidebar.scss

@@ -1,3 +1,15 @@
+.el-menu--vertical .el-menu-item {
+  background-color: rgb(41, 40, 40) !important; /* 设置折叠状态下子菜单的背景色 */
+  color: white !important;
+  &:hover{
+    // background-color:rgb(199, 220, 243) !important;
+    color: rgb(41, 40, 40) !important;
+    background-color: rgb(154, 156, 163) !important;
+  }
+  &.is-active{
+    color: #409EFF !important;
+  }
+}
 #app {
 
   // 主体区域
@@ -79,10 +91,6 @@
   }
 
 
-  .el-menu--collapse .el-menu .el-submenu {
-    min-width: 180px !important;
-  }
-
   //适配移动端
   .mobile {
     .main-container {

+ 1 - 2
src/utils/axios.js

@@ -35,8 +35,7 @@ _axios.interceptors.request.use(
     if (token) {
       // config.headers[constants.tokenHeader] = token
     }
-    config.headers['x-project-id'] = Store.getters.projectId || ''
-    // config.headers['x-project-id'] = Store.getters.projectId || ''
+    config.headers['applicationCode'] = '4e95e3d926a2a4befa5d913acc0aa9f5'
     if (config.loading) {
       loadingInstance = Loading.service({})
     }