From ab93425d83959109ae31c816f98065b7dde288f4 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Fri, 15 Mar 2024 17:56:45 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/element.scss | 4 + src/assets/js/data_dictionary.js | 7 + src/request/training_process_management.js | 18 +- .../exam_paper_management/add.vue | 379 +++++++++++++++++- .../components/add_test_questions.vue | 250 ++++++++++++ .../exam_paper_management/index.vue | 4 +- 6 files changed, 656 insertions(+), 6 deletions(-) create mode 100644 src/views/training_process_management/exam_paper_management/components/add_test_questions.vue diff --git a/src/assets/css/element.scss b/src/assets/css/element.scss index 5157b2c..fa119dd 100644 --- a/src/assets/css/element.scss +++ b/src/assets/css/element.scss @@ -418,3 +418,7 @@ .el-color-predefine__color-selector.selected { --el-color-primary: #fff !important; } + +.el-input-number.is-disabled .el-input-number__decrease, .el-input-number.is-disabled .el-input-number__increase{ + border-color: var(--el-border-color) !important; +} diff --git a/src/assets/js/data_dictionary.js b/src/assets/js/data_dictionary.js index dc19f53..8c8b0dd 100644 --- a/src/assets/js/data_dictionary.js +++ b/src/assets/js/data_dictionary.js @@ -241,3 +241,10 @@ export const layoutFnGetTrainingLevel = async (params) => { const resData = await getTrainingLevel(params); return ref(resData.varList); }; +// 试题标签 +export const layoutFnGetTestQuestionLabels = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "a60ebc858e2c46108bf82bbd8acc8f50", + }); + return ref(resData.list); +}; diff --git a/src/request/training_process_management.js b/src/request/training_process_management.js index ad0934b..93e761e 100644 --- a/src/request/training_process_management.js +++ b/src/request/training_process_management.js @@ -1,4 +1,20 @@ -import { post } from "@/request/axios.js"; +import { post, upload } from "@/request/axios.js"; export const setExamPaperManagementDelete = (params) => post("/stageexampaperinput/delete", params); // 试卷管理删除 +export const setExamPaperManagementAdd = (params) => + upload("/stageexampaperinput/add", params); // 试卷管理添加 +export const setExamPaperManagementEdit = (params) => + upload("/stageexampaperinput/edit", params); // 试卷管理修改 +export const setExamPaperManagementInherit = (params) => + post("/stageexampaperinput/inherit", params); // 试卷管理继承 +export const setExamPaperManagementAddToDraft = (params) => + upload("/stageexampaperCache/add", params); // 试卷管理保存到草稿 +export const setExamPaperManagementTestQuestionsDelete = (params) => + post("/paperQuestion/delete", params); // 试卷管理试题删除 +export const setExamPaperManagementTestQuestionsAdd = (params) => + post("/paperQuestion/add", params); // 试卷管理试题新增 +export const setExamPaperManagementTestQuestionsEdit = (params) => + post("/paperQuestion/edit", params); // 试卷管理试题修改 +export const getAssociatedCoursewareNameList = (params) => + post("/videocourseware/getCourseWareName", params); // 关联课件名称 diff --git a/src/views/training_process_management/exam_paper_management/add.vue b/src/views/training_process_management/exam_paper_management/add.vue index f157976..9257298 100644 --- a/src/views/training_process_management/exam_paper_management/add.vue +++ b/src/views/training_process_management/exam_paper_management/add.vue @@ -1,7 +1,380 @@ - + + + diff --git a/src/views/training_process_management/exam_paper_management/components/add_test_questions.vue b/src/views/training_process_management/exam_paper_management/components/add_test_questions.vue new file mode 100644 index 0000000..3cc789c --- /dev/null +++ b/src/views/training_process_management/exam_paper_management/components/add_test_questions.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/training_process_management/exam_paper_management/index.vue b/src/views/training_process_management/exam_paper_management/index.vue index 722d561..1eb9420 100644 --- a/src/views/training_process_management/exam_paper_management/index.vue +++ b/src/views/training_process_management/exam_paper_management/index.vue @@ -93,7 +93,7 @@ 查看 Date: Fri, 15 Mar 2024 17:59:16 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exam_paper_management/add.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/training_process_management/exam_paper_management/add.vue b/src/views/training_process_management/exam_paper_management/add.vue index 9257298..4c34b34 100644 --- a/src/views/training_process_management/exam_paper_management/add.vue +++ b/src/views/training_process_management/exam_paper_management/add.vue @@ -144,7 +144,9 @@
编辑 - 删除 + + 删除 +
@@ -280,17 +282,17 @@ const fnAddTestQuestionsConfirm = (value) => { }; const fnDelete = debounce( 1000, - async (row, index) => { + async (PAPER_QUESTION_ID, index) => { await ElMessageBox.confirm("确定要删除吗?", { type: "warning", }); if (type === "inherit") { list.value.splice(index, 1); - data.form.EXAMSCORE = data.form.EXAMSCORE - row.SCORE; + data.form.EXAMSCORE = sumBy(list.value, (item) => +item.SCORE); ElMessage.success("删除成功"); } else { await setExamPaperManagementTestQuestionsDelete({ - PAPER_QUESTION_ID: row.PAPER_QUESTION_ID, + PAPER_QUESTION_ID, STAGEEXAMPAPERINPUT_ID, }); ElMessage.success("删除成功"); From fa41f42465c50f9caa73041658ee0bacd54af896 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Mon, 18 Mar 2024 18:01:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/data_dictionary.js | 4 +- src/components/learning_train_type/index.vue | 1205 +---------------- src/request/axios.js | 4 +- src/request/data_dictionary.js | 2 +- src/request/training_process_management.js | 12 + .../class_management/add.vue | 57 + .../components/basic_info.vue | 374 +++++ .../components/curriculum.vue | 7 + .../class_management/components/delay.vue | 61 + .../components/modify_exam_times.vue | 70 + .../class_management/components/student.vue | 7 + .../class_management/index.vue | 334 +++++ .../components/add_test_questions.vue | 14 +- .../course_management/add.vue | 5 + .../course_management/index.vue | 5 + .../video_courseware/index.vue | 1 + 16 files changed, 964 insertions(+), 1198 deletions(-) create mode 100644 src/views/training_process_management/class_management/add.vue create mode 100644 src/views/training_process_management/class_management/components/basic_info.vue create mode 100644 src/views/training_process_management/class_management/components/curriculum.vue create mode 100644 src/views/training_process_management/class_management/components/delay.vue create mode 100644 src/views/training_process_management/class_management/components/modify_exam_times.vue create mode 100644 src/views/training_process_management/class_management/components/student.vue create mode 100644 src/views/training_process_management/class_management/index.vue diff --git a/src/assets/js/data_dictionary.js b/src/assets/js/data_dictionary.js index 8c8b0dd..386a05c 100644 --- a/src/assets/js/data_dictionary.js +++ b/src/assets/js/data_dictionary.js @@ -224,12 +224,12 @@ export const layoutFnGetInsuranceCompany = async () => { // 培训类型 export const layoutFnGetTrainingType = async (params) => { const resData = await getTrainingType(params); - return ref(resData.trainingtypelist); + return ref(resData.varList); }; // 行业类型 export const layoutFnGetIndustryType = async (params) => { const resData = await getIndustryType(params); - return ref(JSON.parse(resData.zTreeNodes)); + return ref(resData.zTreeNodes); }; // 岗位类型 export const layoutFnGetPostType = async (params) => { diff --git a/src/components/learning_train_type/index.vue b/src/components/learning_train_type/index.vue index c05f606..57eace5 100644 --- a/src/components/learning_train_type/index.vue +++ b/src/components/learning_train_type/index.vue @@ -1,5 +1,9 @@ - + diff --git a/src/views/training_process_management/class_management/components/student.vue b/src/views/training_process_management/class_management/components/student.vue index bda425b..b44b53c 100644 --- a/src/views/training_process_management/class_management/components/student.vue +++ b/src/views/training_process_management/class_management/components/student.vue @@ -1,7 +1,348 @@ - + diff --git a/src/views/training_process_management/class_management/index.vue b/src/views/training_process_management/class_management/index.vue index 208f0ca..7191d34 100644 --- a/src/views/training_process_management/class_management/index.vue +++ b/src/views/training_process_management/class_management/index.vue @@ -174,6 +174,8 @@ STATE: row.STATE, CLASS_ID: row.CLASS_ID, TRAINTYPE: row.TRAINTYPE, + EXAMINATION: row.EXAMINATION, + type: row.STATE === '1' ? 'edit' : 'view', }, }) " @@ -191,6 +193,8 @@ STATE: row.STATE, CLASS_ID: row.CLASS_ID, TRAINTYPE: row.TRAINTYPE, + EXAMINATION: row.EXAMINATION, + type: 'edit', }, }) " @@ -208,6 +212,8 @@ STATE: row.STATE, CLASS_ID: row.CLASS_ID, TRAINTYPE: row.TRAINTYPE, + EXAMINATION: row.EXAMINATION, + type: 'edit', }, }) " @@ -240,6 +246,7 @@ @click=" router.push({ path: '/training_process_management/class_management/add', + query: { type: 'add' }, }) " > From 39ccafdc176b99049a8393e27061ff3246fe9851 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Tue, 19 Mar 2024 17:43:42 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86/?= =?UTF-8?q?=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/training_process_management.js | 6 + .../components/exam_details.vue | 107 ++++++++++++++++++ .../components/exam_records.vue | 102 +++++++++++++++++ .../components/learning_records.vue | 74 ++++++++++++ .../class_management/components/student.vue | 14 ++- .../class_management/learning_records.vue | 38 +++++++ 6 files changed, 339 insertions(+), 2 deletions(-) create mode 100644 src/views/training_process_management/class_management/components/exam_details.vue create mode 100644 src/views/training_process_management/class_management/components/exam_records.vue create mode 100644 src/views/training_process_management/class_management/components/learning_records.vue create mode 100644 src/views/training_process_management/class_management/learning_records.vue diff --git a/src/request/training_process_management.js b/src/request/training_process_management.js index 718b0b6..dc1a0d3 100644 --- a/src/request/training_process_management.js +++ b/src/request/training_process_management.js @@ -40,3 +40,9 @@ export const getClassManagementSelectStudentList = (params) => post("/user/studentList", params); // 班级管理新增学员列表 export const getClassManagementSelectStudentAdd = (params) => post("/student/add", params); // 班级管理新增学员保存 +export const getClassManagementStudentLearningRecordsList = (params) => + post("/coursestudyvideorecord/getAllByuserInfo", params); // 班级管理学员学习记录列表 +export const getClassManagementStudentExamRecordsList = (params) => + post("/stageexam/list", params); // 班级管理学员考试记录列表 +export const getClassManagementStudentExamRecordsView = (params) => + post("/stageexam/findExam", params); // 班级管理学员考试记录查看 diff --git a/src/views/training_process_management/class_management/components/exam_details.vue b/src/views/training_process_management/class_management/components/exam_details.vue new file mode 100644 index 0000000..78531be --- /dev/null +++ b/src/views/training_process_management/class_management/components/exam_details.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/src/views/training_process_management/class_management/components/exam_records.vue b/src/views/training_process_management/class_management/components/exam_records.vue new file mode 100644 index 0000000..3831000 --- /dev/null +++ b/src/views/training_process_management/class_management/components/exam_records.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/views/training_process_management/class_management/components/learning_records.vue b/src/views/training_process_management/class_management/components/learning_records.vue new file mode 100644 index 0000000..075dbb9 --- /dev/null +++ b/src/views/training_process_management/class_management/components/learning_records.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/src/views/training_process_management/class_management/components/student.vue b/src/views/training_process_management/class_management/components/student.vue index b44b53c..751aeae 100644 --- a/src/views/training_process_management/class_management/components/student.vue +++ b/src/views/training_process_management/class_management/components/student.vue @@ -143,9 +143,19 @@ > 从本班移除
- + 学习记录 - diff --git a/src/views/training_process_management/class_management/learning_records.vue b/src/views/training_process_management/class_management/learning_records.vue new file mode 100644 index 0000000..fb436e9 --- /dev/null +++ b/src/views/training_process_management/class_management/learning_records.vue @@ -0,0 +1,38 @@ + + + + + From 3bb1832d685f9e800558e048c76579ae36b23b4c Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Tue, 19 Mar 2024 18:00:48 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86/?= =?UTF-8?q?=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../class_management/components/basic_info.vue | 5 ++++- .../class_management/index.vue | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/training_process_management/class_management/components/basic_info.vue b/src/views/training_process_management/class_management/components/basic_info.vue index b8a6df9..bade4d1 100644 --- a/src/views/training_process_management/class_management/components/basic_info.vue +++ b/src/views/training_process_management/class_management/components/basic_info.vue @@ -202,7 +202,9 @@
- 保存 + + {{ !CLASS_ID ? "保存并下一步" : "保存" }} +
Date: Wed, 20 Mar 2024 08:31:26 +0800 Subject: [PATCH 08/10] axios --- src/request/axios.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/request/axios.js b/src/request/axios.js index 80f06e9..2fc5409 100644 --- a/src/request/axios.js +++ b/src/request/axios.js @@ -59,8 +59,8 @@ axios.interceptors.response.use( import.meta.env.DEV && ElMessage.error(`连接错误${error.response.status}`); endLoading(); - // ElMessage.error("登录失效,请重新登陆"); - // router.push("/login").then(); + ElMessage.error("登录失效,请重新登陆"); + router.push("/login").then(); } } else { error.message = "连接到服务器失败"; From 1ffbba0de986603fb8cda2993b5eb4dc03e68d43 Mon Sep 17 00:00:00 2001 From: zhangyanli Date: Wed, 20 Mar 2024 10:02:16 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=92=8C=E6=95=88=E6=9E=9C=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/training_archive_management.js | 36 ++- .../enterprise/archives.vue | 8 + .../enterprise/components/capital.vue | 140 +++++++-- .../enterprise/components/capital_add.vue | 153 ++++++++++ .../enterprise/components/edumanager.vue | 36 +-- .../enterprise/components/eduplan.vue | 66 ++-- .../enterprise/components/pdf.vue | 125 +++++--- .../enterprise/components/postman.vue | 138 +++++++-- .../enterprise/components/postman_add.vue | 141 +++++++++ .../enterprise/components/teacher.vue | 32 +- .../semester/components/results.vue | 8 +- .../semester/components/training_schedule.vue | 6 +- .../semester/handout_list.vue | 26 +- .../semester/paper_list.vue | 45 +-- src/views/archives_management/user/index.vue | 44 ++- .../components/classStrengthen.vue | 211 +++++++++++++ .../components/studentStrengthen.vue | 283 ++++++++++++++++++ .../enterprise_effect/index.vue | 126 ++++++++ .../studentStrengthenDetailsList.vue | 128 ++++++++ 19 files changed, 1505 insertions(+), 247 deletions(-) create mode 100644 src/views/archives_management/enterprise/components/capital_add.vue create mode 100644 src/views/archives_management/enterprise/components/postman_add.vue create mode 100644 src/views/effect_appraisal/enterprise_effect/components/classStrengthen.vue create mode 100644 src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue create mode 100644 src/views/effect_appraisal/enterprise_effect/index.vue create mode 100644 src/views/effect_appraisal/enterprise_effect/studentStrengthenDetailsList.vue diff --git a/src/request/training_archive_management.js b/src/request/training_archive_management.js index 073eb29..d1f8490 100644 --- a/src/request/training_archive_management.js +++ b/src/request/training_archive_management.js @@ -1,4 +1,4 @@ -import { post } from "@/request/axios.js"; +import { post, upload } from "@/request/axios.js"; export const getStudentsList = (params) => post("/archives/getStudentsList", params); // 一人一档用户列表 @@ -24,6 +24,8 @@ export const getLearningRecord = (params) => export const getDict = (params) => post("/dictionaries/getLevels", params); // 获取人员类型 export const downloadFilesdetailword = (params) => post("/archives/filesdetailword", params); // 一人一档:档案详情导出 +export const downloadAward = (params) => + post("/archives/batchDownloadWord", params); // 一人一档:补充档案导出 export const getClassPapers = (params) => post("/archives/getClassPapers", params); // 一期一档:班级试卷列表 @@ -70,12 +72,19 @@ export const downloadSign = (params) => post("/archives/sign", params); // 一 export const downloadAllwordzip = (params) => post("/archivesallcorpword/allwordzip", params); // 一企一档:档案目录 -export const getArchivesfilesList = (params) => - post("/archivesfiles/list", params); // 一企一档列表 export const getArchivesPostmanList = (params) => post("/archivespostman/list", params); // 一企一档:年度三岗人员管理台账列表 export const downloadPersonmanage = (params) => post("/archivespostman/personmanage", params); // 一企一档:三岗人员管理台账导出 +export const getPostmanView = (params) => + post("/archivespostman/goEdit", params); // 一企一档:三岗人员管理台账查看 +export const setPostmanDelete = (params) => + post("/archivespostman/delete", params); // 一企一档:三岗人员管理台账删除 +export const setPostmanAdd = (params) => upload("/archivespostman/add", params); // 一企一档:三岗人员管理台账添加 +export const setPostmanEdit = (params) => + upload("/archivespostman/edit", params); // 一企一档:三岗人员管理台账修改 +export const setPostmanImport = (params) => + upload("/archivespostman/readExcel", params); // 一企一档:三岗人员管理台账导入 export const getArchivesTeacherList = (params) => post("/archivesteacher/list", params); // 一企一档:年度本单位师资管理台账 export const getArchivesPlanList = (params) => @@ -84,6 +93,18 @@ export const getArchivesManagerList = (params) => post("/archivesedumanager/list", params); // 一企一档:年度安全培训教育管理台账 export const getArchivesCapitalList = (params) => post("/archivescapital/list", params); // 一企一档:年度培训资金提取和使用情况管理台账 +export const setCapitalDelete = (params) => + post("/archivescapital/delete", params); // 一企一档:年度培训资金提取和使用情况管理台账删除 +export const getCapitalView = (params) => + post("/archivescapital/goEdit", params); // 一企一档:年度培训资金提取和使用情况管理台账查看 +export const setCapitalAdd = (params) => post("/archivescapital/add", params); // 一企一档:年度培训资金提取和使用情况管理台账添加 +export const setCapitalEdit = (params) => post("/archivescapital/edit", params); // 一企一档:年度培训资金提取和使用情况管理台账修改 +export const setArchivesFilesUpload = (params) => + upload("/archivesfiles/add", params); // 一企一档:上传pdf文件 +export const getArchivesFilesList = (params) => + post("/archivesfiles/listAll", params); // 一企一档:获取附件 +export const setArchivesFilesDelete = (params) => + post("/archivesfiles/delete", params); // 一企一档:删除附件 export const downloadFundmanageword = (params) => post("/archivescapital/fundmanageword", params); // 一企一档:年度培训资金提取和使用情况管理台账导出 export const downloadTrainingplanword = (params) => @@ -96,3 +117,12 @@ export const downloadTeacherword = (params) => export const getPdffileList = (params) => post("/archivespdffile/list", params); // 档案下载重新下载 export const redownLoad = (params) => post("/archivespdffile/redownload", params); // 档案下载重新下载 +export const getClassStrengthenDetailsList = (params) => + post("/class/strengthenlist", params); // 效果评估:班级列表 +export const getStudentStrengthenDetailsList = (params) => + post("/class/strengthenstudentlist", params); // 效果评估:学员列表 +export const getClassEvaluation = (params) => + post("/class/getEvaluation", params); // 获取班级效果评估表信息 +export const getStudentEvaluation = (params) => + post("/student/getEvaluation", params); // 获取个人效果评估表信息 +export const downloadClassEvaluation = (params) => post("class/hs", params); // 导出班级效果评估表信息 diff --git a/src/views/archives_management/enterprise/archives.vue b/src/views/archives_management/enterprise/archives.vue index 00c5888..4d2377f 100644 --- a/src/views/archives_management/enterprise/archives.vue +++ b/src/views/archives_management/enterprise/archives.vue @@ -34,6 +34,7 @@ v-if="data.component" v-model:type="data.type" :title="data.title" + :corp-name="data.corp_name" :year="data.YEAR" /> @@ -53,6 +54,7 @@ import Eduplan from "./components/eduplan"; import Edumanager from "./components/edumanager"; import Capital from "./components/capital"; import { downloadAllwordzip } from "@/request/training_archive_management.js"; +import { getEnterpriseInfo } from "@/request/enterprise_management.js"; const data = reactive({ list: [ @@ -81,8 +83,14 @@ const data = reactive({ YEAR: dayjs().format("YYYY"), component: "", type: "", + corp_name: "", title: "", }); +const fnGetData = async () => { + const resData = await getEnterpriseInfo(); + data.corp_name = resData.pd.CORP_NAME; +}; +fnGetData(); const fnExport = debounce( 1000, async () => { diff --git a/src/views/archives_management/enterprise/components/capital.vue b/src/views/archives_management/enterprise/components/capital.vue index 6ed7c22..13bb0c8 100644 --- a/src/views/archives_management/enterprise/components/capital.vue +++ b/src/views/archives_management/enterprise/components/capital.vue @@ -6,13 +6,22 @@ @close="fnClose" >
+ 新增 + 删除 导出

{{ year }}年度培训资金提取和使用情况管理台账

-

单位名称:{{ name }}

- +

单位名称:{{ corpName }}

+ @@ -32,6 +41,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
制表人:
编制日期:
@@ -45,17 +91,28 @@ 关闭 + + + diff --git a/src/views/archives_management/enterprise/components/edumanager.vue b/src/views/archives_management/enterprise/components/edumanager.vue index 4f669cc..282438f 100644 --- a/src/views/archives_management/enterprise/components/edumanager.vue +++ b/src/views/archives_management/enterprise/components/edumanager.vue @@ -11,8 +11,8 @@

{{ year }}年度安全培训教育管理台账

-

单位名称:{{ name }}

- +

单位名称:{{ corpName }}

+ @@ -27,9 +27,7 @@ - - {{ name }} - + 线上考核 @@ -60,13 +58,14 @@ diff --git a/src/views/archives_management/enterprise/components/postman.vue b/src/views/archives_management/enterprise/components/postman.vue index c7cfdd0..68759c1 100644 --- a/src/views/archives_management/enterprise/components/postman.vue +++ b/src/views/archives_management/enterprise/components/postman.vue @@ -6,13 +6,23 @@ @close="fnClose" >
+ 新增 + 删除 + 导入 导出

{{ year }}年度三岗人员管理台账

-

单位名称:{{ name }}

- +

单位名称:{{ corpName }}

+ @@ -30,12 +40,31 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + +
档案管理人员:
更新日期:
@@ -43,18 +72,36 @@ + + + + diff --git a/src/views/archives_management/enterprise/components/teacher.vue b/src/views/archives_management/enterprise/components/teacher.vue index a0aaadc..af4a586 100644 --- a/src/views/archives_management/enterprise/components/teacher.vue +++ b/src/views/archives_management/enterprise/components/teacher.vue @@ -11,8 +11,8 @@

{{ year }}年度本单位师资管理台账

-

单位名称:{{ name }}

- +

单位名称:{{ corpName }}

+ @@ -37,13 +37,14 @@ +const fnBatchDownload = debounce( + 1000, + async () => { + const selectionData = tableRef.value.getSelectionRows(); + if (selectionData.length === 0) { + ElMessage.warning("请选中要下载的学员补充档案..."); + return; + } + const ids = selectionData + .map((item) => { + return item.USER_ID; + }) + .join(","); + await downloadAward({ + ids, + }); + await ElMessageBox.confirm( + "导出后请前往档案下载中下载该档案!", + "温馨提示", + { type: "info" } + ); + tableRef.value.clearSelection(); + }, + { atBegin: true } +); + diff --git a/src/views/effect_appraisal/enterprise_effect/components/classStrengthen.vue b/src/views/effect_appraisal/enterprise_effect/components/classStrengthen.vue new file mode 100644 index 0000000..168fa95 --- /dev/null +++ b/src/views/effect_appraisal/enterprise_effect/components/classStrengthen.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue b/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue new file mode 100644 index 0000000..29e10e2 --- /dev/null +++ b/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue @@ -0,0 +1,283 @@ + + + + + diff --git a/src/views/effect_appraisal/enterprise_effect/index.vue b/src/views/effect_appraisal/enterprise_effect/index.vue new file mode 100644 index 0000000..f83314e --- /dev/null +++ b/src/views/effect_appraisal/enterprise_effect/index.vue @@ -0,0 +1,126 @@ + + + + diff --git a/src/views/effect_appraisal/enterprise_effect/studentStrengthenDetailsList.vue b/src/views/effect_appraisal/enterprise_effect/studentStrengthenDetailsList.vue new file mode 100644 index 0000000..e4c0fed --- /dev/null +++ b/src/views/effect_appraisal/enterprise_effect/studentStrengthenDetailsList.vue @@ -0,0 +1,128 @@ + + + + From 80f0ffbbe14b33a935d4d84fa016be3b802e19c2 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Wed, 20 Mar 2024 15:45:42 +0800 Subject: [PATCH 10/10] =?UTF-8?q?element=E6=96=B0=E7=89=88=E6=9C=ACapi?= =?UTF-8?q?=E5=BC=83=E7=94=A8=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/components/hidden_add/index.vue | 4 ++-- .../semester/components/paper.vue | 20 +++++++++---------- .../archives_management/user/archives.vue | 20 +++++++++---------- .../components/studentStrengthen.vue | 20 +++++++++---------- .../department/components/add.vue | 12 +++++------ .../post/components/add.vue | 4 ++-- src/views/enterprise_management/user/add.vue | 8 ++++---- .../acceptance/acceptance.vue | 4 ++-- .../rectification/rectification.vue | 8 ++++---- 10 files changed, 50 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index c60b6cc..8bb9dbf 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "axios": "^1.6.3", "dayjs": "^1.11.10", "echarts": "^5.4.3", - "element-plus": "^2.4.4", + "element-plus": "^2.6.1", "html2canvas": "^1.4.1", "jspdf": "^2.5.1", "lodash-es": "^4.17.21", diff --git a/src/components/hidden_add/index.vue b/src/components/hidden_add/index.vue index dc5a627..21c42d4 100644 --- a/src/components/hidden_add/index.vue +++ b/src/components/hidden_add/index.vue @@ -103,11 +103,11 @@ 立即整改 - 限期整改 + 限期整改 diff --git a/src/views/archives_management/semester/components/paper.vue b/src/views/archives_management/semester/components/paper.vue index 2bf5faf..8baf5dd 100644 --- a/src/views/archives_management/semester/components/paper.vue +++ b/src/views/archives_management/semester/components/paper.vue @@ -37,20 +37,20 @@ v-model="item.ANSWER" :disabled="true" > - A.{{ item.OPTIONA }} - B.{{ item.OPTIONB }} - C.{{ item.OPTIONC }} - D.{{ item.OPTIOND }} + A.{{ item.OPTIONA }} + B.{{ item.OPTIONB }} + C.{{ item.OPTIONC }} + D.{{ item.OPTIOND }} - A.{{ item.OPTIONA }} - B.{{ item.OPTIONB }} - C.{{ item.OPTIONC }} - D.{{ item.OPTIOND }} + A.{{ item.OPTIONA }} + B.{{ item.OPTIONB }} + C.{{ item.OPTIONC }} + D.{{ item.OPTIOND }} - A.{{ item.OPTIONA }} + A.{{ item.OPTIONA }}
- B.{{ item.OPTIONB }} + B.{{ item.OPTIONB }}
diff --git a/src/views/archives_management/user/archives.vue b/src/views/archives_management/user/archives.vue index d1850cf..97d7b78 100644 --- a/src/views/archives_management/user/archives.vue +++ b/src/views/archives_management/user/archives.vue @@ -727,16 +727,16 @@ :disabled="true" >
- A.{{ item.OPTIONA }} + A.{{ item.OPTIONA }}
- B.{{ item.OPTIONB }} + B.{{ item.OPTIONB }}
- C.{{ item.OPTIONC }} + C.{{ item.OPTIONC }}
- D.{{ item.OPTIOND }} + D.{{ item.OPTIOND }}
- A.{{ item.OPTIONA }} + A.{{ item.OPTIONA }}
- B.{{ item.OPTIONB }} + B.{{ item.OPTIONB }}
- C.{{ item.OPTIONC }} + C.{{ item.OPTIONC }}
- D.{{ item.OPTIOND }} + D.{{ item.OPTIOND }}
- A.{{ item.OPTIONA }} + A.{{ item.OPTIONA }}
- B.{{ item.OPTIONB }} + B.{{ item.OPTIONB }}
diff --git a/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue b/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue index 29e10e2..8b242e6 100644 --- a/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue +++ b/src/views/effect_appraisal/enterprise_effect/components/studentStrengthen.vue @@ -155,16 +155,16 @@ :disabled="true" >
- A.{{ row.OPTIONA }} + A.{{ row.OPTIONA }}
- B.{{ row.OPTIONB }} + B.{{ row.OPTIONB }}
- C.{{ row.OPTIONC }} + C.{{ row.OPTIONC }}
- D.{{ row.OPTIOND }} + D.{{ row.OPTIOND }}
- A.{{ row.OPTIONA }} + A.{{ row.OPTIONA }}
- B.{{ row.OPTIONB }} + B.{{ row.OPTIONB }}
- C.{{ row.OPTIONC }} + C.{{ row.OPTIONC }}
- D.{{ row.OPTIOND }} + D.{{ row.OPTIOND }}
- A.{{ row.OPTIONA }} + A.{{ row.OPTIONA }}
- B.{{ row.OPTIONB }} + B.{{ row.OPTIONB }}
diff --git a/src/views/enterprise_management/department/components/add.vue b/src/views/enterprise_management/department/components/add.vue index 7e0093a..ffb7450 100644 --- a/src/views/enterprise_management/department/components/add.vue +++ b/src/views/enterprise_management/department/components/add.vue @@ -45,16 +45,14 @@ v-model="form.ISSUPERVISE" @change="fnChangeRegulatoryAuthorities" > - - + + - - - + + + - 启用 - 禁用 + 启用 + 禁用 diff --git a/src/views/enterprise_management/user/add.vue b/src/views/enterprise_management/user/add.vue index a13fb56..23b5180 100644 --- a/src/views/enterprise_management/user/add.vue +++ b/src/views/enterprise_management/user/add.vue @@ -178,16 +178,16 @@ - - + + - - + + - - + + diff --git a/src/views/hidden_danger_government/rectification/rectification.vue b/src/views/hidden_danger_government/rectification/rectification.vue index c7f16c7..d2cc1bd 100644 --- a/src/views/hidden_danger_government/rectification/rectification.vue +++ b/src/views/hidden_danger_government/rectification/rectification.vue @@ -21,8 +21,8 @@ :model-value="data.form.IS_NORMAL" @change="fnIsNormalChange" > - - + + @@ -168,7 +168,7 @@ - + @@ -245,7 +245,7 @@ - +