@@ -33,36 +32,33 @@
当前处理部门：
{{ projectInfo.departmentNameList.join("、") }}
-
+
分类：
-
+
-
{{ item.name }}
+
标签：
-
-
+
{{ item.name }}
+
处理进展
-
+
{{ item.processName }}
@@ -75,29 +71,33 @@
- {{ item.departmentName }}
+
{{ item.publicReply }}
-
说 明：
+
- 内部备注：
- {{
- item.internalRemark
- }}
+ {{ item.internalRemark }}
-
+
{{ att.name }}
@@ -107,56 +107,64 @@
-
+
+
-
+
{{ item.label }}
-
+
-
-
-
- 加载中
-
-
- 
+
+
+
+
+ 加载中
+
+
+
+
-
-
+
+
-
议题标题：
{{ issueInfo.issueTitle }}
@@ -173,8 +181,10 @@
议题发起人：
{{ issueInfo.issueInitiator }}
-
+
议题来源：
{{ issueInfo.topicInfo.groupName }}
@@ -183,15 +193,16 @@
{{ issueInfo.shiftIssueTime }}
+
@@ -264,13 +276,10 @@ import analyse from "@/views/modules/visual/cpts/analyse";
import foldText from "@/views/components/foldText";
import dateFormat from "dai-js/tools/dateFormat";
-function iniData () {
+function iniData() {
return {
projectIdCopy: this.projectId,
- groupList: [
- { label: "研判分析" },
- { label: "项目来源" },
- ],
+ groupList: [{ label: "研判分析" }, { label: "项目来源" }],
groupIndex: 0,
startGroupIndex: 0,
@@ -352,7 +361,6 @@ function iniData () {
// icUserName: '',
// }
],
- singleList: [],//楼院小组
projectData: [
// {
// firstCategoryCode: '',
@@ -361,8 +369,10 @@ function iniData () {
// }
],
hasEvent: false,
- moreList: [],//
-
+ singleTitle: "",
+ moreTitle: "",
+ singleList: [], //楼院小组
+ moreList: [], //
},
};
}
@@ -382,7 +392,6 @@ export default {
type: Array,
default: [],
},
-
},
components: {
@@ -399,7 +408,7 @@ export default {
computed: {},
watch: {
- projectId () {
+ projectId() {
let data = iniData();
Object.keys(data).forEach((k) => {
this[k] = data[k];
@@ -408,21 +417,20 @@ export default {
},
// projectIdCopy () {
-
// },
},
- mounted () {
- console.log(this.projectIdCopy)
+ mounted() {
+ console.log(this.projectIdCopy);
this.getApiData();
},
methods: {
- watchImg (src) {
+ watchImg(src) {
window.open(src);
},
- addStartGroupIndex () {
+ addStartGroupIndex() {
const { startGroupIndex, groupList } = this;
if (startGroupIndex < groupList.length - 9) {
this.startGroupIndex = startGroupIndex + 1;
@@ -430,7 +438,7 @@ export default {
this.startGroupIndex = groupList.length - 9;
}
},
- subStartGroupIndex () {
+ subStartGroupIndex() {
const { startGroupIndex, groupList } = this;
if (startGroupIndex > 0) {
this.startGroupIndex = startGroupIndex - 1;
@@ -438,30 +446,27 @@ export default {
this.startGroupIndex = 0;
}
},
- handleClose () {
+ handleClose() {
this.$emit("close");
},
- async getApiData () {
-
- await this.getProjectInfo()
+ async getApiData() {
+ await this.getProjectInfo();
this.getProjectCate();
this.getProjectProcess();
- if (this.projectInfo.origin === 'issue') {
+ if (this.projectInfo.origin === "issue") {
this.getIssueInfo();
this.getIssueTrend();
- } else if (this.projectInfo.origin === 'resi_event') {
- this.getEventInfo()
+ } else if (this.projectInfo.origin === "resi_event") {
+ this.getEventInfo();
}
- if (this.projectInfo.origin !== 'agency') {
+ if (this.projectInfo.origin !== "agency") {
await this.getYanPan();
-
}
},
//加载组织数据
- async getProjectInfo () {
-
+ async getProjectInfo() {
const url = "/gov/project/trace/projectdetail";
const { data, code, msg } = await requestPost(url, {
@@ -470,16 +475,13 @@ export default {
if (code === 0) {
this.projectInfo = data;
-
-
} else {
this.$message.error(msg);
}
},
//加载组织数据
- async getIssueInfo () {
-
+ async getIssueInfo() {
const url = "/resi/hall/issue/detail";
const { data, code, msg } = await requestPost(url, {
@@ -494,8 +496,7 @@ export default {
},
//加载组织数据
- async getIssueTrend () {
-
+ async getIssueTrend() {
const url = "/resi/hall/issue/votingtrend";
const { data, code, msg } = await requestPost(url, {
@@ -507,7 +508,7 @@ export default {
let chartData = [];
data.polyLine.forEach((item) => {
let date = dateFormat(new Date(item.voteDate * 1000), "yyyy-MM-dd");
- console.log("date:" + date);
+ // console.log("date:" + date);
chartData.push(
{
date,
@@ -528,7 +529,7 @@ export default {
},
//加载组织数据
- async getEventInfo () {
+ async getEventInfo() {
const url = "/gov/project/resievent/eventdetail-icdata";
const { data, code, msg } = await requestPost(url, {
@@ -536,23 +537,20 @@ export default {
});
if (code === 0) {
-
if (data.eventOrg && data.eventOrg.length > 0) {
- data.eventOrgShow = data.eventOrg.join('、')
+ data.eventOrgShow = data.eventOrg.join("、");
}
if (data.eventPerson && data.eventPerson.length > 0) {
- data.eventPersonShow = data.eventPerson.join('、')
+ data.eventPersonShow = data.eventPerson.join("、");
}
this.info = { ...data };
-
} else {
this.$message.error(msg);
}
},
//加载组织数据
- async getProjectProcess () {
-
+ async getProjectProcess() {
const url = "/gov/project/trace/processlist-v2";
const { data, code, msg } = await requestPost(url, {
@@ -572,8 +570,7 @@ export default {
}
},
- async getProjectCate () {
-
+ async getProjectCate() {
const url = "/gov/project/projectcategory/categorytaglist";
const { data, code, msg } = await requestPost(url, {
@@ -589,39 +586,52 @@ export default {
},
//加载组织数据
- async getYanPan () {
+ async getYanPan() {
const url = "/data/aggregator/project/projectanalysis";
+ if (!this.userId) return (this.yanPan.loading = true);
+
const { data, code, msg } = await requestPost(url, {
categoryCodeList: this.categoryCodes,
userId: this.userId,
- projectId: this.projectIdCopy
+ projectId: this.projectIdCopy,
});
if (code === 0) {
- data.icResiUserId = data.icUserId
- data.homeUserList.forEach(item => {
- item.icResiUserId = item.icUserId
+ data.icResiUserId = data.icUserId;
+ data.homeUserList.forEach((item) => {
+ item.icResiUserId = item.icUserId;
});
- let array1 = []
- let array2 = []
+ let array1 = [];
+ let array2 = [];
//楼院小组、居民上报都存在是，研判分析显示两个分支
- if (data.groupProjectList && data.groupProjectList.length > 0 && data.eventProjectList && data.eventProjectList.length > 0) {
- this.yanPan.hasEvent = true
- array1 = [...data.groupProjectList]
- array2 = [...data.eventProjectList]
+ if (
+ data.groupProjectList &&
+ data.groupProjectList.length > 0 &&
+ data.eventProjectList &&
+ data.eventProjectList.length > 0
+ ) {
+ this.yanPan.hasEvent = true;
+ this.yanPan.singleTitle = "楼院小组";
+ this.yanPan.moreTitle = "事件上报";
+ array1 = [...data.groupProjectList];
+ array2 = [...data.eventProjectList];
} else {
- this.yanPan.hasEvent = false
+ this.yanPan.hasEvent = false;
if (data.groupProjectList && data.groupProjectList.length > 0) {
- array1 = [...data.groupProjectList]
- } else if (data.eventProjectList && data.eventProjectList.length > 0) {
- array1 = [...data.eventProjectList]
+ array1 = [...data.groupProjectList];
+ this.yanPan.singleTitle = "楼院小组";
+ } else if (
+ data.eventProjectList &&
+ data.eventProjectList.length > 0
+ ) {
+ array1 = [...data.eventProjectList];
+ this.yanPan.singleTitle = "事件上报";
} else {
- array1 = []
+ array1 = [];
}
-
}
if (array1.length > 0) {
@@ -634,8 +644,7 @@ export default {
return {
title: subItem.title,
status: subItem.status,
- statusName:
- subItem.status == "pending" ? "待处理" : "结案",
+ statusName: subItem.status == "pending" ? "待处理" : "结案",
projectId: subItem.projectId,
};
}),
@@ -652,8 +661,7 @@ export default {
return {
title: subItem.title,
status: subItem.status,
- statusName:
- subItem.status == "pending" ? "待处理" : "结案",
+ statusName: subItem.status == "pending" ? "待处理" : "结案",
projectId: subItem.projectId,
};
}),
@@ -661,23 +669,21 @@ export default {
});
}
-
-
this.yanPan = { ...this.yanPan, ...data };
- console.log(this.yanPan)
+ console.log(this.yanPan);
this.yanPan.loading = true;
} else {
this.$message.error(msg);
}
},
- toUserInfo (item) {
+ toUserInfo(item) {
this.$router.push({
path: `/main-shuju/visual-basicinfo-people/${item.icResiUserId}`,
});
},
- toProjectInfo (item) {
+ toProjectInfo(item) {
console.log(item);
this.projectIdCopy = item.projectId;
// let data = iniData();
diff --git a/src/views/modules/visual/heart/index.vue b/src/views/modules/visual/heart/index.vue
index e299606f..5c92b69c 100644
--- a/src/views/modules/visual/heart/index.vue
+++ b/src/views/modules/visual/heart/index.vue
@@ -266,7 +266,8 @@ export default {
this.tb2.list = data.map((item) => {
return [
{ type: "index" },
- { type: "people", name: item.userName, uid: item.userId },
+ item.userName,
+ // { type: "people", name: item.userName, uid: item.userId },
item.gridName,
item.pointTotal,
];
@@ -296,7 +297,8 @@ export default {
this.tb3.list = data.map((item) => {
return [
{ type: "index" },
- { type: "people", name: item.userName, uid: item.userId },
+ item.userName,
+ // { type: "people", name: item.userName, uid: item.userId },
item.gridName,
item.pointTotal,
];
事件内容
{{ info.eventContent }}
- ![]()
+ ![]()
提交时间：
@@ -208,16 +219,15 @@
-
提报给：
-
{{ info.eventPersonShow}}
- {{ info.eventOrgShow}}
+ {{ info.eventPersonShow }}
+ {{ info.eventOrgShow }}
+
-
@@ -237,17 +247,19 @@
-
+
-
+
+