From 96d5331c6d51975a28378e20051403fdd5b53d9a Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期四, 14 七月 2022 09:09:57 +0800 Subject: [PATCH] 添加修改页面 --- src/router/route.ts | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/theme/dark.scss | 2 src/theme/element.scss | 4 package.json | 2 src/main.ts | 4 5 files changed, 157 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 0167f4e..be1a5a0 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "echarts": "^5.3.3", "echarts-gl": "^2.0.9", "echarts-wordcloud": "^2.0.0", - "element-plus": "^2.2.2", + "element-plus": "^2.2.9", "js-cookie": "^3.0.1", "json-bigint": "^1.0.0", "jsplumb": "^2.15.6", diff --git a/src/main.ts b/src/main.ts index d8ef740..5635729 100644 --- a/src/main.ts +++ b/src/main.ts @@ -12,7 +12,7 @@ import '/@/theme/index.scss'; import mitt from 'mitt'; import VueGridLayout from 'vue-grid-layout'; -import locale from 'element-plus/lib/locale/lang/zh-cn'; +import zhCn from 'element-plus/lib/locale/lang/zh-cn'; const app = createApp(App); for (const [key, component] of Object.entries(ElementPlusIconsVue)) { @@ -21,6 +21,6 @@ directive(app); other.elSvg(app); -app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t, locale }).use(i18n).use(VueGridLayout).mount('#app'); +app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t, locale: zhCn}).use(i18n).use(VueGridLayout).mount('#app'); app.config.globalProperties.mittBus = mitt(); diff --git a/src/router/route.ts b/src/router/route.ts index b0a9927..66e8615 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -6,7 +6,7 @@ path: '/', name: '/', component: () => import('/@/layout/index.vue'), - redirect: '/home', + redirect: '/loginPage', meta: { isKeepAlive: true, }, @@ -25,10 +25,26 @@ roles: ['admin', 'common'], icon: 'iconfont icon-shouye', button:'121231' - }, - }, + } + // }, + // { + // path: '/layoutPage', + // name: 'layoutPage', + // component: () => import('/@/views/layoutPage/index.vue'), + // meta: { + // title: 'message.router.layoutPage', + // isLink: '', + // isHide: false, + // isKeepAlive: true, + // isAffix: true, + // isIframe: false, + // roles: ['admin', 'common'], + // icon: 'iconfont icon-shouye', + // button:'121231' + // }, + } ], - }, + } ]; @@ -67,8 +83,8 @@ ], }, { - path: '/login', - name: 'login', + path: '/loginPage', + name: 'loginPage', component: () => import('/@/views/loginPage/loginPage.vue'), meta: { title: '登录', @@ -79,7 +95,135 @@ name: 'homeMenu', component: () => import('/@/views/homeMenu/homeMenu.vue'), meta: { - title: '登录', + title: '目录', + } + }, + { + path: '/workReservation', + name: 'workReservation', + component: () => import('/@/views/specialWorkSystem/workPlan/workReservation/index.vue'), + meta: { + title: '作业预约', }, }, + { + path: '/workAppointSummary', + name: 'workAppointSummary', + component: () => import('/@/views/specialWorkSystem/workPlan/workAppointSummary/index.vue'), + meta: { + title: '作业预约汇总', + }, + }, + { + path: '/approveProcessSetting', + name: 'approveProcessSetting', + component: () => import('/@/views/specialWorkSystem/approveProcessManagement/approveProcessSetting/index.vue'), + meta: { + title: '审批流程编辑', + }, + }, + { + path: '/reportTypeSetting', + name: 'reportTypeSetting', + component: () => import('/@/views/specialWorkSystem/approveProcessManagement/reportTypeSetting/index.vue'), + meta: { + title: '新建上报类型', + }, + }, + { + path: '/addApproveProcess', + name: 'addApproveProcess', + component: () => import('/@/views/specialWorkSystem/approveProcessManagement/addApproveProcess/index.vue'), + meta: { + title: '新建审批环节', + }, + }, + { + path: '/approveProcessList', + name: 'approveProcessList', + component: () => import('/@/views/specialWorkSystem/approveProcessManagement/approveProcessList/index.vue'), + meta: { + title: '审批流程管理', + }, + }, + { + path: '/workApplyForm', + name: 'workApplyForm', + component: () => import('/@/views/specialWorkSystem/workApplyManagement/workApplyForm/index.vue'), + meta: { + title: '作业申请表单', + }, + }, + { + path: '/myApply', + name: 'myApply', + component: () => import('/@/views/specialWorkSystem/workApplyManagement/myApply/index.vue'), + meta: { + title: '我的申请', + }, + }, + { + path: '/workCheckinRecord', + name: 'workCheckinRecord', + component: () => import('/@/views/specialWorkSystem/workProcessManagement/workCheckinRecord/index.vue'), + meta: { + title: '作业签到记录', + }, + }, + { + path: '/gasCheckAnalyze', + name: 'gasCheckAnalyze', + component: () => import('/@/views/specialWorkSystem/workProcessManagement/gasCheckAnalyze/index.vue'), + meta: { + title: '气体检查分析', + }, + }, + { + path: '/workTicketRecord', + name: 'workTicketRecord', + component: () => import('/@/views/specialWorkSystem/afterWorkManagement/workTicketRecord/index.vue'), + meta: { + title: '作业票归档记录', + }, + }, + { + path: '/workTicketCheck', + name: 'workTicketCheck', + component: () => import('/@/views/specialWorkSystem/afterWorkManagement/workTicketCheck/index.vue'), + meta: { + title: '作业票抽查', + }, + }, + { + path: '/workTypeSetting', + name: 'workTypeSetting', + component: () => import('/@/views/specialWorkSystem/workBasicManagementSetting/workTypeSetting/index.vue'), + meta: { + title: '作业工种设置', + }, + }, + { + path: '/certificateFilterSetting', + name: 'certificateFilterSetting', + component: () => import('/@/views/specialWorkSystem/workBasicManagementSetting/certificateFilterSetting/index.vue'), + meta: { + title: '证书过滤设置', + }, + }, + { + path: '/personalProtectDevices', + name: 'personalProtectDevices', + component: () => import('/@/views/specialWorkSystem/workBasicManagementSetting/personalProtectDevices/index.vue'), + meta: { + title: '个人防护用品库', + }, + }, + { + path: '/securityMeasuresManagement', + name: 'securityMeasuresManagement', + component: () => import('/@/views/specialWorkSystem/workBasicManagementSetting/securityMeasuresManagement/index.vue'), + meta: { + title: '安全措施管理', + }, + } ]; diff --git a/src/theme/dark.scss b/src/theme/dark.scss index c922da1..6a2f5e3 100644 --- a/src/theme/dark.scss +++ b/src/theme/dark.scss @@ -104,7 +104,7 @@ background-color: var(--next-color-disabled) !important; } - // menu + // homeMenu .layout-aside { border-right: 1px solid var(--next-border-color-light) !important; } diff --git a/src/theme/element.scss b/src/theme/element.scss index 5137cb4..6e71c98 100644 --- a/src/theme/element.scss +++ b/src/theme/element.scss @@ -9,7 +9,7 @@ .el-button--default i.iconfont, .el-button--default i.fa { font-size: 14px !important; - margin-right: 5px; + //margin-right: 5px; } .el-button--small i.iconfont, .el-button--small i.fa { @@ -100,7 +100,7 @@ background-color: unset !important; } // 子级菜单背景颜色 -// .el-menu--inline { +// .el-homeMenu--inline { // background: var(--next-bg-menuBar-light-1); // } // 水平菜单、横向菜单折叠 a 标签 -- Gitblit v1.9.2