Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/views/Statistics/BuildingContrast.vue

@@ -117,15 +117,15 @@
          	<div class="hejisan">
             <div class="sanbox1" style="width: 35%;">
               <div class="text1-1">接待合计</div>
-              <div class="text1-2">{{objList1.sum}}</div>
+              <div class="text1-2">{{objList1.sum}}/次</div>
             </div>
             <div  class="sanbox1" style="width: 40%;">
               <div class="text1-1">楼盘总数</div>
-              <div class="text1-2">{{objList1.num}}</div>
+              <div class="text1-2">{{objList1.num}}/个</div>
             </div>
             <div  class="sanbox1" style="width: 25%;">
               <div class="text1-1">平均接待</div>
-              <div class="text1-2">{{objList1.avg}}</div>
+              <div class="text1-2">{{objList1.avg}}/次</div>
             </div>
          </div>
          <div style="overflow-y:auto;height: 350px;width: 94%;margin: 0 auto;">
@@ -145,11 +145,11 @@
           	<div class="hejisan">
             <div class="sanbox1" style="width: 50%;">
               <div class="text1-1">楼盘总数</div>
-              <div class="text1-2">{{objList2.num}}</div>
+              <div class="text1-2">{{objList2.num}}/个</div>
             </div>
             <div  class="sanbox1" style="width: 50%;">
               <div class="text1-1">平均执行率</div>
-              <div class="text1-2">{{objList2.avg}}</div>
+              <div class="text1-2">{{objList2.avg}}%</div>
             </div>
          </div>
           <div style="overflow-y:auto;height: 350px;width: 94%;margin: 0 auto;">
@@ -172,15 +172,15 @@
          	<div class="hejisan">
             <div class="sanbox1" style="width: 35%;">
               <div class="text1-1">合计</div>
-              <div class="text1-2">{{objList3.sum}}</div>
+              <div class="text1-2">{{objList3.sum}}/次</div>
             </div>
             <div  class="sanbox1" style="width: 40%;">
               <div class="text1-1">顾问</div>
-              <div class="text1-2">{{objList3.num}}</div>
+              <div class="text1-2">{{objList3.num}}/个</div>
             </div>
             <div  class="sanbox1" style="width: 25%;">
               <div class="text1-1">人均接待量</div>
-              <div class="text1-2">{{objList3.avg}}</div>
+              <div class="text1-2">{{objList3.avg}}/次</div>
             </div>
          </div>
          <div style="overflow-y:auto;height: 350px;width: 94%;margin: 0 auto;">
@@ -200,15 +200,15 @@
           	<div class="hejisan">
             <div class="sanbox1" style="width: 35%;">
               <div class="text1-1">时长合计</div>
-              <div class="text1-2">{{objList4.sum}}</div>
+              <div class="text1-2">{{objList4.sum}}/分钟</div>
             </div>
             <div  class="sanbox1" style="width: 40%;">
               <div class="text1-1">楼盘总数</div>
-              <div class="text1-2">{{objList4.num}}</div>
+              <div class="text1-2">{{objList4.num}}/个</div>
             </div>
              <div  class="sanbox1" style="width: 25%;">
               <div class="text1-1">平均时长</div>
-              <div class="text1-2">{{objList4.avg}}</div>
+              <div class="text1-2">{{objList4.avg}}/分钟</div>
             </div>
          </div>
           <div style="overflow-y:auto;height: 350px;width: 94%;margin: 0 auto;">

src/views/Statistics/ConsultantBrand.vue

@@ -136,15 +136,15 @@
         <div class="hejisan">
           <div class="sanbox1" style="width: 35%">
             <div class="text1-1">接待合计</div>
-            <div class="text1-2">{{sum1}}</div>
+            <div class="text1-2">{{sum1}}/次</div>
           </div>
           <div class="sanbox1" style="width: 40%">
             <div class="text1-1">顾问人数</div>
-            <div class="text1-2">{{num1}}</div>
+            <div class="text1-2">{{num1}}/个</div>
           </div>
           <div class="sanbox1" style="width: 25%">
             <div class="text1-1">人均接待</div>
