From 61069694e008c9ecd09dfd67280c00247fac046b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 22 Sep 2023 16:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/dataBoard/overview/index.scss |  6 ++---
 .../dataBoard/overview/components/jdtphx.vue  |  4 +--
 .../modules/EventSituation/index.vue          |  4 +--
 .../modules/PersonnelPortrait/index.vue       | 25 ++++++++++---------
 .../modules/SelfTrend/index.vue               |  2 +-
 .../modules/TypesOfDissatisfaction/index.vue  |  4 +--
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss
index 69d4eda69..8d0150eaf 100644
--- a/src/assets/scss/dataBoard/overview/index.scss
+++ b/src/assets/scss/dataBoard/overview/index.scss
@@ -569,7 +569,6 @@
 				height: 40px;
 				line-height: 40px;
 				font-size: 14px;
-				font-family: PingFang SC;
 				font-weight: 400;
 				color: #A3B9DA;
 			}
@@ -583,11 +582,12 @@
 				height: 40px;
 				line-height: 40px;
 				width: 110px;
-				height: 14px;
 				font-size: 14px;
-				font-family: PingFang SC;
 				font-weight: 400;
 				color: #FFFFFF;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 			}
 
 			.tdbg1 {
diff --git a/src/views/dataBoard/overview/components/jdtphx.vue b/src/views/dataBoard/overview/components/jdtphx.vue
index 9919368e0..dbe6b842e 100644
--- a/src/views/dataBoard/overview/components/jdtphx.vue
+++ b/src/views/dataBoard/overview/components/jdtphx.vue
@@ -29,7 +29,7 @@
         <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-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>
@@ -105,7 +105,7 @@
         <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-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>
diff --git a/src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue b/src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue
index e904dd399..060c19ec1 100644
--- a/src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/EventSituation/index.vue
@@ -113,7 +113,6 @@ export default {
 
   .cur-month-item {
     margin-left: 71px;
-
     .txt {
       font-size: 16px;
       font-weight: 400;
@@ -150,7 +149,8 @@ export default {
   .his-month-item {
     flex: 1;
     position: relative;
-    padding-left: 25px;
+    //padding-left: 25px;
+    text-align: center;
 
     &:after {
       content: '';
diff --git a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
index dfb1cee8b..09cfd045b 100644
--- a/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/PersonnelPortrait/index.vue
@@ -3,36 +3,36 @@
     <Tabs v-model="resultType" :list="resultTypeList" @changeVal="resultTypeChange"/>
     <div class="screen">
       <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
             v-for="item in typeConditionList"
             :key="item.value"
             :label="item.label"
             :value="item.value">
         </el-option>
-      </el-select>
+      </el-select>-->
     </div>
 
     <div class="portrait">
-      <div class="tag yellow">
+      <div class="tag yellow" v-if="gridName">
         <div class="text">{{ gridName }}</div>
       </div>
-      <div class="tag blue">
+      <div class="tag blue" v-if="ageClassification">
         <div class="text">{{ ageClassification }}</div>
       </div>
-      <div class="tag red">
+      <div class="tag red" v-if="residentTagName">
         <div class="text">{{ residentTagName }}</div>
       </div>
-      <div class="tag light">
+      <div class="tag light" v-if="monthIncomeLevel">
         <div class="text">{{ monthIncomeLevel }}</div>
       </div>
-      <div class="tag green">
+      <div class="tag green" v-if="cultureLevel">
         <div class="text">{{ cultureLevel }}</div>
       </div>
-      <div class="tag orange">
+      <div class="tag orange" v-if="marriageName">
         <div class="text">{{ marriageName }}</div>
       </div>
-      <div class="tag purple">
+      <div class="tag purple" v-if="gender">
         <div class="text">{{ gender==='1'?'男':gender==='2'?'女':gender==='0'?'未知':'' }}</div>
       </div>
     </div>
@@ -77,13 +77,15 @@ export default {
   watch: {
     "$store.state.chooseArea.chooseName"(val) {
       if (val.orgId) {
-        this.getDisKey()
+        // this.getDisKey()
+        this.getData();
       }
     }
   },
   mounted() {
     if (this.$store.state.chooseArea.chooseName.orgId) {
-      this.getDisKey()
+      // this.getDisKey()
+      this.getData();
     }
   },
   methods: {
@@ -98,7 +100,6 @@ export default {
       this.$http.post('/sys/dict/data/dictlist', {'dictType': 'satisfaction_category'}).then(({data: {data}}) => {
         this.typeCondition = data[0].value
         this.typeConditionList = data
-        this.getData();
       })
     },
     getData() {
diff --git a/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue b/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue
index 9cb614f1d..eb2ab027e 100644
--- a/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/SelfTrend/index.vue
@@ -187,7 +187,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '单位：人',
+            name: '单位：' + (this.trendType === 1 ? '人' : '得分'),
             nameLocation: 'end',
             splitLine: {
               show: true,
diff --git a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
index 57d90f0d6..bdd3fe289 100644
--- a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
@@ -138,7 +138,7 @@ export default {
       }
       let legendName = ['省满意度调查\n各项不满意人数', '社区满意度自查\n各项不满意人数']
       let series = [{
-        name: "省满意度调查\n各项不满意人数",
+        name: this.resultType === 2?'12345热线\n事件上报人数':"省满意度调查\n各项不满意人数",
         type: "radar",
         symbol: "circle",
         symbolSize: 7,
@@ -161,7 +161,7 @@ export default {
         data: [datavaule]
       }]
       if (this.resultType === 2) {
-        legendName = ['省满意度调查\n各项不满意人数']
+        legendName = ['12345热线\n事件上报人数']
       } else {
         series.push({
           name: "社区满意度自查\n各项不满意人数",