From 33c431d34fa9e556e8860eb1dfa675e1e8be6d9c Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Tue, 6 Feb 2024 15:38:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=960206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/application/blind-board/home.vue | 0 pages/application/break-ground/home.vue | 0 pages/application/electricity/home.vue | 0 .../hidden-danger-add/hidden-danger-add.vue | 5 +- .../hidden-danger-check-detail.vue | 55 +- .../hidden-danger-check-risk-detail.vue | 64 +- .../hidden-danger-check.vue | 34 +- .../hidden-danger-finish.vue | 47 +- .../hidden-danger-no-change-detail.vue | 156 +- .../hidden-danger-no-change-risk-detail.vue | 33 +- .../hidden-danger-no-change.vue | 31 +- .../hidden-danger-overdue.vue | 38 +- .../hidden-danger-record-detail.vue | 66 +- .../hidden-danger-record-risk-detail.vue | 64 +- .../hidden-danger-record.vue | 45 +- pages/application/hoisting/home.vue | 0 pages/application/open-circuit/home.vue | 0 .../apply/detail-plead.vue | 499 +++++ .../apply/detail.vue | 1748 +++++++++++++++++ .../apply/flowChart.vue | 104 + .../archive/detail-check.vue | 885 +++++++++ .../archive/detail-hidden.vue | 821 ++++++++ .../archive/detail.vue | 956 +++++++++ .../safety-environmental-inspection/home.vue | 231 +++ .../inspected/detail.vue | 1092 ++++++++++ .../inspector/detail.vue | 1018 ++++++++++ .../rectification/detail.vue | 1109 +++++++++++ pages/basics/home.vue | 43 + 28 files changed, 8871 insertions(+), 273 deletions(-) create mode 100644 pages/application/blind-board/home.vue create mode 100644 pages/application/break-ground/home.vue create mode 100644 pages/application/electricity/home.vue create mode 100644 pages/application/hoisting/home.vue create mode 100644 pages/application/open-circuit/home.vue create mode 100644 pages/application/safety-environmental-inspection/apply/detail-plead.vue create mode 100644 pages/application/safety-environmental-inspection/apply/detail.vue create mode 100644 pages/application/safety-environmental-inspection/apply/flowChart.vue create mode 100644 pages/application/safety-environmental-inspection/archive/detail-check.vue create mode 100644 pages/application/safety-environmental-inspection/archive/detail-hidden.vue create mode 100644 pages/application/safety-environmental-inspection/archive/detail.vue create mode 100644 pages/application/safety-environmental-inspection/home.vue create mode 100644 pages/application/safety-environmental-inspection/inspected/detail.vue create mode 100644 pages/application/safety-environmental-inspection/inspector/detail.vue create mode 100644 pages/application/safety-environmental-inspection/rectification/detail.vue diff --git a/pages/application/blind-board/home.vue b/pages/application/blind-board/home.vue new file mode 100644 index 0000000..e69de29 diff --git a/pages/application/break-ground/home.vue b/pages/application/break-ground/home.vue new file mode 100644 index 0000000..e69de29 diff --git a/pages/application/electricity/home.vue b/pages/application/electricity/home.vue new file mode 100644 index 0000000..e69de29 diff --git a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue index a747600..522887d 100644 --- a/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue +++ b/pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue @@ -442,7 +442,10 @@ USER_ID:loginUser.USER_ID, }, success: function (res) { - _this.levelList = res.data.list; + _this.levelList = res.data.list.filter(function (level) { + return level.NAME !== '轻微隐患'; + }); + // _this.levelList = res.data.list; } }); }, diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue index ec9143a..b503475 100644 --- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue @@ -6,19 +6,25 @@ - - {{pd.HIDDENDESCR}} - - - - 隐患来源 - - - 隐患快报 - 隐患排查 - 隐患排查 - - + + + 隐患描述 + + + {{pd.HIDDENDESCR}} + + + + + 隐患来源 + + + 隐患快报 + 隐患排查 + 安全环保检查 + 安全环保检查 + + 风险点(单元) @@ -146,20 +152,20 @@ 整改信息 - - - 整改描述 - - - {{pd.RECTIFYDESCR}} - - + + + 整改描述 + + + {{pd.RECTIFYDESCR}} + + 整改部门 - {{pd.RECTIFICATIONDEPTNAME}} + {{pd.HIDDENFINDDEPTNAME}} @@ -502,6 +508,7 @@ _this.files.push(res.data.hImgs[i]) } } + _this.videoList = res.data.hiddenVideo; // _this.files = res.data.hImgs; _this.files2 = res.data.rImgs; _this.files3 = res.data.cImgs; @@ -674,8 +681,8 @@ CHECK_TIME: _this.CHECK_TIME, HIDDEN_ID: _this.id, CHECKOR: loginUserId, - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, }, success: (res) => { uni.hideLoading(); diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue index ec9143a..cc24bd8 100644 --- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue @@ -6,9 +6,14 @@ - - {{pd.HIDDENDESCR}} - + + + 隐患描述 + + + {{pd.HIDDENDESCR}} + + 隐患来源 @@ -17,6 +22,8 @@ 隐患快报 隐患排查 隐患排查 + 安全环保检查 + 安全环保检查 @@ -146,14 +153,14 @@ 整改信息 - - - 整改描述 - - - {{pd.RECTIFYDESCR}} - - + + + 整改描述 + + + {{pd.RECTIFYDESCR}} + + 整改部门 @@ -353,14 +360,22 @@ 验收描述 - - 验收日期 - - - {{CHECK_TIME==''?'请选择':CHECK_TIME}} - - - + + + + + + + + + + 验收日期 + + + {{CHECK_TIME==''?'请选择':CHECK_TIME}} + + + 验收图片 @@ -421,9 +436,11 @@ formatDate } from '@/common/tool.js'; import ykAuthpup from "@/components/yk-authpup/yk-authpup" + import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue' export default { components: { - ykAuthpup + ykAuthpup, + ruiDatePicker }, data() { return { @@ -565,6 +582,7 @@ }, goSubmit() { var _this = this; + console.log('提交时的验收日期:', this.CHECK_TIME); if (_this.ISQUALIFIED == '1') { if (!_this.CHECKDESCR) { uni.showToast({ @@ -694,9 +712,9 @@ }); }) }, - changeDate(e) { - this.CHECK_TIME = e.detail.value - }, + changeDate(value) { + this.CHECK_TIME = value; + }, radio(e) { this.ISQUALIFIED = e }, diff --git a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue index 4863b84..8b63478 100644 --- a/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue +++ b/pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue @@ -18,24 +18,32 @@ - - - {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} - 暂无 - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} + + + + 隐患来源:隐患快报 + {{ '隐患描述:' + (item.HIDDENDESCR ? (item.HIDDENDESCR.length > 15 ? item.HIDDENDESCR.substr(0, 15) + '...' : item.HIDDENDESCR) : '暂无') }} - - 风险排查清单检查 - 隐患排查清单检查 - 来源:隐患快报 - 来源:清单排查 - 来源:清单排查 + + 隐患级别: + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} + 未确认 + 已确认 + + + 隐患来源:隐患快报 + 隐患来源:隐患排查 + 隐患来源:隐患排查 + 隐患来源:安全环保检查 + 隐患来源:安全环保检查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} - {{item.RECTIFICATIONTIME}} + + 整改时间: {{item.RECTIFICATIONTIME}} + diff --git a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue index 1ec480a..d7c7c96 100644 --- a/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue +++ b/pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue @@ -8,7 +8,7 @@ - + @@ -18,24 +18,37 @@ - - - {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} - 暂无 - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} - - - 风险排查清单检查 - 隐患排查清单检查 - 来源:隐患快报 - 来源:清单排查 - 来源:清单排查 - + + + + + 隐患描述: + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} + 暂无 + + + + + 隐患来源:隐患快报 + 隐患来源:隐患排查 + 隐患来源:隐患排查 + 隐患来源:安全环保检查 + 隐患来源:安全环保检查 + + + 隐患级别: + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} + 未确认 + 已确认 + + 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} - {{item.RECTIFICATIONTIME}} + + 整改时间: {{item.RECTIFICATIONTIME}} + @@ -77,7 +90,7 @@ } }, onLoad(e) { - this.isIndex = e.isIndex; + this.isIndex = e.isIndex !== undefined ? e.isIndex : 1; this.getData(); loginSession(); }, diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue index c625217..9fa39f2 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue @@ -6,9 +6,14 @@ - - {{pd.HIDDENDESCR}} - + + + 隐患描述 + + + {{pd.HIDDENDESCR}} + + 隐患来源 @@ -16,7 +21,8 @@ 隐患快报 隐患排查 - 隐患排查 + 安全环保检查 + 安全环保检查 @@ -237,7 +243,8 @@ 验收部门 - {{other[index].DEPARTMENT_NAME?other[index].DEPARTMENT_NAME:'请选择'}} + {{other[index].DEPARTMENT_NAME || '请选择'}} + @@ -249,8 +256,8 @@ :disabled="otherUserList[index] ==null || otherUserList[index].length==0" :range="otherUserList[index]" range-key="NAME"> - {{other[index].USER_NAME?other[index].USER_NAME:'请选择'}} - + {{other[index].USER_NAME || '请选择'}} + @@ -271,23 +278,19 @@ - - 是否有整改方案 - - - - - - - - - - - - - - - + + 是否有整改方案 + + + + + + + + + + + 排查日期 @@ -445,7 +448,7 @@ }, data() { return { - permissionID:'', + permissionID:'', noClick: true, date: '', RECTIFICATIONTIME: '', @@ -520,26 +523,28 @@ }, data: { HIDDEN_ID: _this.id, - CORPINFO_ID:loginUser.CORPINFO_ID, - USER_ID:loginUser.USER_ID, + CORPINFO_ID:loginUser.CORPINFO_ID, + USER_ID:loginUser.USER_ID, }, success: (res) => { if ("success" == res.data.result) { uni.hideLoading(); _this.pd = res.data.pd; //参数map - if (_this.pd.HIDDENLEVEL == 'hiddenLevel0002') { + console.log(_this.pd); + if (_this.pd.HIDDENLEVEL == 'hiddenLevel0002') { _this.getqyData(); } if (_this.pd.ISCONFIRM == '1') { _this.HAVESCHEME = '1' } - for (let i = 0; i < res.data.hImgs.length; i++) { - if(res.data.hImgs[i].FILEPATH.substring(res.data.hImgs[i].FILEPATH.lastIndexOf(".") + 1, res.data.hImgs[i].FILEPATH.length) === 'mp4'){ - _this.videoList.push(res.data.hImgs[i]) - }else { - _this.files.push(res.data.hImgs[i]) - } - } + for (let i = 0; i < res.data.hImgs.length; i++) { + // if(res.data.hImgs[i].FILEPATH.substring(res.data.hImgs[i].FILEPATH.lastIndexOf(".") + 1, res.data.hImgs[i].FILEPATH.length) === 'mp4'){ + // _this.videoList.push(res.data.hImgs[i]) + // }else { + _this.files.push(res.data.hImgs[i]) + // } + } + _this.videoList =res.data.hiddenVideo // _this.files = res.data.hImgs; _this.other[0].DEPARTMENT_ID=_this.pd.HIDDENFINDDEPT; _this.other[0].DEPARTMENT_NAME=_this.pd.HIDDENFINDDEPTNAME; @@ -620,19 +625,28 @@ //图片上传 ChooseImage() { - var _this = this; - uni.chooseImage({ - count: 4, //默认9 - sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有 - sourceType: ['camera', 'album'], //从相册选择 - success: (res) => { - if (this.imgList.length != 0) { - this.imgList = this.imgList.concat(res.tempFilePaths) - } else { - this.imgList = res.tempFilePaths - } - } - }); + var _this = this; + var ss = 4 - this.hiddenForm.hiddenImgs.length; + uni.chooseImage({ + count: ss, //默认9 + sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有 + sourceType: ['camera', 'album'], //从相册选择 + success: (res) => { + for (let i = 0; i < res.tempFilePaths.length; i++) { + if (e == 0) { + let img = {}; + img.IMGFILES_ID = ''; + img.FILEPATH = res.tempFilePaths[i]; + this.hiddenForm.hiddenImgs.push(img) + } else { + let img = {}; + img.IMGFILES_ID = ''; + img.FILEPATH = res.tempFilePaths[i]; + this.imgList1.push(img) + } + } + } + }); }, ViewImage(e) { uni.previewImage({ @@ -655,21 +669,19 @@ }) }, //图片上传 - ChooseImage_fa() { - var _this = this; - uni.chooseImage({ - count: 4, //默认9 - sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有 - sourceType: ['camera', 'album'], //从相册选择 - success: (res) => { - if (this.imgList_fa.length != 0) { - this.imgList_fa = this.imgList_fa.concat(res.tempFilePaths) - } else { - this.imgList_fa = res.tempFilePaths - } - } - }); - }, + ChooseImage_fa() { + var _this = this; + uni.chooseImage({ + count: 4 - _this.imgList.length, // +++ 确保总数不超过4张 + sizeType: ['original', 'compressed'], + sourceType: ['camera', 'album'], + success: (res) => { + // 将选择的图片路径添加到 imgList 数组 + _this.imgList = _this.imgList.concat(res.tempFilePaths); + _this.$forceUpdate(); // +++ 强制更新视图以显示新图片 + } + }); + }, ViewImage_fa(e) { uni.previewImage({ urls: this.imgList_fa, @@ -750,14 +762,14 @@ }); return; } - if (_this.imgList.length <= 0) { - uni.showToast({ - icon: 'none', - title: '请上传整改后照片', - duration: 1500 - }); - return; - } + // if (_this.imgList.length <= 0) { + // uni.showToast({ + // icon: 'none', + // title: '请上传整改后照片', + // duration: 1500 + // }); + // return; + // } if (this.HAVESCHEME == 1) { if (this.pd.GOVERNSTANDARDS == '' || this.pd.GOVERNSTANDARDS == undefined) { @@ -1157,7 +1169,6 @@ success: (res) => { if ("success" == res.data.result) { _this.treeNode = eval(res.data.zTreeNodes); - // _this.other[0].DEPARTMENT_ID = loginUser.DEPARTMENT_ID; // _this.other[0].DEPARTMENT_NAME = loginUser.DEPARTMENT_NAME; // _this.other[0].USER_ID = loginUser.USER_ID; @@ -1188,6 +1199,7 @@ // 确定回调事件 ystreeConfirm(e, index) { + console.log(e,index) this.other[index].DEPARTMENT_ID = e[0].id; this.other[index].DEPARTMENT_NAME = e[0].name; this.other[index].USER_ID = ''; diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue index 3fa9d6d..6d8b31f 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue @@ -6,9 +6,14 @@ - - {{pd.HIDDENDESCR}} - + + + 隐患描述 + + + {{pd.HIDDENDESCR}} + + 隐患来源 @@ -17,6 +22,8 @@ 隐患快报 风险排查 风险排查 + 安全环保检查 + 安全环保检查 @@ -278,14 +285,18 @@ - - - - - - - - + + + + + + + + + + + + diff --git a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue index cb94d53..ce6d743 100644 --- a/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue +++ b/pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue @@ -21,26 +21,26 @@ - {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} - 暂无 - - - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} - 未确认 - 已确认 + + {{ '隐患描述:' + (item.HIDDENDESCR ? (item.HIDDENDESCR.length > 15 ? item.HIDDENDESCR.substr(0, 15) + '...' : item.HIDDENDESCR) : '暂无') }} + - - 风险排查清单检查 - 隐患排查清单检查 - 来源:隐患快报 - 来源:清单排查 - 来源:清单排查 + + 隐患级别: + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} + + + 隐患来源:隐患快报 + 隐患来源:隐患排查 + 隐患来源:隐患排查 + 隐患来源:安全环保检查 + 隐患来源:安全环保检查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} - {{item.RECTIFICATIONTIME}} + @@ -140,6 +140,7 @@ }, success: (res) => { // console.info(res.data); + console.log("打印数据:",res.data.varList) if (res.data.result == 'success') { uni.hideLoading(); _this.total = res.data.page.totalResult; diff --git a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue index aedf5cd..f0579e4 100644 --- a/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue +++ b/pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue @@ -18,29 +18,30 @@ - + - - {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} - 暂无 - - - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} - 未确认 - 已确认 - + + 隐患描述: + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} + 暂无 + - - 风险排查清单检查 - 隐患排查清单检查 - 来源:隐患快报 - 来源:清单排查 - 来源:清单排查 + + 隐患级别: + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} + 未确认 + 已确认 + + 隐患来源:隐患快报 + 隐患来源:隐患排查 + 隐患来源:隐患排查 + 隐患来源:安全环保检查 + 隐患来源:安全环保检查 + 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} - {{item.RECTIFICATIONTIME}} @@ -145,6 +146,7 @@ if (res.data.result == 'success') { uni.hideLoading(); _this.total = res.data.page.totalResult; + console.log('打印数据:',res.data) if (_this.totalCount < res.data.page.totalResult) { var content = res.data.varList; _this.list = _this.list.concat(content); diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue index f7d077b..d23e358 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue @@ -6,15 +6,22 @@ - - {{pd.HIDDENDESCR}} - + + + 隐患描述 + + + {{pd.HIDDENDESCR}} + + 隐患来源 隐患快报 隐患排查 隐患排查 + 安全环保检查 + 安全环保检查 @@ -167,14 +174,14 @@ 整改信息 - - - 整改描述 - - - {{pd.RECTIFYDESCR}} - - + + + 整改描述 + + + {{pd.RECTIFYDESCR}} + + 整改部门 @@ -327,17 +334,16 @@ - - - - 整改计划 - - - - - - - + + + 整改计划 + + + + + + + 计划图片 @@ -359,14 +365,14 @@ 验收信息 - - - 验收描述 - - - {{item.CHECKDESCR}} - - + + + 验收描述 + + + {{item.CHECKDESCR}} + + 是否合格 diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue index 6715e73..e296b8b 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue @@ -6,15 +6,20 @@ - - {{pd.HIDDENDESCR}} - + + 隐患描述 + + {{pd.HIDDENDESCR}} + + 隐患来源 隐患快报 风险排查 风险排查 + 安全环保检查 + 安全环保检查 @@ -167,14 +172,14 @@ 整改信息 - - - 整改描述 - - - {{pd.RECTIFYDESCR}} - - + + + 整改描述 + + + {{pd.RECTIFYDESCR}} + + 整改部门 @@ -327,17 +332,16 @@ - - - - 整改计划 - - - - - - - + + + 整改计划 + + + + + + + 计划图片 @@ -359,14 +363,14 @@ 验收信息 - - - 验收描述 - - - {{item.CHECKDESCR}} - - + + + 验收描述 + + + {{item.CHECKDESCR}} + + 是否合格 diff --git a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue index aa90335..eb68052 100644 --- a/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue +++ b/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue @@ -14,8 +14,6 @@ 高级查询 - - 检查部门 @@ -46,8 +44,8 @@ 隐患级别 - 风险排查隐患 - 隐患排查隐患 + 一般隐患 + 重大隐患 隐患级别 @@ -101,7 +99,7 @@ - + @@ -111,24 +109,33 @@ - - - {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} - 暂无 - {{item.HIDDENLEVELNAME}} - {{item.HIDDENLEVELNAME}} - - - 风险排查清单检查 - 隐患排查清单检查 - 来源:隐患快报 - 来源:清单排查 - 来源:清单排查 + + + + + 隐患描述: + {{item.HIDDENDESCR.length>15?item.HIDDENDESCR.substr(0,15)+'...':item.HIDDENDESCR}} + 暂无 + + + 隐患级别: + {{item.HIDDENLEVELNAME}} + {{item.HIDDENLEVELNAME}} + + + + 隐患来源:隐患快报 + 隐患来源:隐患排查 + 隐患来源:隐患排查 + 隐患来源:安全环保检查 + 隐患来源:安全环保检查 整改人:{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}} - {{item.RECTIFICATIONTIME}} + + 整改时间:{{item.RECTIFICATIONTIME}} + diff --git a/pages/application/hoisting/home.vue b/pages/application/hoisting/home.vue new file mode 100644 index 0000000..e69de29 diff --git a/pages/application/open-circuit/home.vue b/pages/application/open-circuit/home.vue new file mode 100644 index 0000000..e69de29 diff --git a/pages/application/safety-environmental-inspection/apply/detail-plead.vue b/pages/application/safety-environmental-inspection/apply/detail-plead.vue new file mode 100644 index 0000000..1564792 --- /dev/null +++ b/pages/application/safety-environmental-inspection/apply/detail-plead.vue @@ -0,0 +1,499 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/apply/detail.vue b/pages/application/safety-environmental-inspection/apply/detail.vue new file mode 100644 index 0000000..da0150e --- /dev/null +++ b/pages/application/safety-environmental-inspection/apply/detail.vue @@ -0,0 +1,1748 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/apply/flowChart.vue b/pages/application/safety-environmental-inspection/apply/flowChart.vue new file mode 100644 index 0000000..d4f9ff7 --- /dev/null +++ b/pages/application/safety-environmental-inspection/apply/flowChart.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/archive/detail-check.vue b/pages/application/safety-environmental-inspection/archive/detail-check.vue new file mode 100644 index 0000000..47baff6 --- /dev/null +++ b/pages/application/safety-environmental-inspection/archive/detail-check.vue @@ -0,0 +1,885 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/archive/detail-hidden.vue b/pages/application/safety-environmental-inspection/archive/detail-hidden.vue new file mode 100644 index 0000000..74385ab --- /dev/null +++ b/pages/application/safety-environmental-inspection/archive/detail-hidden.vue @@ -0,0 +1,821 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/archive/detail.vue b/pages/application/safety-environmental-inspection/archive/detail.vue new file mode 100644 index 0000000..ffc77b9 --- /dev/null +++ b/pages/application/safety-environmental-inspection/archive/detail.vue @@ -0,0 +1,956 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/home.vue b/pages/application/safety-environmental-inspection/home.vue new file mode 100644 index 0000000..9d77a37 --- /dev/null +++ b/pages/application/safety-environmental-inspection/home.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/inspected/detail.vue b/pages/application/safety-environmental-inspection/inspected/detail.vue new file mode 100644 index 0000000..920455c --- /dev/null +++ b/pages/application/safety-environmental-inspection/inspected/detail.vue @@ -0,0 +1,1092 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/inspector/detail.vue b/pages/application/safety-environmental-inspection/inspector/detail.vue new file mode 100644 index 0000000..5fc3c9a --- /dev/null +++ b/pages/application/safety-environmental-inspection/inspector/detail.vue @@ -0,0 +1,1018 @@ + + + + + diff --git a/pages/application/safety-environmental-inspection/rectification/detail.vue b/pages/application/safety-environmental-inspection/rectification/detail.vue new file mode 100644 index 0000000..de420d8 --- /dev/null +++ b/pages/application/safety-environmental-inspection/rectification/detail.vue @@ -0,0 +1,1109 @@ + + + + + diff --git a/pages/basics/home.vue b/pages/basics/home.vue index 31eb7f2..0cc7fc4 100644 --- a/pages/basics/home.vue +++ b/pages/basics/home.vue @@ -109,6 +109,7 @@ 高危作业 + @@ -136,6 +137,18 @@ 学习园地 + + + + + + + + 安全环保检查 + + {{ safetyEnvironmentalInspection }} + + @@ -568,6 +581,7 @@ export default { mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件) data() { return { + safetyEnvironmentalInspection:0,//安全环保总数 permissionID:'', premission: {}, noClick: true, @@ -607,6 +621,7 @@ export default { }, mounted() { loginSession() + this.getSafetyEnvironmentalInspectionCount(); this.getUpdateInfo() this.premission = Object.assign({}, premission) let now = new Date(); @@ -637,6 +652,34 @@ export default { // }, 1000); // }, methods: { + getSafetyEnvironmentalInspectionCount(){ + var _this = this; + return new Promise((resolve, reject) => { + uni.request({ + url: basePath +'/app/safetyenvironmental/countCheck', + method: 'POST', + dataType: 'json', + header:{ + 'Content-type':'application/x-www-form-urlencoded' + }, + data: { + CORPINFO_ID:corpinfoId, + INSPECTION_USER_ID:loginUser.USER_ID, + INSPECTED_SITEUSER_ID: loginUser.USER_ID, + INSPECTION_ORIGINATOR_ID: loginUser.USER_ID, + tm:new Date().getTime() + }, + success: (res) => { + if ("success" == res.data.result) { + _this.safetyEnvironmentalInspection = res.data.confirmCount.confirmCount + + res.data.checkedCount.checkedCount+ res.data.repulseCount.repulseCount + +res.data.repulseAndCheckCount.repulseAndCheckCount + resolve(); + } + } + }); + }) + }, getUpdateInfo() { // console.info(updateInfo) if (!updateInfo) {