From 6ea70cf5ae056ef5dbb70aa3a0b0686bbe8c356e Mon Sep 17 00:00:00 2001 From: LiuJiaNan Date: Wed, 16 Oct 2024 09:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=BE=AE=E4=BF=A1=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../branch-information/qualification.vue | 8 ++-- .../branch-staff/detail.vue | 8 ++-- .../index/inspection-records-detail.vue | 2 +- .../general-hidden/detail.vue | 41 ++++++++++-------- .../ignore-hidden/detail.vue | 8 ++-- .../special-hidden/detail.vue | 25 ++++++----- .../hidden-management/view.vue | 16 +++---- .../penalty-management/viewHidden.vue | 16 +++---- .../detail.vue | 4 +- .../larger-hidden-management/detail.vue | 17 +++++--- .../major-hidden-management/detail.vue | 17 +++++--- pages/map/map.vue | 2 + .../defense-record/plead-list.vue | 10 +++-- .../initiate/detail.vue | 8 ++-- .../initiate/plead.vue | 9 +++- .../inspector-archives/acceptance.vue | 42 ++++++++++--------- pages/super-hot/safety-director/detail.vue | 32 +++++++------- pages/super-hot/security-committee/detail.vue | 16 +++---- .../supervision-department/detail.vue | 16 +++---- 19 files changed, 167 insertions(+), 130 deletions(-) diff --git a/pages/branch-information-management/branch-information/qualification.vue b/pages/branch-information-management/branch-information/qualification.vue index cee91d8..73be23c 100644 --- a/pages/branch-information-management/branch-information/qualification.vue +++ b/pages/branch-information-management/branch-information/qualification.vue @@ -22,12 +22,12 @@ 已上传证书： - - + + - - + + diff --git a/pages/branch-information-management/branch-staff/detail.vue b/pages/branch-information-management/branch-staff/detail.vue index b81a462..6145ea9 100644 --- a/pages/branch-information-management/branch-staff/detail.vue +++ b/pages/branch-information-management/branch-staff/detail.vue @@ -102,12 +102,12 @@ 证书图片 - - + + - - + + diff --git a/pages/branch-self-report/index/inspection-records-detail.vue b/pages/branch-self-report/index/inspection-records-detail.vue index 980b740..344ef29 100644 --- a/pages/branch-self-report/index/inspection-records-detail.vue +++ b/pages/branch-self-report/index/inspection-records-detail.vue @@ -95,7 +95,7 @@ shape="circle" text="清单位置" @click=" - uni.$u.route({ + $u.route({ url: '/pages/branch-self-report/index/map', params: { CHECKRECORD_ID }, }) diff --git a/pages/general-hidden-management/general-hidden/detail.vue b/pages/general-hidden-management/general-hidden/detail.vue index ce11984..1ae00a0 100644 --- a/pages/general-hidden-management/general-hidden/detail.vue +++ b/pages/general-hidden-management/general-hidden/detail.vue @@ -90,12 +90,12 @@ 隐患图片 - - + + - - + + @@ -292,12 +292,12 @@ 整改后图片： - - + + - - + + @@ -351,12 +351,12 @@ 方案图片： - - + + - - + + @@ -398,12 +398,12 @@ 验收图片： - - + + - - + + @@ -489,8 +489,13 @@ export default { }); }, downloadAppendix(DISPOSAL_FILE) { - plus.runtime.openURL(this.$store.state.filePath + DISPOSAL_FILE, function (res) { - console.log(res); + uni.downloadFile({ + url: this.$store.state.filePath + DISPOSAL_FILE, + success: (res) => { + uni.openDocument({ + filePath: res.tempFilePath, + }); + }, }); }, }, diff --git a/pages/general-hidden-management/ignore-hidden/detail.vue b/pages/general-hidden-management/ignore-hidden/detail.vue index adacd08..b594c41 100644 --- a/pages/general-hidden-management/ignore-hidden/detail.vue +++ b/pages/general-hidden-management/ignore-hidden/detail.vue @@ -80,12 +80,12 @@ 隐患图片 - - + + - - + + diff --git a/pages/general-hidden-management/special-hidden/detail.vue b/pages/general-hidden-management/special-hidden/detail.vue index bfeea9e..a9a6090 100644 --- a/pages/general-hidden-management/special-hidden/detail.vue +++ b/pages/general-hidden-management/special-hidden/detail.vue @@ -95,12 +95,12 @@ 隐患照片 - - + + - - + + @@ -144,12 +144,12 @@ 整改后图片： - - + + - - + + @@ -326,8 +326,13 @@ export default { }); }, downloadAppendix(DISPOSAL_FILE) { - plus.runtime.openURL(this.$store.state.filePath + DISPOSAL_FILE, function (res) { - console.log(res); + uni.downloadFile({ + url: this.$store.state.filePath + DISPOSAL_FILE, + success: (res) => { + uni.openDocument({ + filePath: res.tempFilePath, + }); + }, }); }, }, diff --git a/pages/key-project-management/hidden-management/view.vue b/pages/key-project-management/hidden-management/view.vue index 709f46b..fe8c973 100644 --- a/pages/key-project-management/hidden-management/view.vue +++ b/pages/key-project-management/hidden-management/view.vue @@ -6,12 +6,12 @@ 隐患照片： - - + + - - + + @@ -87,12 +87,12 @@ 整改照片： - - + + - - + + diff --git a/pages/key-project-management/penalty-management/viewHidden.vue b/pages/key-project-management/penalty-management/viewHidden.vue index b6bbf94..2421bdd 100644 --- a/pages/key-project-management/penalty-management/viewHidden.vue +++ b/pages/key-project-management/penalty-management/viewHidden.vue @@ -6,12 +6,12 @@ 隐患照片： - - + + - - + + @@ -87,12 +87,12 @@ 整改照片： - - + + - - + + diff --git a/pages/key-project-management/safety-environmental-inspection/detail.vue b/pages/key-project-management/safety-environmental-inspection/detail.vue index a51bbd6..bc43875 100644 --- a/pages/key-project-management/safety-environmental-inspection/detail.vue +++ b/pages/key-project-management/safety-environmental-inspection/detail.vue @@ -95,7 +95,7 @@ 检查人员： - {{ form.INSPECTION_USERS }} + @@ -151,7 +151,7 @@ - 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 5aee503..2ed9796 100644 --- a/pages/larger-major-hidden-management/larger-hidden-management/detail.vue +++ b/pages/larger-major-hidden-management/larger-hidden-management/detail.vue @@ -83,11 +83,11 @@ 隐患照片 - - + + - - + + @@ -330,8 +330,13 @@ export default { }); }, downloadAppendix(DISPOSAL_FILE) { - plus.runtime.openURL(this.$store.state.filePath + DISPOSAL_FILE, function (res) { - console.log(res); + uni.downloadFile({ + url: this.$store.state.filePath + DISPOSAL_FILE, + success: (res) => { + uni.openDocument({ + filePath: res.tempFilePath, + }); + }, }); }, }, 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 594c59b..4a16039 100644 --- a/pages/larger-major-hidden-management/major-hidden-management/detail.vue +++ b/pages/larger-major-hidden-management/major-hidden-management/detail.vue @@ -81,12 +81,12 @@ 隐患图片 - - + + - - + + @@ -305,8 +305,13 @@ export default { }); }, downloadAppendix(DISPOSAL_FILE) { - plus.runtime.openURL(this.$store.state.filePath + DISPOSAL_FILE, function (res) { - console.log(res); + uni.downloadFile({ + url: this.$store.state.filePath + DISPOSAL_FILE, + success: (res) => { + uni.openDocument({ + filePath: res.tempFilePath, + }); + }, }); }, }, diff --git a/pages/map/map.vue b/pages/map/map.vue index 662fddd..4164bd0 100644 --- a/pages/map/map.vue +++ b/pages/map/map.vue @@ -42,7 +42,9 @@ export default { eventChannel.emit('acceptDataFromOpenedPage', { data: event.detail.data[0] }); + // #ifdef APP-PLUS uni.navigateBack(); + // #endif }, } } diff --git a/pages/safety-environmental-inspection/defense-record/plead-list.vue b/pages/safety-environmental-inspection/defense-record/plead-list.vue index 5b37720..6c4f5e4 100644 --- a/pages/safety-environmental-inspection/defense-record/plead-list.vue +++ b/pages/safety-environmental-inspection/defense-record/plead-list.vue @@ -84,9 +84,13 @@ export default { }); }, downloadAppendix(url) { - console.log(url) - plus.runtime.openURL(this.$store.state.filePath + url, function (res) { - console.log(res); + uni.downloadFile({ + url: this.$store.state.filePath + url, + success: (res) => { + uni.openDocument({ + filePath: res.tempFilePath, + }); + }, }); }, } diff --git a/pages/safety-environmental-inspection/initiate/detail.vue b/pages/safety-environmental-inspection/initiate/detail.vue index a663d77..9f6ade4 100644 --- a/pages/safety-environmental-inspection/initiate/detail.vue +++ b/pages/safety-environmental-inspection/initiate/detail.vue @@ -244,7 +244,7 @@ - @@ -345,8 +345,10 @@ 隐患上报位置： - + + + 经度:{{ hiddenForm.LONGITUDE }} diff --git a/pages/safety-environmental-inspection/initiate/plead.vue b/pages/safety-environmental-inspection/initiate/plead.vue index 65ad238..fe4f7b2 100644 --- a/pages/safety-environmental-inspection/initiate/plead.vue +++ b/pages/safety-environmental-inspection/initiate/plead.vue @@ -132,8 +132,13 @@ export default { }); }, downloadAppendix() { - plus.runtime.openURL(this.$store.state.filePath + this.form.INSPECTED_EXPLAIN_FILEPATH, function (res) { - console.log(res); + uni.downloadFile({ + url: this.$store.state.filePath + this.form.INSPECTED_EXPLAIN_FILEPATH, + success: (res) => { + uni.openDocument({ + filePath: res.tempFilePath, + }); + }, }); }, signConfirm({path}) { diff --git a/pages/safety-environmental-inspection/inspector-archives/acceptance.vue b/pages/safety-environmental-inspection/inspector-archives/acceptance.vue index 8ba2f23..4c98ac3 100644 --- a/pages/safety-environmental-inspection/inspector-archives/acceptance.vue +++ b/pages/safety-environmental-inspection/inspector-archives/acceptance.vue @@ -89,12 +89,12 @@ 隐患图片： - - + + - - + + @@ -279,12 +279,12 @@ 整改后图片： - - + + - - + + @@ -344,12 +344,12 @@ 方案图片： - - + + - - + + @@ -385,12 +385,12 @@ 验收图片： - - + + - - + + @@ -549,9 +549,13 @@ export default { }); }, downloadAppendix(DISPOSAL_FILE) { - // console.log(this.$store.state.filePath + DISPOSAL_FILE) - plus.runtime.openURL(this.$store.state.filePath + DISPOSAL_FILE, function (res) { - console.log(res); + uni.downloadFile({ + url: this.$store.state.filePath + DISPOSAL_FILE, + success: (res) => { + uni.openDocument({ + filePath: res.tempFilePath, + }); + }, }); }, finalChecktimeConfirm(e) { diff --git a/pages/super-hot/safety-director/detail.vue b/pages/super-hot/safety-director/detail.vue index 751ed95..665045c 100644 --- a/pages/super-hot/safety-director/detail.vue +++ b/pages/super-hot/safety-director/detail.vue @@ -97,23 +97,23 @@ 上传会签文件： - - + + - - + + 上传附件： - - + + - - + + @@ -202,25 +202,25 @@ 上传会议纪要： - - + + - - + + 上传附件： - - + + - - + + diff --git a/pages/super-hot/security-committee/detail.vue b/pages/super-hot/security-committee/detail.vue index f42b562..ba4c1b2 100644 --- a/pages/super-hot/security-committee/detail.vue +++ b/pages/super-hot/security-committee/detail.vue @@ -98,25 +98,25 @@ 上传会签文件： - - + + - - + + 上传附件： - - + + - - + + diff --git a/pages/super-hot/supervision-department/detail.vue b/pages/super-hot/supervision-department/detail.vue index b2347ab..55740fa 100644 --- a/pages/super-hot/supervision-department/detail.vue +++ b/pages/super-hot/supervision-department/detail.vue @@ -99,25 +99,25 @@ 上传会签文件： - - + + - - + + 上传附件： - - + + - - + +