Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/customerData/index.vue

@@ -576,7 +576,8 @@
               </div>
               <div>
                 <div ref="customerUnfllowEl"></div>
-                <div style="margin-top:10px">
+                <div style="font-size:16px;color:#333333;margin:10px 0">{{ unfllowStatus ? unfllowStatus : '全部' }}</div>
+                <div>
                   <pageTable
                     ref="customerUnfllowTable"
                     :tablecols="tool.tabelCol($route.name).typeTable1.tablecols.splice(0,tool.tabelCol($route.name).typeTable1.tablecols.length - 1)"
@@ -611,6 +612,7 @@
                 </div>
               </div>
             </div>
+
             <!--12月客户报价分析-->
             <div class="data-panel">
               <div class="panel-header">
@@ -684,6 +686,7 @@ export default {
       dataAll:{
         data:{}
       },
+      unfllowStatus:'',
       person:'',
       dualAxes:'',
       customerTypeMap:'',
@@ -1368,8 +1371,10 @@ export default {
         this.customerUnfllowMap.on('element:click',(v) => {
           console.log(v);
           if (v.data.data.datetype == this.unfllowTableParam.content.where.dateType) {
+            this.unfllowStatus = ''
             this.unfllowTableParam.content.where.dateType = ''
           } else {
+            this.unfllowStatus = v.data.data.datetype
             this.unfllowTableParam.content.where.dateType = v.data.data.datetype
           }
           this.$refs.customerUnfllowTable.listData()

src/HDrpManagement/projectData/index.vue

@@ -280,16 +280,19 @@
               <div>
                 <div ref="scoreEl" style="max-height:400px;min-height:100px"></div>
                 <div class="panel-table">
-                  <div class="mt-10 inline-16">
-                    <label  class="search__label" >评估分档位:</label>
-                    <el-select v-model="scoreTableParam1.content.where.taskType" filterable placeholder="请选择" size="small"
-                    @change="$refs.scoreTable.listData()"
-                    >
-                      <el-option label="全部" value="" />
-                      <el-option label="高分档" value="高分档" />
-                      <el-option label="中分档" value="中分档" />
-                      <el-option label="低分档" value="低分档" />
-                    </el-select>
+                  <div class="mt-10 inline-16" style="margin-top:10px;display:flex !important;justify-content:space-between">
+                    <span style="font-size:16px;color:#333333">{{ scoreStatus ? scoreStatus : '全部' }}</span>
+                    <div>
+                      <label  class="search__label" >评估分档位:</label>
+                      <el-select v-model="scoreTableParam1.content.where.taskType" filterable placeholder="请选择" size="small"
+                      @change="$refs.scoreTable.listData()"
+                      >
+                        <el-option label="全部" value="" />
+                        <el-option label="高分档" value="高分档" />
+                        <el-option label="中分档" value="中分档" />
+                        <el-option label="低分档" value="低分档" />
+                      </el-select>
+                    </div>
                   </div>
                   <pageTable
                     ref="scoreTable"
@@ -868,7 +871,8 @@
               </div>
               <div>
                 <div ref="customerUnfllowEl" style="height:400px"></div>
-                <div style="margin-top:25px">
+                <div style="font-size:16px;color:#333333;margin:10px 0">{{ unfllowStatus ? unfllowStatus : '全部' }}</div>
+                <div>
                   <pageTable
                     v-if="projectType[0].value != ''"
                     ref="customerUnfllowTable"
@@ -1058,6 +1062,8 @@ export default {
       dataAll:{
         data:{}
       },
+      scoreStatus:'',
+      unfllowStatus:'',
       person:'',
       //项目类型分析
       typeMap:'',
@@ -1554,9 +1560,11 @@ export default {
         });
         this.scoreMap.on('element:click',(v) => {
           if (v.data.data.key != this.scoreTableParam1.content.occupancyratio) {
+            this.scoreStatus = v.data.data.key
             this.scoreTableParam1.content.occupancyratio = v.data.data.key
             this.$refs.scoreTable.listData()
           } else {
+            this.scoreStatus = ''
             this.scoreTableParam1.content.occupancyratio = ''
             this.$refs.scoreTable.listData()
           }
@@ -1978,8 +1986,10 @@ export default {
         this.customerUnfllowMap.on('element:click',(v) => {
           console.log(v);
           if (v.data.data.datetype == this.unfllowTableParam.content.where.dateType) {
+            this.unfllowStatus = ''
             this.unfllowTableParam.content.where.dateType = ''
           } else {
+            this.unfllowStatus = v.data.data.datetype
             this.unfllowTableParam.content.where.dateType = v.data.data.datetype
           }
           this.$refs.customerUnfllowTable.listData()

src/components/normal-basic-layout/details/index.vue

@@ -415,6 +415,6 @@ export default {
   font-size:30px;
   font-weight:300;
   margin-right:16px;
-  line-height: 2rem;
+  line-height: 32px;
 }
 </style>