diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c1c4ea6..4e727c3 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -131,9 +131,21 @@ aside { .app-container { // padding: 20px; - height: calc(100vh - 139px); + height: calc(100vh - 140px); width: 1200px; margin: 0 auto; + background: #ffffff; + padding: 20px 20px 0 20px; +} + + +.my-container { + height: calc(100vh - 140px); + width: 1200px; + margin: 0 auto; + overflow-y: auto; + background: #F8F8F8; + padding: 0; } .components-container { @@ -187,4 +199,4 @@ aside { vertical-align: middle; margin-bottom: 10px; } -} +} \ No newline at end of file diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 66d5b11..588e0c9 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -138,7 +138,7 @@ // padding: 0 !important; .svg-icon { - margin-left: 20px; + // margin-left: 20px; } } diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 81e93be..cab7600 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -130,6 +130,11 @@ function addIframe() { } // 全局table表格样式 开始 +.el-table { + --el-table-border-color: transparent !important; + --el-table-border: 1px solid #ebeef5 !important; +} + .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th { word-break: break-word; @@ -142,6 +147,7 @@ function addIframe() { font-size: 18px; text-align: left; color: #505050; + // border-bottom: 1px solid ; } .el-table .el-table__cell { @@ -153,6 +159,4 @@ function addIframe() { color: #505050; } -// 全局table表格样式 结束 - - +// 全局table表格样式 结束 diff --git a/src/router/index.js b/src/router/index.js index 6329ba1..f4f108f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -228,6 +228,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/safetyReview/examinerTasks/addTaskForm', + component: Layout, + hidden: true, + permissions: ['safetyReview:examinerTasks:add'], + children: [ + { + path: '', + component: () => import('@/views/safetyReview/examinerTasks/addTaskForm'), + name: 'addTaskForm', + meta: { title: '审核员任务', activeMenu: '/safetyReview/examinerTasks' } + } + ] + }, { path: '/system/user-auth', component: Layout, diff --git a/src/views/labelManage/adminApproval/index.vue b/src/views/labelManage/adminApproval/index.vue index cb0c64f..64dc1f5 100644 --- a/src/views/labelManage/adminApproval/index.vue +++ b/src/views/labelManage/adminApproval/index.vue @@ -54,7 +54,7 @@
- +