From ca055e9792329ef0828b376c174b292d30ce8384 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Mon, 30 Jun 2025 11:20:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/index.scss | 16 +-
src/assets/styles/sidebar.scss | 2 +-
src/layout/components/AppMain.vue | 10 +-
src/router/index.js | 14 +
src/views/labelManage/adminApproval/index.vue | 10 +-
src/views/labelManage/escApproval/index.vue | 10 +-
src/views/qualification/dashboard/index.vue | 10 +-
src/views/qualification/escApproval/index.vue | 10 +-
.../escTask/components/LableApply.vue | 2 +-
.../escTask/components/QualificationApply.vue | 2 +-
src/views/qualification/escTask/index.vue | 8 +-
.../components/LableApplyForm.vue | 8 +-
.../components/QualificationApplyForm.vue | 8 +-
.../qualification/myQualifications/index.vue | 6 +-
.../qualification/trainApproval/index.vue | 10 +-
.../qualification/vehicleTrain/index.vue | 10 +-
src/views/safetyReview/dashboard/index.vue | 507 ++++++++++++++++
.../examinerApproval/approvalDetail.vue | 544 ++++++++++++++++++
.../safetyReview/examinerApproval/index.vue | 384 +++++++++++++
.../examinerEscTask/approvalDetail.vue | 544 ++++++++++++++++++
.../safetyReview/examinerEscTask/index.vue | 384 +++++++++++++
.../examinerTasks/addTaskForm.vue | 483 ++++++++++++++++
.../safetyReview/examinerTasks/index.vue | 371 ++++++++++++
23 files changed, 3273 insertions(+), 80 deletions(-)
create mode 100644 src/views/safetyReview/dashboard/index.vue
create mode 100644 src/views/safetyReview/examinerApproval/approvalDetail.vue
create mode 100644 src/views/safetyReview/examinerApproval/index.vue
create mode 100644 src/views/safetyReview/examinerEscTask/approvalDetail.vue
create mode 100644 src/views/safetyReview/examinerEscTask/index.vue
create mode 100644 src/views/safetyReview/examinerTasks/addTaskForm.vue
create mode 100644 src/views/safetyReview/examinerTasks/index.vue
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 @@
-
+
{{ scope.$index + 1 }}
@@ -252,14 +252,6 @@ const handleApproval = () => {
clear: both;
}
-.app-container {
- height: calc(100vh - 140px);
- width: 1200px;
- margin: 0 auto;
- background: #ffffff;
- padding: 20px 20px 0 20px;
-}
-
.myRow {
margin-left: 0 !important;
margin-right: 0 !important;
diff --git a/src/views/labelManage/escApproval/index.vue b/src/views/labelManage/escApproval/index.vue
index e99c0c1..701386e 100644
--- a/src/views/labelManage/escApproval/index.vue
+++ b/src/views/labelManage/escApproval/index.vue
@@ -53,7 +53,7 @@
-
+
{{ scope.$index + 1 }}
@@ -251,14 +251,6 @@ const handleApproval = () => {
clear: both;
}
-.app-container {
- height: calc(100vh - 140px);
- width: 1200px;
- margin: 0 auto;
- background: #ffffff;
- padding: 20px 20px 0 20px;
-}
-
.myRow {
margin-left: 0 !important;
margin-right: 0 !important;
diff --git a/src/views/qualification/dashboard/index.vue b/src/views/qualification/dashboard/index.vue
index 50790af..1c8d445 100644
--- a/src/views/qualification/dashboard/index.vue
+++ b/src/views/qualification/dashboard/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -389,14 +389,6 @@ const initVehicleTrainBar = () => {
clear: both;
}
-.app-container {
- height: calc(100vh - 140px);
- width: 1200px;
- margin: 0 auto;
- overflow-y: auto;
- background: #F8F8F8;
-}
-
.searchPanel {
background: #FFFFFF;
padding: 20px 20px 0 20px;
diff --git a/src/views/qualification/escApproval/index.vue b/src/views/qualification/escApproval/index.vue
index def8253..2c7667e 100644
--- a/src/views/qualification/escApproval/index.vue
+++ b/src/views/qualification/escApproval/index.vue
@@ -53,7 +53,7 @@
-
+
{{ scope.$index + 1 }}
@@ -256,14 +256,6 @@ const handleApproval = () => {
clear: both;
}
-.app-container {
- height: calc(100vh - 140px);
- width: 1200px;
- margin: 0 auto;
- background: #ffffff;
- padding: 20px 20px 0 20px;
-}
-
.myRow {
margin-left: 0 !important;
margin-right: 0 !important;
diff --git a/src/views/qualification/escTask/components/LableApply.vue b/src/views/qualification/escTask/components/LableApply.vue
index 071c787..60d8fba 100644
--- a/src/views/qualification/escTask/components/LableApply.vue
+++ b/src/views/qualification/escTask/components/LableApply.vue
@@ -32,7 +32,7 @@
-
+
{{ scope.$index + 1 }}
diff --git a/src/views/qualification/escTask/components/QualificationApply.vue b/src/views/qualification/escTask/components/QualificationApply.vue
index 34b5c25..c37b434 100644
--- a/src/views/qualification/escTask/components/QualificationApply.vue
+++ b/src/views/qualification/escTask/components/QualificationApply.vue
@@ -35,7 +35,7 @@
-
+
{{ scope.$index + 1 }}
diff --git a/src/views/qualification/escTask/index.vue b/src/views/qualification/escTask/index.vue
index 90e2fbb..da11e71 100644
--- a/src/views/qualification/escTask/index.vue
+++ b/src/views/qualification/escTask/index.vue
@@ -56,13 +56,7 @@ onBeforeMount(() => {
.clearBoth {
clear: both;
}
-.app-container {
- height: calc(100vh - 140px);
- width: 1200px;
- margin: 0 auto;
- background: #ffffff;
- padding: 20px 20px 0 20px;
-}
+
// .page-container {
// padding: 20px;
// background: #ffffff;
diff --git a/src/views/qualification/myQualifications/components/LableApplyForm.vue b/src/views/qualification/myQualifications/components/LableApplyForm.vue
index e44eed7..c75ebef 100644
--- a/src/views/qualification/myQualifications/components/LableApplyForm.vue
+++ b/src/views/qualification/myQualifications/components/LableApplyForm.vue
@@ -1,5 +1,5 @@
-
+
-
+
取消
提交
@@ -197,7 +197,7 @@ const handleSubmit = () => {
}
\ No newline at end of file
diff --git a/src/views/safetyReview/examinerApproval/approvalDetail.vue b/src/views/safetyReview/examinerApproval/approvalDetail.vue
new file mode 100644
index 0000000..5fc2f56
--- /dev/null
+++ b/src/views/safetyReview/examinerApproval/approvalDetail.vue
@@ -0,0 +1,544 @@
+
+
+
+
+
+ {{
+ item.title }}
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ES
+
+
+
+
+ XXXX部门
+
+
+
+
+ XXX科室
+
+
+
+
+ NO.43242342
+
+
+
+
+ 管思成
+
+
+
+
+ GuangSiCheng
+
+
+
+
+ XXX属地
+
+
+
+
+ 赵文杰
+
+
+
+
+ 2024-12-24 14:23
+
+
+
+
+
+
+ 待审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 正常
+ 过期
+
+
+
+
+ {{ scope.row.startTime
+ }}
+ -
+
+
+
+
+ {{ scope.row.expireTime
+ }}
+ -
+
+
+
+
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+ {{ scope.row.approvalTime
+ }}
+ -
+
+
+
+
+
+
+
+
+
+
+
+ 驳回
+ 通过
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/safetyReview/examinerApproval/index.vue b/src/views/safetyReview/examinerApproval/index.vue
new file mode 100644
index 0000000..b2837ce
--- /dev/null
+++ b/src/views/safetyReview/examinerApproval/index.vue
@@ -0,0 +1,384 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 展开
+
+
+ 折叠
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+ 待审核
+ 通过
+ 驳回
+
+
+
+
+ 查看
+ 审批
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/safetyReview/examinerEscTask/approvalDetail.vue b/src/views/safetyReview/examinerEscTask/approvalDetail.vue
new file mode 100644
index 0000000..5fc2f56
--- /dev/null
+++ b/src/views/safetyReview/examinerEscTask/approvalDetail.vue
@@ -0,0 +1,544 @@
+
+
+
+
+
+ {{
+ item.title }}
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ES
+
+
+
+
+ XXXX部门
+
+
+
+
+ XXX科室
+
+
+
+
+ NO.43242342
+
+
+
+
+ 管思成
+
+
+
+
+ GuangSiCheng
+
+
+
+
+ XXX属地
+
+
+
+
+ 赵文杰
+
+
+
+
+ 2024-12-24 14:23
+
+
+
+
+
+
+ 待审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 正常
+ 过期
+
+
+
+
+ {{ scope.row.startTime
+ }}
+ -
+
+
+
+
+ {{ scope.row.expireTime
+ }}
+ -
+
+
+
+
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+ {{ scope.row.approvalTime
+ }}
+ -
+
+
+
+
+
+
+
+
+
+
+
+ 驳回
+ 通过
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/safetyReview/examinerEscTask/index.vue b/src/views/safetyReview/examinerEscTask/index.vue
new file mode 100644
index 0000000..b2837ce
--- /dev/null
+++ b/src/views/safetyReview/examinerEscTask/index.vue
@@ -0,0 +1,384 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 展开
+
+
+ 折叠
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+ 待审核
+ 通过
+ 驳回
+
+
+
+
+ 查看
+ 审批
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/safetyReview/examinerTasks/addTaskForm.vue b/src/views/safetyReview/examinerTasks/addTaskForm.vue
new file mode 100644
index 0000000..0d51849
--- /dev/null
+++ b/src/views/safetyReview/examinerTasks/addTaskForm.vue
@@ -0,0 +1,483 @@
+
+
+
+
+
+ {{
+ item.title }}
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 正常
+ 过期
+
+
+
+
+ {{ scope.row.startTime
+ }}
+ -
+
+
+
+
+ {{ scope.row.expireTime
+ }}
+ -
+
+
+
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/safetyReview/examinerTasks/index.vue b/src/views/safetyReview/examinerTasks/index.vue
new file mode 100644
index 0000000..1f4a1a6
--- /dev/null
+++ b/src/views/safetyReview/examinerTasks/index.vue
@@ -0,0 +1,371 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.startTime }}
+ -
+
+
+
+
+ {{ scope.row.expireTime }}
+ -
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
\ No newline at end of file