From a90d2303fda8f420ebb1b26467acd1dcc6a30045 Mon Sep 17 00:00:00 2001
From: wangxiaohua <1214073490@qq.com>
Date: Tue, 7 Dec 2021 11:39:14 +0800
Subject: [PATCH] init

---
 src/views/Customer/AgentManagement.vue   |  4 +--
 src/views/Customer/CompanyRecord.vue     |  4 +--
 src/views/Customer/index.vue             |  2 +-
 src/views/Statistics/ConsultantBrand.vue |  6 ++---
 src/views/Statistics/TrendAnalysis.vue   | 17 +++++++++---
 src/views/Statistics/dataScreeAge.vue    |  1 +
 src/views/Statistics/dataScreeSys.vue    |  1 +
 src/views/Statistics/houseDataSys.vue    |  2 ++
 src/views/Statistics/trend.vue           |  2 ++
 src/views/admin/user/index.vue           | 33 ++++++++----------------
 src/views/building/Count.vue             |  3 +++
 11 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue
index f0a3258..1da9a57 100644
--- a/src/views/Customer/AgentManagement.vue
+++ b/src/views/Customer/AgentManagement.vue
@@ -218,7 +218,7 @@
           </el-form-item> -->
 
 
-        <el-form-item label="楼盘地区" prop="provinceId">
+        <el-form-item label="地区" prop="provinceId">
           <el-cascader
             :props="props"
             @change="locationsChange"
@@ -284,7 +284,7 @@
               <el-input v-model="editoragentobj.linkmanPhone"  type="tel"  maxlength="11" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"></el-input>
           </el-form-item>
 
-          <el-form-item label="楼盘地区" prop="provinceId">
+          <el-form-item label="地区" prop="provinceId">
           <el-cascader
             :props="props"
             @change="locationsChange"
diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue
index 321a74d..a3dca86 100644
--- a/src/views/Customer/CompanyRecord.vue
+++ b/src/views/Customer/CompanyRecord.vue
@@ -141,7 +141,7 @@
               <el-input v-model="addagentobj.contactNumber"    onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));" maxlength="11"></el-input>
           </el-form-item>
 
-          <el-form-item label="楼盘地区" prop="provinceId">
+          <el-form-item label="地区" prop="provinceId">
           <el-cascader
             :props="props"
             @change="locationsChange"
@@ -216,7 +216,7 @@
               <el-input v-model="editoragentobj.contactNumber"  onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));" maxlength="11"></el-input>
           </el-form-item>
 
-          <el-form-item label="楼盘地区" prop="provinceId">
+          <el-form-item label="地区" prop="provinceId">
           <el-cascader
             :props="props"
             @change="locationsChange"