-            <div class="text1-2">{{avg1}}</div>
+            <div class="text1-2">{{avg1}}/次</div>
           </div>
         </div>
         <div
@@ -170,15 +170,15 @@
            <div class="hejisan">
           <div class="sanbox1" style="width: 35%">
             <div class="text1-1">接待时长合计</div>
-            <div class="text1-2">{{Math.floor(sum2/60)}}</div>
+            <div class="text1-2">{{Math.floor(sum2/60)}}/分钟</div>
           </div>
           <div class="sanbox1" style="width: 40%">
             <div class="text1-1">顾问人数</div>
-            <div class="text1-2">{{num2}}</div>
+            <div class="text1-2">{{num2}}/个</div>
           </div>
           <div class="sanbox1" style="width: 25%">
             <div class="text1-1">均值</div>
-            <div class="text1-2">{{Math.floor(avg2/60)}}</div>
+            <div class="text1-2">{{Math.floor(avg2/60)}}/分钟</div>
           </div>
         </div>
         <div
@@ -223,11 +223,11 @@
      <div class="hejisan">
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">顾问人数</div>
-            <div class="text1-2">{{num3}}</div>
+            <div class="text1-2">{{num3}}/个</div>
           </div>
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">平均执行</div>
-            <div class="text1-2">{{avg3}}</div>
+            <div class="text1-2">{{avg3}}%</div>
           </div>
         </div>
         <div
@@ -268,15 +268,15 @@
         <div class="hejisan">
           <div class="sanbox1" style="width: 35%">
             <div class="text1-1">违禁合计</div>
-            <div class="text1-2">{{sum4}}</div>
+            <div class="text1-2">{{sum4}}/次</div>
           </div>
           <div class="sanbox1" style="width: 40%">
             <div class="text1-1">顾问人数</div>
-            <div class="text1-2">{{num4}}</div>
+            <div class="text1-2">{{num4}}/个</div>
           </div>
           <div class="sanbox1" style="width: 25%">
             <div class="text1-1">均值</div>
-            <div class="text1-2">{{avg4}}</div>
+            <div class="text1-2">{{avg4}}/次</div>
           </div>
         </div>
         <div

src/views/Statistics/MentoringAbility.vue

@@ -62,11 +62,11 @@
         <div class="hejisan">
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">{{consultantname}}</div>
-            <div class="text1-2">{{datalistobj1.avgA}}</div>
+            <div class="text1-2">{{datalistobj1.avgA}}/次</div>
           </div>
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">{{Packname}}</div>
-            <div class="text1-2">{{datalistobj1.avgB}}</div>
+            <div class="text1-2">{{datalistobj1.avgB}}/次</div>
           </div>
         </div>
         <div
@@ -82,11 +82,11 @@
         <div class="hejisan">
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">{{consultantname}}</div>
-            <div class="text1-2">{{datalistobj2.avgA}}</div>
+            <div class="text1-2">{{datalistobj2.avgA}}/分钟</div>
           </div>
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">{{Packname}}</div>
-            <div class="text1-2">{{datalistobj2.avgB}}</div>
+            <div class="text1-2">{{datalistobj2.avgB}}/分钟</div>
           </div>
         </div>
         <div
@@ -115,11 +115,11 @@
         <div class="hejisan">
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">{{consultantname}}</div>
-            <div class="text1-2">{{datalistobj3.avgA}}</div>
+            <div class="text1-2">{{datalistobj3.avgA}}%</div>
           </div>
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">{{Packname}}</div>
-            <div class="text1-2">{{datalistobj3.avgB}}</div>
+            <div class="text1-2">{{datalistobj3.avgB}}%</div>
           </div>
 
         </div>
@@ -165,11 +165,11 @@
         <div class="hejisan">
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">{{consultantname}}</div>
-            <div class="text1-2">{{datalistobj5.avgA}}</div>
+            <div class="text1-2">{{datalistobj5.avgA}}/次</div>
           </div>
           <div class="sanbox1" style="width: 50%">
             <div class="text1-1">{{Packname}}</div>
