diff --git a/src/assets/scss/modules/visual/distributionAnalyze.scss b/src/assets/scss/modules/visual/distributionAnalyze.scss
index 874dfbed..438c0e30 100644
--- a/src/assets/scss/modules/visual/distributionAnalyze.scss
+++ b/src/assets/scss/modules/visual/distributionAnalyze.scss
@@ -116,12 +116,12 @@
display: flex;
flex-direction: row;
// flex-wrap: wrap;
- // justify-content: center;
+ justify-content: space-between;
height: calc(100vh - 230px);
.g-l {
width: 40%;
- height: calc(100vh - 290px);
+ height: calc(100vh - 240px);
.echart-line {
margin-left: 30px;
@@ -139,7 +139,7 @@
}
.g-r {
- width: 60%;
+ width: 55%;
height: calc(100vh - 250px);
.r-map {
diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss
index 989b7d56..25c58be0 100644
--- a/src/assets/scss/modules/visual/incident-info.scss
+++ b/src/assets/scss/modules/visual/incident-info.scss
@@ -85,7 +85,7 @@
.m-info {
padding-left: 62px;
- font-size: 16px;
+ font-size: 14px;
font-family: PingFang SC;
font-weight: 400;
color: #ffffff;
diff --git a/src/views/modules/visual/communityGovern/cpt/project-info.vue b/src/views/modules/visual/communityGovern/cpt/project-info.vue
new file mode 100644
index 00000000..952c3df4
--- /dev/null
+++ b/src/views/modules/visual/communityGovern/cpt/project-info.vue
@@ -0,0 +1,630 @@
+
+
+
+
+
+

+
项目详情
+
+
+
+

+
+
+
+
+ 项目标题:
+ {{ projectInfo.projectTitle }}
+
+
+ 项目背景:
+ {{ projectInfo.backGround }}
+
+
+ 项目方案:
+ {{ projectInfo.projectTitle }}
+
+
+ 内部备注:
+ {{ projectInfo.internalRemark || "--" }}
+
+
+ 当前处理部门:
+ {{ projectInfo.departmentNameList.join("、") }}
+
+
+
分类:
+
+
+ {{ item.name }}
+
+
+
+
+
标签:
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
处理进展
+
+
+
+
{{ item.processName }}
+
+ {{ item.processTime }}
+
+
+
+
+
处理部门:
+
{{ item.departmentName }}
+
+
+
+
说 明:
+
+ {{ item.publicReply }}
+
+
+
+
+
内部备注:
+
+ {{
+ item.internalRemark
+ }}
+
+
+
+
+
+
+
+
+
+

+
+
+ {{ item.label }}
+
+
+

+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+ 议题标题:
+ {{ issueInfo.issueTitle }}
+
+
+ 议题建议:
+ {{ issueInfo.issueSuggestion }}
+
+
+ 所属网格:
+ {{ issueInfo.belongsGridName || "--" }}
+
+
+ 议题发起人:
+ {{ issueInfo.issueInitiator }}
+
+
+ 议题来源:
+ {{ issueInfo.topicInfo.groupName }}
+
+
+ 转议题时间:
+ {{ issueInfo.shiftIssueTime }}
+
+
+
+
事件内容
+
{{ info.eventContent }}
+
+
![]()
+
+
+ 提交时间:
+ {{ info.eventTime }}
+
+
+ 报事人:
+ {{ info.eventPeopleName }}
+
+
+ 所属网格:
+ {{ info.gridName }}
+
+
+ 提报给:
+ {{ info.eventPerson.join("、") || "--" }}
+
+
+
+
+
+
+
+ {{ issueTrend.realityVoteCount }}/{{
+ issueTrend.shouldVoteCount
+ }}
+
+
已表决/应表决
+
+
+
{{ issueTrend.supportAmount }}
+
支持
+
+
+
{{ issueTrend.oppositionAmount }}
+
反对
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/visual/communityGovern/distributionAnalyze.vue b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
index 097df0a0..5f5e4c79 100644
--- a/src/views/modules/visual/communityGovern/distributionAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/distributionAnalyze.vue
@@ -503,11 +503,12 @@ export default {
let dataArray = new Array(num)
//遍历每个分类
this.lineList[0].categoryList.forEach((categoryItem, index) => {
- this.legend.push(categoryItem.name)
+ this.legend.push(categoryItem.categoryName)
dataArray[index] = []
});
+
//遍历每个时间
this.lineList.forEach(item => {
this.xaxis.push(item.time)
@@ -523,8 +524,9 @@ export default {
this.lineList[0].categoryList.forEach((categoryItem, index) => {
let object = {
- name: categoryItem.name,
+ name: categoryItem.categoryName,
type: 'line',
+ smooth: true,
barWidth: 15,
areaStyle: {},
itemStyle: {
diff --git a/src/views/modules/visual/communityGovern/distributionLineOption.js b/src/views/modules/visual/communityGovern/distributionLineOption.js
index ac897026..05df510d 100644
--- a/src/views/modules/visual/communityGovern/distributionLineOption.js
+++ b/src/views/modules/visual/communityGovern/distributionLineOption.js
@@ -2,6 +2,21 @@ import * as echarts from 'echarts'
export function lineOption () {
return {
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross',
+ label: {
+ backgroundColor: '#6a7985'
+ }
+ }
+ },
+ grid: {
+ left: 70,
+ top: 40,
+ right: 50,
+ bottom: 150
+ },
legend: {
textStyle: {
color: '#D2E7FF',
@@ -10,7 +25,7 @@ export function lineOption () {
},
itemWidth: 20,
itemHeight: 10,
- // top: 350,
+ // top: 650,
bottom: 0,
data: []
},
@@ -62,6 +77,7 @@ export function lineOption () {
}
},
series: [
+
// {
// name: '项目数',
// type: 'line',
diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index ec2ca8c8..c20b4ece 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -528,7 +528,6 @@ export default {
}
this.$refs.pieChart.handleClick(fun)
-
},
clickPie (seriesIndex) {
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 84e9e9c0..73918a26 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -192,8 +192,8 @@ export default {
pageNo: 1,
total: 0,
},
- showIssue: true,
- issueId: 'cf48b7dc70ef4c319fd9c71890d9dbbb',
+ showIssue: false,
+ issueId: '',
casOptions: [],
agencyIdArray: [],
@@ -243,7 +243,6 @@ export default {
this.orgId = this.agencyInfo.agencyId
this.orgType = this.agencyInfo.level === 'grid' ? 'grid' : 'agency'
-
if (!this.agencyInfo.latitude) {
this.agencyInfo.latitude = 36.072227
}
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index d6a9d629..a78d2c24 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -43,7 +43,8 @@
+ :list="demand.list"
+ @operate="toProjectInfo">
@@ -61,6 +62,11 @@
+
@@ -70,6 +76,7 @@ import { requestPost } from "@/js/dai/request";
import cptCard from "@/views/modules/visual/cpts/card";
import cptTb from "@/views/modules/visual/cpts/tb";
import screenEchartsFrame from "@/views/modules/visual/components/screen-echarts-frame";
+import projectInfo from "./cpt/project-info";
import { pieOption } from './typePieOption.js'
import nextTick from 'dai-js/tools/nextTick'
@@ -150,8 +157,13 @@ export default {
pageSize: 10,
pageNo: 1,
total: 0,
-
},
+ tableList: [],
+ showProject: false,
+ userId: '',//话题事件创始人
+ categoryCodes: [],//一级分类Id
+ projectId: '',
+
casOptions: [],
agencyIdArray: [],
@@ -175,7 +187,7 @@ export default {
},
async mounted () {
- this.userId = this.uid;
+
this.initData()
await this.getAgencylist()//获取组织级别
await nextTick(500)
@@ -382,6 +394,7 @@ export default {
if (code === 0) {
this.demand.total = data.total;
+ this.tableList = data.list
this.demand.list = data.list.map((item) => {
//楼院小组:issue; 项目立项:agency 事件上报:resi_event【也可控制点击查看时里边三个按钮的显示】
item.originShow = item.origin === 'issue' ? '楼院小组' : item.origin === 'agency' ? '项目立项' : '事件上报'
@@ -408,8 +421,14 @@ export default {
this.demand.pageNo = val;
this.getTable();
},
- toUserInfo (uid) {
- this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${uid}` });
+ async toProjectInfo (index) {
+ const { tableList } = this;
+ this.projectId = tableList[index].projectId
+ this.userId = tableList[index].userId
+ this.categoryCodes = tableList[index].categoryCodes
+
+ this.showProject = true
+
},
},
props: {
@@ -426,6 +445,7 @@ export default {
cptCard,
cptTb,
screenEchartsFrame,
+ projectInfo,
},
watch: {
@@ -433,13 +453,7 @@ export default {
let dataArray = this.dateIdShow.split('-')
this.dateId = dataArray.join('')
},
- uid (id) {
- this.userId = id;
- },
- userId () {
- this.getPie()
- window.scrollTo(0, 0);
- },
+
},
};
diff --git a/src/views/modules/visual/cpts/analyse.vue b/src/views/modules/visual/cpts/analyse.vue
index 462db2f8..acc1bbab 100644
--- a/src/views/modules/visual/cpts/analyse.vue
+++ b/src/views/modules/visual/cpts/analyse.vue
@@ -5,7 +5,10 @@
(家属)
-
{{item.icUserName}}
+
{{item.icUserName}}
-
+
@@ -112,11 +133,10 @@
-

+
-
-
{{ singleTitle }}
@@ -128,35 +148,51 @@
-
+
-
+
{{item.categoryName}}
(同类案件)
-
-

+
-
+
-
-
+
+
{{ n.statusName || filterStatus(n.status)}}
{{n.title}}
@@ -165,10 +201,10 @@
已结案
合肥路与安宁路交合肥路与安宁路交
-->
-
+
-
+
@@ -213,7 +249,7 @@ export default {
userList: Array, // 默认,必传
userName: String, // 默认,必传
singleList: Array, // 默认,必传
-
+
},
data () {
return {
@@ -221,31 +257,32 @@ export default {
tempList: []
}
},
- created() {
+ created () {
this.tempList = [...this.singleList]
+
},
methods: {
- filterStatus(status) {
- const statusObj = {
+ filterStatus (status) {
+ const statusObj = {
pending: '待处理',
closed: '已结案'
}
return statusObj[status]
},
- handleTabs(type) {
- if (type === 'group') this.tempList = [ ...this.singleList ]
- else if (type === 'event') this.tempList = [ ...this.moreList ]
+ handleTabs (type) {
+ 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
},
- handleProject(item) {
+ handleProject (item) {
this.$emit('project', item)
},
- handleUser(item) {
+ handleUser (item) {
this.$emit('user', item)
},
- handleShow(item) {
+ handleShow (item) {
item.showItem = !item.showItem
}
}
@@ -279,7 +316,7 @@ export default {
color: #fff;
text-align: center;
background: rgba(255, 255, 255, 0);
- border: 1px solid #1257C9;
+ border: 1px solid #1257c9;
border-radius: 2px;
box-shadow: 0 0 5px 2px rgba(18, 87, 201, 1) inset;
}
@@ -310,7 +347,8 @@ export default {
padding-top: 60px;
color: #fff;
text-align: center;
- background: url('../../../../assets/img/shuju/measure/zhuhu@2x.png') no-repeat center;
+ background: url("../../../../assets/img/shuju/measure/zhuhu@2x.png")
+ no-repeat center;
background-size: cover;
.personal-name {
font-size: 18px;
@@ -336,7 +374,7 @@ export default {
color: #fff;
cursor: pointer;
background: rgba(255, 255, 255, 0);
- border: 1px solid #1257C9;
+ border: 1px solid #1257c9;
border-radius: 4px;
box-shadow: 1px 1px 10px 5px rgba(18, 87, 201, 1) inset;
.label {
@@ -388,7 +426,7 @@ export default {
width: 230px;
.cate-list-w0 {
width: 0;
- transition: width .2s;
+ transition: width 0.2s;
overflow: hidden;
// border: 0;
// padding: 0;
@@ -399,7 +437,7 @@ export default {
// // background: rgba(255, 255, 255, 0);
// border: 1px solid #1257C9;
// overflow: auto;
- transition: width .2s;
+ transition: width 0.2s;
}
}
}
@@ -424,7 +462,7 @@ export default {
box-sizing: border-box;
padding: 4px 14px 10px;
background: rgba(255, 255, 255, 0);
- border: 1px solid #1257C9;
+ border: 1px solid #1257c9;
overflow: auto;
border-radius: 4px;
box-shadow: 1px 1px 10px 5px rgba(18, 87, 201, 1) inset;
@@ -445,15 +483,16 @@ export default {
font-size: 10px;
text-align: center;
// line-height: 15px;
- background: #0C5CFE;
+ background: #0c5cfe;
border-radius: 2px;
- &-pending, &-canceled {
+ &-pending,
+ &-canceled {
background: rgba(224, 84, 0, 1);
}
- &-assigned, &-have_order {
+ &-assigned,
+ &-have_order {
background: rgba(9, 163, 125, 1);
}
-
}
.item-content {
font-size: 14px;
@@ -463,8 +502,6 @@ export default {
}
}
}
-
-
}
.analys-col-wr {
height: 100%;
@@ -502,7 +539,6 @@ export default {
// left: -30px;
}
}
-
}
}
.pad10 {
@@ -516,20 +552,21 @@ export default {
.list-wr::-webkit-scrollbar-corner,
/* 滚动条角落 */
.list-wr::-webkit-scrollbar-thumb,
-.list-wr::-webkit-scrollbar-track { /*滚动条的轨道*/
+.list-wr::-webkit-scrollbar-track {
+ /*滚动条的轨道*/
border-radius: 4px;
}
.list-wr::-webkit-scrollbar-corner,
.list-wr::-webkit-scrollbar-track {
/* 滚动条轨道 */
-
- background: rgba(12, 129, 254, .24);
+
+ background: rgba(12, 129, 254, 0.24);
// box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
}
.list-wr::-webkit-scrollbar-thumb {
/* 滚动条手柄 */
- background: linear-gradient(270deg, #0063FE, #0095FF);
+ background: linear-gradient(270deg, #0063fe, #0095ff);
}
diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue
index 2abb586a..f0e903b3 100644
--- a/src/views/modules/visual/cpts/tb.vue
+++ b/src/views/modules/visual/cpts/tb.vue
@@ -22,10 +22,22 @@
item
}}
-

-

-

-
{{index + 1}}
+

+

+

+
{{ index + 1 }}
-

+
@@ -160,18 +169,21 @@ export default {
&-body {
box-sizing: border-box;
width: 100%;
- font-size: 18px;
+ font-size: 16px;
font-weight: 400;
color: #ffffff;
&-tr {
+ box-sizing: border-box;
width: 100%;
- height: 50px;
+ min-height: 50px;
+
.td {
text-align: center;
border: none;
+ padding: 10px 0;
a {
- font-size: 18px;
+ font-size: 16px;
font-weight: 400;
color: #e4dc00;
position: relative;