diff --git a/api/index.js b/api/index.js
index 7e3dfb6..15029b5 100644
--- a/api/index.js
+++ b/api/index.js
@@ -5,26 +5,23 @@ export const getUserInfo = (params) => post("/sys/user/info/app", params); //
export const getHotWorkListByState = (params) => post("/app/hotworkapplication/list", params)//获取动火列表
export const getHotWorkGoEdit = (params) => post("/app/hotworkapplication/goEdit", params) //获取动火详情
export const getImgfilesListByKeyAndType = (params) => post("/app/imgfiles/listImgs", params) //获取附件表的信息
-export const getDept = (params) => post("/app/sys/listTree", {loading: false, ...params}) //获取监管端的部门信息
-export const getCorpDept = (params) => post("/app/corpDepartment/listTreeCorpDept", {loading: false, ...params}) //获取监管端的部门信息
+export const getDept = (params) => post("/app/sys/listTree", {loading: false, ...params}) //获取监管端的部门信息//获取监管端的部门信息
export const getDeptUser = (params) => post("/AppUser/listAllManageAndCorp", {loading: false, ...params}) //获取监管端的部门的人员
-export const getSafetyenvironmentalList = (params) => post("/app/safetyenvironmental/list", params) //获取安全环保检查列表
+export const getSafetyenvironmentalList = (params) => post("/inspection/safety/environmental/query/page", params) //获取安全环保检查列表
export const getSafetyenvironmentalCheckList = (params) => post("/app/safetyenvironmental/checkList/v2", params) //获取安全环保检查列表(隐患指派及验收)
export const getpleadList = (params) => post("/app/safetyenvironmental/pleadList", params) //获取安全环保检查列表
-export const getSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goEdit", params) //安全环保检查明细信息
-export const setSafetyenvironmentalAdd = (params) => post("/app/safetyenvironmental/add1", params) //新增安全环保检查
-export const setSafetyenvironmentalAdd_plus = (params) => upload("/app/safetyenvironmental/add", params) //新增安全环保检查
-export const setSafetyenvironmentalEdit = (params) => post("/app/safetyenvironmental/edit1", params) //修改安全环保检查
-export const setSafetyenvironmentalEdit_plus = (params) => upload("/app/safetyenvironmental/edit", params) //修改安全环保检查
-export const setSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goEdit", params) //修改安全环保检查
+export const getSafetyenvironmentalGoEdit = (params) => post(`/inspection/safety/environmental/query/${params.id}`, params) //安全环保检查明细信息
+export const setSafetyenvironmentalAdd = (params) => post("/inspection/safety/environmental/process/save", params) //新增安全环保检查
+export const setSafetyenvironmentalAdd_plus = (params) => upload("/inspection/safety/environmental/process/img/save", params) //新增安全环保检查
+export const setSafetyenvironmentalEdit = (params) => post("/inspection/safety/environmental/process/revise", params) //修改安全环保检查
+export const setSafetyenvironmentalEdit_plus = (params) => upload("/inspection/safety/environmental/process/img/revise", params) //修改安全环保检查//修改安全环保检查
export const getSafetyenvironmentalRedPoint = (params) => post("/app/safetyenvironmental/countCheck", params) //修改安全环保检查
-export const setSafetyenvironmentalExplain = (params) => upload("/app/safetyenvironmental/explain", params) //申辩
+export const setSafetyenvironmentalExplain = (params) => upload("/inspection/safety/environmental/process/plead", params) //申辩
export const setSafetyenvironmentalFlow = (params) => post("/app/safetyenvironmental/showFlowChart", params) //申辩
export const setImgFilesAdd = (params) => uploads("/app/imgfiles/uploadFile", params) //上传图片
export const setImgFilesListAdd = (params) => uploads("/app/imgfiles/uploadFileList", params) //上传图片
export const setVideoAdd = (params) => upload("/app/imgfiles/add", params) //上传视频
-export const setImgFilesAddVideo = (params) => uploads("/app/imgfiles/addVideo", params) //上传视频
-export const getHiddenRegion = (params) => post("/app/hiddenRegion/gerRegionList", {loading: false, ...params}) //获取隐患部位
+export const getHiddenRegion = (params) => post("/hidden/region/list", {loading: false, ...params}) //获取隐患部位
export const getInspectedDepartment = (params) => post("/app/corpDepartment/listTreeCorpDept", {loading: false, ...params}) //获取被检查部门
export const getInspectionDepartment = (params) => post("/app/corpDepartment/listTreeManageAndCorp", {loading: false, ...params}) //获取检查部门
export const getInspectors = (params) => post("/AppUser/listAllManageAndCorp", {loading: false, ...params}) //获取检查人员
diff --git a/pages/larger-major-hidden-management/larger-hidden-management/detail.vue b/pages/larger-major-hidden-management/larger-hidden-management/detail.vue
index a71314d..3c80a45 100644
--- a/pages/larger-major-hidden-management/larger-hidden-management/detail.vue
+++ b/pages/larger-major-hidden-management/larger-hidden-management/detail.vue
@@ -7,20 +7,7 @@
隐患来源
-
-
- 隐患快报
-
-
- 清单排查
-
-
- 清单排查
-
-
- 点检隐患
-
-
+ {{ sourceName }}
隐患描述
@@ -134,18 +121,18 @@
隐患级别
{{ form.hiddenlevelName }}
-
+
临时处置信息
+ @click="downloadAppendix(majorinforPdf)">
-
+
补充重大隐患信息
+ @click="downloadAppendix(supplementPdf)">
@@ -167,18 +154,18 @@
隐患级别
{{ form.hiddenlevelName }}
-
+
安委会办公室会议记录
+ @click="downloadAppendix(safetyofficePdf)">
-
+
整改建议及方案
+ @click="downloadAppendix(majorapprovedPdf)">
@@ -212,18 +199,18 @@
核定时间
{{ resultslist.approvedTime }}
-
+
隐患调查报告
+ @click="downloadAppendix(reportPdf)">
-
+
安委会或党委会决议记录
+ @click="downloadAppendix(resolutionPdf)">
@@ -241,18 +228,18 @@
整改人
{{ form.rectificationName }}
-
+
临时处置措施与隐患整改方案
+ @click="downloadAppendix(rectificationPdf)">
-
+
隐患整改过程记录
+ @click="downloadAppendix(processPdf)">
@@ -313,14 +300,14 @@ export default {
this.form = resData.data;
this.hiddenFindPeople = resData.data?.acceptor;
this.resultslist = resData.data?.major?.[0] || {};
- this.majorinforPdf = this.findAPicture(resData.data?.files, 106);
- this.majorapprovedPdf = this.findAPicture(resData.data?.files, 107);
- this.resolutionPdf = this.findAPicture(resData.data?.files, 109);
- this.rectificationPdf = this.findAPicture(resData.data?.files, 110);
- this.processPdf = this.findAPicture(resData.data?.files, 111);
- this.reportPdf = this.findAPicture(resData.data?.files, 108);
- this.supplementPdf = this.findAPicture(resData.data?.files, 112);
- this.safetyofficePdf = this.findAPicture(resData.data?.files, 113);
+ this.majorinforPdf = this.findAPicture(resData.data?.files, 106)?.[0];
+ this.majorapprovedPdf = this.findAPicture(resData.data?.files, 107)?.[0];
+ this.resolutionPdf = this.findAPicture(resData.data?.files, 109)?.[0];
+ this.rectificationPdf = this.findAPicture(resData.data?.files, 110)?.[0];
+ this.processPdf = this.findAPicture(resData.data?.files, 111)?.[0];
+ this.reportPdf = this.findAPicture(resData.data?.files, 108)?.[0];
+ this.supplementPdf = this.findAPicture(resData.data?.files, 112)?.[0];
+ this.safetyofficePdf = this.findAPicture(resData.data?.files, 113)?.[0];
this.hImgs = this.findAPicture(resData.data?.files, 3);
this.videoUrl = this.findAPicture(resData.data?.files, 102)?.[0];
},
@@ -350,6 +337,28 @@ export default {
return result.length > 0 ? result : null;
}
},
+ computed: {
+ sourceName: function () {
+ switch (this.form.source) {
+ case '1':
+ return '隐患快报';
+ case '2':
+ return '清单排查';
+ case '3':
+ return '清单排查';
+ case '4':
+ return '安全环保检查(监管端)';
+ case '5':
+ return '安全环保检查(企业端)';
+ case '6':
+ return '消防检查';
+ case '8':
+ return '点检隐患';
+ default:
+ return '';
+ }
+ }
+ }
}
diff --git a/pages/larger-major-hidden-management/major-hidden-management/detail.vue b/pages/larger-major-hidden-management/major-hidden-management/detail.vue
index b493963..ac7ce63 100644
--- a/pages/larger-major-hidden-management/major-hidden-management/detail.vue
+++ b/pages/larger-major-hidden-management/major-hidden-management/detail.vue
@@ -7,20 +7,7 @@
隐患来源
-
-
- 隐患快报
-
-
- 清单排查
-
-
- 清单排查
-
-
- 点检隐患
-
-
+ {{ sourceName }}
隐患描述
@@ -129,18 +116,18 @@
隐患级别
{{ form.hiddenlevelName }}
-
+
临时处置信息
+ @click="downloadAppendix(majorinforPdf)">
-
+
补充重大隐患信息
+ @click="downloadAppendix(supplementPdf)">
@@ -162,18 +149,18 @@
隐患级别
{{ form.hiddenlevelName }}
-
+
安委会办公室会议记录
+ @click="downloadAppendix(safetyofficePdf)">
-
+
临时处置信息
+ @click="downloadAppendix(majorapprovedPdf)">
@@ -207,18 +194,18 @@
核定时间
{{ resultslist.approvedTime }}
-
+
隐患调查报告
+ @click="downloadAppendix(reportPdf)">
-
+
安委会或党委会决议记录
+ @click="downloadAppendix(resolutionPdf)">
@@ -236,18 +223,18 @@
整改人
{{ form.rectificationName }}
-
+
隐患调查报告
+ @click="downloadAppendix(rectificationPdf)">
-
+
安委会或党委会决议记录
+ @click="downloadAppendix(processPdf)">
@@ -288,14 +275,14 @@ export default {
this.form = resData.data;
this.hiddenFindPeople = resData.data?.acceptor;
this.resultslist = resData.data?.major?.[0] || {};
- this.majorinforPdf = this.findAPicture(resData.data?.files, 106);
- this.majorapprovedPdf = this.findAPicture(resData.data?.files, 107);
- this.resolutionPdf = this.findAPicture(resData.data?.files, 109);
- this.reportPdf = this.findAPicture(resData.data?.files, 108);
- this.rectificationPdf = this.findAPicture(resData.data?.files, 110);
- this.processPdf = this.findAPicture(resData.data?.files, 111);
- this.supplementPdf = this.findAPicture(resData.data?.files, 112);
- this.safetyofficePdf = this.findAPicture(resData.data?.files, 113);
+ this.majorinforPdf = this.findAPicture(resData.data?.files, 106)?.[0];
+ this.majorapprovedPdf = this.findAPicture(resData.data?.files, 107)?.[0];
+ this.resolutionPdf = this.findAPicture(resData.data?.files, 109)?.[0];
+ this.reportPdf = this.findAPicture(resData.data?.files, 108)?.[0];
+ this.rectificationPdf = this.findAPicture(resData.data?.files, 110)?.[0];
+ this.processPdf = this.findAPicture(resData.data?.files, 111)?.[0];
+ this.supplementPdf = this.findAPicture(resData.data?.files, 112)?.[0];
+ this.safetyofficePdf = this.findAPicture(resData.data?.files, 113)?.[0];
this.hImgs = this.findAPicture(resData.data?.files, 3);
this.videoUrl = this.findAPicture(resData.data?.files, 102)?.[0];
},
@@ -325,6 +312,28 @@ export default {
return result.length > 0 ? result : null;
}
},
+ computed: {
+ sourceName: function () {
+ switch (this.form.source) {
+ case '1':
+ return '隐患快报';
+ case '2':
+ return '清单排查';
+ case '3':
+ return '清单排查';
+ case '4':
+ return '安全环保检查(监管端)';
+ case '5':
+ return '安全环保检查(企业端)';
+ case '6':
+ return '消防检查';
+ case '8':
+ return '点检隐患';
+ default:
+ return '';
+ }
+ }
+ }
}
diff --git a/pages/safety-environmental-inspection/index/index.vue b/pages/safety-environmental-inspection/index/index.vue
index 51fd5e2..538ce75 100644
--- a/pages/safety-environmental-inspection/index/index.vue
+++ b/pages/safety-environmental-inspection/index/index.vue
@@ -12,7 +12,7 @@