-            <div class="text1-2">{{datalistobj5.avgB}}</div>
+            <div class="text1-2">{{datalistobj5.avgB}}/次</div>
           </div>
 
         </div>
@@ -217,6 +217,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="activeCustomer" label="接待量" align="center">
+            <template slot-scope="{row}">
+            {{row.activeCustomer}}次
+          </template>
         </el-table-column>
         <el-table-column
           v-if="tabFlag == 1"
@@ -253,7 +256,7 @@
           align="center"
         >
         <template slot-scope="{row}">
-          {{Math.floor(row.sumDuration/60)}}
+          {{Math.floor(row.sumDuration/60)}}分钟
         </template>
         </el-table-column>
         <!-- <el-table-column v-if="tabFlag == 0" prop="acceptanceNum" label="品牌介绍执行率" align="center">
@@ -270,8 +273,15 @@
         </el-table-column>
         <el-table-column prop="remark" v-if="tabFlag == 1" label="...执行性次数" align="center">
         </el-table-column> -->
-        <el-table-column v-if="tabFlag == 0" prop="fraction" label="平均执行率" align="center"> </el-table-column>
+        <el-table-column v-if="tabFlag == 0" prop="fraction" label="平均执行率" align="center">
+          <template slot-scope="{row}">
+            {{row.fraction}}%
+          </template>
+        </el-table-column>
         <el-table-column  v-for="(item,idx) in tablist" :key="idx" :prop="item.props"  :label="item.label" align="center">
+          <template slot-scope="{row}">
+            {{row[item.props]}}%
+          </template>
         </el-table-column>
       </el-table>
       <div style="display: flex; justify-content: flex-end; margin-top: 10px">
@@ -850,7 +860,8 @@ export default {
         },
         legend: {
           data:  [this.consultantname,this.Packname,],
-          bottom: "10",
+          right: "10",
+          top:'10'
         },
         color:[
           '#2671E2',

src/views/Statistics/TheTeamCompared.vue

@@ -67,7 +67,7 @@
          	<div class="hejisan">
             <div class="sanbox1" style="width: 50%;">
               <div class="text1-1">团队总数</div>
-              <div class="text1-2">{{teamobj1.num}}</div>
+              <div class="text1-2">{{teamobj1.num}}/个</div>
             </div>
             <div  class="sanbox1" style="width: 50%;">
               <div class="text1-1">均值</div>
@@ -91,7 +91,7 @@
           	<div class="hejisan">
             <div class="sanbox1" style="width: 50%;">
               <div class="text1-1">团队总数</div>
-              <div class="text1-2">{{teamobj2.num}}</div>
+              <div class="text1-2">{{teamobj2.num}}/个</div>
             </div>
             <div  class="sanbox1" style="width: 50%;">
               <div class="text1-1">均值</div>
@@ -128,7 +128,7 @@
           <div class="hejisan">
             <div class="sanbox1" style="width: 50%;">
               <div class="text1-1">团队总数</div>
-              <div class="text1-2">{{teamobj3.num}}</div>
+              <div class="text1-2">{{teamobj3.num}}/个</div>
             </div>
             <div  class="sanbox1" style="width: 50%;">
               <div class="text1-1">均值</div>
@@ -171,7 +171,7 @@
           <div class="hejisan">
             <div class="sanbox1" style="width: 50%;">
               <div class="text1-1">团队总数</div>
-              <div class="text1-2">{{teamobj5.num||0}}</div>
+              <div class="text1-2">{{teamobj5.num||0}}/个</div>
             </div>
             <div  class="sanbox1" style="width: 50%;">
               <div class="text1-1">均值</div>

vue.config.js

@@ -3,9 +3,9 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-const url = 'http://39.97.167.65:9999' //测试
+// const url = 'http://39.97.167.65:9999' //测试
 // const url = 'http://192.168.31.169:9999' //长龙
-// const url = 'http://192.168.31.134:9999' //嘉豪
+const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://nitu5e.natappfree.cc' //王笑