From 6a6930d43b3de95ed2838487c370c5ae325f407b Mon Sep 17 00:00:00 2001 From: SongZhen <> Date: Wed, 20 Sep 2023 14:16:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Tree/nodeWrap.vue | 4 +- .../organizational/dangTree/index.vue | 26 ++++++------- .../organizational/gridTree/index.vue | 26 ++++++------- .../dataBoard/organizational/jwTree/index.vue | 26 ++++++------- .../microgrid/components/reportAnEvent.vue | 38 +++++++++---------- .../organizational/microgrid/index.vue | 7 +++- 6 files changed, 61 insertions(+), 66 deletions(-) diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue index 36fda9d08..680c93c18 100644 --- a/src/components/Tree/nodeWrap.vue +++ b/src/components/Tree/nodeWrap.vue @@ -134,11 +134,13 @@ export default { getHomeTypes(id) { this.$http.get(`/actual/base/organizational/structure/getResidentCategoryByHouseId?houseId=${"1495582904602800129"}`).then((res) => { - const { code, data } = res.data; + const { code, msg, data } = res.data; if (code === 0) { const newItem = data[0]; const itemNumOne = Object.keys(newItem).filter((key) => newItem[key] === 1); this.homeTypeArr = itemNumOne; + } else { + this.$message.error(msg); } }); }, diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue index 29fa0ca9f..913ce7552 100644 --- a/src/views/dataBoard/organizational/dangTree/index.vue +++ b/src/views/dataBoard/organizational/dangTree/index.vue @@ -68,21 +68,19 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http - .get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`) - .then((res) => { - const { - data: { code, data }, - } = res; - if (code === 0) { - this.nodeConfig = data[0]; - this.getDataPLevel(data); - this.loading = false; - } - }) - .catch(() => { + this.$http.get(`/actual/base/organizational/structure/partyCommitteeOrg?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + const { + data: { code, msg, data }, + } = res; + if (code === 0) { + this.nodeConfig = data[0]; + this.getDataPLevel(data); this.loading = false; - }); + } else { + this.loading = false; + this.$message.error(msg); + } + }); }, getTitleNameMapFun(i) { diff --git a/src/views/dataBoard/organizational/gridTree/index.vue b/src/views/dataBoard/organizational/gridTree/index.vue index 93605bb76..5d80b7ba4 100644 --- a/src/views/dataBoard/organizational/gridTree/index.vue +++ b/src/views/dataBoard/organizational/gridTree/index.vue @@ -72,21 +72,19 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http - .get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`) - .then((res) => { - const { - data: { code, data }, - } = res; - if (code === 0) { - this.nodeConfig = data[0]; - this.getDataPLevel(data); - this.loading = false; - } - }) - .catch(() => { + this.$http.get(`/gov/org/organizational/neighborhood/getGridCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + const { + data: { code, msg, data }, + } = res; + if (code === 0) { + this.nodeConfig = data[0]; + this.getDataPLevel(data); this.loading = false; - }); + } else { + this.loading = false; + this.$message.error(msg); + } + }); }, getTitleNameMapFun(i) { diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue index d44934d76..cfd63391d 100644 --- a/src/views/dataBoard/organizational/jwTree/index.vue +++ b/src/views/dataBoard/organizational/jwTree/index.vue @@ -74,21 +74,19 @@ export default { //获取树状结构 getTreeData() { this.loading = true; - this.$http - .get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`) - .then((res) => { - const { - data: { code, data }, - } = res; - if (code === 0) { - this.nodeConfig = data[0]; - this.getDataPLevel(data); - this.loading = false; - } - }) - .catch(() => { + this.$http.get(`/gov/org/organizational/neighborhood/getNeighborhoodCommitteeOrgTreeList?agencyId=${this.$store.state.chooseArea.chooseName.orgId}`).then((res) => { + const { + data: { code, msg, data }, + } = res; + if (code === 0) { + this.nodeConfig = data[0]; + this.getDataPLevel(data); this.loading = false; - }); + } else { + this.loading = false; + this.$message.error(msg); + } + }); }, getTitleNameMapFun(i) { diff --git a/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue b/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue index 03355c59c..31f1fddfc 100644 --- a/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue +++ b/src/views/dataBoard/organizational/microgrid/components/reportAnEvent.vue @@ -191,32 +191,28 @@ export default { getDetailsData(id) { this.loading = true; - this.$http - .post("/governance/icEvent/detail", { icEventId: id }) - .then((res) => { - const { code, data } = res.data; - if (code === 0) { - this.item = data; - } - }) - .catch((res) => { + this.$http.post("/governance/icEvent/detail", { icEventId: id }).then((res) => { + const { code, data, msg } = res.data; + if (code === 0) { + this.item = data; + } else { this.loading = false; - }); + this.$message.error(msg); + } + }); }, getProcessData(id) { - this.$http - .post("/governance/icEvent/process", { icEventId: id }) - .then((res) => { - const { code, data } = res.data; - if (code === 0) { - this.activities = data; - this.loading = false; - } - }) - .catch((err) => { + this.$http.post("/governance/icEvent/process", { icEventId: id }).then((res) => { + const { code, data, msg } = res.data; + if (code === 0) { + this.activities = data; + this.loading = false; + } else { this.loading = false; - }); + this.$message.error(msg); + } + }); }, // /governance/icEvent/detail diff --git a/src/views/dataBoard/organizational/microgrid/index.vue b/src/views/dataBoard/organizational/microgrid/index.vue index 568729d22..b88a51a40 100644 --- a/src/views/dataBoard/organizational/microgrid/index.vue +++ b/src/views/dataBoard/organizational/microgrid/index.vue @@ -9,7 +9,7 @@
- +