From b5f7c2e98e6f85bac25cc254e2fe4e521773ab9c Mon Sep 17 00:00:00 2001 From: fufeifei Date: Mon, 14 Oct 2024 17:19:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/accesscontrol/accesscontroldata/components/list.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/accesscontrol/accesscontroldata/components/list.vue b/src/views/accesscontrol/accesscontroldata/components/list.vue index c9433b0..1e50ad8 100644 --- a/src/views/accesscontrol/accesscontroldata/components/list.vue +++ b/src/views/accesscontrol/accesscontroldata/components/list.vue @@ -59,9 +59,7 @@
申请 - +
From 504fdc7746a798025399c1dd8e9ede5b033dcfca Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Thu, 31 Oct 2024 15:21:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[BUG=E4=BF=AE=E5=A4=8D](hyx=5F2024-10-30=5F?= =?UTF-8?q?new)=20=E6=96=B0=E6=A1=86=E6=9E=B6bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accesscontrol/accesscontroldata/components/list.vue | 2 +- .../corpInfo/information/qualifications/components/list.vue | 6 +++--- src/views/firefighting/device/components/info.vue | 2 +- src/views/firefighting/points/components/list.vue | 3 +++ src/views/hiddenApi/publicMethod/list.vue | 2 +- src/views/index/index.vue | 4 ++-- src/views/risk/identificationparts/components/list.vue | 4 ++-- src/views/risk/riskpoint/components/list.vue | 6 +++--- src/views/risk/riskunit/components/list.vue | 2 +- 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/views/accesscontrol/accesscontroldata/components/list.vue b/src/views/accesscontrol/accesscontroldata/components/list.vue index 1e50ad8..99588e8 100644 --- a/src/views/accesscontrol/accesscontroldata/components/list.vue +++ b/src/views/accesscontrol/accesscontroldata/components/list.vue @@ -368,7 +368,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskunit/excelModel' + window.location.href = config.httpurl + '/riskunit/excelModel' }).catch(() => { this.listLoading = false }) diff --git a/src/views/corpInfo/information/qualifications/components/list.vue b/src/views/corpInfo/information/qualifications/components/list.vue index 90be215..6406a35 100644 --- a/src/views/corpInfo/information/qualifications/components/list.vue +++ b/src/views/corpInfo/information/qualifications/components/list.vue @@ -76,14 +76,14 @@
- 新增 + 新增
diff --git a/src/views/firefighting/device/components/info.vue b/src/views/firefighting/device/components/info.vue index 21285ce..bf34ef9 100644 --- a/src/views/firefighting/device/components/info.vue +++ b/src/views/firefighting/device/components/info.vue @@ -163,7 +163,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskpoint/excelModel' + window.location.href = config.httpurl + '/riskpoint/excelModel' }).catch(() => { this.listLoading = false }) diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index decdf53..caeffe8 100644 --- a/src/views/firefighting/points/components/list.vue +++ b/src/views/firefighting/points/components/list.vue @@ -173,6 +173,9 @@ export default { KEYWORDS: '', FIRE_POINT_NAME: '', FIRE_POINT_CODE: '', + selectForm: { + DEPARTMENT_ID: '' + }, // 树形菜单 filterText: '', varList: [], diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue index 22e2de2..3252e46 100644 --- a/src/views/hiddenApi/publicMethod/list.vue +++ b/src/views/hiddenApi/publicMethod/list.vue @@ -644,7 +644,7 @@ export default { data += '&ENDTIME=' + _this.condform.creatTime[1] data += '&sessionID=' + ssionID data += '&tm=' + new Date().getTime() - window.location.href = config.httpurl + 'hiddenExcel/excel2' + data + window.location.href = config.httpurl + '/hiddenExcel/excel2' + data var timingTask = setInterval(function() { requestFN( diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 96db313..9e88e33 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -118,9 +118,9 @@ export default { this.jinduData[1] = nowYear + '-12-31' this.getJindu() this.getQingdan() - // this.getWorkNumber() + this.getWorkNumber() this.getRiskNumber() - // this.getHiddenTypeCount() + this.getHiddenTypeCount() /* this.getNoticeList() this.getNoticeCorpList()*/ diff --git a/src/views/risk/identificationparts/components/list.vue b/src/views/risk/identificationparts/components/list.vue index b54e1c1..b946999 100644 --- a/src/views/risk/identificationparts/components/list.vue +++ b/src/views/risk/identificationparts/components/list.vue @@ -468,7 +468,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'identificationparts/excel' + window.location.href = config.httpurl + '/identificationparts/excel' }).catch(() => { this.listLoading = false }) @@ -505,7 +505,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'identificationparts/excelModel' + window.location.href = config.httpurl + '/identificationparts/excelModel' }).catch(() => { this.listLoading = false }) diff --git a/src/views/risk/riskpoint/components/list.vue b/src/views/risk/riskpoint/components/list.vue index 48cc85a..37d1eca 100644 --- a/src/views/risk/riskpoint/components/list.vue +++ b/src/views/risk/riskpoint/components/list.vue @@ -493,7 +493,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskpoint/excel' + window.location.href = config.httpurl + '/riskpoint/excel' }).catch(() => { this.listLoading = false }) @@ -517,7 +517,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.open(this.config.httpurl + 'riskpoint/excelAll?ids=' + ids) + window.open(this.config.httpurl + '/riskpoint/excelAll?ids=' + ids) }).catch(() => { this.listLoading = false }) @@ -530,7 +530,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskpoint/excelModel' + window.location.href = config.httpurl + '/riskpoint/excelModel' }).catch(() => { this.listLoading = false }) diff --git a/src/views/risk/riskunit/components/list.vue b/src/views/risk/riskunit/components/list.vue index c104dcb..a026b56 100644 --- a/src/views/risk/riskunit/components/list.vue +++ b/src/views/risk/riskunit/components/list.vue @@ -379,7 +379,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskunit/excelModel' + window.location.href = config.httpurl + '/riskunit/excelModel' }).catch(() => { this.listLoading = false })