暂存

src/HDrpManagement/customerData/index.vue

@@ -24,7 +24,7 @@
               ></el-cascader>
             </div>
             <div class="data-all">
-              <div style="margin-bottom:20px">客户</div>
+              <div style="margin-bottom:20px">客户数据概况</div>
               <div class="data-all-wrapper">
                 <div class="data-left">
                   <div class="data-item">
@@ -46,7 +46,7 @@
                     <p>{{ tool.formatAmount(dataAll.tradedCustomers)}}</p>
                     <p>
                       成交客户数
-                      <el-tooltip class="item" effect="dark" content="成交客户：已成交状态的客户数量" placement="top">
+                      <el-tooltip class="item" effect="dark" content="成交客户：已成交、多次成交状态的客户数量" placement="top">
                         <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
@@ -149,6 +149,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="typeTableParam.content.dataid"
@@ -189,13 +190,13 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -229,6 +230,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="gradTableParam.content.dataid"
@@ -269,13 +271,13 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -306,6 +308,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="contactTableParam.content.dataid"
@@ -346,13 +349,13 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -383,6 +386,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="projectTableParam.content.dataid"
@@ -423,13 +427,13 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -460,6 +464,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="fllowTableParam.content.dataid"
@@ -500,13 +505,13 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -685,13 +690,13 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -1067,7 +1072,24 @@ export default {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
       }
       let res = await this.$api.requested(param)