diff --git a/src/views/Customer/index.vue b/src/views/Customer/index.vue
index e06b567..948cf4c 100644
--- a/src/views/Customer/index.vue
+++ b/src/views/Customer/index.vue
@@ -377,7 +377,7 @@ export default {
         },
         {
           value: "1",
-          label: "最近接待时间",
+          label: "最近到访时间",
         },
       ],
       options5: [
diff --git a/src/views/Statistics/ConsultantBrand.vue b/src/views/Statistics/ConsultantBrand.vue
index de30169..30fbc06 100644
--- a/src/views/Statistics/ConsultantBrand.vue
+++ b/src/views/Statistics/ConsultantBrand.vue
@@ -500,8 +500,7 @@ export default {
         houseId: this.houseId,
         statDateStart: this.statDateStart,
         statDateEnd: this.statDateEnd,
-        current: this.current,
-        size: this.size,
+
         deptId: this.deptId,
         dateType: this.dateType == 7 ? null : this.dateType,
         type,
@@ -512,7 +511,8 @@ export default {
       this['num'+type]=res.data.num || 0;
       this['avg'+type]=res.data.avg || 0;
       let arr=[]
-      if(arr.length!=0){
+      let newarr=res.data.list||[]
+      if(newarr.length!=0){
           res.data.list.map(item=>{
             let obj={}
             if(type==1){
diff --git a/src/views/Statistics/TrendAnalysis.vue b/src/views/Statistics/TrendAnalysis.vue
index 8e1528e..4e4e0cc 100644
--- a/src/views/Statistics/TrendAnalysis.vue
+++ b/src/views/Statistics/TrendAnalysis.vue
@@ -85,9 +85,13 @@
         </div>
         <div v-if="Confirmthecontrast" class="xia">
           <span class="span1">对比:{{cardobj.endSumCustomer ||0}}次</span>
-          <span class="span2">{{cardobj.contrastSumCustomer ||0}}%</span>
+          <!-- <span class="span2">{{cardobj.contrastSumCustomer ||0}}%</span> -->
+            <span class="span2" v-if="cardobj.contrastSumCustomer==0">{{cardobj.contrastSumCustomer}}%</span>
+            <span class="span2" v-else-if="cardobj.contrastSumCustomer>0" style="color: red;">{{cardobj.contrastSumCustomer}}%</span>
+            <span class="span2" v-else-if="cardobj.contrastSumCustomer<0" style="color: #25CEBA;">{{cardobj.contrastSumCustomer}}%</span>
         </div>
       </div>
+
       <div class="kayi">
         <div class="shang">
           <div class="zuo">
@@ -100,9 +104,13 @@
         </div>
         <div v-if="Confirmthecontrast" class="xia">
           <span class="span1">对比:{{cardobj.endFraction ||0}}%</span>
-          <span class="span2">{{cardobj.contrastFraction ||0}}%</span>
+          <!-- <span class="span2">{{cardobj.contrastFraction ||0}}%</span> -->
+           <span class="span2" v-if="cardobj.contrastFraction==0">{{cardobj.contrastFraction}}%</span>
+            <span class="span2" v-else-if="cardobj.contrastFraction>0" style="color: red;">{{cardobj.contrastFraction}}%</span>
+            <span class="span2" v-else-if="cardobj.contrastFraction<0" style="color: #25CEBA;">{{cardobj.contrastFraction}}%</span>
         </div>
       </div>
+
       <div class="kayi" style="margin: 0px">
         <div class="shang">
           <div class="zuo">
@@ -115,7 +123,10 @@
         </div>
         <div v-if="Confirmthecontrast" class="xia">
           <span class="span1">对比:{{cardobj.endSumDuration ||0}}</span>
-          <span class="span2">{{cardobj.contrastSumDuration ||0}}%</span>
+          <!-- <span class="span2">{{cardobj.contrastSumDuration ||0}}%</span> -->
+            <span class="span2" v-if="cardobj.contrastSumDuration==0">{{cardobj.contrastSumDuration}}%</span>
+            <span class="span2" v-else-if="cardobj.contrastSumDuration>0" style="color: red;">{{cardobj.contrastSumDuration}}%</span>
+            <span class="span2" v-else-if="cardobj.contrastSumDuration<0" style="color: #25CEBA;">{{cardobj.contrastSumDuration}}%</span>
         </div>
       </div>
     </div>
diff --git a/src/views/Statistics/dataScreeAge.vue b/src/views/Statistics/dataScreeAge.vue
index 01f5afc..4fecee6 100644
--- a/src/views/Statistics/dataScreeAge.vue
+++ b/src/views/Statistics/dataScreeAge.vue
@@ -428,6 +428,7 @@ export default {
           // agentId: this.selValue == 0 ? this.choicValue : null,
           agentId: localStorage.getItem('agentId'),
           orgCode: this.selValue == 1 ? this.choicValue : null,
+          orgType: localStorage.getItem("orgType"),
         })
         .then((res) => {
           // console.log(res);
diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue
index c6a5aca..4592a78 100644
--- a/src/views/Statistics/dataScreeSys.vue
+++ b/src/views/Statistics/dataScreeSys.vue
@@ -535,6 +535,7 @@ export default {
         .dataOverViewWithSystem({
           agentId: this.selValue == 0 ? this.choicValue : null,
           orgCode: this.selValue == 1 ? this.choicValue : null,
+          orgType: localStorage.getItem("orgType"),
         })
         .then((res) => {
           this.firstTab = res.data;
diff --git a/src/views/Statistics/houseDataSys.vue b/src/views/Statistics/houseDataSys.vue
index 2e502b3..f29d9df 100644
--- a/src/views/Statistics/houseDataSys.vue
+++ b/src/views/Statistics/houseDataSys.vue
@@ -242,6 +242,7 @@ export default {
           // agentId: this.selValue == 0 ? this.choicValue : null,
           agentId: this.orgType==0?(this.selValue == 0 ? this.choicValue : null):localStorage.getItem('agentId'),
           orgCode: this.selValue == 1 ? this.choicValue : null,
+          orgType: localStorage.getItem("orgType"),
         })
         .then((res) => {
           this.firstTab = res.data;
@@ -260,6 +261,7 @@ export default {
           // agentId: this.selValue == 0 ? this.choicValue : null,
           agentId: this.orgType==0?(this.selValue == 0 ? this.choicValue : null):localStorage.getItem('agentId'),
           orgCode: this.selValue == 1 ? this.choicValue : null,
+          orgType: localStorage.getItem("orgType"),
         })
         .then((res) => {
           // 数据处理
diff --git a/src/views/Statistics/trend.vue b/src/views/Statistics/trend.vue
index fc1517a..4b7e261 100644
--- a/src/views/Statistics/trend.vue
+++ b/src/views/Statistics/trend.vue
@@ -419,6 +419,7 @@ export default {
         agentId: this.selValue == 0 ? this.choicValue : null,
         orgCode: this.selValue == 1 ? this.choicValue : null,
         houseId: this.selValue == 2 ? this.choicValue : null,
+        orgType: localStorage.getItem("orgType"),
       };
       this.$api.api.receptionOverviewOfSystem(obj).then((res) => {
         this.compare = res.data.firstData;
@@ -441,6 +442,7 @@ export default {
         agentId: this.selValue == 0 ? this.choicValue : null,
         orgCode: this.selValue == 1 ? this.choicValue : null,
         houseId: this.selValue == 2 ? this.choicValue : null,
+        orgType: localStorage.getItem("orgType"),
       };
       if (!this.selectTime1) {
         let res = await this.$api.api.receptionDataOfSystem(obj);
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index 7e41d15..890d442 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -182,9 +182,9 @@
 
     <!-- 表格 -->
     <div class="con" style="margin-left: 10px">
-      <el-table
+      <div   v-if="choseFlag">
+          <el-table
         :data="tableData"
-        v-if="choseFlag"
         border
         @selection-change="handleSelectionChange"
         style="width: 100%"
@@ -199,7 +199,6 @@
             {{ row.sex == 0 ? "男" : "女" }}
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="orgName" label="所属组织"> </el-table-column> -->
         <el-table-column prop="createTime" label="注册时间"> </el-table-column>
         <el-table-column prop="address" label="操作">
           <template slot-scope="scope">
@@ -280,34 +279,20 @@
           </template>
         </el-table-column>
       </el-table>
-
-      <el-table
+      </div>
+      <div  v-else>
+           <el-table
         :data="tableData1"
-        v-else
         border
         @selection-change="handleSelectionChange"
         style="width: 100%"
-        :header-cell-style="{ textAlign: 'center' }"
+          :header-cell-style="{ textAlign: 'center' }"
         :cell-style="{ textAlign: 'center' }"
       >
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column prop="name" label="用户名"> </el-table-column>
         <el-table-column label="登录手机" prop="username"> </el-table-column>
-        <el-table-column  :show-overflow-tooltip="true"  width="120px" align="center" prop="orgName" label="所属组织"> </el-table-column>
-        <!-- <el-table-column prop="orgType" label="组织类型">
-          <template slot-scope="scope">
-            {{
-              scope.row.orgType == 0
-                ? "系统用户"
-                : scope.row.orgType == 1
-                ? "代理商用户"
-                : scope.row.orgType == 2
-                ? "公司用户"
-                :  scope.row.orgType == 3?'楼盘用户'
-                : ""
-            }}
-          </template>
-        </el-table-column> -->
+        <el-table-column  :show-overflow-tooltip="true"   width="140" prop="orgName" label="所属组织"> </el-table-column>
         <el-table-column prop="orgTypeName" label="组织类型"> </el-table-column>
         <el-table-column prop="roleName" label="组织角色"> </el-table-column>
         <el-table-column prop="userRoleTypeName" label="用户身份">
@@ -357,6 +342,7 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
       <div style="display: flex; justify-content: flex-end; margin-top: 10px">
       <el-pagination
         style="text-align: center; margin-top: 18px"
@@ -2577,5 +2563,8 @@ export default {
     // display: flex;
   }
 }
+/deep/ .el-tooltip{
+  width: 140px;
+}
 </style>
 
diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue
index 7c6cf39..837e6e9 100644
--- a/src/views/building/Count.vue
+++ b/src/views/building/Count.vue
@@ -207,6 +207,9 @@
           label="平均执行率"
           align="center"
         >
+           <template slot-scope="{row}">
+           {{row.avgExacutiveRate||0}}%
+        </template>
         </el-table-column>
         <el-table-column
           prop="sumProhibitedQuantity"