From 227f26e770f5dcba58be75a2e236cb0cd77f3b1c Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 25 Apr 2024 10:04:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/cpts/details/yxwxfw.vue | 22 ++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/dataBoard/cpts/details/yxwxfw.vue b/src/views/dataBoard/cpts/details/yxwxfw.vue index 022941eff..44d2cf741 100644 --- a/src/views/dataBoard/cpts/details/yxwxfw.vue +++ b/src/views/dataBoard/cpts/details/yxwxfw.vue @@ -99,7 +99,7 @@ export default { item: {}, loading: false, loading1: false, - activities: [], + // activities: [], zuziTypes: { community_org: "社区自组织", ic_user_volunteer: "志愿者", @@ -180,16 +180,16 @@ export default { this.$message.error(msg); } }); - this.$http - .post("/governance/icEvent/process", { icEventId: id }) - .then((res) => { - const { code, data, msg } = res.data; - if (code === 0) { - this.activities = data; - } else { - this.$message.error(msg); - } - }); + // this.$http + // .post("/governance/icEvent/process", { icEventId: id }) + // .then((res) => { + // const { code, data, msg } = res.data; + // if (code === 0) { + // this.activities = data; + // } else { + // this.$message.error(msg); + // } + // }); }, }, }; From 6083f34baeafe1fc08c879915361ede52abd67ed Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 25 Apr 2024 14:22:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A2=AB=E6=B3=A8?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/overview/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/dataBoard/overview/index.vue b/src/views/dataBoard/overview/index.vue index a06eb7ed4..ef18bf3d3 100644 --- a/src/views/dataBoard/overview/index.vue +++ b/src/views/dataBoard/overview/index.vue @@ -73,8 +73,8 @@ -- bmysxqk = 不满意事项情况 -- xqwwcqk = 需求未完成情况 --> - + From a88d4872d4c7d035ef389a7b6d7eb2d732dd6d75 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 25 Apr 2024 14:59:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2,=E5=AE=BD=E5=BA=A6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/cpts/details/jmxq.vue | 2 +- src/views/dataBoard/cpts/details/smyd.vue | 2 +- src/views/dataBoard/cpts/details/xqwmz.vue | 2 +- src/views/dataBoard/cpts/event-details.vue | 9 ++++++--- .../cpts/personnel/modules/businessTables/complaint.vue | 2 +- .../modules/businessTables/reporting-events.vue | 3 ++- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/views/dataBoard/cpts/details/jmxq.vue b/src/views/dataBoard/cpts/details/jmxq.vue index f6b2cac28..ff0217dc1 100644 --- a/src/views/dataBoard/cpts/details/jmxq.vue +++ b/src/views/dataBoard/cpts/details/jmxq.vue @@ -190,7 +190,7 @@ export default { } .eventWrap { - width: 1094px; + // width: 1094px; height: 798px; overflow-y: auto; overflow-x: hidden; diff --git a/src/views/dataBoard/cpts/details/smyd.vue b/src/views/dataBoard/cpts/details/smyd.vue index e2cf0d45c..de16f799f 100644 --- a/src/views/dataBoard/cpts/details/smyd.vue +++ b/src/views/dataBoard/cpts/details/smyd.vue @@ -207,7 +207,7 @@ export default { } .eventWrap { - width: 1094px; + // width: 1094px; max-height: 798px; overflow-y: auto; overflow-x: hidden; diff --git a/src/views/dataBoard/cpts/details/xqwmz.vue b/src/views/dataBoard/cpts/details/xqwmz.vue index 1a8fd95ff..c69a4bc89 100644 --- a/src/views/dataBoard/cpts/details/xqwmz.vue +++ b/src/views/dataBoard/cpts/details/xqwmz.vue @@ -291,7 +291,7 @@ export default { } .eventWrap { - width: 1094px; + // width: 1094px; max-height: 798px; overflow-y: auto; overflow-x: hidden; diff --git a/src/views/dataBoard/cpts/event-details.vue b/src/views/dataBoard/cpts/event-details.vue index 5f3fe4567..dbccfe7bc 100644 --- a/src/views/dataBoard/cpts/event-details.vue +++ b/src/views/dataBoard/cpts/event-details.vue @@ -221,6 +221,10 @@ export default { type: Boolean, default: false, }, + formType: { + type: String, + default: false, + }, }, data() { @@ -267,7 +271,7 @@ export default { getDetailsData(id) { this.loading = true; this.$http - .post("/governance/icEvent/detail", {icEventId: id}) + .post(`/governance/${this.formType == '12345'?'icEvent':'icEventOld'}/detail`, {icEventId: id}) .then((res) => { const {code, data, msg} = res.data; if (code === 0) { @@ -279,10 +283,9 @@ export default { } }); }, - getProcessData(id) { this.$http - .post("/governance/icEvent/process", {icEventId: id}) + .post(`/governance/${this.formType == '12345'?'icEvent':'icEventOld'}/process`, {icEventId: id}) .then((res) => { const {code, data, msg} = res.data; if (code === 0) { diff --git a/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue b/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue index f5c8f03b4..2f615e02e 100644 --- a/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue +++ b/src/views/dataBoard/cpts/personnel/modules/businessTables/complaint.vue @@ -17,7 +17,7 @@
暂无数据
- + - + @@ -45,6 +45,7 @@ export default { total: 0, rowId: null, showDialog: false, + }; }, created() {}, From 05a66500853ec7f095adc2b192243931d6526111 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 25 Apr 2024 15:13:21 +0800 Subject: [PATCH 4/6] no message --- src/views/dataBoard/cpts/details/yxwxfw.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dataBoard/cpts/details/yxwxfw.vue b/src/views/dataBoard/cpts/details/yxwxfw.vue index 44d2cf741..c56b5c4e5 100644 --- a/src/views/dataBoard/cpts/details/yxwxfw.vue +++ b/src/views/dataBoard/cpts/details/yxwxfw.vue @@ -30,7 +30,7 @@
所属组织： - {{ formData.principalName }} + {{ formData.agencyName || '--'}}
服务类型： From 922538099e59b84d808ae90c28a83b20b9ba9261 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 25 Apr 2024 15:25:29 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/organizational/jwTree/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dataBoard/organizational/jwTree/index.vue b/src/views/dataBoard/organizational/jwTree/index.vue index 763f97ba0..c1f4f15e2 100644 --- a/src/views/dataBoard/organizational/jwTree/index.vue +++ b/src/views/dataBoard/organizational/jwTree/index.vue @@ -280,7 +280,7 @@ export default { .flowLevel-5 { top: 775px; height: 180px !important; - line-height: 130px; + line-height: 180px; div { padding-left: 80px; From bbf5a286486bab0879814207f4b138224f6a3f74 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 25 Apr 2024 22:10:53 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=91=E6=87=92?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/JwTree/nodeWrap.vue | 69 ++- src/views/dataBoard/organizational/index.vue | 413 +----------------- .../dataBoard/organizational/jwTree/index.vue | 23 +- 3 files changed, 71 insertions(+), 434 deletions(-) diff --git a/src/components/JwTree/nodeWrap.vue b/src/components/JwTree/nodeWrap.vue index 1fd567fc1..6522b5fd8 100644 --- a/src/components/JwTree/nodeWrap.vue +++ b/src/components/JwTree/nodeWrap.vue @@ -18,28 +18,29 @@
- +
-
- +
+
- +
-
- +
+
-
-
- {{ spliceNameFun(item.organizationName, 3) }} +
+
+ + {{ item.organizationName }}
-
- +
+
@@ -61,6 +62,7 @@