-
@@ -54,7 +54,7 @@
楼院小组
+ {{ singleTitle }}
(反应渠道)
@@ -54,7 +54,7 @@
-
@@ -71,7 +71,7 @@
-
事件上报
+ {{ moreTitle }}
(反应渠道)
@@ -71,7 +71,7 @@
+
@@ -79,25 +79,29 @@
- 
+
{{item.categoryName}}
(同类案件)
-
+
+
+
+
-
+
-
-
-
@@ -216,151 +185,25 @@ export default {
hasEvent: {
type: Boolean,
default: false
- }
+ },
+ singleTitle: {
+ type: String,
+ default: '楼院小组'
+ },
+ moreTitle: String,
+ userList: Array,
+ userName: String,
+ singleList: Array,
+ moreList: Array
},
data () {
return {
sourceTab: 'group',
- userList: [
- {
- homeId: '1',
- icUserId: '1',
- icUserName: '沾上干'
- },
- {
- homeId: '2',
- icUserId: '2',
- icUserName: '李四'
- },
- {
- homeId: '3',
- icUserId: '3',
- icUserName: '王五哈哈'
- }
- ],
- userName: '王亚男哈',
- groupList: [
- {
- categoryName: '哈哈哈',
- categoryCode: '1',
- projectList: [
- {
- title: '我也不知道该谢谢什么啊啊啊',
- status: 'pending',
- projectId: '10'
- }
- ]
- },
- {
- categoryName: '啊啊啊啊',
- categoryCode: '2',
- projectList: [
- {
- title: '我也不知道该谢谢什么啊啊啊',
- status: 'pending',
- projectId: '12'
- }
- ]
- },
- {
- categoryName: '啦啦啦',
- categoryCode: '3',
- projectList: [
- {
- title: '我也不知道该谢谢什么啊啊啊',
- status: 'closed',
- projectId: '13'
- }
- ]
- },
- {
- categoryName: '为民服务',
- categoryCode: '4',
- projectList: [
- {
- title: '我也不知道该谢谢什么啊啊啊',
- status: 'pending',
- projectId: '14'
- }
- ]
- }
- ],
- eventList: [
- {
- categoryName: '辨明服务',
- categoryCode: '1',
- projectList: [
- {
- title: '不知道写了什么哈哈哈',
- status: 'closed',
- projectId: '1'
- },
- {
- title: '罗里吧嗦写了什么哈哈哈',
- status: 'closed',
- projectId: '2'
- },
- {
- title: '胡说八道写了什么哈哈哈',
- status: 'closed',
- projectId: '1=3'
- },
- {
- title: '费眼飞鱼不知道写了什么哈哈哈',
- status: 'closed',
- projectId: '1=4'
- },
- {
- title: '狗屁不通不知道写了什么哈哈哈',
- status: 'closed',
- projectId: '5'
- },
- {
- title: '啦啦啦不知道写了什么哈哈哈',
- status: 'closed',
- projectId: '6'
- }
- ]
- },
- {
- categoryName: '水煮鱼辨明服务辨明服务',
- categoryCode: '4',
- projectList: [
- {
- title: '熟煮雨不知道写了什么哈哈哈',
- status: 'pending',
- projectId: '4'
- }
- ]
- },
- {
- categoryName: '开心麻花',
- categoryCode: '2',
- projectList: [
- {
- title: '不知道开心麻花写了什么哈哈哈',
- status: 'closed',
- projectId: '1'
- }
- ]
- },
- {
- categoryName: '酸菜鱼',
- categoryCode: '3',
- projectList: [
- {
- title: '不知道酸菜鱼写了什么哈哈哈',
- status: 'pending',
- projectId: '3'
- }
- ]
- }
- ],
tempList: []
}
},
created() {
- this.tempList = [...this.groupList]
+ this.tempList = [...this.singleList]
},
methods: {
filterStatus(status) {
@@ -371,8 +214,8 @@ export default {
return statusObj[status]
},
handleTabs(type) {
- if (type === 'group') this.tempList = [ ...this.groupList ]
- else if (type === 'event') this.tempList = [ ...this.eventList ]
+ if (type === 'group') this.tempList = [ ...this.singleList ]
+ else if (type === 'event') this.tempList = [ ...this.moreList ]
this.sourceTab = type
const _dom = document.getElementById('scroll-wr')
_dom.scrollTop = 0
@@ -382,6 +225,9 @@ export default {
},
handleUser(item) {
this.$emit('user', item)
+ },
+ handleShow(item) {
+ item.showItem = !item.showItem
}
}
}
@@ -393,7 +239,7 @@ export default {
display: flex;
align-items: center;
width: 100%;
- height: 560px;
+ max-height: 560px;
box-sizing: border-box;
overflow: auto;
@@ -506,6 +352,37 @@ export default {
align-items: center;
margin-bottom: 20px;
// margin-top: 0;
+ .cate-col-arrow {
+ width: 32px;
+ height: 18px;
+ // box-sizing: border-box;
+ margin: 0 6px;
+ .analys-arrow {
+ display: block;
+ width: 32px;
+ height: 100%;
+ box-sizing: border-box;
+ margin: 0 auto;
+ }
+ }
+ .cate-col-w100 {
+ width: 230px;
+ .cate-list-w0 {
+ width: 0;
+ transition: width .2s;
+ overflow: hidden;
+ // border: 0;
+ // padding: 0;
+ }
+ .cate-list-w100 {
+ width: 230px;
+ // padding: 4px 14px 10px;
+ // // background: rgba(255, 255, 255, 0);
+ // border: 1px solid #1257C9;
+ // overflow: auto;
+ transition: width .2s;
+ }
+ }
}
}
.cate-list-more {
@@ -571,6 +448,14 @@ export default {
padding-right: 30px;
overflow: auto;
}
+ .analys-col-more {
+ height: 560px;
+ }
+ .analys-single {
+ .list {
+ height: 235px;
+ }
+ }
.analys-col-posi {
// .analys-up, .analys-down {
// position: absolute;
@@ -578,7 +463,7 @@ export default {
.analys-up {
// top: -200px;
// left: -30px;
- // margin-bottom: 160px;
+ // margin-bottom: 160px;
}
.analys-down {
// margin-top: 160px;
From 04afb63b8e4b6e8896fe123fdc24d206647b2987 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 13 Dec 2021 09:42:33 +0800
Subject: [PATCH 2/7] dd
---
src/views/modules/visual/cpts/analyse.vue | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index c7e9f541..45ae825d 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -155,7 +155,9 @@
{{filterStatus(n.status)}}
- {{n.title}}
+
+
@@ -115,91 +119,56 @@
+
+
-
-
+
+
+
{{filterStatus(n.status)}}
+ {{n.title}}
+
-
楼院小组
+ {{ singleTitle }}
(反应渠道)
-
+
- 
-
- 
+
+
+
-
-
-
+
+
+
-
+
+
-
-
-
-
+
-
-
-
-->
+ {{item.categoryName}}
(同类案件)
-
+
-
-
-
-
+
-
+
-
-
-
- {{filterStatus(n.status)}}
- {{n.title}}
-
+
-
-
-
-
-
-
-
-
-
- 已结案
- 合肥路与安宁路交合肥路与安宁路交
-
-
- 已结案
- 合肥路与安宁路交合肥路与安宁路交
-
-
- 已结案
- 合肥路与安宁路交合肥路与安宁路交
-
-
- 已结案
- 合肥路与安宁路交合肥路与安宁路交
-
-
- 已结案
- 合肥路与安宁路交合肥路与安宁路交
-
-
<% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %>
From 16aeecf6c8c53bfcb5281add4d6b08a842f06140 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 13 Dec 2021 14:54:30 +0800
Subject: [PATCH 6/7] ddd
---
.../visual/communityParty/community.vue | 107 +++++-
.../modules/visual/communityParty/party.vue | 352 ++++++++++--------
src/views/modules/visual/cpts/analyse.vue | 1 +
3 files changed, 287 insertions(+), 173 deletions(-)
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 27019e26..c7029f60 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -38,21 +38,22 @@
{{filterStatus(n.status)}}
+
+ {{ n.statusName || filterStatus(n.status)}}
+
{{n.title}}
-
-
@@ -141,6 +142,7 @@ export default {
tableData: [
// [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
],
+ detailId: '',
agencyId: '',
value2: '',
timeRange: '',
@@ -180,7 +182,7 @@ export default {
icon: require('../../../../assets/img/shuju/measure/qita.png')
}
],
-
+ cateInfo: [],
//地图相关数据
isfirstInit: true,//记录是否是首次加载地图
agencyInfo: {},//登陆者的组织信息：主要为了获取地图中心点和level
@@ -231,6 +233,8 @@ export default {
await nextTick(100);
this.loadUnit()
this.getList();
+ this.getCateCount()
+ this.getCateType()
await this.getWorkUserInfo()
await this.getMapUnitList()
},
@@ -261,6 +265,81 @@ export default {
}
this.visibleLoading = false
},
+ async getCateCount () {
+
+ const url = "/heart/icpartyactivity/statistics"
+ // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+ let params = {
+ agencyId: this.agencyId
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.cateInfo = data
+ } else {
+ this.$message.error(msg)
+ }
+ },
+ async getCateType () {
+
+ const url = "/heart/icpartyunit/typestatistics"
+ // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
+ let params = {
+ agencyId: this.agencyId
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ // this.cateInfo = data
+ const colorItem = {
+ 0: {
+ color: 'rgba(250, 32, 10, 1)',
+ icon: require('../../../../assets/img/shuju/measure/ly@2x.png')
+ },
+ 1: {
+ color: 'rgba(251, 177, 4, 1)',
+ icon: require('../../../../assets/img/shuju/measure/lxdj@2x.png')
+ },
+ 2: {
+ color: 'rgba(80, 194, 237, 1)',
+ icon: require('../../../../assets/img/shuju/measure/xq@2x.png')
+ },
+ 3: {
+ color: 'rgba(65, 181, 104, 1)',
+ icon: require('../../../../assets/img/shuju/measure/jgzs@2x.png')
+ },
+ 4: {
+ color: 'rgba(192, 21, 195, 1)',
+ icon: require('../../../../assets/img/shuju/measure/qita.png')
+ }
+ }
+ this.partyItem = data.map((item, index) => {
+ return {
+ ...item,
+ ...colorItem[index]
+ }
+ })
+ } else {
+ this.$message.error(msg)
+ }
+ },
+ async getDetail () {
+
+ const url = "/heart/icpartyactivity/detail"
+ let params = {
+ id: this.agencyId
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ this.detailInfo = data
+ } else {
+ this.$message.error(msg)
+ }
+ },
async loadUnit () {
const url = "/heart/icresidemanddict/subcodelist"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
@@ -328,8 +407,8 @@ export default {
//获取联建单位分布图
async getMapUnitList () {
- // const url = "/heart/icpartyunit/distribution"
- const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
+ const url = "/heart/icpartyunit/distribution"
+ // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
let params = {
agencyId: this.agencyId
@@ -393,7 +472,9 @@ export default {
clickProject (feature) {
console.log('标注信息', feature.values_.properties)
},
-
+ handleLook(val) {
+ this.detailId = val.id
+ },
handleSelectChange () {
this.getList();
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 3f0f419f..a94b7916 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -4,7 +4,7 @@
@@ -58,19 +56,19 @@
@@ -98,8 +96,8 @@
- 更多信息
+ 话题详情
-
组织单位
- 1233
+
+
- {{ item.label }}
+ {{ item.value }}
+
-
党建单位分类统计
+ 党建单位分布
@@ -75,7 +76,7 @@
![]()
-
-
@@ -95,7 +96,7 @@
{{ item.name }}
+ {{ item.label }}
{{ item.value }}
{{ item.name }}
+ {{ item.label }}
-
+
+ -->
+
+
+
@@ -47,7 +45,7 @@
{{item.value}}
- 25%
+ {{ item.radio }}
- 更多信息
+ 话题详情
-
-
-
- 所属网格：
- {{ gridName }}
-
-
- 所属小区：
- {{ xiaoquName }}
-
-
- 所属楼宇：
- {{ louName }}-{{ danyuanName }}
-
-
- 所属家庭：
- {{ homeName }}
-
-
- {{ field.label }}：
-
- {{
- info[field.columnName] == null
- ? "--"
- : getOptionLabel(
- field.options,
- info[field.columnName],
- field.itemType
- )
- }}
-
- {{
- info[field.columnName] == null ? "--" : info[field.columnName]
- }}
-
+
+
话题内容
+ {{ info.topicContent }}
+
+ ![]()
+
+
+ 发布时间：
+ {{ info.releaseTime }}
+
+
+ 话题地址：
+ {{ info.releaseAddress }}
+
+
+ 所属网格：
+ {{ info.gridName }}
-
-
@@ -89,81 +58,197 @@
-
-
-
- {{ field.label }}：
- {{
- infoItem[field.columnName] == null
- ? "--"
- : getOptionLabel(
- field.options,
- infoItem[field.columnName],
- field.itemType
- )
- }}
-
- {{
- infoItem[field.columnName] == null
- ? "--"
- : infoItem[field.columnName]
- }}
+
+
+
+
+ 加载中
+
+
+ 
+
+
+
+
+
+
+
-
+
+
+
+
+
+ 议题标题：
+ {{ issueInfo.issueTitle }}
+
+
+ 议题建议：
+ {{ issueInfo.issueSuggestion }}
+
+
+ 所属网格：
+ {{ issueInfo.belongsGridName || "--" }}
+
+
+ 议题发起人：
+ {{ issueInfo.issueInitiator }}
+
+
+ 议题来源：
+ {{ issueInfo.topicInfo.groupName }}
+
+
+ 转议题时间：
+ {{ issueInfo.shiftIssueTime }}
+
+
+
+
+
+
+
+
+ {{ issueTrend.realityVoteCount }}/{{
+ issueTrend.shouldVoteCount
+ }}
+
+ 已表决/应表决
+
+
+ {{ issueTrend.supportAmount }}
+ 支持
+
+
+ {{ issueTrend.oppositionAmount }}
+ 反对
+
+
-
diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue
new file mode 100644
index 00000000..99795ad5
--- /dev/null
+++ b/src/views/modules/visual/cpts/line-chart.vue
@@ -0,0 +1,214 @@
+
+
- {{ field.label }}：
- {{
- !allInfo[group.tableName] ||
- allInfo[group.tableName][0][field.columnName] == null
- ? "--"
- : getOptionLabel(
- field.options,
- allInfo[group.tableName][0][field.columnName],
- field.itemType
- )
- }}
-
- {{
- !allInfo[group.tableName] ||
- allInfo[group.tableName][0][field.columnName] == null
- ? "--"
- : allInfo[group.tableName][0][field.columnName]
- }}
+
+
@@ -174,16 +259,25 @@
-
+
diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 42241b4c..03656ab7 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -448,17 +448,18 @@
/>
+
+
+
+
+
+
+ 项目标题：
+ {{ projectInfo.projectTitle }}
+
+
+ 项目方案：
+ {{ projectInfo.projectTitle }}
+
+
+ 内部备注：
+ {{ projectInfo.internalRemark || "--" }}
+
+
+ 当前处理部门：
+ {{ projectInfo.departmentNameList.join("、") }}
+
+
+ 分类：
+
+
+
+
+ {{ item.name }}
+
+
+ 标签：
+
+
+
+
+ {{ item.name }}
+
+
+
+ 处理进展
+
+
+
+
+
+
+
+ {{ item.processName }}
+
+ {{ item.processTime }}
+
+
+
+
+ 处理部门：
+ {{ item.departmentName }}
+
+
+
+ 说 明：
+
+ {{ item.publicReply }}
+
+
+
+ 内部备注：
+
+ {{
+ item.internalRemark
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+