From 8a8fc5abadff28a96dd79d491300a65b016a5b66 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 14 Dec 2021 10:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BB=84=E4=BB=B62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/incident-info.scss | 2 + .../visual/basicinfo/cpts/incident-info.vue | 230 +++++++------- .../visual/basicinfo/cpts/topic-info.vue | 283 ++++++++++-------- src/views/modules/visual/cpts/line-chart.vue | 10 +- 4 files changed, 291 insertions(+), 234 deletions(-) diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss index b59c7a1d..989b7d56 100644 --- a/src/assets/scss/modules/visual/incident-info.scss +++ b/src/assets/scss/modules/visual/incident-info.scss @@ -176,6 +176,8 @@ } .m-line { + min-width: 400px; + .stat { margin: 20px 0 10px; display: flex; diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue index ce0975e1..19c524fb 100644 --- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue @@ -15,7 +15,12 @@
事件内容
{{ info.eventContent }}
- +
提交时间: @@ -72,6 +77,7 @@ :userName="yanPan.icUserName" :singleList="yanPan.categoryList" @user="toUserInfo" + @project="toProjectInfo" /> 加载中
@@ -110,7 +116,7 @@ 当前处理部门: {{ projectInfo.departmentNameList.join("、") }} -
+
分类:
@@ -118,7 +124,7 @@
-
+
标签:
@@ -208,6 +214,108 @@ import cptTb from "@/views/modules/visual/cpts/tb"; import analyse from "@/views/modules/visual/cpts/analyse"; import dateFormat from "dai-js/tools/dateFormat"; +function iniData() { + return { + groupList: [ + { label: "研判分析" }, + { label: "查看回复" }, + { label: "查看项目" }, + ], + groupIndex: 0, + startGroupIndex: 0, + + info: { + eventTime: "", + eventContent: "", + eventAddress: "", + gridName: "", + isClosed: true, + isResolve: true, + isRollback: true, + eventImgs: [], + eventPerson: [], + eventOrg: [], + eventPeopleName: "", + projectInfo: { + projectId: "", + operationName: "", + operationTime: "", + projectDeclare: "", + }, + }, + + comment: { + loading: true, + colList: [ + { + align: "center", + width: "20%", + }, + { + align: "center", + width: "30%", + }, + { + align: "left", + width: "50%", + }, + ], + header: ["回复者", "回复时间", "回复内容"], + list: [], + }, + + projectProcess: [], + + projectInfo: { + backGround: "", + departmentList: [ + // { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] }, + ], + departmentNameList: [], + internalRemark: "", + isSend: false, + locateAddress: "", + locateDimension: "", + locateLongitude: "", + origin: "", + originId: "", + platformIds: [], + processable: false, + projectId: "", + projectStatus: "pending", + projectTitle: "", + publicReply: "", + returnable: false, + }, + + projectCate: [], + projectTag: [], + + yanPan: { + loading: false, + + icResiUserId: "", + houseId: "", + icUserName: "", + epmetUserIdList: [], + houseUserList: [ + // { + // icResiUserId: '', + // icUserName: '', + // } + ], + categoryList: [], + projectData: [ + // { + // firstCategoryCode: '', + // firstCategoryName: '', + // projectList: [], + // } + ], + }, + }; +} + export default { name: "demandInfo", props: { @@ -232,112 +340,16 @@ export default { screenLoading, }, - data() { - return { - groupList: [ - { label: "研判分析" }, - { label: "查看回复" }, - { label: "查看项目" }, - ], - groupIndex: 0, - startGroupIndex: 0, - - info: { - eventTime: "", - eventContent: "", - eventAddress: "", - gridName: "", - isClosed: true, - isResolve: true, - isRollback: true, - eventImgs: [], - eventPerson: [], - eventOrg: [], - eventPeopleName: "", - projectInfo: { - projectId: "", - operationName: "", - operationTime: "", - projectDeclare: "", - }, - }, - - comment: { - loading: true, - colList: [ - { - align: "center", - width: "20%", - }, - { - align: "center", - width: "30%", - }, - { - align: "left", - width: "50%", - }, - ], - header: ["回复者", "回复时间", "回复内容"], - list: [], - }, - - projectProcess: [], - - projectInfo: { - backGround: "", - departmentList: [ - // { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] }, - ], - departmentNameList: [], - internalRemark: "", - isSend: false, - locateAddress: "", - locateDimension: "", - locateLongitude: "", - origin: "", - originId: "", - platformIds: [], - processable: false, - projectId: "", - projectStatus: "pending", - projectTitle: "", - publicReply: "", - returnable: false, - }, - - projectCate: [], - projectTag: [], - - yanPan: { - loading: false, - - icResiUserId: "", - houseId: "", - icUserName: "", - epmetUserIdList: [], - houseUserList: [ - // { - // icResiUserId: '', - // icUserName: '', - // } - ], - categoryList: [], - projectData: [ - // { - // firstCategoryCode: '', - // firstCategoryName: '', - // projectList: [], - // } - ], - }, - }; - }, + data: iniData, computed: {}, watch: { resiEventId() { + let data = iniData(); + Object.keys(data).forEach((k) => { + this[k] = data[k]; + }); this.getApiData(); }, }, @@ -347,6 +359,10 @@ export default { }, methods: { + watchImg(src) { + window.open(src); + }, + addStartGroupIndex() { const { startGroupIndex, groupList } = this; if (startGroupIndex < groupList.length - 9) { @@ -496,6 +512,7 @@ export default { statusName: subItem.projectStatus == "pending" ? "待处理" : "结案", projectId: subItem.projectId, + resiEventId: subItem.resiEventId, }; }), }; @@ -512,6 +529,11 @@ export default { path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`, }); }, + + toProjectInfo(item) { + console.log(item) + this.resiEventId = item.resiEventId; + }, }, }; diff --git a/src/views/modules/visual/basicinfo/cpts/topic-info.vue b/src/views/modules/visual/basicinfo/cpts/topic-info.vue index 3bb9f932..b024d344 100644 --- a/src/views/modules/visual/basicinfo/cpts/topic-info.vue +++ b/src/views/modules/visual/basicinfo/cpts/topic-info.vue @@ -15,7 +15,12 @@
话题内容
{{ info.topicContent }}
- +
发布时间: @@ -68,6 +73,7 @@ :userName="yanPan.icUserName" :singleList="yanPan.categoryList" @user="toUserInfo" + @project="toProjectInfo" /> 加载中
@@ -137,7 +143,10 @@
- +
@@ -266,6 +275,133 @@ import lineChart from "@/views/modules/visual/cpts/line-chart"; import analyse from "@/views/modules/visual/cpts/analyse"; import dateFormat from "dai-js/tools/dateFormat"; +function iniData() { + return { + groupList: [ + { label: "研判分析" }, + { label: "话题评论" }, + { label: "查看议题" }, + { label: "查看项目" }, + ], + groupIndex: 0, + startGroupIndex: 0, + + info: { + badgeList: [], + closeDetail: { + closeUserName: "", + closeDateTime: "-1", + closeReason: "", + closeUserHeadPhoto: "", + }, + dimension: "", + hiddenDetail: null, + issueId: "", + longitude: "", + releaseAddress: "", + releaseTime: "", + releaseUserHeadPhoto: "", + releaseUserName: "", + shiftIssueFlag: true, + topicContent: "", + topicId: "", + topicImgs: [], + topicStatus: "discussing", + }, + + comment: { + loading: true, + colList: [ + { + align: "center", + width: "20%", + }, + { + align: "center", + width: "20%", + }, + { + align: "left", + width: "50%", + }, + { + align: "left", + width: "10%", + }, + ], + header: ["评论者", "评论时间", "评论内容", "评论图片"], + list: [], + }, + + issueInfo: { + attitude: "", + belongsGridName: "", + issueIdea: "", + issueInitiator: "", + issueStatus: "", + issueSuggestion: "", + issueTitle: "", + joinVote: true, + projectId: "", + projectStatus: false, + publishIdeaFlag: false, + }, + + issueTrend: {}, + issueChartData: [], + + projectProcess: [], + + projectInfo: { + backGround: "", + departmentList: [ + // { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] }, + ], + departmentNameList: [], + internalRemark: "", + isSend: false, + locateAddress: "", + locateDimension: "", + locateLongitude: "", + origin: "", + originId: "", + platformIds: [], + processable: false, + projectId: "", + projectStatus: "pending", + projectTitle: "", + publicReply: "", + returnable: false, + }, + + projectCate: [], + projectTag: [], + + yanPan: { + loading: false, + + icResiUserId: "", + houseId: "", + icUserName: "", + epmetUserIdList: [], + houseUserList: [ + // { + // icResiUserId: '', + // icUserName: '', + // } + ], + categoryList: [], + projectData: [ + // { + // firstCategoryCode: '', + // firstCategoryName: '', + // projectList: [], + // } + ], + }, + }; +} + export default { name: "demandInfo", props: { @@ -291,137 +427,16 @@ export default { lineChart, }, - data() { - return { - groupList: [ - { label: "研判分析" }, - { label: "话题评论" }, - { label: "查看议题" }, - { label: "查看项目" }, - ], - groupIndex: 0, - startGroupIndex: 0, - - info: { - badgeList: [], - closeDetail: { - closeUserName: "", - closeDateTime: "-1", - closeReason: "", - closeUserHeadPhoto: "", - }, - dimension: "", - hiddenDetail: null, - issueId: "", - longitude: "", - releaseAddress: "", - releaseTime: "", - releaseUserHeadPhoto: "", - releaseUserName: "", - shiftIssueFlag: true, - topicContent: "", - topicId: "", - topicImgs: [], - topicStatus: "discussing", - }, - - comment: { - loading: true, - colList: [ - { - align: "center", - width: "20%", - }, - { - align: "center", - width: "20%", - }, - { - align: "left", - width: "50%", - }, - { - align: "left", - width: "10%", - }, - ], - header: ["评论者", "评论时间", "评论内容", "评论图片"], - list: [], - }, - - issueInfo: { - attitude: "", - belongsGridName: "", - issueIdea: "", - issueInitiator: "", - issueStatus: "", - issueSuggestion: "", - issueTitle: "", - joinVote: true, - projectId: "", - projectStatus: false, - publishIdeaFlag: false, - }, - - issueTrend: {}, - issueChartData: [], - - projectProcess: [], - - projectInfo: { - backGround: "", - departmentList: [ - // { departmentName: "南宁社区-南宁第二网格", staffList: ["周相成"] }, - ], - departmentNameList: [], - internalRemark: "", - isSend: false, - locateAddress: "", - locateDimension: "", - locateLongitude: "", - origin: "", - originId: "", - platformIds: [], - processable: false, - projectId: "", - projectStatus: "pending", - projectTitle: "", - publicReply: "", - returnable: false, - }, - - projectCate: [], - projectTag: [], - - yanPan: { - loading: false, - - icResiUserId: "", - houseId: "", - icUserName: "", - epmetUserIdList: [], - houseUserList: [ - // { - // icResiUserId: '', - // icUserName: '', - // } - ], - categoryList: [], - projectData: [ - // { - // firstCategoryCode: '', - // firstCategoryName: '', - // projectList: [], - // } - ], - }, - }; - }, + data: iniData, computed: {}, watch: { topicId() { + let data = iniData(); + Object.keys(data).forEach((k) => { + this[k] = data[k]; + }); this.getApiData(); }, }, @@ -431,6 +446,10 @@ export default { }, methods: { + watchImg(src) { + window.open(src); + }, + addStartGroupIndex() { const { startGroupIndex, groupList } = this; if (startGroupIndex < groupList.length - 9) { @@ -510,7 +529,7 @@ export default { comment: { srcList }, } = this; if (srcList[index] && srcList[index].imageList) { - window.open(srcList[index].imageList[0].url); + this.watchImg(srcList[index].imageList[0].url); } }, @@ -652,6 +671,7 @@ export default { statusName: subItem.projectStatus == "pending" ? "待处理" : "结案", projectId: subItem.projectId, + topicId: subItem.topicId, }; }), }; @@ -668,6 +688,11 @@ export default { path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`, }); }, + + toProjectInfo(item) { + console.log(item); + this.topicId = item.topicId; + }, }, }; diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue index 99795ad5..84d14f2b 100644 --- a/src/views/modules/visual/cpts/line-chart.vue +++ b/src/views/modules/visual/cpts/line-chart.vue @@ -1,6 +1,6 @@ @@ -189,6 +189,14 @@ export default { return {}; }, }, + width: { + type: Number, + default: 400, + }, + height: { + type: Number, + default: 260, + }, }, data() { return {