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/details/yxwxfw.vue b/src/views/dataBoard/cpts/details/yxwxfw.vue index 8e2679e98..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 || '--'}}
服务类型: @@ -99,6 +99,7 @@ export default { item: {}, loading: false, loading1: false, + // activities: [], zuziTypes: { community_org: "社区自组织", ic_user_volunteer: "志愿者", @@ -179,7 +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); + // } + // }); }, }, }; 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() {}, 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; 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 = 需求未完成情况 --> - +