elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

项目详情布局调整

shibei_master
jiangyy 4 years ago
parent
4997488a8a
commit
cc792d620b
6 changed files with 56 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/assets/scss/modules/visual/incident-info.scss
  2. 8
      src/assets/scss/modules/visual/issue-info.scss
  3. 32
      src/views/modules/visual/communityGovern/cpt/issue-info.vue
  4. 27
      src/views/modules/visual/communityGovern/cpt/project-info.vue
  5. 10
      src/views/modules/visual/communityGovern/resibuzz.vue
  6. 6
      src/views/modules/visual/components/screen-echarts-frame/index.vue

5
src/assets/scss/modules/visual/incident-info.scss
View File

@ -120,6 +120,11 @@
margin: 10px 0; margin: 10px 0;
display: flex; display: flex;
padding-left: 15px; padding-left: 15px;
.info-title-2 {
width: 70px;
flex: 0 0 1;
font-size: 14px;
}
> span, > span,
> div { > div {

8
src/assets/scss/modules/visual/issue-info.scss
View File

@ -73,10 +73,14 @@
margin: 10px 0; margin: 10px 0;
display: flex; display: flex;
padding-left: 15px; padding-left: 15px;
.info-title-2 {
width: 90px;
flex: 0 0 1;
font-size: 14px;
}
.info-pics { .info-pics {
display: flex; display: flex;
margin: 20px 0; margin: 10px 0;
img { img {
display: block; display: block;
width: 32%; width: 32%;

32
src/views/modules/visual/communityGovern/cpt/issue-info.vue
View File

@ -15,46 +15,48 @@
<div class="m-info"> <div class="m-info">
<div class="info-prop"> <div class="info-prop">
<span>议题标题：</span> <span class="info-title-2">议题标题：</span>
<span>{{ info.issueTitle }}</span> <span>{{ info.issueTitle }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>议题建议：</span> <span class="info-title-2">议题建议：</span>
<span>{{ info.issueSuggestion }}</span> <span>{{ info.issueSuggestion }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>话题内容：</span> <span class="info-title-2">话题内容：</span>
<div>{{ info.topicInfo.topicContent }}</div> <div>
<div v-if="info.topicInfo.topicImgs&&info.topicInfo.topicImgs.length>0" <div>{{ info.topicInfo.topicContent }}</div>
class="info-pics"> <div v-if="info.topicInfo.topicImgs&&info.topicInfo.topicImgs.length>0"
<img :src="src" class="info-pics">
:key="src" <img :src="src"
v-for="src in info.topicInfo.topicImgs" /> :key="src"
v-for="src in info.topicInfo.topicImgs" />
</div>
</div> </div>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>转议题时间：</span> <span class="info-title-2">转议题时间：</span>
<span>{{ info.shiftIssueTime}}</span> <span>{{ info.shiftIssueTime}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>所属网格：</span> <span class="info-title-2">所属网格：</span>
<span>{{ info.belongsGridName}}</span> <span>{{ info.belongsGridName}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>话题发表人：</span> <span class="info-title-2">话题发表人：</span>
<span>{{ info.topicInfo.publishedUser}}</span> <span>{{ info.topicInfo.publishedUser}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>议题发起人：</span> <span class="info-title-2">议题发起人：</span>
<span>{{ info.issueInitiator}}</span> <span>{{ info.issueInitiator}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>话题来源：</span> <span class="info-title-2">话题来源：</span>
<span>{{ info.topicInfo.groupName}}</span> <span>{{ info.topicInfo.groupName}}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>话题发表时间：</span> <span class="info-title-2">话题发表时间：</span>
<span>{{ info.topicInfo.publishedTimeShow}}</span> <span>{{ info.topicInfo.publishedTimeShow}}</span>
</div> </div>
</div> </div>

27
src/views/modules/visual/communityGovern/cpt/project-info.vue
View File

@ -193,20 +193,25 @@
@click="watchImg(src)" /> @click="watchImg(src)" />
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>提交时间：</span> <span class="info-title-2">提交时间：</span>
<span>{{ info.eventTime }}</span> <span>{{ info.eventTime }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>报事人：</span> <span class="info-title-2">报事人：</span>
<span>{{ info.eventPeopleName }}</span> <span>{{ info.eventPeopleName }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>所属网格：</span> <span class="info-title-2">所属网格：</span>
<span>{{ info.gridName }}</span> <span>{{ info.gridName }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span>提报给：</span> <span class="info-title-2">提报给：</span>
<span>{{ info.eventPerson.join("、") || "--" }}</span> <div>
<div>{{ info.eventPersonShow}}</div>
<div>{{ info.eventOrgShow}}</div>
</div>
<!-- <span>{{ info.eventPerson.join("、") || "--" }}</span> -->
</div> </div>
</div> </div>
@ -530,7 +535,15 @@ export default {
}); });
if (code === 0) { 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 { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -592,7 +605,7 @@ export default {
let array1 = [] let array1 = []
let array2 = [] let array2 = []
// debugger
//楼院小组、居民上报都存在是，研判分析显示两个分支 //楼院小组、居民上报都存在是，研判分析显示两个分支
if (data.groupProjectList && data.groupProjectList.length > 0 && data.eventProjectList && data.eventProjectList.length > 0) { if (data.groupProjectList && data.groupProjectList.length > 0 && data.eventProjectList && data.eventProjectList.length > 0) {
this.yanPan.hasEvent = true this.yanPan.hasEvent = true

10
src/views/modules/visual/communityGovern/resibuzz.vue
View File

@ -31,12 +31,11 @@
<div class="g-cpt-resi"> <div class="g-cpt-resi">
<div class="g-l"> <div class="g-l">
<screen-echarts-frame v-if="!pieNoData && !dataLoading" <screen-echarts-frame v-if=" !dataLoading"
class="echart-wr" class="echart-wr"
@myChartMethod="pieInitOk" @myChartMethod="pieInitOk"
ref="pieChart"></screen-echarts-frame> ref="pieChart"></screen-echarts-frame>
<screen-nodata class="nodata"
v-if="pieNoData && !dataLoading"></screen-nodata>
<div class="table-status" <div class="table-status"
v-if="dataLoading"> v-if="dataLoading">
<screen-loading>加载中</screen-loading> <screen-loading>加载中</screen-loading>
@ -92,7 +91,6 @@ export default {
data () { data () {
return { return {
dataLoading: true, dataLoading: true,
pieNoData: false,
pieChartS: null, pieChartS: null,
pieChart: '', pieChart: '',
@ -365,7 +363,7 @@ export default {
this.pieTotal = 0 this.pieTotal = 0
if (this.pieData.length > 0) { if (this.pieData.length > 0) {
this.pieNoData = false this.$refs.pieChart.setNoData(false)
const _that = this const _that = this
let maxIndex = 0 let maxIndex = 0
let maxValue = this.pieData[0].count let maxValue = this.pieData[0].count
@ -402,7 +400,7 @@ export default {
} }
this.$refs.pieChart.handleClick(fun) this.$refs.pieChart.handleClick(fun)
} else { } else {
this.pieNoData = true this.$refs.pieChart.setNoData(true)
} }
}, },

6
src/views/modules/visual/components/screen-echarts-frame/index.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<div> <div>
<div class="screenEchartsFrame" <div v-show="!noData"
class="screenEchartsFrame"
ref="screenEchartsFrame"></div> ref="screenEchartsFrame"></div>
<screen-nodata v-if="noData" <screen-nodata v-show="noData"
class="nodata"></screen-nodata> class="nodata"></screen-nodata>
</div> </div>
</template> </template>
@ -55,6 +56,7 @@ export default {
}, },
//没有数据 //没有数据
setNoData (nodata) { setNoData (nodata) {
this.noData = nodata this.noData = nodata
}, },

Write Preview
Loading…
Cancel
Save