From e2950d9672ddc50b5debbb456c740f41141386d5 Mon Sep 17 00:00:00 2001
From: jyt <1592211625@qq.com>
Date: Fri, 24 Jun 2022 15:12:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/index/top/index.vue               |  10 +-
 src/page/wel.vue                           |  22 +--
 src/views/Statistics/ReceptionOverview.vue |   8 +-
 src/views/Statistics/TrendAnalysis.vue     |   4 +-
 src/views/Statistics/houseDataSys.vue      |   8 +-
 src/views/Statistics/trend.vue             |   2 +-
 src/views/building/Count.vue               | 202 +++++++++++----------
 src/views/houseData/count.vue              |   2 +-
 8 files changed, 142 insertions(+), 116 deletions(-)

diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index c1747b0..51f68ab 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -43,7 +43,15 @@
           }}
         </div>
         
-          <el-button @click="goChange" class="avue-header" style="margin-left: 10px;color: #2671E2;border:1px solid #2671E2;padding: 10px;">切换后台</el-button>
+          <el-button @click="goChange" class="avue-header" style="margin-left: 10px;color: #2671E2;border:1px solid #2671E2;padding: 10px;"> {{
+            orgType == 0
+              ? "切换后台"
+              : orgType == 1
+              ? "切换代理"
+              : orgType == 2
+              ? "切换公司"
+              : "切换后台"
+          }}</el-button>
       </div>
       <div
         v-if="companyName"
diff --git a/src/page/wel.vue b/src/page/wel.vue
index a5e595f..4c3aed2 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -148,11 +148,11 @@
                   环比:{{ cardlist.sequential.fraction || 0 }}</span>
 
                 <span class="span2-2" v-if="cardlist.liftlist.fraction > 0">
-                  +{{ 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 }}
+                  {{ cardlist.liftlist.fraction || 0 }}%
                   <i class="down"></i>
                 </span>
 
@@ -257,11 +257,11 @@
                   环比:{{ cardlist.sequential.prohibitedZb || 0 }}</span>
 
                 <span class="span2-2" v-if="cardlist.liftlist.prohibitedZb > 0">
-                  +{{ cardlist.liftlist.prohibitedZb || 0 }}
+                  +{{ cardlist.liftlist.prohibitedZb || 0 }}%
                   <i class="up"></i>
                 </span>
                 <span class="span2-3" v-if="cardlist.liftlist.prohibitedZb < 0">
-                  {{ cardlist.liftlist.prohibitedZb || 0 }}
+                  {{ cardlist.liftlist.prohibitedZb || 0 }}%
                   <i class="down"></i>
                 </span>
 
@@ -280,7 +280,7 @@
       <div class="app-box-san">
         <div class="zuo">
           <div class="title">
-            <div class="text1">维度触达占比
+            <div class="text1">场景执行分析
               <el-tooltip effect="light"
                 content="筛选时间内，场景触达率=有效接待的场景执行率的之和/有效接待数，例如：品牌介绍，第1次接待执行了100%，第2次接待没有执行，场景触达率=（100+0）/2=50%；"
                 placement="bottom-end">
@@ -988,11 +988,11 @@
                     环比:{{ sysCompare.avgFration || 0 }}</span>
 
                   <span class="span2-2" v-if="orderBy.avgFration > 0">
-                    +{{ orderBy.avgFration || 0 }}
+                    +{{ orderBy.avgFration || 0 }}%
                     <i class="up"></i>
                   </span>
                   <span class="span2-3" v-if="orderBy.avgFration < 0">
-                    {{ orderBy.avgFration || 0 }}
+                    {{ orderBy.avgFration || 0 }}%
                     <i class="down"></i>
                   </span>
 
@@ -1142,7 +1142,7 @@
             </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">无效接待
@@ -1173,12 +1173,12 @@
                 </div>
               </div>
             </div>
-          </div> -->
+          </div>
 
 
 
 
-          <!-- <div class="pagechen" @click="toDetail('/Equipment/state', '', '设备监控')">
+          <div class="pagechen" @click="toDetail('/Equipment/state', '', '设备监控')">
             <div style="width:100%">
               <div class="pageboxtitle1 projectCardItem">
                 <div class="sum">活跃设备数
@@ -1213,7 +1213,7 @@
               </div>
             </div>
 
-          </div> -->
+          </div>
 
           <div class="pagechen" @click="toDetail('/Equipment/state', '', '设备监控')">
             <div style="width:100%">
