@@ -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 {
From 5397a504dd1a503b099865f97d51884edced4d36 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 14 Dec 2021 11:15:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=AF=9D?=
=?UTF-8?q?=E9=A2=98=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
---
src/views/components/foldText.vue | 135 ++++++++++++++++++
.../visual/basicinfo/cpts/incident-info.vue | 12 +-
.../visual/basicinfo/cpts/topic-info.vue | 10 +-
3 files changed, 148 insertions(+), 9 deletions(-)
create mode 100644 src/views/components/foldText.vue
diff --git a/src/views/components/foldText.vue b/src/views/components/foldText.vue
new file mode 100644
index 00000000..4438e0c7
--- /dev/null
+++ b/src/views/components/foldText.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+ {{ isFolded ? "展开" : "收起" }}
+
+
+
+
+
+
diff --git a/src/views/modules/visual/basicinfo/cpts/incident-info.vue b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
index 19c524fb..e95e2fe2 100644
--- a/src/views/modules/visual/basicinfo/cpts/incident-info.vue
+++ b/src/views/modules/visual/basicinfo/cpts/incident-info.vue
@@ -118,19 +118,19 @@