From 8f97c106712b213e1120fd7af7550744df14dd9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E4=BD=B3=E8=B1=AA?= <2044682269@qq.com>
Date: Wed, 1 Dec 2021 20:23:22 +0800
Subject: [PATCH] bug

---
 src/page/wel.vue                              | 28 +++++++++----------
 src/views/Statistics/ReceptionStatistical.vue | 11 ++++----
 src/views/Statistics/TrendAnalysis.vue        |  4 +--
 src/views/admin/dept/index.vue                | 26 ++++++++++-------
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/page/wel.vue b/src/page/wel.vue
index 9bbd35b..6100552 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -230,8 +230,8 @@
                   </el-table-column>
 
                   <el-table-column
-                    prop="num"
-                    label="禁忌执行率"
+                    prop="name"
+                    label="客户"
                     align="center">
                   </el-table-column>
 
@@ -502,17 +502,17 @@
             <div class="pagechen">
               <div class="pageboxtitle1">有效接待</div>
               <div class="pageboxtitle2">
-              <div class="span1">{{sysSec.customerQuantity || 0}}</div>
+              <div class="span1">{{sysSec.activeCustomer || 0}}</div>
               <div class="span2">
-                <span class="span2-1"> 环比:{{sysCompare.customerQuantity || 0}}</span>
+                <span class="span2-1"> 环比:{{sysCompare.activeCustomer || 0}}</span>
                 <!-- <span class="span2-2">{{cardlist.liftlist.accountNum || 0}}%</span> -->
-                  <span class="span2-2" v-if="orderBy.customerQuantity>0">
+                  <span class="span2-2" v-if="orderBy.activeCustomer>0">
                     <i class="el-icon-top" style="color: red;"></i>
-                    {{orderBy.customerQuantity || 0}}%
+                    {{orderBy.activeCustomer || 0}}%
                   </span>
-                  <span class="span2-3" v-if="orderBy.customerQuantity<0">
+                  <span class="span2-3" v-if="orderBy.activeCustomer<0">
                      <i class="el-icon-bottom" style="color: #25CEBA;"></i>
-                    {{orderBy.customerQuantity || 0}}%
+                    {{orderBy.activeCustomer || 0}}%
                   </span>
               </div>
               </div>
@@ -599,17 +599,17 @@
             <div class="pagechen">
               <div class="pageboxtitle1">有效接待</div>
               <div class="pageboxtitle2">
-              <div class="span1">{{sysSec.customerQuantity || 0}}</div>
+              <div class="span1">{{sysSec.activeCustomer || 0}}</div>
               <div class="span2">
-                <span class="span2-1"> 环比:{{sysCompare.customerQuantity || 0}}</span>
+                <span class="span2-1"> 环比:{{sysCompare.activeCustomer || 0}}</span>
                 <!-- <span class="span2-2">{{cardlist.liftlist.accountNum || 0}}%</span> -->
-                  <span class="span2-2" v-if="orderBy.customerQuantity>0">
+                  <span class="span2-2" v-if="orderBy.activeCustomer>0">
                     <i class="el-icon-top" style="color: red;"></i>
-                    {{orderBy.customerQuantity || 0}}%
+                    {{orderBy.activeCustomer || 0}}%
                   </span>
-                  <span class="span2-3" v-if="orderBy.customerQuantity<0">
+                  <span class="span2-3" v-if="orderBy.activeCustomer<0">
                      <i class="el-icon-bottom" style="color: #25CEBA;"></i>
-                    {{orderBy.customerQuantity || 0}}%
+                    {{orderBy.activeCustomer || 0}}%
                   </span>
               </div>
               </div>
diff --git a/src/views/Statistics/ReceptionStatistical.vue b/src/views/Statistics/ReceptionStatistical.vue
index ef90d53..e57abc8 100644
--- a/src/views/Statistics/ReceptionStatistical.vue
+++ b/src/views/Statistics/ReceptionStatistical.vue
@@ -323,6 +323,8 @@ export default {
       this.customtime=[];
       this.TimetoAhoose=4;
       this.statDateStart= '';
+      this.deptId=''
+       this.accountId=''
       this.statDateEnd= '';
  this.tabtimetap(4);
       this.deptFindList();
@@ -397,7 +399,9 @@ export default {
             },
           ];
           this.options.push(...res.data);
+          this.receptionStatisticsAllAccount();
           this.accountRank();
+
         });
     },
     deptChange() {
@@ -412,12 +416,7 @@ export default {
         })
         .then((res) => {
           console.log(res);
-          this.repList = [
-            {
-              name: "全部",
-              deptId: "",
-            },
-          ];
+          this.repList = [];
           this.repList.push(...res.data);
           this.accountRank();
         });
diff --git a/src/views/Statistics/TrendAnalysis.vue b/src/views/Statistics/TrendAnalysis.vue
index 94d5f67..5fdf808 100644
--- a/src/views/Statistics/TrendAnalysis.vue
+++ b/src/views/Statistics/TrendAnalysis.vue
@@ -107,14 +107,14 @@
         <div class="shang">
           <div class="zuo">
             <div class="text1">平均接待时长/min</div>
-            <div class="text2">{{Math.floor(cardobj.startSumDuration/60)||0}}</div>
+            <div class="text2">{{cardobj.startSumDuration||0}}</div>
           </div>
           <div class="you">
             <img class="youimg" src="/img/waves3.png" alt="" />
           </div>
         </div>
         <div v-if="Confirmthecontrast" class="xia">
-          <span class="span1">对比:{{Math.floor(cardobj.endSumDuration/60) ||0}}</span>
+          <span class="span1">对比:{{cardobj.endSumDuration ||0}}</span>
           <span class="span2">{{cardobj.contrastSumDuration ||0}}%</span>
         </div>
       </div>
diff --git a/src/views/admin/dept/index.vue b/src/views/admin/dept/index.vue
index fa9825c..d82510d 100644
--- a/src/views/admin/dept/index.vue
+++ b/src/views/admin/dept/index.vue
@@ -216,16 +216,22 @@ export default {
           this.deptList=res.data
           if(this.deptList.length==0){
             // this.$message.warning('没有别的部门啦！')
-          this.$api.api.deptDel({
-            houseId:this.houseId,
-            deptId:row.deptId
-            // ...this.deptForm,
-           })
-           .then(res=>{
-             console.log(res);
-             this.deptFindByPage();
-             this.$message.success('删除成功')
-           })
+            if(this.tableData[0].peopleCount>0){
+              this.$message.warning('当前部门下还有用户！')
+              return
+            }else{
+              this.$api.api.deptDel({
+                houseId:this.houseId,
+                deptId:row.deptId
+                // ...this.deptForm,
+              })
+                .then(res=>{
+                  console.log(res);
+                  this.deptFindByPage();
+                  this.$message.success('删除成功')
+                })
+            }
+
           }else{
             this.deptVisible = true;
           }