From e803f8bf41ac57ef25fb5123e06ddb8e6cda220d Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Wed, 20 Mar 2024 17:04:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E4=B8=89=E6=A3=80?= =?UTF-8?q?=E6=89=BF=E8=AF=BA=E9=97=AE=E8=AF=A2=EF=BC=8C=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=A3=80=E6=9F=A5=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/data_dictionary.js | 7 + src/request/traffic_driving_commitment.js | 12 + src/request/traffic_driving_type.js | 12 + .../driving_commitment/components/add.vue | 75 ++++ .../driving_commitment/index.vue | 132 +++++++ .../driving_inspections/driving_log/add.vue | 229 ++++++++++++ .../driving_log/drivingLog_info.vue | 341 ++++++++++++++++++ .../driving_inspections/driving_log/index.vue | 136 +++++++ .../driving_type/components/add.vue | 97 +++++ .../driving_type/index.vue | 145 ++++++++ 10 files changed, 1186 insertions(+) create mode 100644 src/request/traffic_driving_commitment.js create mode 100644 src/request/traffic_driving_type.js create mode 100644 src/views/driving_inspections/driving_commitment/components/add.vue create mode 100644 src/views/driving_inspections/driving_commitment/index.vue create mode 100644 src/views/driving_inspections/driving_log/add.vue create mode 100644 src/views/driving_inspections/driving_log/drivingLog_info.vue create mode 100644 src/views/driving_inspections/driving_log/index.vue create mode 100644 src/views/driving_inspections/driving_type/components/add.vue create mode 100644 src/views/driving_inspections/driving_type/index.vue diff --git a/src/assets/js/data_dictionary.js b/src/assets/js/data_dictionary.js index 386a05c..72f3316 100644 --- a/src/assets/js/data_dictionary.js +++ b/src/assets/js/data_dictionary.js @@ -181,6 +181,13 @@ export const layoutFnGetRiskClassification = async () => { }); return ref(resData.list); }; +// 排查项类型 +export const layoutFnGetDrivingType = async () => { + const resData = await getLevels({ + DICTIONARIES_ID: "5ef3a19edcb2435f8db94487834bbae3", + }); + return ref(resData.list); +}; // 部门树 export const layoutFnGetDepartmentTree = async (params) => { const resData = await getDepartmentTree(params); diff --git a/src/request/traffic_driving_commitment.js b/src/request/traffic_driving_commitment.js new file mode 100644 index 0000000..7a2ccf0 --- /dev/null +++ b/src/request/traffic_driving_commitment.js @@ -0,0 +1,12 @@ +import { post } from "@/request/axios.js"; +export const getSafetyDrivingCommitmentList = (params) => + post("/drivingcommitment/listForSafetyDrivingCommitment", params); // 行车日志列表 + +export const setDrivingCommitmentDelete = (params) => + post("/drivingcommitment/delete", params); // 行车日志删除 + +export const getSafetyDrivingCommitmentView = (params) => + post("/drivingcommitment/goEdit", params); // 安全例会详情 + +export const setDrivingCommitmentAdd = (params) => post("/drivingcommitment/add", params); // 风险点单元添加 +export const setDrivingCommitmentEdit = (params) => post("/drivingcommitment/edit", params); // 风险点单元修改 \ No newline at end of file diff --git a/src/request/traffic_driving_type.js b/src/request/traffic_driving_type.js new file mode 100644 index 0000000..6e5cb74 --- /dev/null +++ b/src/request/traffic_driving_type.js @@ -0,0 +1,12 @@ +import { post } from "@/request/axios.js"; +export const getSafetyDrivingTypeList = (params) => + post("/drivingtype/listForSafetyDrivingType", params); // 行车日志列表 + +export const setDrivingTypeDelete = (params) => + post("/drivingtype/delete", params); // 行车日志删除 + +export const getSafetyDrivingTypeView = (params) => + post("/drivingtype/goEdit", params); // 安全例会详情 + +export const setDrivingTypeAdd = (params) => post("/drivingtype/add", params); // 风险点单元添加 +export const setDrivingTypeEdit = (params) => post("/drivingtype/edit", params); // 风险点单元修改 \ No newline at end of file diff --git a/src/views/driving_inspections/driving_commitment/components/add.vue b/src/views/driving_inspections/driving_commitment/components/add.vue new file mode 100644 index 0000000..2d13049 --- /dev/null +++ b/src/views/driving_inspections/driving_commitment/components/add.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/driving_inspections/driving_commitment/index.vue b/src/views/driving_inspections/driving_commitment/index.vue new file mode 100644 index 0000000..4a8a997 --- /dev/null +++ b/src/views/driving_inspections/driving_commitment/index.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/driving_inspections/driving_log/add.vue b/src/views/driving_inspections/driving_log/add.vue new file mode 100644 index 0000000..a93807e --- /dev/null +++ b/src/views/driving_inspections/driving_log/add.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/views/driving_inspections/driving_log/drivingLog_info.vue b/src/views/driving_inspections/driving_log/drivingLog_info.vue new file mode 100644 index 0000000..0d344c0 --- /dev/null +++ b/src/views/driving_inspections/driving_log/drivingLog_info.vue @@ -0,0 +1,341 @@ + + + + + diff --git a/src/views/driving_inspections/driving_log/index.vue b/src/views/driving_inspections/driving_log/index.vue new file mode 100644 index 0000000..b7358b3 --- /dev/null +++ b/src/views/driving_inspections/driving_log/index.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/src/views/driving_inspections/driving_type/components/add.vue b/src/views/driving_inspections/driving_type/components/add.vue new file mode 100644 index 0000000..4eb6cd4 --- /dev/null +++ b/src/views/driving_inspections/driving_type/components/add.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/views/driving_inspections/driving_type/index.vue b/src/views/driving_inspections/driving_type/index.vue new file mode 100644 index 0000000..2ce8647 --- /dev/null +++ b/src/views/driving_inspections/driving_type/index.vue @@ -0,0 +1,145 @@ + + + + + From ea9800791abb702ffa1fb8500e5b20966bd72483 Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Wed, 20 Mar 2024 17:46:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86/?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/training_process_management.js | 18 + .../class_management/add_curriculum.vue | 339 ++++++++++++++++++ .../components/basic_info.vue | 11 +- .../components/configuration_test_paper.vue | 148 ++++++++ .../components/curriculum.vue | 149 +++++++- .../components/exam_details.vue | 56 +-- .../components/exam_paper_details.vue | 30 ++ .../components/exam_paper_records.vue | 106 ++++++ .../components/involved_in_training.vue | 222 ++++++++++++ .../components/test_paper_type.vue | 70 ++++ .../class_management/index.vue | 3 - .../class_management/view_curriculum.vue | 166 +++++++++ .../exam_paper_management/add.vue | 20 +- .../course_management/view.vue | 22 +- .../exam_paper_management/components/view.vue | 92 +++++ .../exam_paper_management/view.vue | 85 +---- 16 files changed, 1403 insertions(+), 134 deletions(-) create mode 100644 src/views/training_process_management/class_management/add_curriculum.vue create mode 100644 src/views/training_process_management/class_management/components/configuration_test_paper.vue create mode 100644 src/views/training_process_management/class_management/components/exam_paper_details.vue create mode 100644 src/views/training_process_management/class_management/components/exam_paper_records.vue create mode 100644 src/views/training_process_management/class_management/components/involved_in_training.vue create mode 100644 src/views/training_process_management/class_management/components/test_paper_type.vue create mode 100644 src/views/training_process_management/class_management/view_curriculum.vue create mode 100644 src/views/training_resource_management/exam_paper_management/components/view.vue diff --git a/src/request/training_process_management.js b/src/request/training_process_management.js index dc1a0d3..175eab7 100644 --- a/src/request/training_process_management.js +++ b/src/request/training_process_management.js @@ -46,3 +46,21 @@ export const getClassManagementStudentExamRecordsList = (params) => post("/stageexam/list", params); // 班级管理学员考试记录列表 export const getClassManagementStudentExamRecordsView = (params) => post("/stageexam/findExam", params); // 班级管理学员考试记录查看 +export const getClassManagementCurriculumList = (params) => + post("/classCurriculum/list", params); // 班级管理课程列表 +export const setClassManagementCurriculumDelete = (params) => + post("/classCurriculum/delete", params); // 班级管理课程删除 +export const setClassManagementCurriculumAdd = (params) => + post("/classCurriculum/addClassCurriculum", params); // 班级管理课程新增 +export const getClassManagementCurriculumView = (params) => + post("/classCurriculum/goEdit", params); // 班级管理课程查看 +export const getClassManagementInvolvedInTrainingList = (params) => + post("/curriculumpost/listClassCurPost", params); // 班级管理获取涉及培训岗位 +export const getClassManagementInvolvedInTrainingDepartmentList = (params) => + post("/classpost/listDepByClass", params); // 班级管理获取涉及培训岗位部门列表 +export const getClassManagementInvolvedInTrainingPostList = (params) => + post("/classpost/listPostByClassDep", params); // 班级管理获取涉及培训岗位岗位列表 +export const setClassManagementInvolvedInTrainingAdd = (params) => + post("/curriculumpost/saveClassCurPost", params); // 班级管理涉及培训岗位保存 +export const getClassManagementExamPaperList = (params) => + post("/classpost/listClassPost", params); // 班级管理试卷列表 diff --git a/src/views/training_process_management/class_management/add_curriculum.vue b/src/views/training_process_management/class_management/add_curriculum.vue new file mode 100644 index 0000000..bcfb0dc --- /dev/null +++ b/src/views/training_process_management/class_management/add_curriculum.vue @@ -0,0 +1,339 @@ + + + + + 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 bade4d1..2908414 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 @@ -185,17 +185,17 @@ - - + + - 强制 - - + 强制 + + @@ -351,7 +351,6 @@ const fnSubmit = debounce( query: { ...route.query, CLASS_ID: !CLASS_ID ? resData.CLASS_ID : CLASS_ID, - TRAINTYPE: data.form.TRAINTYPE, EXAMINATION: data.form.EXAMINATION, ISSTRENGTHEN: data.form.ISSTRENGTHEN, }, diff --git a/src/views/training_process_management/class_management/components/configuration_test_paper.vue b/src/views/training_process_management/class_management/components/configuration_test_paper.vue new file mode 100644 index 0000000..62087cc --- /dev/null +++ b/src/views/training_process_management/class_management/components/configuration_test_paper.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/views/training_process_management/class_management/components/curriculum.vue b/src/views/training_process_management/class_management/components/curriculum.vue index e95413c..5464272 100644 --- a/src/views/training_process_management/class_management/components/curriculum.vue +++ b/src/views/training_process_management/class_management/components/curriculum.vue @@ -1,5 +1,94 @@ 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 index 78531be..181dc44 100644 --- a/src/views/training_process_management/class_management/components/exam_details.vue +++ b/src/views/training_process_management/class_management/components/exam_details.vue @@ -1,18 +1,32 @@