From 9b5583e49b8871b85463c836e2a0dd05df8a2729 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 4 Jan 2024 09:23:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/dist/index.html | 2 +- client/src/router/index.js | 2 +- client/src/views/testvideo/certificate.vue | 43 +++++++++++----------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/client/dist/index.html b/client/dist/index.html index bddc307..e8d6d95 100644 --- a/client/dist/index.html +++ b/client/dist/index.html @@ -1 +1 @@ -vue Admin Template
\ No newline at end of file +vue Admin Template
\ No newline at end of file diff --git a/client/src/router/index.js b/client/src/router/index.js index 4afc899..f9a435c 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -430,7 +430,7 @@ export const asyncRoutes = [ path: 'course', name: 'course', component: () => import('@/views/testvideo/course.vue'), - meta: { title: '课程列表'} + meta: { title: '课程列表', perms: ['certificate']} }, { path: 'videolist', diff --git a/client/src/views/testvideo/certificate.vue b/client/src/views/testvideo/certificate.vue index f95151e..7464f78 100644 --- a/client/src/views/testvideo/certificate.vue +++ b/client/src/views/testvideo/certificate.vue @@ -94,7 +94,7 @@ - + @@ -155,23 +155,26 @@ > - + + + + + + + - - - - - - - + + + + + + - - - - - - @@ -357,6 +356,8 @@ export default { 证书编号: [{ required: true, message: "请填写", trigger: "blur" }], 所属单位: [{ required: true, message: "请填写", trigger: "blur" }], 单位名称: [{ required: true, message: "请填写", trigger: "blur" }], + 证书方案: [{ required: true, message: "请选择", trigger: "blur" }], + 姓名: [{ required: true, message: "请填写", trigger: "blur" }], }, courseOption:[], planOption:["202309","202312"], From 1663cd88ad0ff6ccebe0fc006524d5647d6125c6 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 4 Jan 2024 09:27:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/dist/index.html | 2 +- client/src/views/testvideo/certificate.vue | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/dist/index.html b/client/dist/index.html index e8d6d95..b82c2dc 100644 --- a/client/dist/index.html +++ b/client/dist/index.html @@ -1 +1 @@ -vue Admin Template
\ No newline at end of file +vue Admin Template
\ No newline at end of file diff --git a/client/src/views/testvideo/certificate.vue b/client/src/views/testvideo/certificate.vue index 7464f78..3f3a359 100644 --- a/client/src/views/testvideo/certificate.vue +++ b/client/src/views/testvideo/certificate.vue @@ -94,7 +94,9 @@ - + + + From 9a53418b17a83f8a5c7615f2d34ee1b785a85beb Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 4 Jan 2024 09:32:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/dist/index.html | 2 +- client/src/views/testvideo/certificate.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/dist/index.html b/client/dist/index.html index b82c2dc..3ef4821 100644 --- a/client/dist/index.html +++ b/client/dist/index.html @@ -1 +1 @@ -vue Admin Template
\ No newline at end of file +vue Admin Template
\ No newline at end of file diff --git a/client/src/views/testvideo/certificate.vue b/client/src/views/testvideo/certificate.vue index 3f3a359..bb8c358 100644 --- a/client/src/views/testvideo/certificate.vue +++ b/client/src/views/testvideo/certificate.vue @@ -96,7 +96,7 @@ - + From 214a0f10b46f94fe56591849d1bf66ccc2c86f2b Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 4 Jan 2024 10:39:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/views/testvideo/certificate.vue | 6 +++++- server/dist/index_zs.html | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/src/views/testvideo/certificate.vue b/client/src/views/testvideo/certificate.vue index bb8c358..7a4713c 100644 --- a/client/src/views/testvideo/certificate.vue +++ b/client/src/views/testvideo/certificate.vue @@ -73,7 +73,8 @@ 导入证书 - 202312模板 + + 202312模板 @@ -363,11 +364,14 @@ export default { }, courseOption:[], planOption:["202309","202312"], + fileUrl:'' }; }, mounted() { this.getList(); this.getCourseList(); + let timers = new Date().getTime(); + this.fileUrl ='/media/cert/template/cert-202312.xlsx?time='+timers; }, methods: { checkPermission, diff --git a/server/dist/index_zs.html b/server/dist/index_zs.html index 7ed288e..8a7c265 100644 --- a/server/dist/index_zs.html +++ b/server/dist/index_zs.html @@ -215,10 +215,11 @@ user-scalable: 用户是否能缩放页面 -->
姓名：{{item.姓名}}
+
单位名称：{{item.单位名称}}
证书编号：{{item.证书编号}}
培训日期：{{item.培训日期}}
培训结束日期：{{item.培训结束日期}}
-
培训日期：{{item.发证日期}}
+
发证日期{{item.发证日期}}