From 2388ecf61292d834d3c7e0ef82b409a79cc14dfd Mon Sep 17 00:00:00 2001 From: fufeifei Date: Wed, 6 Nov 2024 17:17:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81=E5=AE=89=E5=85=A8=E3=80=81?= =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E6=A3=80=E6=9F=A5=E7=AE=A1=E7=90=86=E4=B8=AD?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=88=97=E8=A1=A8=E7=9A=84=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=94=99=E4=BA=86=EF=BC=8C=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/safetyenvironmental/archive/components/info.vue | 2 +- src/views/safetyenvironmental/inspection/components/list.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue index 4ed4426..2c568e4 100644 --- a/src/views/safetyenvironmental/archive/components/info.vue +++ b/src/views/safetyenvironmental/archive/components/info.vue @@ -370,7 +370,7 @@ export default { // 导出表格的数据 goExport() { var dataStr = '?INSPECTION_ID=' + encodeURIComponent(this.$parent.INSPECTION_ID) - window.location.href = config.httpurl + 'safetyenvironmental/exportInfo' + dataStr + window.location.href = config.httpurl + '/safetyenvironmental/exportInfo' + dataStr } } } diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index fb0e7c7..b52cd2e 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -389,7 +389,7 @@ export default { dataStr += '&INSPECTION_SUBJECT=' + encodeURIComponent(this.search.INSPECTION_SUBJECT) // 检查题目 dataStr += '&INSPECTION_TIME_START=' + encodeURIComponent(this.search.INSPECTION_TIME[0]) // 开始检查时间 dataStr += '&INSPECTION_TIME_END=' + encodeURIComponent(this.search.INSPECTION_TIME[1]) // 结束检查时间 - window.location.href = config.httpurl + 'safetyenvironmental/exportexcel' + dataStr + window.location.href = config.httpurl + '/safetyenvironmental/exportexcel' + dataStr }, // 获取列表 getList() { From e5dba3b4d05cc3caa5473809101fa7b49a9219ed Mon Sep 17 00:00:00 2001 From: fufeifei Date: Mon, 11 Nov 2024 18:13:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E9=9A=90=E6=82=A3=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=AD=E4=B8=B4=E6=97=B6=E5=AE=89=E5=85=A8=E6=8E=AA?= =?UTF-8?q?=E6=96=BDbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hidden/rectify/components/change.vue | 4 ++-- src/views/hiddenApi/publicMethod/list.vue | 20 ++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/views/hidden/rectify/components/change.vue b/src/views/hidden/rectify/components/change.vue index aa45fd9..b1c5e76 100644 --- a/src/views/hidden/rectify/components/change.vue +++ b/src/views/hidden/rectify/components/change.vue @@ -33,7 +33,7 @@ - + @@ -426,7 +426,7 @@ export default { this.loading = true if (this.DAYNUM >= 1 && this.form.TEMPORARY_SAFE_MEASURE == '') { this.$message({ - message: '临时安全措施不能为空，请先返回上个页面填写临时安全措施！！！', + message: '请先输入临时安全措施！！！', type: 'error' }) this.loading = false diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue index 1635f0e..74ed8ec 100644 --- a/src/views/hiddenApi/publicMethod/list.vue +++ b/src/views/hiddenApi/publicMethod/list.vue @@ -784,14 +784,20 @@ export default { }, // 添加临时安全措施的点击事件 AddTempSafeMeasureClick() { - if (!this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE && this.dayNum >= 1) { - this.$message({ - message: '请填写临时安全措施', - type: 'error' - }) - this.loading = false - return false + if (!this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE) { + alert(this.dayNum) + if (this.dayNum >= 1) { + this.$message({ + message: '请填写临时安全措施', + type: 'error' + }) + this.loading = false + return false + }else { + this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE = '' + } } + const loading = this.$loading({ lock: true, text: '加载中......', From 565df5ed49d0e105087adc6ddeb2eac052a42a07 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Tue, 12 Nov 2024 16:20:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D](pet)?= =?UTF-8?q?=20=20=20=E4=BF=AE=E5=A4=8D=E7=AD=9B=E9=80=89=E9=A1=B9=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hidden/rectify/components/change.vue | 2 +- src/views/hiddenApi/publicMethod/list.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/hidden/rectify/components/change.vue b/src/views/hidden/rectify/components/change.vue index b1c5e76..2c3fe2b 100644 --- a/src/views/hidden/rectify/components/change.vue +++ b/src/views/hidden/rectify/components/change.vue @@ -33,7 +33,7 @@ - + diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue index 74ed8ec..381fed6 100644 --- a/src/views/hiddenApi/publicMethod/list.vue +++ b/src/views/hiddenApi/publicMethod/list.vue @@ -18,7 +18,7 @@