diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index 9668fe32..1b95d188 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -205,7 +205,7 @@ import { Loading } from "element-ui"; // 引入Loading服务 import foldText from "@/views/components/foldText"; import projectInfoOrigin from "../../xiangmu/cpts/project-info"; import demandInfoOrigin from "@/views/modules/communityService/measure/info"; -import eventInfo from "./event-info1"; + import dateFormat from "dai-js/tools/dateFormat"; @@ -260,7 +260,7 @@ export default { components: { foldText, - eventInfo, + eventAdd, eventDetail, processForm, diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue index c8df5c96..6adb7112 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue @@ -225,6 +225,14 @@ export default { type: String, default: "", }, + orgId: { + type: String, + default: "", + }, + orgType: { + type: String, + default: "", + }, }, @@ -335,7 +343,7 @@ export default { //楼院小组、居民上报都存在是,研判分析显示两个分支 - this.yanPan.singleTitle = "楼院小组"; + this.yanPan.singleTitle = data.categoryName; this.yanPan.hasEvent = false; @@ -348,22 +356,25 @@ export default { }, //加载组织数据 async getYanPanList () { - //const url = "/gov/project/icEvent/processAnalysis/categoryEventList"; - const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/categoryEventList"; + const url = "/gov/project/icEvent/processAnalysis/categoryEventList"; + // const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/categoryEventList"; let param = { - categoryPids: this.yanPan.categoryId, + categoryPids: this.yanPan.categoryPids, pageNo: 1, - pageSize: 10 + pageSize: 10, + orgType: this.orgType, + orgId: this.orgId, + } const { data, code, msg } = await requestPost(url, param); this.yanPan.loading = true; if (code === 0) { let oneData = { - categoryCode: 111, - categoryName: 111, + // categoryCode: 111, + // categoryName: 111, showItem: true, addressList: data.list.map((subItem) => { return { diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue index de37ee5e..ad8e7b04 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue @@ -118,6 +118,8 @@