diff --git a/src/views/Statistics/ReceptionOverview.vue b/src/views/Statistics/ReceptionOverview.vue
index e0df96f..be6846c 100644
--- a/src/views/Statistics/ReceptionOverview.vue
+++ b/src/views/Statistics/ReceptionOverview.vue
@@ -39,13 +39,13 @@
         <el-card shadow="hover" :class="{ tophovese: cardindex == 4 }">
           <div @click="Overviewxlick('4')">
             <div class="text1">
-              平均执行率(%)
+              平均执行率
               <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均执行率；" placement="bottom-end">
                 <i class="pop"></i>
               </el-tooltip>
             </div>
             <div class="text2">
-              {{ cardobj.fraction || 0 }}
+              {{ cardobj.fraction || 0 }}<span style="font-size: 24px;">%</span>
             </div>
             <div class="text3">
               <span>环比 {{ cardobjs.fraction || 0 }}</span>
@@ -979,13 +979,13 @@ export default {
       var newline2 = [];
       var Strname = "";
       if (this.cardindex == 1) {
-        Strname = "接待客户/个";
+        Strname = "接待量/个";
         this.Brokenline.map((item) => {
           newline.push(item.receptionCount);
           newline2.push(item.statDate.slice(5, 10));
         });
       } else if (this.cardindex == 2) {
-        Strname = "接待客户/个";
+        Strname = "有效接待/次";
         this.Brokenline.map((item) => {
           newline.push(item.activeCustomer);
           newline2.push(item.statDate.slice(5, 10));
diff --git a/src/views/Statistics/TrendAnalysis.vue b/src/views/Statistics/TrendAnalysis.vue
index 5562adc..68af28f 100644
--- a/src/views/Statistics/TrendAnalysis.vue
+++ b/src/views/Statistics/TrendAnalysis.vue
@@ -155,11 +155,11 @@
                 环比:{{ cardobj.endFraction || 0 }}次</span>
 
               <span class="span2-2" v-if="cardobj.contrastFraction > 0">
-                +{{ cardobj.contrastFraction || 0 }}
+                +{{ cardobj.contrastFraction || 0 }}%
                 <i class="up"></i>
               </span>
               <span class="span2-3" v-if="cardobj.contrastFraction < 0">
-                {{ cardobj.contrastFraction || 0 }}
+                {{ cardobj.contrastFraction || 0 }}%
                 <i class="down"></i>
               </span>
 
diff --git a/src/views/Statistics/houseDataSys.vue b/src/views/Statistics/houseDataSys.vue
index b22b576..29d1368 100644
--- a/src/views/Statistics/houseDataSys.vue
+++ b/src/views/Statistics/houseDataSys.vue
@@ -82,13 +82,13 @@
               style="font-size:22px;color:#FFF;position: absolute;right: 2px;bottom: -42px;"></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('累计项目数')" :class="{ borderCss: tabName == '累计项目数' }">
-          <span>过期项目数</span>
+        <div class="cardItem" @click="changeTab('累计项目数')">
+          <span>累计项目数</span>
           <h2>{{ firstTab.houseQuantity || 0 }}</h2>
-          <div class="sel" :class="{ seled: tabName == '累计项目数' }">
+          <!-- <div class="sel" :class="{ seled: tabName == '累计项目数' }">
             <i v-show="tabName == '累计项目数'" class="el-icon-check"
               style="font-size:22px;color:#FFF;position: absolute;right: 2px;bottom: -42px;"></i>
-          </div>
+          </div> -->
         </div>
       </div>
       <!-- <div id="main"></div> -->
diff --git a/src/views/Statistics/trend.vue b/src/views/Statistics/trend.vue
index e92dc19..939066e 100644
--- a/src/views/Statistics/trend.vue
+++ b/src/views/Statistics/trend.vue
@@ -224,7 +224,7 @@
               有效接待占比
             </div>
             <div class="text2">
-              {{ compare.activeCustomerRate || 0 }}
+              {{ compare.activeCustomerRate || 0 }}<span style="font-size: 24px;">%</span>
             </div>
             <div class="text3" v-if="selectTime1">
               <span>环比 {{ compare1.activeCustomerRate || 0 }}</span>
diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue
index 93fa94b..5ed0a34 100644
--- a/src/views/building/Count.vue
+++ b/src/views/building/Count.vue
@@ -1,44 +1,52 @@
 <template>
   <div class="box-center">
-    <div class="toptab" style="cursor: pointer" v-if="orgType != 2">
-      <div @click="tapclickyab(0)" :class="{ activecllasscet: activeTotal == 0 }"
-        :style="{ background: activeTotal == 0 ? '#2671E2' : '#ffffff' }">
-        项目
-      </div>
-      <div v-if="orgType == 0" @click="tapclickyab(1)" :class="{ activecllasscet: activeTotal == 1 }"
-        :style="{ background: activeTotal == 1 ? '#2671E2' : '#ffffff' }">
-        代理商
-      </div>
-      <div v-if="orgType == 0 || orgType == 1" @click="tapclickyab(2)" :class="{ activecllasscet: activeTotal == 2 }"
-        :style="{ background: activeTotal == 2 ? '#2671E2' : '#ffffff' }">
-        公司
+    <div style="
+    width: calc(100% - 270px);
+    position: fixed;    
+    z-index: 999;
+    margin-top: -16px;
+    background: #ecedf0;
+    box-shadow: 0px 0px 10px 0px #dadada;
+    ">
+      <div class="toptab" style="cursor: pointer" v-if="orgType != 2">
+        <div @click="tapclickyab(0)" :class="{ activecllasscet: activeTotal == 0 }"
+          :style="{ background: activeTotal == 0 ? '#2671E2' : '#ffffff' }">
+          项目
+        </div>
+        <div v-if="orgType == 0" @click="tapclickyab(1)" :class="{ activecllasscet: activeTotal == 1 }"
+          :style="{ background: activeTotal == 1 ? '#2671E2' : '#ffffff' }">
+          代理商
+        </div>
+        <div v-if="orgType == 0 || orgType == 1" @click="tapclickyab(2)" :class="{ activecllasscet: activeTotal == 2 }"
+          :style="{ background: activeTotal == 2 ? '#2671E2' : '#ffffff' }">
+          公司
+        </div>
       </div>
-    </div>
-    <!-- 头 -->
-    <div class="app-top">
-      <div class="app-titel" style="margin-top: 5px">
-        <div class="div-lab">
-          <div class="label" style="margin-left: 15px">时间：</div>
-          <div class="toptimeqhuan">
-            <div :class="{ tophove: searchForm.dateType == 4 }" @click="tabtimetap(4)" style="cursor: pointer">
-              近7天
+      <!-- 头 -->
+      <div class="app-top">
+        <div class="app-titel" style="margin-top: 5px">
+          <div class="div-lab">
+            <div class="label" style="margin-left: 15px">时间：</div>
+            <div class="toptimeqhuan">
+              <div :class="{ tophove: searchForm.dateType == 4 }" @click="tabtimetap(4)" style="cursor: pointer">
+                近7天
+              </div>
+              <div :class="{ tophove: searchForm.dateType == 5 }" @click="tabtimetap(5)" style="cursor: pointer">
+                近15天
+              </div>
+              <div :class="{ tophove: searchForm.dateType == 6 }" @click="tabtimetap(6)" style="cursor: pointer">
+                近30天
+              </div>
             </div>
-            <div :class="{ tophove: searchForm.dateType == 5 }" @click="tabtimetap(5)" style="cursor: pointer">
-              近15天
+            <div>
+              <el-date-picker v-model="time" type="daterange" class="div-inp" range-separator="-"
+                start-placeholder="开始日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd"
+                end-placeholder="结束日期" @change="timeChange">
+              </el-date-picker>
             </div>
-            <div :class="{ tophove: searchForm.dateType == 6 }" @click="tabtimetap(6)" style="cursor: pointer">
-              近30天
-            </div>
-          </div>
-          <div>
-            <el-date-picker v-model="time" type="daterange" class="div-inp" range-separator="-" start-placeholder="开始日期"
-              :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" end-placeholder="结束日期"
-              @change="timeChange">
-            </el-date-picker>
           </div>
-        </div>
 
-        <!--
+          <!--
         <div class="div-lab" v-if="orgType!=2">
           <el-input
             v-model="changeValue"
@@ -63,36 +71,36 @@
           </el-input>
         </div> -->
 
-        <div class="div-lab" v-if="orgType == 0">
-          <el-input v-model="changeValue" clearable placeholder="请输入" maxlength="10" @change="selectChange"
-            style="width: 363px">
-            <el-select v-model="selflag" slot="prepend" class="input-with-select" style="width: 115px" placeholder="请选择"
-              @change="selChange">
-              <el-option v-if="activeTotal != 1" label="公司名称" value="1"></el-option>
-              <el-option v-if="activeTotal != 2" label="代理商名称" value="2"></el-option>
-              <el-option v-if="activeTotal == 0" label="项目名称" value="3"></el-option>
-            </el-select>
-          </el-input>
-        </div>
+          <div class="div-lab" v-if="orgType == 0">
+            <el-input v-model="changeValue" clearable placeholder="请输入" maxlength="10" @change="selectChange"
+              style="width: 363px">
+              <el-select v-model="selflag" slot="prepend" class="input-with-select" style="width: 115px"
+                placeholder="请选择" @change="selChange">
+                <el-option v-if="activeTotal != 1" label="公司名称" value="1"></el-option>
+                <el-option v-if="activeTotal != 2" label="代理商名称" value="2"></el-option>
+                <el-option v-if="activeTotal == 0" label="项目名称" value="3"></el-option>
+              </el-select>
+            </el-input>
+          </div>
 
-        <div class="div-lab" v-if="orgType == 1">
-          <el-input v-model="changeValue" clearable placeholder="请输入" maxlength="10" @change="selectChange"
-            style="width: 363px">
-            <el-select v-model="selflag" slot="prepend" class="input-with-select" style="width: 115px" placeholder="请选择"
-              @change="selChange">
-              <el-option v-if="activeTotal != 1" label="公司名称" value="1"></el-option>
-              <el-option v-if="activeTotal == 0" label="项目名称" value="3"></el-option>
-            </el-select>
-          </el-input>
-        </div>
-      </div>
-      <div class="app-titel" style="margin-top: 5px">
-        <div class="div-lab">
-          <div class="label">地区：</div>
-          <el-cascader :props="props" @change="locationsChange" placeholder="省/市" size="small" separator="/"
-            v-model="provice" clearable></el-cascader>
+          <div class="div-lab" v-if="orgType == 1">
+            <el-input v-model="changeValue" clearable placeholder="请输入" maxlength="10" @change="selectChange"
+              style="width: 363px">
+              <el-select v-model="selflag" slot="prepend" class="input-with-select" style="width: 115px"
+                placeholder="请选择" @change="selChange">
+                <el-option v-if="activeTotal != 1" label="公司名称" value="1"></el-option>
+                <el-option v-if="activeTotal == 0" label="项目名称" value="3"></el-option>
+              </el-select>
+            </el-input>
+          </div>
         </div>
-        <!-- <div class="div-lab" v-if="orgType == 0">
+        <div class="app-titel" style="margin-top: 5px">
+          <div class="div-lab">
+            <div class="label">地区：</div>
+            <el-cascader :props="props" @change="locationsChange" placeholder="省/市" size="small" separator="/"
+              v-model="provice" clearable></el-cascader>
+          </div>
+          <!-- <div class="div-lab" v-if="orgType == 0">
           <div class="label" style="min-width:70px;">系统运营：</div>
           <el-input  maxlength="10" clearable v-model="searchForm.linkman"></el-input>
         </div>
@@ -100,36 +108,39 @@
           <div class="label" style="min-width:70px;">售后运营：</div>
           <el-input  maxlength="10" clearable v-model="searchForm.linkman"></el-input>
         </div> -->
-        <div v-if="orgType == 0 || orgType == 1" class="div-lab">
-          <div class="label">运营人员：</div>
-          <el-select v-model="searchForm.operationStaffId" placeholder="请选择" class="div-inp" filterable clearable>
-            <el-option v-for="item in operaList" :key="item.accountId" :label="item.name" :value="item.accountId">
-            </el-option>
-          </el-select>
-        </div>
-      </div>
-      <div class="app-titel" style="margin-top: 15px">
-        <div style="margin-left: 20px">
-          <el-button type="primary" @click="screen">筛选</el-button>
-        </div>
-        <div style="margin-left: 20px">
-          <el-button @click="clascreen" type="text">清空筛选条件</el-button>
+          <div v-if="orgType == 0 || orgType == 1" class="div-lab">
+            <div class="label">运营人员：</div>
+            <el-select v-model="searchForm.operationStaffId" placeholder="请选择" class="div-inp" filterable clearable>
+              <el-option v-for="item in operaList" :key="item.accountId" :label="item.name" :value="item.accountId">
+              </el-option>
+            </el-select>
+          </div>
         </div>
-        <div style="margin-left: auto; margin-right: 10px" v-if="cus_build_count_download">
-          <el-button @click="downLoad" icon="el-icon-download">导出</el-button>
+        <div class="app-titel" style="margin-top: 15px">
+          <div style="margin-left: 20px">
+            <el-button type="primary" @click="screen">筛选</el-button>
+          </div>
+          <div style="margin-left: 20px">
+            <el-button @click="clascreen" type="text">清空筛选条件</el-button>
+          </div>
+          <div style="margin-left: auto; margin-right: 10px" v-if="cus_build_count_download">
+            <el-button @click="downLoad" icon="el-icon-download">导出</el-button>
+          </div>
         </div>
       </div>
     </div>
 
     <!-- 表格 -->
-    <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" v-if="activeTotal == 0" :data="tableData" stripe style="width: 100%" height="640">
+    <div class="cen-tab" :style="{ marginTop: orgType != 2 ? '230px' : '170px' }">
+      <el-table :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 0" :data="tableData"
+        stripe style="width: 100%" height="640">
         <el-table-column prop="propertyName" label="项目名称" align="center">
         </el-table-column>
         <el-table-column prop="orgName" label="公司名称" align="center">
           <template slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" :content="row.orgName" placement="top-start">
-              <span style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.orgName}}</span>
+              <span
+                style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.orgName }}</span>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -150,15 +161,17 @@
         <el-table-column prop="area" label="地区" align="center">
           <template slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" :content="row.area" placement="top-start">
-              <span style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.area}}</span>
+              <span
+                style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.area }}</span>
             </el-tooltip>
           </template>
         </el-table-column>
 
         <el-table-column v-if="orgType != 2" prop="operationStaffName" label="运营人员" align="center">
-        <template slot-scope="{ row }">
+          <template slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" :content="row.operationStaffName" placement="top-start">
-              <span style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.operationStaffName}}</span>
+              <span
+                style="display: block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.operationStaffName }}</span>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -188,7 +201,8 @@
         </el-table-column>
       </el-table>
 
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" v-if="activeTotal == 2" :data="tableData" stripe style="width: 100%" height="640">
+      <el-table :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 2" :data="tableData"
+        stripe style="width: 100%" height="640">
         <el-table-column prop="orgName" label="公司名称" align="center">
         </el-table-column>
         <el-table-column prop="houseQuantityOfEnough" label="服务期内项目" align="center" width="140">
@@ -234,7 +248,8 @@
         </el-table-column>
       </el-table>
 
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" v-if="activeTotal == 1" :data="tableData" stripe style="width: 100%" height="640">
+      <el-table :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 1" :data="tableData"
+        stripe style="width: 100%" height="640">
         <el-table-column prop="agentName" label="代理商名称" align="center">
         </el-table-column>
         <el-table-column prop="area" label="地区" align="center">
@@ -722,21 +737,24 @@ export default {
 .div-inp {
   width: 250px;
 }
-/deep/ .el-table__header-wrapper{
-  thead{
-    tr{
-      th{
+
+/deep/ .el-table__header-wrapper {
+  thead {
+    tr {
+      th {
         background: #F5F7FA;
         color: #333333;
       }
     }
   }
 }
-/deep/ .el-button--primary{
+
+/deep/ .el-button--primary {
   background: #2671E2 !important;
   border: 1px solid #2671E2 !important;
 }
-/deep/ .el-button--text{
+
+/deep/ .el-button--text {
   color: #2671E2;
 }
 </style>
diff --git a/src/views/houseData/count.vue b/src/views/houseData/count.vue
index 0bb2028..1324494 100644
--- a/src/views/houseData/count.vue
+++ b/src/views/houseData/count.vue
@@ -56,7 +56,7 @@
     <div class="cen-tab">
       <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="operationName" label="运营" align="center" sortable></el-table-column>
-        <el-table-column prop="houseQuantityInService" label="服务中项目数" width="120" align="center" sortable></el-table-column>
+        <el-table-column prop="houseQuantityInService" label="项目数" width="120" align="center" sortable></el-table-column>
         <el-table-column prop="wrongWordAddCount" width="120" label="常错词添加数" align="center" sortable></el-table-column>
         <el-table-column prop="wrongWordUpdateCount" width="150" label="接待错词修改条数" align="center" sortable></el-table-column>
         <el-table-column prop="markAdviserCount" width="120" label="标记顾问数" align="center" sortable></el-table-column>