diff --git a/src/assets/scss/modules/visual/incident-info.scss b/src/assets/scss/modules/visual/incident-info.scss
index a8fa9ff2..1ca5a43a 100644
--- a/src/assets/scss/modules/visual/incident-info.scss
+++ b/src/assets/scss/modules/visual/incident-info.scss
@@ -120,6 +120,11 @@
margin: 10px 0;
display: flex;
padding-left: 15px;
+ .info-title-2 {
+ width: 70px;
+ flex: 0 0 1;
+ font-size: 14px;
+ }
> span,
> div {
diff --git a/src/assets/scss/modules/visual/issue-info.scss b/src/assets/scss/modules/visual/issue-info.scss
index da6031fb..43f77201 100644
--- a/src/assets/scss/modules/visual/issue-info.scss
+++ b/src/assets/scss/modules/visual/issue-info.scss
@@ -73,10 +73,14 @@
margin: 10px 0;
display: flex;
padding-left: 15px;
-
+ .info-title-2 {
+ width: 90px;
+ flex: 0 0 1;
+ font-size: 14px;
+ }
.info-pics {
display: flex;
- margin: 20px 0;
+ margin: 10px 0;
img {
display: block;
width: 32%;
diff --git a/src/views/modules/visual/communityGovern/cpt/issue-info.vue b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
index 61df9568..0cc0f2fb 100644
--- a/src/views/modules/visual/communityGovern/cpt/issue-info.vue
+++ b/src/views/modules/visual/communityGovern/cpt/issue-info.vue
@@ -15,46 +15,48 @@
- 议题标题:
+ 议题标题:
{{ info.issueTitle }}
- 议题建议:
+ 议题建议:
{{ info.issueSuggestion }}
-
话题内容:
-
{{ info.topicInfo.topicContent }}
-
-
![]()
+
话题内容:
+
+
{{ info.topicInfo.topicContent }}
+
+
![]()
+
- 转议题时间:
+ 转议题时间:
{{ info.shiftIssueTime}}
- 所属网格:
+ 所属网格:
{{ info.belongsGridName}}
- 话题发表人:
+ 话题发表人:
{{ info.topicInfo.publishedUser}}
- 议题发起人:
+ 议题发起人:
{{ info.issueInitiator}}
- 话题来源:
+ 话题来源:
{{ info.topicInfo.groupName}}
- 话题发表时间:
+ 话题发表时间:
{{ info.topicInfo.publishedTimeShow}}
diff --git a/src/views/modules/visual/communityGovern/cpt/project-info.vue b/src/views/modules/visual/communityGovern/cpt/project-info.vue
index c1ae0326..2810747b 100644
--- a/src/views/modules/visual/communityGovern/cpt/project-info.vue
+++ b/src/views/modules/visual/communityGovern/cpt/project-info.vue
@@ -193,20 +193,25 @@
@click="watchImg(src)" />
- 提交时间:
+ 提交时间:
{{ info.eventTime }}
- 报事人:
+ 报事人:
{{ info.eventPeopleName }}
- 所属网格:
+ 所属网格:
{{ info.gridName }}
-
提报给:
-
{{ info.eventPerson.join("、") || "--" }}
+
提报给:
+
+
{{ info.eventPersonShow}}
+
{{ info.eventOrgShow}}
+
+
+
@@ -530,7 +535,15 @@ export default {
});
if (code === 0) {
- this.info = data;
+
+ if (data.eventOrg && data.eventOrg.length > 0) {
+ data.eventOrgShow = data.eventOrg.join('、')
+ }
+ if (data.eventPerson && data.eventPerson.length > 0) {
+ data.eventPersonShow = data.eventPerson.join('、')
+ }
+ this.info = { ...data };
+
} else {
this.$message.error(msg);
}
@@ -592,7 +605,7 @@ export default {
let array1 = []
let array2 = []
- // debugger
+
//楼院小组、居民上报都存在是,研判分析显示两个分支
if (data.groupProjectList && data.groupProjectList.length > 0 && data.eventProjectList && data.eventProjectList.length > 0) {
this.yanPan.hasEvent = true
diff --git a/src/views/modules/visual/communityGovern/resibuzz.vue b/src/views/modules/visual/communityGovern/resibuzz.vue
index 73918a26..85b78d24 100644
--- a/src/views/modules/visual/communityGovern/resibuzz.vue
+++ b/src/views/modules/visual/communityGovern/resibuzz.vue
@@ -31,12 +31,11 @@
-
-
+
加载中
@@ -92,7 +91,6 @@ export default {
data () {
return {
dataLoading: true,
- pieNoData: false,
pieChartS: null,
pieChart: '',
@@ -365,7 +363,7 @@ export default {
this.pieTotal = 0
if (this.pieData.length > 0) {
- this.pieNoData = false
+ this.$refs.pieChart.setNoData(false)
const _that = this
let maxIndex = 0
let maxValue = this.pieData[0].count
@@ -402,7 +400,7 @@ export default {
}
this.$refs.pieChart.handleClick(fun)
} else {
- this.pieNoData = true
+ this.$refs.pieChart.setNoData(true)
}
},
diff --git a/src/views/modules/visual/components/screen-echarts-frame/index.vue b/src/views/modules/visual/components/screen-echarts-frame/index.vue
index fc4511e8..9d97c8fb 100644
--- a/src/views/modules/visual/components/screen-echarts-frame/index.vue
+++ b/src/views/modules/visual/components/screen-echarts-frame/index.vue
@@ -1,8 +1,9 @@
@@ -55,6 +56,7 @@ export default {
},
//没有数据
setNoData (nodata) {
+
this.noData = nodata
},