-      this.uvBillData = res.data.histogram
+      /*this.uvBillData = res.data.histogram*/
+      let lastYear = []
+      let nowYear = []
+      let k=0
+      for (var i=0;i<res.data.histogram.length;i++){
+        if (res.data.histogram[i].key === '去年同期新增'){
+          lastYear[k]=res.data.histogram[i]
+          k++
+        }
+      }
+      let x=0
+      for (var i=0;i<res.data.histogram.length;i++){
+        if (res.data.histogram[i].key === '本期新增'){
+          nowYear[x]=res.data.histogram[i]
+          x++
+        }
+      }
+      this.uvBillData = lastYear.concat(nowYear)
       /*res.data.lineChart.forEach(item => item[`同比增长率`] = item.value)*/
       this.transformData = res.data.lineChart
       if (init) {
@@ -1080,6 +1102,7 @@ export default {
               geometry: 'column',
               isGroup: true,
               seriesField: 'key',
+              color:['#62daab','#6395fa'],
             },
             {
               geometry: 'line',
@@ -1087,6 +1110,7 @@ export default {
                 lineWidth: 2,
               },
               seriesField: 'key',
+              color: '#657798',
             },
           ],
           tooltip: {
@@ -1109,10 +1133,34 @@ export default {
       let res = await this.$api.requested(param)
       console.log(res.data,'近12月跟进');
       this.chartMapData = res.data
+      let lastYear = []
+      let nowYear = []
+      let k=0
+      for (var i=0;i<res.data.followup.length;i++){
+        if (res.data.followup[i].key === '去年同期新增'){
+          lastYear[k]=res.data.followup[i]
+          k++
+        }
+      }
+      let x=0
+      for (var i=0;i<res.data.followup.length;i++){
+        if (res.data.followup[i].key === '本期新增'){
+          nowYear[x]=res.data.followup[i]
+          x++
+        }
+      }
+      this.newFollowup = lastYear.concat(nowYear)
+      this.lineChart = res.data.lineChart.map(item=>{
+        return {
+          date: item.date,
+          type:"同比增长率",
+          value: item.value
+        }
+      })
      /* this.chartMapData.tbzzl.forEach(item => item.key = '同比增长率(%)')*/
       if (init) {
         this.chartMap = new DualAxes(this.$refs.chart2, {
-          data: [this.chartMapData.followup, this.chartMapData.tbzzl],
+          data: [this.newFollowup, this.chartMapData.tbzzl],
           xField: 'date',
           yField: ['value', 'value'],
           geometryOptions: [
@@ -1120,12 +1168,12 @@ export default {
               geometry: 'column',
               seriesField:'key',
               isGroup: 'true',
-              color: '#5B8FF9',
+              color:['#62daab','#6395fa'],
             },
             {
               geometry: 'line',
               seriesField:'key',
-              color: '#5AD8A6',
+              color: '#657798',
             },
           ],
           tooltip: {

src/HDrpManagement/projectData/index.vue

@@ -26,7 +26,7 @@
               ></el-cascader>
             </div>
             <div class="data-all">
-              <div style="margin-bottom:20px">项目</div>
+              <div style="margin-bottom:20px">项目数据概况</div>
               <div class="data-all-wrapper">
                 <div class="data-left">
                   <div class="data-item">
@@ -106,6 +106,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="typeTableParam.content.dataid"
@@ -136,8 +137,10 @@
                   </div>
                 </div>
                 <div class="panel-content">
-                  <div ref="typeEl" style="width:30%"></div>
-                  <div class="panel-table" style="width:70%">
+                  <div ref="typeEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
+<!--                  <div ref="typeEl" style="width:30%"></div>-->
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+<!--                  <div class="panel-table" style="width:70%">-->
                     <pageTable
                       ref="typeTable"
                       :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -147,7 +150,7 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
@@ -156,7 +159,7 @@
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -191,6 +194,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="gradTableParam.content.dataid"
@@ -232,7 +236,7 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
@@ -241,7 +245,7 @@
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -287,6 +291,7 @@
                     <label  class="search__label" >部门:</label>
                     <el-cascader
                       ref="selectdep"
+                      placement="left-start"
                       size="small"
                       v-model="scoreTableParam1.content.dataid"
                       :options="deplist"
@@ -352,7 +357,7 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)">详情</el-button>
@@ -364,7 +369,7 @@
                           {{ tool.formatAmount(scope.data.data.dealamount,2,'￥') }}
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -398,6 +403,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         ref="selectdep"
+                        placement="left-start"
                         size="small"
                         :append-to-body="false"
                         v-model="addParam.content.dataid"
@@ -450,6 +456,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="baobeiParam.content.dataid"
@@ -502,6 +509,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="baojiaParam.content.dataid"
@@ -554,6 +562,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="fllowParam.content.dataid"
@@ -606,6 +615,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="fllowTableParam.content.dataid"
@@ -647,7 +657,7 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
@@ -656,7 +666,7 @@
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -691,6 +701,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="contactTableParam.content.dataid"
@@ -732,7 +743,7 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
@@ -741,7 +752,7 @@
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -776,6 +787,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="customerTableParam.content.dataid"
@@ -817,7 +829,7 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
@@ -826,7 +838,7 @@
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -861,6 +873,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="scoreTableParam.content.dataid"
@@ -902,7 +915,7 @@
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
                           <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
@@ -911,7 +924,7 @@
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
-                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
+                          <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname === 'tradingstatus'">
                           <span style="color:#3874f6" v-if="scope.data.data[[scope.data.columnname]] == '未成交'">{{scope.data.data[[scope.data.columnname]]}}</span>
@@ -945,6 +958,7 @@
                       <label  class="search__label" >部门:</label>
                       <el-cascader
                         :append-to-body="false"
+                        placement="left-start"
                         ref="selectdep"
                         size="small"
                         v-model="unfllowTableParam.content.dataid"
@@ -1584,6 +1598,12 @@ export default {
           radius: 1,
           innerRadius: 0.64,
           label:{
+            /*type: 'inner',
+            offset: '-50%',
+            style: {
+              textAlign: 'center',
+            },
+            autoRotate: false,*/
             formatter: (datum) => `${datum.ratio}%`
           },
           tooltip:{

src/views/clueData/modules/digitalSigns.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="div-box-new-margin">
     <div class="div-box-new">
-      <div style="font-size: 16px;color: #333333">线索</div>
+      <div style="font-size: 16px;color: #333333">线索数据概况</div>
       <div class="div-border-new">
         <div class="item">
           <p class="title">{{list.total}}</p>

src/views/salesData/components/departmentSalesperson.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <span class="search__label inline-16">部门:</span>
-    <el-cascader  class="inline-16" ref="selectdep" size="small" v-model="depment" :options="deplist" :append-to-body="!isFull"
+    <el-cascader  class="inline-16" ref="selectdep" size="small" v-model="depment" :options="deplist" :append-to-body="!isFull"  :placement="placement"
                   :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep" ></el-cascader>
     <span class="search__label inline-16">业务员:</span>
     <el-select  v-model="person" filterable placeholder="请选择" size="small" class="inline-16"  @change="selectPerson"  :popper-append-to-body="!isFull">
@@ -18,7 +18,7 @@
 <script>
 export default {
   name: "departmentSalesperson",
-  props:['isFull'],
+  props:['isFull','placement'],
   /*props:['dataid','deplist','personnelList'],*/
   data(){
     return {

src/views/salesData/modules/financialCollectionAnalysis.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson ref="departmentSalesperson" placement="left-start"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
           <div class="inline-15 mt-10">
             <exportFile  :param="tableParam" :columns="tablecols" fileName="财务回款分析" :dataid="tableParam.content.dataid"></exportFile>

src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson ref="departmentSalesperson" placement="left-start" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
           <div class="inline-15 mt-10">
             <exportFile  :param="param" :columns="tablecols" fileName="出货未开票分析" :dataid="param.content.dataid"></exportFile>