优化

src/page/check/chose.vue

@@ -512,8 +512,8 @@ export default {
   }
   .tab:hover{
     // color: white;
-    // background: #ccc;
-    border: 1px solid #409eff;
+    border: 1px solid #2671e2 !important;
+    background: rgba(38, 113, 226, 0.04);
   }
 }
 .page {

src/page/check/index.vue

@@ -10,7 +10,7 @@
     <div class="content">
       <!-- 质控后台 -->
       <div class="tab" @click="goindex(0)" v-if="tabFlag1">
-        <div><img src="../../../public/logoPng.png" alt="" style="width:auto;"/></div>
+        <div><img src="../../../public/logoPng.png" alt="" style="padding: 8px 0;"/></div>
         <div class="text">AI销讲助手后台</div>
       </div>
       <div class="tab" @click="goindex(1)" v-if="tabFlag2">

src/page/index/logo.vue

@@ -48,17 +48,17 @@ export default {
   span{
     width: 99px;
     height: 28px;
-    font-size: 20px;
+    font-size: 18px;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #FFFFFF;
     line-height: 28px;
-    margin-left: 12px;
+    margin-left: 8px;
   }
   .logoIcon{
   display: block;
-  width: 58px;
-  height: 44px;
+  width: 50px;
+  height: 36px;
   background: url('../../../public/logoPng.png') no-repeat;
   background-size: 100%;
 }

src/page/index/top/index.vue

@@ -89,10 +89,10 @@
           <top-lock />
         </div>
       </el-tooltip>
-      <div class="notice">
+      <!-- <div class="notice">
         <i class="noticeIcon"></i>
         <span>通知(0)</span>
-      </div>
+      </div> -->
     <!--  暂时注释下一版本开发上线 -->
       <el-popover placement="bottom" trigger="hover" width="350">
         <el-table :data="gridData" @row-click="msgTap">

src/page/wel.vue

@@ -18,77 +18,55 @@
       </div>
       <!-- 卡片部分 -->
       <div class="page-container grid4">
-        <div class="pagechen" @click="toDetail('/ReceivingRecords/index', '', '接待记录')">
-          <div style="width:100%">
-            <div class="pageboxtitle1 projectCardItem">
-              <div class="sum">平均执行率
-                <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均执行率；" placement="bottom-end">
-                  <i class="el-icon-question" style="color:#74A3EA"></i>
-                </el-tooltip>
-                <div class="span1">{{ cardlist.datalist.fraction || 0 }}%</div>
-              </div>
-
-              <div class="cardicon">
-                <img src="../../public/img/indexIcon/indexCardIcon4.png" alt="" srcset="">
-              </div>
-            </div>
+        <div class="pagechen projectCardItem">
+          <div>
+            <div class="pageboxtitle1">正在接待</div>
             <div class="pageboxtitle2 projectColumn">
-              <div class="span2">
-                <span class="span2-1">
-                  环比:{{ cardlist.sequential.fraction || 0 }}</span>
-
-                <span class="span2-2" v-if="cardlist.liftlist.fraction > 0">
-                  +{{ cardlist.liftlist.fraction || 0 }}
-                  <i class="up"></i>
-                </span>
-                <span class="span2-3" v-if="cardlist.liftlist.fraction < 0">
-                  {{ cardlist.liftlist.fraction || 0 }}
-                  <i class="down"></i>
-                </span>
-
-                <span style="margin-left:15px;" v-if="cardlist.liftlist.fraction > 0">数据有所增长</span>
-                <span style="margin-left:15px;" v-if="cardlist.liftlist.fraction < 0">数据有所下降</span>
-
+              <div class="span1">
+                {{ cardlist.datalist.receivingCustomer || 0 }}
               </div>
             </div>
           </div>
+
+          <div class="cardicon">
+            <img src="../../public/img/indexIcon/indexCardIcon3.png" alt="">
+          </div>
         </div>
         <div class="pagechen" @click="toDetail('/ReceivingRecords/index', '', '接待记录')">
           <div style="width:100%">
             <div class="pageboxtitle1 projectCardItem">
-              <div class="sum">平均接待时长(分钟)
-                <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
+              <div class="sum">接待量 (次)
+                <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
                   <i class="el-icon-question" style="color:#74A3EA"></i>
                 </el-tooltip>
-                <div class="span1">{{ cardlist.datalist.avgDuration || 0 }}</div>
+                <div class="span1">{{ cardlist.datalist.receptionCount || 0 }}</div>
               </div>
 
               <div class="cardicon">
-                <img src="../../public/img/indexIcon/indexCardIcon8.png" alt="" srcset="">
+                <img src="../../public/img/indexIcon/indexCardIcon1.png" alt="" srcset="">
               </div>
             </div>
             <div class="pageboxtitle2 projectColumn">
               <div class="span2">
                 <span class="span2-1">
-                  环比:{{ cardlist.sequential.avgDuration || 0 }}</span>
+                  环比:{{ cardlist.sequential.receptionCount || 0 }}</span>
 
-                <span class="span2-2" v-if="cardlist.liftlist.avgDuration > 0">
-                  +{{ cardlist.liftlist.avgDuration || 0 }}
+                <span class="span2-2" v-if="cardlist.liftlist.receptionCount > 0">
+                  +{{ cardlist.liftlist.receptionCount || 0 }}
                   <i class="up"></i>
                 </span>
-                <span class="span2-3" v-if="cardlist.liftlist.avgDuration < 0">
-                  {{ cardlist.liftlist.avgDuration || 0 }}
+                <span class="span2-3" v-if="cardlist.liftlist.receptionCount < 0">
+                  {{ cardlist.liftlist.receptionCount || 0 }}
                   <i class="down"></i>
                 </span>
 
-                <span style="margin-left:15px;" v-if="cardlist.liftlist.avgDuration > 0">数据有所增长</span>
-                <span style="margin-left:15px;" v-if="cardlist.liftlist.avgDuration < 0">数据有所下降</span>
+                <span style="margin-left:15px;" v-if="cardlist.liftlist.receptionCount > 0">数据有所增长</span>
+                <span style="margin-left:15px;" v-if="cardlist.liftlist.receptionCount < 0">数据有所下降</span>
 
               </div>
             </div>
           </div>
         </div>
-        <!-- validInvalid;//是否为有效接待 0：有效  1：无效 -->
         <div class="pagechen" @click="
           toDetail('/ReceivingRecords/index', 'validInvalid,0', '接待记录')
         ">
@@ -126,55 +104,103 @@
             </div>
           </div>
         </div>
-        <div class="pagechen projectCardItem">
+        <div class="pagechen projectCardItem" @click="toDetail('/Statistics/ConsultantBrand', '', '顾问排名')">
           <div>
-            <div class="pageboxtitle1">正在接待</div>
+            <div class="pageboxtitle1">顾问(人)</div>
             <div class="pageboxtitle2 projectColumn">
-              <div class="span1">
-                {{ cardlist.datalist.receivingCustomer || 0 }}
-              </div>
+              <div class="span1">{{ cardlist.datalist.accountNum || 0 }}</div>
+              <!-- <div class="span2">
+                <span class="span2-1">
+                  环比:{{ cardlist.sequential.accountNum || 0 }}</span>
+                <span class="span2-2" v-if="cardlist.liftlist.accountNum > 0">
+                  <i class="el-icon-top" style="color: red"></i>
+                  {{ cardlist.liftlist.accountNum || 0 }}
+                </span>
+                <span class="span2-3" v-if="cardlist.liftlist.accountNum < 0">
+                  <i class="el-icon-bottom" style="color: #25ceba"></i>
+                  {{ cardlist.liftlist.accountNum || 0 }}
+                </span>
+              </div> -->
             </div>
           </div>
-
           <div class="cardicon">
-            <img src="../../public/img/indexIcon/indexCardIcon3.png" alt="">
+            <img src="../../public/img/indexIcon/indexCardIcon7.png" alt="" />
           </div>
         </div>
         <div class="pagechen" @click="toDetail('/ReceivingRecords/index', '', '接待记录')">
           <div style="width:100%">
             <div class="pageboxtitle1 projectCardItem">
-              <div class="sum">接待量 (次)
-                <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
+              <div class="sum">平均执行率
+                <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均执行率；" placement="bottom-end">
                   <i class="el-icon-question" style="color:#74A3EA"></i>
                 </el-tooltip>
-                <div class="span1">{{ cardlist.datalist.receptionCount || 0 }}</div>
+                <div class="span1">{{ cardlist.datalist.fraction || 0 }}%</div>
               </div>
 
               <div class="cardicon">
-                <img src="../../public/img/indexIcon/indexCardIcon1.png" alt="" srcset="">
+                <img src="../../public/img/indexIcon/indexCardIcon4.png" alt="" srcset="">
               </div>
             </div>
             <div class="pageboxtitle2 projectColumn">
               <div class="span2">
                 <span class="span2-1">
-                  环比:{{ cardlist.sequential.receptionCount || 0 }}</span>
+                  环比:{{ cardlist.sequential.fraction || 0 }}</span>
 
-                <span class="span2-2" v-if="cardlist.liftlist.receptionCount > 0">
-                  +{{ cardlist.liftlist.receptionCount || 0 }}
+                <span class="span2-2" v-if="cardlist.liftlist.fraction > 0">
+                  +{{ cardlist.liftlist.fraction || 0 }}
                   <i class="up"></i>
                 </span>
-                <span class="span2-3" v-if="cardlist.liftlist.receptionCount < 0">
-                  {{ cardlist.liftlist.receptionCount || 0 }}
+                <span class="span2-3" v-if="cardlist.liftlist.fraction < 0">
+                  {{ cardlist.liftlist.fraction || 0 }}
                   <i class="down"></i>
                 </span>
 
-                <span style="margin-left:15px;" v-if="cardlist.liftlist.receptionCount > 0">数据有所增长</span>
-                <span style="margin-left:15px;" v-if="cardlist.liftlist.receptionCount < 0">数据有所下降</span>
+                <span style="margin-left:15px;" v-if="cardlist.liftlist.fraction > 0">数据有所增长</span>
+                <span style="margin-left:15px;" v-if="cardlist.liftlist.fraction < 0">数据有所下降</span>
+
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="pagechen" @click="toDetail('/ReceivingRecords/index', '', '接待记录')">
+          <div style="width:100%">
+            <div class="pageboxtitle1 projectCardItem">
+              <div class="sum">平均接待时长(分钟)
+                <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
+                  <i class="el-icon-question" style="color:#74A3EA"></i>
+                </el-tooltip>
+                <div class="span1">{{ cardlist.datalist.avgDuration || 0 }}</div>
+              </div>
+
+              <div class="cardicon">
+                <img src="../../public/img/indexIcon/indexCardIcon8.png" alt="" srcset="">
+              </div>
+            </div>
+            <div class="pageboxtitle2 projectColumn">
+              <div class="span2">
+                <span class="span2-1">
+                  环比:{{ cardlist.sequential.avgDuration || 0 }}</span>
+
+                <span class="span2-2" v-if="cardlist.liftlist.avgDuration > 0">
+                  +{{ cardlist.liftlist.avgDuration || 0 }}
+                  <i class="up"></i>
+                </span>
+                <span class="span2-3" v-if="cardlist.liftlist.avgDuration < 0">
+                  {{ cardlist.liftlist.avgDuration || 0 }}
+                  <i class="down"></i>
+                </span>
+
+                <span style="margin-left:15px;" v-if="cardlist.liftlist.avgDuration > 0">数据有所增长</span>
+                <span style="margin-left:15px;" v-if="cardlist.liftlist.avgDuration < 0">数据有所下降</span>
 
               </div>
             </div>
           </div>
         </div>
+        <!-- validInvalid;//是否为有效接待 0：有效  1：无效 -->
+        
+        
+        
         <div class="pagechen" @click="toDetail('/ReceivingRecords/index', 'taboo,1', '接待记录')">
           <div style="width:100%">
             <div class="pageboxtitle1 projectCardItem">
@@ -245,29 +271,7 @@
             </div>
           </div>
         </div>
-        <div class="pagechen projectCardItem" @click="toDetail('/Statistics/ConsultantBrand', '', '顾问排名')">
-          <div>
-            <div class="pageboxtitle1">顾问(人)</div>
-            <div class="pageboxtitle2 projectColumn">
-              <div class="span1">{{ cardlist.datalist.accountNum || 0 }}</div>
-              <!-- <div class="span2">
-                <span class="span2-1">
-                  环比:{{ cardlist.sequential.accountNum || 0 }}</span>
-                <span class="span2-2" v-if="cardlist.liftlist.accountNum > 0">
-                  <i class="el-icon-top" style="color: red"></i>
-                  {{ cardlist.liftlist.accountNum || 0 }}
-                </span>
-                <span class="span2-3" v-if="cardlist.liftlist.accountNum < 0">
-                  <i class="el-icon-bottom" style="color: #25ceba"></i>
-                  {{ cardlist.liftlist.accountNum || 0 }}
-                </span>
-              </div> -->
-            </div>
-          </div>
-          <div class="cardicon">
-            <img src="../../public/img/indexIcon/indexCardIcon7.png" alt="" />
-          </div>
-        </div>
+        
         <!-- <div class="pagechen1"></div>
         <div class="pagechen1"></div> -->
       </div>
@@ -577,6 +581,78 @@
               </div>
             </div>
 
+          </div>
+          <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
+
+            <div style="width:100%">
+              <div class="pageboxtitle1 projectCardItem">
+                <div class="sum">活跃设备数
+                  <el-tooltip effect="light" content="筛选时间内，有接待并上传录音的设备；" placement="bottom-end">
+                    <i class="el-icon-question" style="color:#74A3EA"></i>
+                  </el-tooltip>
+                  <div class="span1">{{ sysSec.activeEquipmentQuantity || 0 }}</div>
+                </div>
+
+                <div class="cardicon">
+                  <img src="../../public/img/indexIcon/indexCardIcon4.png" alt="" srcset="">
+                </div>
+              </div>
+              <div class="pageboxtitle2 projectColumn">
+                <div class="span2">
+                  <span class="span2-1">
+                    环比:{{ sysCompare.activeEquipmentQuantity || 0 }}</span>
+
+                  <span class="span2-2" v-if="orderBy.activeEquipmentQuantity > 0">
+                    +{{ orderBy.activeEquipmentQuantity || 0 }}
+                    <i class="up"></i>
+                  </span>
+                  <span class="span2-3" v-if="orderBy.activeEquipmentQuantity < 0">
+                    {{ orderBy.activeEquipmentQuantity || 0 }}
+                    <i class="down"></i>
+                  </span>
+
+                  <span style="margin-left:15px;" v-if="orderBy.activeEquipmentQuantity > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.activeEquipmentQuantity < 0">数据有所下降</span>
+
+                </div>
+              </div>
+            </div>
+
+          </div>
+          <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
+
+            <div style="width:100%">
+              <div class="pageboxtitle1 projectCardItem">
+                <div class="sum">录音总时长(小时)
+                  <div class="span1">{{ sysSec.receptionTime || 0 }}</div>
+                </div>
+
+                <div class="cardicon">
+                  <img src="../../public/img/indexIcon/indexCardIcon4.png" alt="" srcset="">
+                </div>
+              </div>
+              <div class="pageboxtitle2 projectColumn">
+                <div class="span2">
+                  <span class="span2-1">
+                    环比:{{ sysCompare.receptionTime || 0 }}</span>
+
+                  <span class="span2-2" v-if="orderBy.receptionTime > 0">
+                    +{{ orderBy.receptionTime || 0 }}
+                    <i class="up"></i>
+                  </span>
+                  <span class="span2-3" v-if="orderBy.receptionTime < 0">
+                    {{ orderBy.receptionTime || 0 }}
+                    <i class="down"></i>
+                  </span>
+
+                  <span style="margin-left:15px;" v-if="orderBy.receptionTime > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.receptionTime < 0">数据有所下降</span>
+
+                </div>
+              </div>
+            </div>
+
+
           </div>
           <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
 
@@ -690,54 +766,52 @@
             </div>
 
           </div>
-          
-          
-          <!-- <div class="pagechen" @click="toDetail('/Equipment/index', '', '设备管理')">
-
+          <div class="pagechen">
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">销售设备数
-                  <el-tooltip effect="light" content="筛选时间内，绑定正式+测试的楼盘的设备数;" placement="bottom-end">
+                <div class="sum">平均接待时长(分钟)
+                  <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
                     <i class="el-icon-question" style="color:#74A3EA"></i>
                   </el-tooltip>
-                  <div class="span1">{{ sysSec.equipmentQuantityWithSold || 0 }}</div>
+                  <div class="span1">{{ sysSec.receptionTimeWithAvg || 0 }}</div>
                 </div>
 
                 <div class="cardicon">
-                  <img src="../../public/img/indexIcon/indexCardIcon4.png" alt="" srcset="">
+                  <img src="../../public/img/indexIcon/indexCardIcon8.png" alt="" srcset="">
                 </div>
               </div>
               <div class="pageboxtitle2 projectColumn">
                 <div class="span2">
                   <span class="span2-1">
-                    环比:{{ sysCompare.equipmentQuantityWithSold || 0 }}</span>
+                    环比:{{ sysCompare.receptionTimeWithAvg || 0 }}</span>
 
-                  <span class="span2-2" v-if="orderBy.equipmentQuantityWithSold > 0">
-                    +{{ orderBy.equipmentQuantityWithSold || 0 }}
-                    <i class="up"></i>
+                  <span class="span2-2" v-if="orderBy.receptionTimeWithAvg > 0">
+                    +{{ orderBy.receptionTimeWithAvg || 0 }}
+                    <i class="up"></i>
                   </span>
-                  <span class="span2-3" v-if="orderBy.equipmentQuantityWithSold < 0">
-                    {{ orderBy.equipmentQuantityWithSold || 0 }}
+                  <span class="span2-3" v-if="orderBy.receptionTimeWithAvg < 0">
+                    {{ orderBy.receptionTimeWithAvg || 0 }}
                     <i class="down"></i>
                   </span>
 
-                  <span style="margin-left:15px;" v-if="orderBy.equipmentQuantityWithSold > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.equipmentQuantityWithSold < 0">数据有所下降</span>
+                  <span style="margin-left:15px;" v-if="orderBy.receptionTimeWithAvg > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.receptionTimeWithAvg < 0">数据有所下降</span>
 
                 </div>
               </div>
             </div>
-
-          </div> -->
-          <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
+          </div>
+          
+          
+          <!-- <div class="pagechen" @click="toDetail('/Equipment/index', '', '设备管理')">
 
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">活跃设备数
-                  <el-tooltip effect="light" content="筛选时间内，有接待并上传录音的设备；" placement="bottom-end">
+                <div class="sum">销售设备数
+                  <el-tooltip effect="light" content="筛选时间内，绑定正式+测试的楼盘的设备数;" placement="bottom-end">
                     <i class="el-icon-question" style="color:#74A3EA"></i>
                   </el-tooltip>
-                  <div class="span1">{{ sysSec.activeEquipmentQuantity || 0 }}</div>
+                  <div class="span1">{{ sysSec.equipmentQuantityWithSold || 0 }}</div>
                 </div>
 
                 <div class="cardicon">
@@ -747,25 +821,26 @@
               <div class="pageboxtitle2 projectColumn">
                 <div class="span2">
                   <span class="span2-1">
-                    环比:{{ sysCompare.activeEquipmentQuantity || 0 }}</span>
+                    环比:{{ sysCompare.equipmentQuantityWithSold || 0 }}</span>
 
-                  <span class="span2-2" v-if="orderBy.activeEquipmentQuantity > 0">
-                    +{{ orderBy.activeEquipmentQuantity || 0 }}
+                  <span class="span2-2" v-if="orderBy.equipmentQuantityWithSold > 0">
+                    +{{ orderBy.equipmentQuantityWithSold || 0 }}
                     <i class="up"></i>
                   </span>
-                  <span class="span2-3" v-if="orderBy.activeEquipmentQuantity < 0">
-                    {{ orderBy.activeEquipmentQuantity || 0 }}
+                  <span class="span2-3" v-if="orderBy.equipmentQuantityWithSold < 0">
+                    {{ orderBy.equipmentQuantityWithSold || 0 }}
                     <i class="down"></i>
                   </span>
 
-                  <span style="margin-left:15px;" v-if="orderBy.activeEquipmentQuantity > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.activeEquipmentQuantity < 0">数据有所下降</span>
+                  <span style="margin-left:15px;" v-if="orderBy.equipmentQuantityWithSold > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.equipmentQuantityWithSold < 0">数据有所下降</span>
 
                 </div>
               </div>
             </div>
 
-          </div>
+          </div> -->
+          
           <!-- <div class="pagechen">
 
             <div style="width:100%">
@@ -808,81 +883,85 @@
          
           
           
-          <div class="pagechen">
+          
+          
+        </div>
+      </div>
+      <div v-if="role == 2">
+        <!-- 卡片部分 -->
+        <div class="page-container grid4">
+          <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">平均接待时长(分钟)
-                  <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
+                <div class="sum">接待量
+                  <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
                     <i class="el-icon-question" style="color:#74A3EA"></i>
                   </el-tooltip>
-                  <div class="span1">{{ sysSec.receptionTimeWithAvg || 0 }}</div>
+                  <div class="span1">{{ sysSec.receptionCount || 0 }}</div>
                 </div>
 
                 <div class="cardicon">
-                  <img src="../../public/img/indexIcon/indexCardIcon8.png" alt="" srcset="">
+                  <img src="../../public/img/indexIcon/indexCardIcon1.png" alt="" srcset="">
                 </div>
               </div>
               <div class="pageboxtitle2 projectColumn">
                 <div class="span2">
                   <span class="span2-1">
-                    环比:{{ sysCompare.receptionTimeWithAvg || 0 }}</span>
+                    环比:{{ sysCompare.receptionCount || 0 }}</span>
 
-                  <span class="span2-2" v-if="orderBy.receptionTimeWithAvg > 0">
-                    +{{ orderBy.receptionTimeWithAvg || 0 }}
+                  <span class="span2-2" v-if="orderBy.receptionCount > 0">
+                    +{{ orderBy.receptionCount || 0 }}
                     <i class="up"></i>
                   </span>
-                  <span class="span2-3" v-if="orderBy.receptionTimeWithAvg < 0">
-                    {{ orderBy.receptionTimeWithAvg || 0 }}
+                  <span class="span2-3" v-if="orderBy.receptionCount < 0">
+                    {{ orderBy.receptionCount || 0 }}
                     <i class="down"></i>
                   </span>
 
-                  <span style="margin-left:15px;" v-if="orderBy.receptionTimeWithAvg > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.receptionTimeWithAvg < 0">数据有所下降</span>
+                  <span style="margin-left:15px;" v-if="orderBy.receptionCount > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.receptionCount < 0">数据有所下降</span>
 
                 </div>
               </div>
             </div>
+
           </div>
           <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
-
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">录音总时长(小时)
-                  <div class="span1">{{ sysSec.receptionTime || 0 }}</div>
+                <div class="sum">有效接待
+                  <el-tooltip effect="light" content="筛选时间内，标记为有效的接待数，不包含待接单；" placement="bottom-end">
+                    <i class="el-icon-question" style="color:#74A3EA"></i>
+                  </el-tooltip>
+                  <div class="span1">{{ sysSec.activeCustomer || 0 }}</div>
                 </div>
 
                 <div class="cardicon">
-                  <img src="../../public/img/indexIcon/indexCardIcon4.png" alt="" srcset="">
+                  <img src="../../public/img/indexIcon/indexCardIcon2.png" alt="" srcset="">
                 </div>
               </div>
               <div class="pageboxtitle2 projectColumn">
                 <div class="span2">
                   <span class="span2-1">
-                    环比:{{ sysCompare.receptionTime || 0 }}</span>
+                    环比:{{ sysCompare.activeCustomer || 0 }}</span>
 
-                  <span class="span2-2" v-if="orderBy.receptionTime > 0">
-                    +{{ orderBy.receptionTime || 0 }}
+                  <span class="span2-2" v-if="orderBy.activeCustomer > 0">
+                    +{{ orderBy.activeCustomer || 0 }}
                     <i class="up"></i>
                   </span>
-                  <span class="span2-3" v-if="orderBy.receptionTime < 0">
-                    {{ orderBy.receptionTime || 0 }}
+                  <span class="span2-3" v-if="orderBy.activeCustomer < 0">
+                    {{ orderBy.activeCustomer || 0 }}
                     <i class="down"></i>
                   </span>
 
-                  <span style="margin-left:15px;" v-if="orderBy.receptionTime > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.receptionTime < 0">数据有所下降</span>
+                  <span style="margin-left:15px;" v-if="orderBy.activeCustomer > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.activeCustomer < 0">数据有所下降</span>
 
                 </div>
               </div>
             </div>
 
-
           </div>
-        </div>
-      </div>
-      <div v-if="role == 2">
-        <!-- 卡片部分 -->
-        <div class="page-container grid4">
           <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
@@ -958,69 +1037,33 @@
           <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">接待量
-                  <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
-                    <i class="el-icon-question" style="color:#74A3EA"></i>
-                  </el-tooltip>
-                  <div class="span1">{{ sysSec.receptionCount || 0 }}</div>
-                </div>
-
-                <div class="cardicon">
-                  <img src="../../public/img/indexIcon/indexCardIcon1.png" alt="" srcset="">
-                </div>
-              </div>
-              <div class="pageboxtitle2 projectColumn">
-                <div class="span2">
-                  <span class="span2-1">
-                    环比:{{ sysCompare.receptionCount || 0 }}</span>
-
-                  <span class="span2-2" v-if="orderBy.receptionCount > 0">
-                    +{{ orderBy.receptionCount || 0 }}
-                    <i class="up"></i>
-                  </span>
-                  <span class="span2-3" v-if="orderBy.receptionCount < 0">
-                    {{ orderBy.receptionCount || 0 }}
-                    <i class="down"></i>
-                  </span>
-
-                  <span style="margin-left:15px;" v-if="orderBy.receptionCount > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.receptionCount < 0">数据有所下降</span>
-
-                </div>
-              </div>
-            </div>
-
-          </div>
-          <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
-            <div style="width:100%">
-              <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">有效接待
-                  <el-tooltip effect="light" content="筛选时间内，标记为有效的接待数，不包含待接单；" placement="bottom-end">
+                <div class="sum">违禁接待次数
+                  <el-tooltip effect="light" content="筛选时间内，出现违禁的接待次数，不包含待接单/无效接待/无效违禁；" placement="bottom-end">
                     <i class="el-icon-question" style="color:#74A3EA"></i>
                   </el-tooltip>
-                  <div class="span1">{{ sysSec.activeCustomer || 0 }}</div>
+                  <div class="span1">{{ sysSec.prohibitedCount || 0 }}</div>
                 </div>
 
                 <div class="cardicon">
-                  <img src="../../public/img/indexIcon/indexCardIcon2.png" alt="" srcset="">
+                  <img src="../../public/img/indexIcon/indexCardIcon5.png" alt="" srcset="">
                 </div>
               </div>
               <div class="pageboxtitle2 projectColumn">
                 <div class="span2">
                   <span class="span2-1">
-                    环比:{{ sysCompare.activeCustomer || 0 }}</span>
+                    环比:{{ sysCompare.prohibitedCount || 0 }}</span>
 
-                  <span class="span2-2" v-if="orderBy.activeCustomer > 0">
-                    +{{ orderBy.activeCustomer || 0 }}
+                  <span class="span2-2" v-if="orderBy.prohibitedCount > 0">
+                    +{{ orderBy.prohibitedCount || 0 }}
                     <i class="up"></i>
                   </span>
-                  <span class="span2-3" v-if="orderBy.activeCustomer < 0">
-                    {{ orderBy.activeCustomer || 0 }}
+                  <span class="span2-3" v-if="orderBy.prohibitedCount < 0">
+                    {{ orderBy.prohibitedCount || 0 }}
                     <i class="down"></i>
                   </span>
 
-                  <span style="margin-left:15px;" v-if="orderBy.activeCustomer > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.activeCustomer < 0">数据有所下降</span>
+                  <span style="margin-left:15px;" v-if="orderBy.prohibitedCount > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.prohibitedCount < 0">数据有所下降</span>
 
                 </div>
               </div>
@@ -1030,8 +1073,8 @@
           <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">无效接待
-                  <div class="span1">{{ sysSec.invalidCustomer || 0 }}</div>
+                <div class="sum">接待时长(小时)
+                  <div class="span1">{{ sysSec.receptionTime || 0 }}</div>
                 </div>
 
                 <div class="cardicon">
@@ -1041,29 +1084,30 @@
               <div class="pageboxtitle2 projectColumn">
                 <div class="span2">
                   <span class="span2-1">
-                    环比:{{ sysCompare.invalidCustomer || 0 }}</span>
+                    环比:{{ sysCompare.receptionTime || 0 }}</span>
 
-                  <span class="span2-2" v-if="orderBy.invalidCustomer > 0">
-                    +{{ orderBy.invalidCustomer || 0 }}
+                  <span class="span2-2" v-if="orderBy.receptionTime > 0">
+                    +{{ orderBy.receptionTime || 0 }}
                     <i class="up"></i>
                   </span>
-                  <span class="span2-3" v-if="orderBy.invalidCustomer < 0">
-                    {{ orderBy.invalidCustomer || 0 }}
+                  <span class="span2-3" v-if="orderBy.receptionTime < 0">
+                    {{ orderBy.receptionTime || 0 }}
                     <i class="down"></i>
                   </span>
 
-                  <span style="margin-left:15px;" v-if="orderBy.invalidCustomer > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.invalidCustomer < 0">数据有所下降</span>
+                  <span style="margin-left:15px;" v-if="orderBy.receptionTime > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.receptionTime < 0">数据有所下降</span>
 
                 </div>
               </div>
             </div>
+
           </div>
           <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">接待时长(小时)
-                  <div class="span1">{{ sysSec.receptionTime || 0 }}</div>
+                <div class="sum">活跃项目数
+                  <div class="span1">{{ sysSec.activeHouseQuantity || 0 }}</div>
                 </div>
 
                 <div class="cardicon">
@@ -1073,62 +1117,60 @@
               <div class="pageboxtitle2 projectColumn">
                 <div class="span2">
                   <span class="span2-1">
-                    环比:{{ sysCompare.receptionTime || 0 }}</span>
+                    环比:{{ sysCompare.activeHouseQuantity || 0 }}</span>
 
-                  <span class="span2-2" v-if="orderBy.receptionTime > 0">
-                    +{{ orderBy.receptionTime || 0 }}
+                  <span class="span2-2" v-if="orderBy.activeHouseQuantity > 0">
+                    +{{ orderBy.activeHouseQuantity || 0 }}
                     <i class="up"></i>
                   </span>
-                  <span class="span2-3" v-if="orderBy.receptionTime < 0">
-                    {{ orderBy.receptionTime || 0 }}
+                  <span class="span2-3" v-if="orderBy.activeHouseQuantity < 0">
+                    {{ orderBy.activeHouseQuantity || 0 }}
                     <i class="down"></i>
                   </span>
 
-                  <span style="margin-left:15px;" v-if="orderBy.receptionTime > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.receptionTime < 0">数据有所下降</span>
+                  <span style="margin-left:15px;" v-if="orderBy.activeHouseQuantity > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.activeHouseQuantity < 0">数据有所下降</span>
 
                 </div>
               </div>
             </div>
 
           </div>
-
-          <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
+          <!-- <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">违禁接待次数
-                  <el-tooltip effect="light" content="筛选时间内，出现违禁的接待次数，不包含待接单/无效接待/无效违禁；" placement="bottom-end">
-                    <i class="el-icon-question" style="color:#74A3EA"></i>
-                  </el-tooltip>
-                  <div class="span1">{{ sysSec.prohibitedCount || 0 }}</div>
+                <div class="sum">无效接待
+                  <div class="span1">{{ sysSec.invalidCustomer || 0 }}</div>
                 </div>
 
                 <div class="cardicon">
-                  <img src="../../public/img/indexIcon/indexCardIcon5.png" alt="" srcset="">
+                  <img src="../../public/img/indexIcon/indexCardIcon8.png" alt="" srcset="">
                 </div>
               </div>
               <div class="pageboxtitle2 projectColumn">
                 <div class="span2">
                   <span class="span2-1">
-                    环比:{{ sysCompare.prohibitedCount || 0 }}</span>
+                    环比:{{ sysCompare.invalidCustomer || 0 }}</span>
 
-                  <span class="span2-2" v-if="orderBy.prohibitedCount > 0">
-                    +{{ orderBy.prohibitedCount || 0 }}
+                  <span class="span2-2" v-if="orderBy.invalidCustomer > 0">
+                    +{{ orderBy.invalidCustomer || 0 }}
                     <i class="up"></i>
                   </span>
-                  <span class="span2-3" v-if="orderBy.prohibitedCount < 0">
-                    {{ orderBy.prohibitedCount || 0 }}
+                  <span class="span2-3" v-if="orderBy.invalidCustomer < 0">
+                    {{ orderBy.invalidCustomer || 0 }}
                     <i class="down"></i>
                   </span>
 
-                  <span style="margin-left:15px;" v-if="orderBy.prohibitedCount > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.prohibitedCount < 0">数据有所下降</span>
+                  <span style="margin-left:15px;" v-if="orderBy.invalidCustomer > 0">数据有所增长</span>
+                  <span style="margin-left:15px;" v-if="orderBy.invalidCustomer < 0">数据有所下降</span>
 
                 </div>
               </div>
             </div>
+          </div> -->
+          
 
-          </div>
+          
 
           <!-- <div class="pagechen" @click="toDetail('/Equipment/state', '', '设备监控')">
             <div style="width:100%">
@@ -1204,39 +1246,7 @@
 
           </div>
 
-          <div class="pagechen" @click="toDetail('/building/Count', '', '楼盘统计')">
-            <div style="width:100%">
-              <div class="pageboxtitle1 projectCardItem">
-                <div class="sum">活跃项目数
-                  <div class="span1">{{ sysSec.activeHouseQuantity || 0 }}</div>
-                </div>
-
-                <div class="cardicon">
-                  <img src="../../public/img/indexIcon/indexCardIcon8.png" alt="" srcset="">
-                </div>
-              </div>
-              <div class="pageboxtitle2 projectColumn">
-                <div class="span2">
-                  <span class="span2-1">
-                    环比:{{ sysCompare.activeHouseQuantity || 0 }}</span>
-
-                  <span class="span2-2" v-if="orderBy.activeHouseQuantity > 0">
-                    +{{ orderBy.activeHouseQuantity || 0 }}
-                    <i class="up"></i>
-                  </span>
-                  <span class="span2-3" v-if="orderBy.activeHouseQuantity < 0">
-                    {{ orderBy.activeHouseQuantity || 0 }}
-                    <i class="down"></i>
-                  </span>
-
-                  <span style="margin-left:15px;" v-if="orderBy.activeHouseQuantity > 0">数据有所增长</span>
-                  <span style="margin-left:15px;" v-if="orderBy.activeHouseQuantity < 0">数据有所下降</span>
-
-                </div>
-              </div>
-            </div>
-
-          </div>
+          
         </div>
       </div>
 

src/styles/theme/white.scss

@@ -2,14 +2,14 @@
   .avue-header,
   .avue-logo,
   .tags-container {
-      background-color: #409EFF;
+      background-color: #fff;
   }
   .avue-sidebar--tip{
     background-color:transparent;
     color:#333;
   }
   .el-dropdown{
-    color:#fff;
+    color:#333;
   }
   .avue-logo_title{
     font-weight: 400;
@@ -18,9 +18,9 @@
   .logo_title,
   .avue-breadcrumb
   {
-      color: #fff ;
+      color: #333 ;
       i {
-          color: #fff;
+          color: #333;
       }
   }
   .avue-top{
@@ -60,20 +60,20 @@
     background-color:#fff ;
     .el-menu-item,.el-submenu__title{
       i,span{
-        color:#666 ;
+        color:rgb(140, 140, 140) ;
       }
-      background-color:#fff ;
+      background-color:#001529 ;
     }
     .el-menu-item,.el-submenu__title{
       &:hover{
         background-color: transparent ;
         i,span{
-          color:#666 ;
+          color:#fff ;
         }
       }
     }
     .el-menu-item.is-active,.el-submenu__title.is-active{
-      background-color:#409EFF ;
+      background-color:#2671E2 ;
       i,span{
         color:#fff ;
       }
@@ -81,7 +81,7 @@
         display: none;
       }
       &:hover{
-        background-color: #409EFF ;
+        background-color: #2671E2 ;
         i,span{
           color:#fff ;
         }

src/views/Receive/index.vue

@@ -34,12 +34,12 @@
             </div>
             <div v-if="rec_index_receflag" style="margin-left: 20px" @click="alllogo()">
               <div v-if="userinformationlist.validInvalidName == '有效接待'" style="display:flex;align-items: center;">
-                <i style="color:#E7483C" class="el-icon-remove"></i>
+                <i style="color:#43CD80" class="el-icon-success"></i>
                 <span style="font-size: 14px;color: #333333;margin-left:4px">{{ userinformationlist.validInvalidName
                 }}</span>
               </div>
               <div v-else style="display:flex;align-items: center;">
-                <i style="color:#43CD80" class="el-icon-success"></i>
+                <i style="color:#E7483C" class="el-icon-remove"></i>
                 <span style="font-size: 14px;color: #333333;margin-left:4px">{{ userinformationlist.validInvalidName
                 }}</span>
               </div>
@@ -313,7 +313,7 @@
                 userinformationlist.fraction || 0
             }}%</el-button>
           <el-button :class="{ activecllasscet: zhixingcenterindex == 1 }" type=""
-            style="margin-left: 0px;height: 40px; border-left: none;border-radius: 0 5px 5px 0;"
+            style="margin-left: 0px;height: 40px; width: 126.5px; border-left: none;border-radius: 0 5px 5px 0;"
             @click="recordclick(1)">禁忌执行</el-button>
 
         </div>
@@ -488,8 +488,10 @@
           text-align: center;
           font-size: 20px;
           font-weight: 400;
+          position: relative;
         ">
         文本优化
+        <i class="el-icon-circle-close" @click="closeTextYh" style="position: absolute;right: 10px;top: 10px;"></i>
       </div>
       <div
         style="width: 100%; display: flex; height: 32px;justify-content: space-between;padding: 0 15px; margin-bottom: 20px;">
@@ -778,6 +780,9 @@ export default {
   },
 
   methods: {
+    closeTextYh(){
+      this.dialogFormtext = false;
+    },
     // 格式化话术内容
     formatAudioList() {
       let list = this.arr[0].audioContent

src/views/Statistics/TrendAnalysis.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="box-center">
     <!-- 头 -->
-    <div class="app-top" style="display:flex;align-items: center;padding-left: 10px;">
-      <div class="app-titel" v-if="role != 3" style="margin-bottom: 10px;width:30%;">
+    <div class="app-top" style="display:flex;padding:10px 16px;flex-direction: column;">
+      <div class="app-titel" v-if="role != 3" style="width:27%;">
         <div class="titel-text">项目选择:</div>
         <div style="margin-left: 26px">
           <el-select v-model="houseId" placeholder="请选择" filterable @change="houseChange">
@@ -11,20 +11,21 @@
           </el-select>
         </div>
       </div>
-      <div class="titel-text">筛选日期：</div>
-      <div class="">
-        <el-button :class="{ 'el-button--primary': timeType == 4 }" @click="tabtimetap(4)">近7天</el-button>
-        <el-button :class="{ 'el-button--primary': timeType == 5 }" @click="tabtimetap(5)">近15天</el-button>
-        <el-button :class="{ 'el-button--primary': timeType == 6 }" @click="tabtimetap(6)">近30天</el-button>
-      </div>
-      <div style="margin-left: 20px;display: flex;align-items: center;">
-        <el-date-picker @change="confirmtime" v-model="customtime" :clearable="false" type="daterange"
-          range-separator="-" format="yyyy-MM-dd" value-format="yyyy-MM-dd" start-placeholder="开始日期"
-          end-placeholder="结束日期" :picker-options="pickerOptions">
-        </el-date-picker>
+      <div style="display: flex;align-items: center;margin-top: 15px;">
+        <div class="titel-text" style="font-size: 14px;font-weight: 600;">筛选日期：</div>
+        <div style="margin-left: 16px;">
+          <el-button :class="{ 'el-button--primary': timeType == 4 }" @click="tabtimetap(4)">近7天</el-button>
+          <el-button :class="{ 'el-button--primary': timeType == 5 }" @click="tabtimetap(5)">近15天</el-button>
+          <el-button :class="{ 'el-button--primary': timeType == 6 }" @click="tabtimetap(6)">近30天</el-button>
+        </div>
+        <div style="margin-left: 20px;display: flex;align-items: center;">
+          <el-date-picker @change="confirmtime" v-model="customtime" :clearable="false" type="daterange"
+            range-separator="-" format="yyyy-MM-dd" value-format="yyyy-MM-dd" start-placeholder="开始日期"
+            end-placeholder="结束日期" :picker-options="pickerOptions">
+          </el-date-picker>
 
 
-        <!-- <div style="text-indent: 30px; min-width: 104px">接待时间:</div>
+          <!-- <div style="text-indent: 30px; min-width: 104px">接待时间:</div>
         <div class="toptimeqhuan">
           <div :class="{ tophove: timeType == 4 }" @click="tabtimetap(4)">
             近7天
@@ -36,7 +37,7 @@
             近30天
           </div>
         </div> -->
-        <!-- <div style="margin-left: 20px">
+          <!-- <div style="margin-left: 20px">
           <el-date-picker
             @change="confirmtime"
             v-model="customtime"
@@ -51,10 +52,10 @@
           >
           </el-date-picker>
         </div> -->
-        <div style="margin-left: 20px">
-          <el-checkbox v-model="checked" @change="radioChange">对比时间段</el-checkbox>
-        </div>
-        <div v-if="checked" style="
+          <div style="margin-left: 20px">
+            <el-checkbox v-model="checked" @change="radioChange">对比时间段</el-checkbox>
+          </div>
+          <div v-if="checked" style="
             margin-left: 20px;
             border: 1px solid #dcdfe6;
             min-width: 220px;
@@ -64,31 +65,34 @@
             font-size: 13px;
             line-height: 30px;
             text-indent: 8px;
+            width: 300px;
             cursor: pointer;
           " @click="show">
-          <!-- {{ selectTime1 ? "时段二： " : "请选择： " }}
+            <!-- {{ selectTime1 ? "时段二： " : "请选择： " }}
           <span v-if="selectTime1">{{ selectTime + "-" + selectTime1 }}</span> -->
-          <div style="display: flex">
-            <div style="min-width: 60px">
-              {{ selectTime1 ? "时段二： " : "请选择： " }}
-            </div>
-            <div v-if="selectTime1" style="display: flex">
-              <!-- {{ selectTime+ "-" + selectTime1}} -->
-              <div style="min-width: 120px; text-align: center">
-                {{ selectTime }}
+            <div style="display: flex">
+              <div style="min-width: 60px">
+                {{ selectTime1 ? "时段二： " : "请选择： " }}
               </div>
-              <span>-</span>
-              <div style="min-width: 120px; text-align: center; margin-right: 32px">
-                {{ selectTime1 }}
+              <div v-if="selectTime1" style="display: flex">
+                <!-- {{ selectTime+ "-" + selectTime1}} -->
+                <div style="min-width: 120px; text-align: center">
+                  {{ selectTime }}
+                </div>
+                <span>-</span>
+                <div style="min-width: 120px; text-align: center; margin-right: 32px">
+                  {{ selectTime1 }}
+                </div>
               </div>
             </div>
+            <el-date-picker style="opacity: 0" v-model="time" @change="timeChange" ref="time" type="date"
+              :clearable="false" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+              :picker-options="pickerOptions">
+            </el-date-picker>
           </div>
-          <el-date-picker style="opacity: 0" v-model="time" @change="timeChange" ref="time" type="date"
-            :clearable="false" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-            :picker-options="pickerOptions">
-          </el-date-picker>
         </div>
       </div>
+
     </div>
 
     <!-- //卡片 -->
@@ -1403,10 +1407,11 @@ export default {
     // height: 144px;
     background: #ffffff;
     border-radius: 4px;
-    border-bottom:3px solid #fff;
+    border-bottom: 3px solid #fff;
     transition: all 0.3s linear;
-    &:hover{
-      border-bottom:3px solid #2671e2;
+
+    &:hover {
+      border-bottom: 3px solid #2671e2;
     }
 
     .shang {
@@ -1430,6 +1435,7 @@ export default {
           color: #32363d;
           margin-left: 30px;
           margin-top: 18px;
+          margin-bottom: 20px;
         }
       }
 
@@ -1440,8 +1446,9 @@ export default {
         justify-content: center;
 
         .youimg {
-          width: 33%;
-          // height: 60px;
+          // width: 33%;
+          width: 62px;
+          height: 62px;
         }
       }
     }
@@ -1450,7 +1457,7 @@ export default {
       width: 100%;
       font-size: 14px;
       text-indent: 30px;
-      margin: 10px 0;
+      margin-bottom: 10px;
 
       .span1 {
         color: #333333;
@@ -1487,10 +1494,9 @@ export default {
 
   .titel-text {
     height: 100%;
-    font-size: 16px;
+    font-size: 14px;
     font-weight: 600;
     color: #32363d;
-    text-indent: 30px;
   }
 
   .toptimeqhuan {

src/views/Statistics/dataScreeAge.vue

@@ -254,7 +254,7 @@
             {{ thirdTab.houseQuantity || 0 }}
           </div>
         </div> -->
-        <el-card shadow="hover" :class="{ tophovese: cardindex == 1 }">
+        <!-- <el-card shadow="hover" :class="{ tophovese: cardindex == 1 }">
           <div @click="Overviewxlick('1')">
             <div class="text1">
               购买服务项目数
@@ -274,7 +274,7 @@
               </span>
             </div>
           </div>
-        </el-card>
+        </el-card> -->
         <!-- <el-card shadow="hover" :class="{ tophovese: cardindex == 4 }">
           <div @click="Overviewxlick('4')">
             <div class="text1">
@@ -299,27 +299,7 @@
             </div>
           </div>
         </el-card> -->
-        <el-card shadow="hover" :class="{ tophovese: cardindex == 5 }">
-          <div @click="Overviewxlick('5')">
-            <div class="text1">
-              新增用户数
-            </div>
-            <div class="text2">
-              {{ thirdTab.userCountWithNewJoin || 0 }}
-            </div>
-            <div class="text3">
-              <span>环比 {{ sysCompare.userCountWithNewJoin || 0 }}</span>
-              <span class="textUp" v-if="orderBy.userCountWithNewJoin > 0">
-                +{{ orderBy.userCountWithNewJoin || 0 }}
-                <i class="up"></i>
-              </span>
-              <span class="textDown" v-if="orderBy.userCountWithNewJoin < 0">
-                {{ orderBy.userCountWithNewJoin || 0 }}
-                <i class="down"></i>
-              </span>
-            </div>
-          </div>
-        </el-card>
+        
         <el-card shadow="hover" :class="{ tophovese: cardindex == 6 }">
           <div @click="Overviewxlick('6')">
             <div class="text1">
@@ -392,6 +372,27 @@
             </div>
           </div>
         </el-card>
+        <el-card shadow="hover" :class="{ tophovese: cardindex == 5 }">
+          <div @click="Overviewxlick('5')">
+            <div class="text1">
+              新增用户数
+            </div>
+            <div class="text2">
+              {{ thirdTab.userCountWithNewJoin || 0 }}
+            </div>
+            <div class="text3">
+              <span>环比 {{ sysCompare.userCountWithNewJoin || 0 }}</span>
+              <span class="textUp" v-if="orderBy.userCountWithNewJoin > 0">
+                +{{ orderBy.userCountWithNewJoin || 0 }}
+                <i class="up"></i>
+              </span>
+              <span class="textDown" v-if="orderBy.userCountWithNewJoin < 0">
+                {{ orderBy.userCountWithNewJoin || 0 }}
+                <i class="down"></i>
+              </span>
+            </div>
+          </div>
+        </el-card>
         <!-- <el-card shadow="hover" :class="{ tophovese: cardindex == 9 }">
           <div @click="Overviewxlick('9')">
             <div class="text1">
@@ -484,7 +485,7 @@
         </el-table-column> -->
           <el-table-column prop="date" label="日期" align="center">
           </el-table-column>
-          <el-table-column prop="buyHouseQuantity" label="购买服务项目数" align="center">
+          <!-- <el-table-column prop="buyHouseQuantity" label="购买服务项目数" align="center">
             <template slot-scope="{ row }">
               <span @click="goDetail1(row, '购买服务项目数', 0)" style="cursor: pointer">{{ row.buyHouseQuantity || 0 }}</span>
             </template>
@@ -493,18 +494,14 @@
             <template slot-scope="{ row }">
               <span @click="goDetail1(row, '活跃用户数', 1)" style="cursor: pointer">{{ row.activeUserQuantity }}</span>
             </template>
-          </el-table-column>
-          <el-table-column prop="newJoinUserQuantity" label="新增用户数" align="center">
-            <template slot-scope="{ row }">
-              <span @click="goDetail1(row, '新增用户数', 2)" style="cursor: pointer">{{ row.newJoinUserQuantity || 0
-              }}</span>
-            </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="receptionQuantity" label="接待量" align="center">
             <template slot-scope="{ row }">
               <span @click="goDetail1(row, '接待量', 3)" style="cursor: pointer">{{ row.receptionQuantity || 0 }}</span>
             </template>
           </el-table-column>
+          
+          
           <el-table-column prop="avgReceptionTime" label="平均接待时长" align="center">
             <template slot-scope="{ row }">
               <span @click="goDetail1(row, '平均接待时长', 4)" style="cursor: pointer">{{ row.avgReceptionTime || 0 }}</span>
@@ -516,11 +513,17 @@
               }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="buyEquipQuantity" label="销售设备数" align="center">
+          <el-table-column prop="newJoinUserQuantity" label="新增用户数" align="center">
             <template slot-scope="{ row }">
-              <span @click="goDetail1(row, '销售设备数', 6)" style="cursor: pointer">{{ row.buyEquipQuantity || 0 }}</span>
+              <span @click="goDetail1(row, '新增用户数', 2)" style="cursor: pointer">{{ row.newJoinUserQuantity || 0
+              }}</span>
             </template>
           </el-table-column>
+          <!-- <el-table-column prop="buyEquipQuantity" label="销售设备数" align="center">
+            <template slot-scope="{ row }">
+              <span @click="goDetail1(row, '销售设备数', 6)" style="cursor: pointer">{{ row.buyEquipQuantity || 0 }}</span>
+            </template>
+          </el-table-column> -->
         </el-table>
         <div style="display: flex; justify-content: flex-end; margin-top: 10px">
           <el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"

src/views/Statistics/dataScreeSys.vue

@@ -310,8 +310,8 @@
           <el-table-column prop="receptionQuantityInToday" label="接待量" align="center">
           </el-table-column>
 
-          <el-table-column prop="activeUserQuantity" label="活跃用户" align="center">
-          </el-table-column>
+          <!-- <el-table-column prop="activeUserQuantity" label="活跃用户" align="center">
+          </el-table-column> -->
 
           <el-table-column prop="activeEquipmentQuantity" label="活跃设备" align="center">
           </el-table-column>

src/views/Statistics/trend.vue

@@ -170,74 +170,70 @@
       </div>
 
       <div class="container tabcard">
-
-        <el-card shadow="hover" :class="{ tophovese: secindex == 'fraction' }">
-          <div @click="secondChange('fraction', '平均执行率/%')">
+        <el-card shadow="hover" :class="{ tophovese: secindex == 'receptionCount' }">
+          <div @click="secondChange('receptionCount', '接待客户/个')">
             <div class="text1">
-              平均执行率
-            <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均执行率；" placement="bottom-end">
+              接待量
+            <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
                 <i class="el-icon-question" style="color:#74A3EA"></i>
               </el-tooltip>
             </div>
             <div class="text2">
-              {{ compare.fraction || 0 }}<span style="margin-left:6px;font-size:24px;">%</span>
+              {{ compare.receptionCount || 0 }}
             </div>
             <div class="text3" v-if="selectTime1">
-              <span>环比 {{ compare1.fraction || 0 }}</span>
-              <span class="textUp" v-if="compare2.fraction > 0">
-                +{{ compare2.fraction || 0 }}
+              <span>环比 {{ compare1.receptionCount || 0 }}</span>
+              <span class="textUp" v-if="compare2.receptionCount > 0">
+                +{{ compare2.receptionCount || 0 }}
                 <i class="up"></i>
               </span>
-              <span class="textDown" v-if="compare2.fraction < 0">
-                {{ compare2.fraction || 0 }}
+              <span class="textDown" v-if="compare2.receptionCount < 0">
+                {{ compare2.receptionCount || 0 }}
                 <i class="down"></i>
               </span>
             </div>
           </div>
         </el-card>
-        <el-card shadow="hover" :class="{ tophovese: secindex == 'avgDuration' }">
-          <div @click="secondChange('avgDuration', '平均接待时长/分钟')">
+        <el-card shadow="hover" :class="{ tophovese: secindex == 'activeCustomer' }">
+          <div @click="secondChange('activeCustomer', '有效接待/次')">
             <div class="text1">
-              平均接待时长
-            <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
+              有效接待
+            <el-tooltip effect="light" content="筛选时间内，标记为有效的接待数，不包含待接单；" placement="bottom-end">
                 <i class="el-icon-question" style="color:#74A3EA"></i>
               </el-tooltip>
             </div>
             <div class="text2">
-              {{ compare.fraction || 0 }}
+              {{ compare.activeCustomer || 0 }}
             </div>
             <div class="text3" v-if="selectTime1">
-              <span>环比 {{ compare1.avgDuration || 0 }}</span>
-              <span class="textUp" v-if="compare2.avgDuration > 0">
-                +{{ compare2.avgDuration || 0 }}
+              <span>环比 {{ compare1.activeCustomer || 0 }}</span>
+              <span class="textUp" v-if="compare2.activeCustomer > 0">
+                +{{ compare2.activeCustomer || 0 }}
                 <i class="up"></i>
               </span>
-              <span class="textDown" v-if="compare2.avgDuration < 0">
-                {{ compare2.avgDuration || 0 }}
+              <span class="textDown" v-if="compare2.activeCustomer < 0">
+                {{ compare2.activeCustomer || 0 }}
                 <i class="down"></i>
               </span>
             </div>
           </div>
         </el-card>
-        <el-card shadow="hover" :class="{ tophovese: secindex == 'receptionCount' }">
-          <div @click="secondChange('receptionCount', '接待客户/个')">
+        <el-card shadow="hover" :class="{ tophovese: secindex == 'activeCustomerRate' }">
+          <div @click="secondChange('activeCustomerRate', '有效接待占比/%')">
             <div class="text1">
-              接待量
-            <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
-                <i class="el-icon-question" style="color:#74A3EA"></i>
-              </el-tooltip>
+              有效接待占比
             </div>
             <div class="text2">
-              {{ compare.receptionCount || 0 }}
+              {{ compare.activeCustomerRate || 0 }}
             </div>
             <div class="text3" v-if="selectTime1">
-              <span>环比 {{ compare1.receptionCount || 0 }}</span>
-              <span class="textUp" v-if="compare2.receptionCount > 0">
-                +{{ compare2.receptionCount || 0 }}
+              <span>环比 {{ compare1.activeCustomerRate || 0 }}</span>
+              <span class="textUp" v-if="compare2.activeCustomerRate > 0">
+                +{{ compare2.activeCustomerRate || 0 }}
                 <i class="up"></i>
               </span>
-              <span class="textDown" v-if="compare2.receptionCount < 0">
-                {{ compare2.receptionCount || 0 }}
+              <span class="textDown" v-if="compare2.activeCustomerRate < 0">
+                {{ compare2.activeCustomerRate || 0 }}
                 <i class="down"></i>
               </span>
             </div>
@@ -267,51 +263,58 @@
             </div>
           </div>
         </el-card>
-        <el-card shadow="hover" :class="{ tophovese: secindex == 'activeCustomer' }">
-          <div @click="secondChange('activeCustomer', '有效接待/次')">
+        <el-card shadow="hover" :class="{ tophovese: secindex == 'fraction' }">
+          <div @click="secondChange('fraction', '平均执行率/%')">
             <div class="text1">
-              有效接待
-            <el-tooltip effect="light" content="筛选时间内，标记为有效的接待数，不包含待接单；" placement="bottom-end">
+              平均执行率
+            <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均执行率；" placement="bottom-end">
                 <i class="el-icon-question" style="color:#74A3EA"></i>
               </el-tooltip>
             </div>
             <div class="text2">
-              {{ compare.activeCustomer || 0 }}
+              {{ compare.fraction || 0 }}<span style="margin-left:6px;font-size:24px;">%</span>
             </div>
             <div class="text3" v-if="selectTime1">
-              <span>环比 {{ compare1.activeCustomer || 0 }}</span>
-              <span class="textUp" v-if="compare2.activeCustomer > 0">
-                +{{ compare2.activeCustomer || 0 }}
+              <span>环比 {{ compare1.fraction || 0 }}</span>
+              <span class="textUp" v-if="compare2.fraction > 0">
+                +{{ compare2.fraction || 0 }}
                 <i class="up"></i>
               </span>
-              <span class="textDown" v-if="compare2.activeCustomer < 0">
-                {{ compare2.activeCustomer || 0 }}
+              <span class="textDown" v-if="compare2.fraction < 0">
+                {{ compare2.fraction || 0 }}
                 <i class="down"></i>
               </span>
             </div>
           </div>
         </el-card>
-        <el-card shadow="hover" :class="{ tophovese: secindex == 'activeCustomerRate' }">
-          <div @click="secondChange('activeCustomerRate', '有效接待占比/%')">
+        <el-card shadow="hover" :class="{ tophovese: secindex == 'avgDuration' }">
+          <div @click="secondChange('avgDuration', '平均接待时长/分钟')">
             <div class="text1">
-              有效接待占比
+              平均接待时长
+            <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
+                <i class="el-icon-question" style="color:#74A3EA"></i>
+              </el-tooltip>
             </div>
             <div class="text2">
-              {{ compare.activeCustomerRate || 0 }}
+              {{ compare.fraction || 0 }}
             </div>
             <div class="text3" v-if="selectTime1">
-              <span>环比 {{ compare1.activeCustomerRate || 0 }}</span>
-              <span class="textUp" v-if="compare2.activeCustomerRate > 0">
-                +{{ compare2.activeCustomerRate || 0 }}
+              <span>环比 {{ compare1.avgDuration || 0 }}</span>
+              <span class="textUp" v-if="compare2.avgDuration > 0">
+                +{{ compare2.avgDuration || 0 }}
                 <i class="up"></i>
               </span>
-              <span class="textDown" v-if="compare2.activeCustomerRate < 0">
-                {{ compare2.activeCustomerRate || 0 }}
+              <span class="textDown" v-if="compare2.avgDuration < 0">
+                {{ compare2.avgDuration || 0 }}
                 <i class="down"></i>
               </span>
             </div>
           </div>
         </el-card>
+        
+        
+        
+        
       </div>
       <div id="main"></div>
     </div>