From 21d3c75ce297b7ff7785c481827d1c9b843aa91b Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 26 Mar 2024 15:25:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E2=80=9C=E7=BB=BC?= =?UTF-8?q?=E5=90=88=E6=95=99=E8=82=B2=E5=9F=B9=E8=AE=AD=E8=80=83=E8=AF=95?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E2=80=9D=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/api/examSystem/subjectManagement.js | 74 +++ src/router/index.js | 54 +++ .../examManagement/examManagement.vue | 0 .../examRegulation/examRegulation.vue | 0 .../learningMaterial/learningMaterial.vue | 0 .../noticeManagement/noticeManagement.vue | 0 .../pointManagement/pointManagement.vue | 0 .../questionManagement/questionManagement.vue | 0 .../examSystem/safetyManual/safetyManual.vue | 0 .../subjectManagement/subjectManagement.vue | 428 ++++++++++++++++++ .../examSystem/trainRecord/trainRecord.vue | 0 11 files changed, 556 insertions(+) create mode 100644 src/assets/js/api/examSystem/subjectManagement.js create mode 100644 src/views/projectFront/examSystem/examManagement/examManagement.vue create mode 100644 src/views/projectFront/examSystem/examRegulation/examRegulation.vue create mode 100644 src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue create mode 100644 src/views/projectFront/examSystem/noticeManagement/noticeManagement.vue create mode 100644 src/views/projectFront/examSystem/pointManagement/pointManagement.vue create mode 100644 src/views/projectFront/examSystem/questionManagement/questionManagement.vue create mode 100644 src/views/projectFront/examSystem/safetyManual/safetyManual.vue create mode 100644 src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue create mode 100644 src/views/projectFront/examSystem/trainRecord/trainRecord.vue diff --git a/src/assets/js/api/examSystem/subjectManagement.js b/src/assets/js/api/examSystem/subjectManagement.js new file mode 100644 index 00000000..e3238269 --- /dev/null +++ b/src/assets/js/api/examSystem/subjectManagement.js @@ -0,0 +1,74 @@ +/** + * api接口统一管理 综合教育培训考试系统--科目管理 + */ +import {post, get} from '../../http' + +// >>>>>>>>>>>>>>>>>>>>科目管理<<<<<<<<<<<<<<<<<<<< + +// >>>>>>>>>>>>>>>>>>>>科目管理<<<<<<<<<<<<<<<<<<<< + + +export const getCheckListDataApi = data => post('xmgl/inspectionRecord/list', data); // 查询 我的整改 || 我的提交 列表 +//获取详情信息 +export const getCheckDetailsApi = data => post('xmgl/inspectionRecord/getProjectInspectionDetails', data); // 查询 详情基本信息 +export const getCrewListDataApi = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data); // 查询 所有整改人员 +export const getCheckRecordListApi = data => post('xmgl/inspectionRectifyRecord/selectInspectionRectifyRecord', data); // 获取当前 数据的整改记录列表 +export const addCheckReplyApi = data => post('xmgl/inspectionRectifyRecord/add', data); // 新增 整改 回复 +export const addCheckAuditApi = data => post('xmgl/inspectionRectifyRecord/auditInspectionRectifyRecord', data); // 新增 整改 审核 +//新增 +export const addCheckListDataApi = data => post('xmgl/inspectionRecord/add', data); // 新增 整改信息 + + +/** + * api接口统一管理 + */ +// import {post,get} from '../http' + +//甘特图-列表查询任务进度 +export const getParentChildTaskListApi = data => post('xmgl/taskProgress/getParentChildList', data); + +//分部分项工程管理 +export const addTaskProgressApi = data => post('xmgl/taskProgress/add', data); +export const deleteTaskProgressApi = data => post('xmgl/taskProgress/delete', data); +export const editTaskProgressApi = data => post('xmgl/taskProgress/edit', data); +export const editProgressBindComponentApi = data => post('xmgl/taskProgress/editBimComponent', data); +export const getTaskProgressPageApi = data => post('xmgl/taskProgress/getParentChildPage', data); + +//分部分项工程管理--BIMBASE中心进度管理 +export const addTaskProgressRtApi = data => post('xmgl/taskProgressRt/add', data); +export const deleteTaskProgressRtApi = data => post('xmgl/taskProgressRt/delete', data); +export const editTaskProgressRtApi = data => post('xmgl/taskProgressRt/edit', data); +export const editProgressBindComponentRtApi = data => post('xmgl/taskProgressRt/editBimComponent', data); +export const getTaskProgressPageRtApi = data => post('xmgl/taskProgressRt/getParentChildPage', data); + + +//分部分项工程管理_详情-进度记录 +export const getTaskProgressContentApi = data => get('xmgl/taskProgressContent/list', data); + +//分部分项工程管理_详情-材料用量 +export const getTaskProgressMaterialRelApi = data => get('xmgl/taskProgressMaterialRel/detailList', data); + + +//分部分项工程管理_上报进度 +export const addTaskProgressContentApi = data => post('xmgl/taskProgressContent/add', data); + +//分部分项工程管理_开始任务 +export const addTaskProgressStart = data => post('xmgl/taskProgress/startTask', data); + + + +//材料类型配置 +export const addTaskProgressMaterialRelApi = data => post('xmgl/taskProgressMaterialType/add', data); +export const deleteTaskProgressMaterialRelApi = data => post('xmgl/taskProgressMaterialType/delete', data); +export const getTypeProgressMaterialRelApi = data => get('xmgl/taskProgressMaterialType/list', data); + + +//进度预警 +export const getTaskProgressAlarmPageApi = data => get('xmgl/taskProgressAlarm/page', data); + + +//计划材料工程 +export const getTaskProgressMaterialRelTreeApi = data => get('xmgl/taskProgressMaterialRel/tree/list', data); + + + diff --git a/src/router/index.js b/src/router/index.js index 34f8ad90..6353f137 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -682,6 +682,60 @@ const routes2 = [ component: () => import("@/views/projectFront/safeManage/v2/business.vue"), }, + // 安全考试系统--科目管理 + { + path: "/project/examSystem/subjectManagement", + name: "安全考试系统_科目管理", + component: () => import("@/views/projectFront/examSystem/subjectManagement/subjectManagement.vue"), + }, + // 安全考试系统--学习资料 + { + path: "/project/examSystem/learningMaterial", + name: "安全考试系统_学习资料", + component: () => import("@/views/projectFront/examSystem/learningMaterial/learningMaterial.vue"), + }, + // 安全考试系统--题库管理 + { + path: "/project/examSystem/questionManagement", + name: "安全考试系统_题库管理", + component: () => import("@/views/projectFront/examSystem/questionManagement/questionManagement.vue"), + }, + // 安全考试系统--考试管理 + { + path: "/project/examSystem/examManagement", + name: "安全考试系统_考试管理", + component: () => import("@/views/projectFront/examSystem/examManagement/examManagement.vue"), + }, + // 安全考试系统--规章制度 + { + path: "/project/examSystem/examRegulation", + name: "安全考试系统_规章制度", + component: () => import("@/views/projectFront/examSystem/examRegulation/examRegulation.vue"), + }, + // 安全考试系统--安全手册 + { + path: "/project/examSystem/safetyManual", + name: "安全考试系统_安全手册", + component: () => import("@/views/projectFront/examSystem/safetyManual/safetyManual.vue"), + }, + // 安全考试系统--通知管理 + { + path: "/project/examSystem/noticeManagement", + name: "安全考试系统_通知管理", + component: () => import("@/views/projectFront/examSystem/noticeManagement/noticeManagement.vue"), + }, + // 安全考试系统--积分管理 + { + path: "/project/examSystem/pointManagement", + name: "安全考试系统_积分管理", + component: () => import("@/views/projectFront/examSystem/pointManagement/pointManagement.vue"), + }, + // 安全考试系统--培训管理 + { + path: "/project/examSystem/trainRecord", + name: "安全考试系统_培训管理", + component: () => import("@/views/projectFront/examSystem/trainRecord/trainRecord.vue"), + }, { path: "/project/environmentalMonitor/alarmValueSet", name: "绿色施工_阈值设置1", diff --git a/src/views/projectFront/examSystem/examManagement/examManagement.vue b/src/views/projectFront/examSystem/examManagement/examManagement.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/projectFront/examSystem/examRegulation/examRegulation.vue b/src/views/projectFront/examSystem/examRegulation/examRegulation.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue b/src/views/projectFront/examSystem/learningMaterial/learningMaterial.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/projectFront/examSystem/noticeManagement/noticeManagement.vue b/src/views/projectFront/examSystem/noticeManagement/noticeManagement.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/projectFront/examSystem/pointManagement/pointManagement.vue b/src/views/projectFront/examSystem/pointManagement/pointManagement.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/projectFront/examSystem/questionManagement/questionManagement.vue b/src/views/projectFront/examSystem/questionManagement/questionManagement.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/projectFront/examSystem/safetyManual/safetyManual.vue b/src/views/projectFront/examSystem/safetyManual/safetyManual.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue b/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue new file mode 100644 index 00000000..64d61b67 --- /dev/null +++ b/src/views/projectFront/examSystem/subjectManagement/subjectManagement.vue @@ -0,0 +1,428 @@ + + + \ No newline at end of file diff --git a/src/views/projectFront/examSystem/trainRecord/trainRecord.vue b/src/views/projectFront/examSystem/trainRecord/trainRecord.vue new file mode 100644 index 00000000..e69de29b From 0f24579c8485ba25f8baae2d81f744332c36a9f4 Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 26 Mar 2024 17:23:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0http://jxj.zhgdyun?= =?UTF-8?q?.com:15551=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 3 ++- src/store/index.js | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 1b2b505a..6d61bc92 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 @@ -91,6 +91,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 + axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/store/index.js b/src/store/index.js index 67abeeae..d76a5a6e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -46,19 +46,19 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl + ? baseUrl + : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl