Browse Source

修改bug

V1.0
战立标 3 years ago
parent
commit
61069694e0
  1. 6
      src/assets/scss/dataBoard/overview/index.scss
  2. 4
      src/views/dataBoard/overview/components/jdtphx.vue
  3. 4
      src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue
  4. 25
      src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
  5. 2
      src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue
  6. 4
      src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue

6
src/assets/scss/dataBoard/overview/index.scss

@ -569,7 +569,6 @@
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
font-size: 14px; font-size: 14px;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #A3B9DA; color: #A3B9DA;
} }
@ -583,11 +582,12 @@
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
width: 110px; width: 110px;
height: 14px;
font-size: 14px; font-size: 14px;
font-family: PingFang SC;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.tdbg1 { .tdbg1 {

4
src/views/dataBoard/overview/components/jdtphx.vue

@ -29,7 +29,7 @@
<div class="m-jdhx-card-content"> <div class="m-jdhx-card-content">
<div class="m-jdhx-card-content-item" v-for="(item,index) in houseList" :key="index"> <div class="m-jdhx-card-content-item" v-for="(item,index) in houseList" :key="index">
<div class="m-jdhx-card-content-item-lable">{{item.name}}</div> <div class="m-jdhx-card-content-item-lable">{{item.name}}</div>
<div class="m-jdhx-card-content-item-value">{{item.num}}</div> <div class="m-jdhx-card-content-item-value">{{item.ratio}}</div>
</div> </div>
</div> </div>
</div> </div>
@ -105,7 +105,7 @@
<div class="m-jdhx-card-content"> <div class="m-jdhx-card-content">
<div class="m-jdhx-card-content-item" v-for="(item,index) in riskList" :key="index"> <div class="m-jdhx-card-content-item" v-for="(item,index) in riskList" :key="index">
<div class="m-jdhx-card-content-item-lable">{{item.riskName}}</div> <div class="m-jdhx-card-content-item-lable">{{item.riskName}}</div>
<div class="m-jdhx-card-content-item-value">{{item.riskNum}}</div> <div class="m-jdhx-card-content-item-value">{{item.riskNum}}</div>
</div> </div>
</div> </div>
</div> </div>

4
src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue

@ -113,7 +113,6 @@ export default {
.cur-month-item { .cur-month-item {
margin-left: 71px; margin-left: 71px;
.txt { .txt {
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
@ -150,7 +149,8 @@ export default {
.his-month-item { .his-month-item {
flex: 1; flex: 1;
position: relative; position: relative;
padding-left: 25px; //padding-left: 25px;
text-align: center;
&:after { &:after {
content: ''; content: '';

25
src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue

@ -3,36 +3,36 @@
<Tabs v-model="resultType" :list="resultTypeList" @changeVal="resultTypeChange"/> <Tabs v-model="resultType" :list="resultTypeList" @changeVal="resultTypeChange"/>
<div class="screen"> <div class="screen">
<div class="txt">不满意人员画像</div> <div class="txt">不满意人员画像</div>
<el-select v-model="typeCondition" @change="getData" placeholder="请选择" class="select" popper-class="selectPopClass"> <!-- <el-select v-model="typeCondition" @change="getData" placeholder="请选择" class="select" popper-class="selectPopClass">
<el-option <el-option
v-for="item in typeConditionList" v-for="item in typeConditionList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>-->
</div> </div>
<div class="portrait"> <div class="portrait">
<div class="tag yellow"> <div class="tag yellow" v-if="gridName">
<div class="text">{{ gridName }}</div> <div class="text">{{ gridName }}</div>
</div> </div>
<div class="tag blue"> <div class="tag blue" v-if="ageClassification">
<div class="text">{{ ageClassification }}</div> <div class="text">{{ ageClassification }}</div>
</div> </div>
<div class="tag red"> <div class="tag red" v-if="residentTagName">
<div class="text">{{ residentTagName }}</div> <div class="text">{{ residentTagName }}</div>
</div> </div>
<div class="tag light"> <div class="tag light" v-if="monthIncomeLevel">
<div class="text">{{ monthIncomeLevel }}</div> <div class="text">{{ monthIncomeLevel }}</div>
</div> </div>
<div class="tag green"> <div class="tag green" v-if="cultureLevel">
<div class="text">{{ cultureLevel }}</div> <div class="text">{{ cultureLevel }}</div>
</div> </div>
<div class="tag orange"> <div class="tag orange" v-if="marriageName">
<div class="text">{{ marriageName }}</div> <div class="text">{{ marriageName }}</div>
</div> </div>
<div class="tag purple"> <div class="tag purple" v-if="gender">
<div class="text">{{ gender==='1'?'男':gender==='2'?'女':gender==='0'?'未知':'' }}</div> <div class="text">{{ gender==='1'?'男':gender==='2'?'女':gender==='0'?'未知':'' }}</div>
</div> </div>
</div> </div>
@ -77,13 +77,15 @@ export default {
watch: { watch: {
"$store.state.chooseArea.chooseName"(val) { "$store.state.chooseArea.chooseName"(val) {
if (val.orgId) { if (val.orgId) {
this.getDisKey() // this.getDisKey()
this.getData();
} }
} }
}, },
mounted() { mounted() {
if (this.$store.state.chooseArea.chooseName.orgId) { if (this.$store.state.chooseArea.chooseName.orgId) {
this.getDisKey() // this.getDisKey()
this.getData();
} }
}, },
methods: { methods: {
@ -98,7 +100,6 @@ export default {
this.$http.post('/sys/dict/data/dictlist', {'dictType': 'satisfaction_category'}).then(({data: {data}}) => { this.$http.post('/sys/dict/data/dictlist', {'dictType': 'satisfaction_category'}).then(({data: {data}}) => {
this.typeCondition = data[0].value this.typeCondition = data[0].value
this.typeConditionList = data this.typeConditionList = data
this.getData();
}) })
}, },
getData() { getData() {

2
src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue

@ -187,7 +187,7 @@ export default {
yAxis: [ yAxis: [
{ {
type: 'value', type: 'value',
name: '单位:人', name: '单位:' + (this.trendType === 1 ? '人' : '得分'),
nameLocation: 'end', nameLocation: 'end',
splitLine: { splitLine: {
show: true, show: true,

4
src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue

@ -138,7 +138,7 @@ export default {
} }
let legendName = ['省满意度调查\n各项不满意人数', '社区满意度自查\n各项不满意人数'] let legendName = ['省满意度调查\n各项不满意人数', '社区满意度自查\n各项不满意人数']
let series = [{ let series = [{
name: "省满意度调查\n各项不满意人数", name: this.resultType === 2?'12345热线\n事件上报人数':"省满意度调查\n各项不满意人数",
type: "radar", type: "radar",
symbol: "circle", symbol: "circle",
symbolSize: 7, symbolSize: 7,
@ -161,7 +161,7 @@ export default {
data: [datavaule] data: [datavaule]
}] }]
if (this.resultType === 2) { if (this.resultType === 2) {
legendName = ['省满意度调查\n各项不满意人数'] legendName = ['12345热线\n事件上报人数']
} else { } else {
series.push({ series.push({
name: "社区满意度自查\n各项不满意人数", name: "社区满意度自查\n各项不满意人数",

Loading…
Cancel
Save