diff --git a/src/page/wel.vue b/src/page/wel.vue
index eccbe55..7917714 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -2186,13 +2186,14 @@ export default {
   margin-top: 15px;
 
   .zuo {
-    padding: 0 0 20px 0;
+    padding: 0 15px;
     margin-right: 15px;
     background: #ffffff;
     border-radius: 4px;
     width: 48.7%;
     flex-grow: 1;
 
+
     .title {
       width: 100%;
       height: 55px;
@@ -2215,6 +2216,7 @@ export default {
     width: 49%;
     background: #ffffff;
     border-radius: 4px;
+    padding: 0 15px;
 
     .title {
       width: 100%;
@@ -2346,7 +2348,7 @@ export default {
 
 .hejisan {
   width: 100%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
 
   .sanbox1 {
diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue
index cb7608b..f9fdffd 100644
--- a/src/views/Equipment/equipmentDetailList.vue
+++ b/src/views/Equipment/equipmentDetailList.vue
@@ -64,8 +64,8 @@
           padding-right: 18px;
         ">
         <span style="min-width: 80px" class="demonstration">使用时间：</span>
-        <div class="toptimeqhuan">
-          <div :class="{ tophove: timeType == 4 }" @click="tabtimetap(4)">
+        <div style="margin-left:15px">
+          <!-- <div :class="{ tophove: timeType == 4 }" @click="tabtimetap(4)">
             近7天
           </div>
           <div :class="{ tophove: timeType == 5 }" @click="tabtimetap(5)">
@@ -73,7 +73,23 @@
           </div>
           <div :class="{ tophove: timeType == 6 }" @click="tabtimetap(6)">
             近30天
-          </div>
+          </div> -->
+          <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
+              style="margin-right:15px"
+                :class="{ 'el-button--primary': timeType == 6 }"
+                @click="tabtimetap(6)"
+                >近30天</el-button
+              >
         </div>
         <el-date-picker @change="confirmtime" v-model="customtime" type="daterange" range-separator="-"
           :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" start-placeholder="开始日期"
@@ -1819,4 +1835,8 @@ export default {
 /deep/ .el-button--text{
   color: #2671E2;
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/BuildingContrast.vue b/src/views/Statistics/BuildingContrast.vue
index f8f4a67..bfbd49b 100644
--- a/src/views/Statistics/BuildingContrast.vue
+++ b/src/views/Statistics/BuildingContrast.vue
@@ -2,7 +2,7 @@
   <div class="box-center">
     <!-- 头 -->
     <div class="app-titel">
-      <div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
+      <!-- <div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
       <div class="toptimeqhuan">
         <div :class="{ tophove: TimetoAhoose == 4 }" @click="tabtimetap(4)">
           近7天
@@ -19,7 +19,33 @@
           range-separator="-" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd"
           start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
-      </div>
+      </div> -->
+      <!-- <div class="app-titel projectBackend"> -->
+        <div class="titel-text">筛选日期：</div>
+        <div style="margin-left: 14px;">
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
+            @click="tabtimetap(4)"
+            >今天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 5 }"
+            @click="tabtimetap(5)"
+            >近7天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 6 }"
+            @click="tabtimetap(6)"
+            >近30天</el-button
+          >
+        </div>
+        <div style="margin-left: 26px">
+         <el-date-picker v-model="customtime" @change="confirmtime()" type="daterange" :clearable="false"
+          range-separator="-" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd"
+          start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+        </div>
+      <!-- </div> -->
       <!-- <el-select
           v-model="houseTypes"
           @change="sysChange"
@@ -789,10 +815,10 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  padding-top: 10px;
-  padding-bottom: 10px;
+  // padding-top: 10px;
+  // padding-bottom: 10px;
 
   .text1-1 {
     color: #666666;
@@ -868,4 +894,8 @@ export default {
     text-indent: 16px;
   }
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/ConsultantBrand.vue b/src/views/Statistics/ConsultantBrand.vue
index 807b2dd..28a0492 100644
--- a/src/views/Statistics/ConsultantBrand.vue
+++ b/src/views/Statistics/ConsultantBrand.vue
@@ -21,7 +21,7 @@
         </div>
       </div>
       <div class="app-titel">
-        <div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
+        <!-- <div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
         <div class="toptimeqhuan">
           <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
             近7天
@@ -45,7 +45,32 @@
             end-placeholder="结束日期"
           >
           </el-date-picker>
+        </div> -->
+        <div class="titel-text">筛选日期：</div>
+        <div style="margin-left: 14px;">
+          <el-button
+            :class="{ 'el-button--primary': dateType == 4 }"
+            @click="tabtimetap(4)"
+            >今天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': dateType == 5 }"
+            @click="tabtimetap(5)"
+            >近7天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': dateType == 6 }"
+            @click="tabtimetap(6)"
+            >近30天</el-button
+          >
+        </div>
+        <div style="margin-left: 26px">
+          <el-date-picker v-model="customtime" @change="confirmtime()" type="daterange" :clearable="false"
+            range-separator="-" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd"
+            start-placeholder="开始日期" end-placeholder="结束日期">
+          </el-date-picker>
         </div>
+      
         <div style="margin-left: 26px" class="div-lab">
           <div class="label">团队</div>
           <el-select
@@ -1250,10 +1275,10 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  padding-top: 10px;
-  padding-bottom: 10px;
+  // padding-top: 10px;
+  // padding-bottom: 10px;
   .text1-1 {
     color: #666666;
   }
@@ -1334,4 +1359,8 @@ export default {
   background: #2671e2 !important;
   border-color: #2671e2 !important;
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/MentoringAbility.vue b/src/views/Statistics/MentoringAbility.vue
index 89858ee..b45ae81 100644
--- a/src/views/Statistics/MentoringAbility.vue
+++ b/src/views/Statistics/MentoringAbility.vue
@@ -22,7 +22,7 @@
           </el-select>
         </div>
       </div>
-      <div class="app-titel">
+      <!-- <div class="app-titel">
         <div style="text-indent: 30px; min-width: 100px;font-weight:bold;">接待时间:</div>
         <div class="toptimeqhuan">
           <div :class="{ tophove: TimetoAhoose == 4 }" @click="tabtimetap(4)">
@@ -49,6 +49,32 @@
           >
           </el-date-picker>
         </div>
+      </div> -->
+      <div class="app-titel projectBackend">
+        <div class="titel-text">筛选日期：</div>
+        <div style="margin-left: 14px;">
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
+            @click="tabtimetap(4)"
+            >今天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 5 }"
+            @click="tabtimetap(5)"
+            >近7天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 6 }"
+            @click="tabtimetap(6)"
+            >近30天</el-button
+          >
+        </div>
+        <div style="margin-left: 26px">
+          <el-date-picker v-model="customtime" @change="confirmtime()" type="daterange" :clearable="false"
+            range-separator="-" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd"
+            start-placeholder="开始日期" end-placeholder="结束日期">
+          </el-date-picker>
+        </div>
       </div>
       <div class="app-titel">
         <div style="margin-left: 26px; margin-top: 12px" class="div-lab">
@@ -264,6 +290,7 @@
             <el-button @click="downLoad" icon="el-icon-download">导出</el-button>
           </div>
         </div>
+        <div style="padding:10px;background: #fff;">
         <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" height="640">
           <el-table-column prop="statDate" label="日期" align="center">
             <template slot-scope="scope">
@@ -370,6 +397,7 @@
           >
           </el-pagination>
         </div>
+        </div>
       </div>
     </div>
 
@@ -1221,7 +1249,7 @@ export default {
     display: flex;
     align-items: center;
     overflow: hidden;
-    margin-left: 20px;
+    margin-left: 10px;
     cursor: pointer;
   }
   .toptimeqhuan div {
@@ -1340,10 +1368,10 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  padding-top: 10px;
-  padding-bottom: 10px;
+  // padding-top: 10px;
+  // padding-bottom: 10px;
   .text1-1 {
     color: #666666;
   }
@@ -1439,4 +1467,9 @@ export default {
   background-size: 100%;
   margin-left: 6px;
 }
+
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/ReceptionOverview.vue b/src/views/Statistics/ReceptionOverview.vue
index be6846c..9e2668c 100644
--- a/src/views/Statistics/ReceptionOverview.vue
+++ b/src/views/Statistics/ReceptionOverview.vue
@@ -5,14 +5,24 @@
       <div class="app-titel" v-if="role != 3" style="margin-bottom: 10px">
         <div class="titel-text">项目选择:</div>
         <div style="margin-left: 26px">
-          <el-select v-model="houseId" filterable placeholder="请选择" @change="houseChange">
-            <el-option v-for="item in houseList" :key="item.id" :label="item.propertyName" :value="item.id">
+          <el-select
+            v-model="houseId"
+            filterable
+            placeholder="请选择"
+            @change="houseChange"
+          >
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.propertyName"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </div>
       </div>
-      <div class="app-titel">
-        <div style="text-indent: 30px;font-weight:bold;">接待时间:</div>
+      <!-- <div class="app-titel">
+        <div style="text-indent: 30px; font-weight: bold">接待时间:</div>
         <div class="toptimeqhuan">
           <div :class="{ tophove: TimetoAhoose == 4 }" @click="tabtimetap(4)">
             近7天
@@ -25,27 +35,76 @@
           </div>
         </div>
         <div style="margin-left: 26px">
-          <el-date-picker @change="confirmtime()" v-model="customtime" type="daterange" range-separator="-"
-            :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" start-placeholder="开始日期"
-            end-placeholder="结束日期" :picker-options="pickerOptions">
+          <el-date-picker
+            @change="confirmtime()"
+            v-model="customtime"
+            type="daterange"
+            range-separator="-"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :picker-options="pickerOptions"
+          >
+          </el-date-picker>
+        </div>
+      </div> -->
+      <div class="app-titel projectBackend">
+        <div class="titel-text">筛选日期：</div>
+        <div style="margin-left: 14px;">
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
+            @click="tabtimetap(4)"
+            >今天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 5 }"
+            @click="tabtimetap(5)"
+            >近7天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 6 }"
+            @click="tabtimetap(6)"
+            >近30天</el-button
+          >
+        </div>
+        <div style="margin-left: 26px">
+          <el-date-picker
+            @change="confirmtime()"
+            v-model="customtime"
+            :clearable="false"
+            type="daterange"
+            range-separator="-"
+            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          >
           </el-date-picker>
         </div>
       </div>
     </div>
 
     <!-- 二 -->
-    <div class="app-box-er" :style="{ 'margin-top': role != 3 ? '110px' : '70px' }">
+    <div
+      class="app-box-er"
+      :style="{ 'margin-top': role != 3 ? '110px' : '70px' }"
+    >
       <div class="container tabcard">
         <el-card shadow="hover" :class="{ tophovese: cardindex == 4 }">
           <div @click="Overviewxlick('4')">
             <div class="text1">
               平均执行率
-              <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均执行率；" placement="bottom-end">
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，有效接待（不包含待接单）的平均执行率；"
+                placement="bottom-end"
+              >
                 <i class="pop"></i>
               </el-tooltip>
             </div>
             <div class="text2">
-              {{ cardobj.fraction || 0 }}<span style="font-size: 24px;">%</span>
+              {{ cardobj.fraction || 0 }}<span style="font-size: 24px">%</span>
             </div>
             <div class="text3">
               <span>环比 {{ cardobjs.fraction || 0 }}</span>
@@ -64,7 +123,11 @@
           <div @click="Overviewxlick('3')">
             <div class="text1">
               平均接待时长
-              <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；"
+                placement="bottom-end"
+              >
                 <i class="pop"></i>
               </el-tooltip>
             </div>
@@ -77,7 +140,10 @@
                 +{{ cardobjCycle.receptionTimeWithAvg || 0 }}
                 <i class="up"></i>
               </span>
-              <span class="textDown" v-if="cardobjCycle.receptionTimeWithAvg < 0">
+              <span
+                class="textDown"
+                v-if="cardobjCycle.receptionTimeWithAvg < 0"
+              >
                 -{{ cardobjCycle.receptionTimeWithAvg || 0 }}
                 <i class="down"></i>
               </span>
@@ -88,8 +154,12 @@
           <div @click="Overviewxlick('1')">
             <div class="text1">
               接待量
-              <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
-               <i class="pop"></i>
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，已经结束的接待条数，不包含待接单；"
+                placement="bottom-end"
+              >
+                <i class="pop"></i>
               </el-tooltip>
             </div>
             <div class="text2">
@@ -112,7 +182,11 @@
           <div @click="Overviewxlick('2')">
             <div class="text1">
               有效接待
-              <el-tooltip effect="light" content="筛选时间内，标记为有效的接待数，不包含待接单；" placement="bottom-end">
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，标记为有效的接待数，不包含待接单；"
+                placement="bottom-end"
+              >
                 <i class="pop"></i>
               </el-tooltip>
             </div>
@@ -136,7 +210,11 @@
           <div @click="Overviewxlick('5')">
             <div class="text1">
               违禁接待次数
-              <el-tooltip effect="light" content="筛选时间内，出现违禁的接待次数，不包含待接单/无效接待/无效违禁；" placement="bottom-end">
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，出现违禁的接待次数，不包含待接单/无效接待/无效违禁；"
+                placement="bottom-end"
+              >
                 <i class="pop"></i>
               </el-tooltip>
             </div>
@@ -162,48 +240,65 @@
     </div>
 
     <!-- 三 -->
-    <div class="app-box-san" style="justify-content: space-between;">
-      <div class="zuo noflex" style="width:49%">
+    <div class="app-box-san" style="justify-content: space-between">
+      <div class="zuo noflex" style="width: 49%">
         <div class="title">
           <div class="text1">团队执行率趋势</div>
-          <div class="text2" style="justify-content: end;">
-            <el-select style="width: 60%;     margin-right: 20px;" @change="Pinspeaktap(1)" v-model="departmentsri"
-              placeholder="请选择">
-              <el-option v-for="item in departmentlist" :key="item.deptId" :label="item.name" :value="item.deptId">
+          <div class="text2" style="justify-content: end">
+            <el-select
+              style="width: 60%; margin-right: 20px"
+              @change="Pinspeaktap(1)"
+              v-model="departmentsri"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in departmentlist"
+                :key="item.deptId"
+                :label="item.name"
+                :value="item.deptId"
+              >
               </el-option>
             </el-select>
           </div>
         </div>
         <div class="hejisan">
-          <div class="sanbox1" style="width: 50%;text-align: center;">
+          <div class="sanbox1" style="width: 50%; text-align: center">
             <div class="text1-1">合计接待</div>
             <div class="text1-2">{{ Pinspeak.sum || 0 }}个</div>
           </div>
-          <div class="sanbox1" style="width: 50%;text-align: center;">
+          <div class="sanbox1" style="width: 50%; text-align: center">
             <div class="text1-1">均值</div>
             <div class="text1-2">{{ Pinspeak.avg || 0 }}%</div>
           </div>
         </div>
         <div id="Pinspeak1"></div>
       </div>
-      <div class="you noflex" style="width:49%">
+      <div class="you noflex" style="width: 49%">
         <div class="title">
           <div class="text1">顾问执行率趋势</div>
-          <div class="text2" style="justify-content: end;">
-            <el-select style="width: 60%;     margin-right: 20px;" @change="Pinspeaktap(2)" v-model="consultantsri"
-              placeholder="请选择">
-              <el-option v-for="item in consultantlist" :key="item.accountId" :label="item.name"
-                :value="item.accountId">
+          <div class="text2" style="justify-content: end">
+            <el-select
+              style="width: 60%; margin-right: 20px"
+              @change="Pinspeaktap(2)"
+              v-model="consultantsri"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in consultantlist"
+                :key="item.accountId"
+                :label="item.name"
+                :value="item.accountId"
+              >
               </el-option>
             </el-select>
           </div>
         </div>
         <div class="hejisan">
-          <div class="sanbox1" style="width: 50%;text-align: center;">
+          <div class="sanbox1" style="width: 50%; text-align: center">
             <div class="text1-1">合计接待</div>
             <div class="text1-2">{{ Pinspeak2.sum || 0 }}个</div>
           </div>
-          <div class="sanbox1" style="width: 50%;text-align: center;">
+          <div class="sanbox1" style="width: 50%; text-align: center">
             <div class="text1-1">均值</div>
             <div class="text1-2">{{ Pinspeak2.avg || 0 }}%</div>
           </div>
@@ -215,11 +310,17 @@
     <!-- 四 -->
     <div class="app-box-san">
       <div class="zuo">
-        <div class="title nof" style="border:none">
+        <div class="title nof" style="border: none">
           <!-- <div class="text1" style="font-size: 14px;">顾问{{ activeName | abName }}排名（TOP10）</div> -->
-          <div class="text1" style="font-size: 14px;height: 44px;">顾问排名（TOP10）</div>
-          <div style="font-size: 14px;margin-left: 20px;" class="text2">
-            <el-radio-group v-model="activeName" size="medium" @change="handleClick">
+          <div class="text1" style="font-size: 14px; height: 44px">
+            顾问排名（TOP10）
+          </div>
+          <div style="font-size: 14px; margin-left: 20px" class="text2">
+            <el-radio-group
+              v-model="activeName"
+              size="medium"
+              @change="handleClick"
+            >
               <el-radio-button label="3">平均执行率</el-radio-button>
               <el-radio-button label="0">接待量</el-radio-button>
               <el-radio-button label="1">接待时长</el-radio-button>
@@ -234,7 +335,7 @@
           </div>
         </div>
         <div class="hejisan">
-          <div class="sanbox1" style="width: 30%;    text-align: center;">
+          <div class="sanbox1" style="width: 30%; text-align: center">
             <div class="text1-1">
               {{ activeName == "3" ? "平均执行率" : "合计" }}
             </div>
@@ -242,12 +343,12 @@
               {{ ceratelist.avg || 0 }}{{ activeName | company }}
             </div>
           </div>
-          <div class="sanbox1" style="width: 40%;    text-align: center;">
+          <div class="sanbox1" style="width: 40%; text-align: center">
             <div class="text1-1">顾问</div>
             <div class="text1-2">{{ ceratelist.num || 0 }}个</div>
           </div>
           <template v-if="activeName != '3'">
-            <div class="sanbox1" style="width: 30%;    text-align: center;">
+            <div class="sanbox1" style="width: 30%; text-align: center">
               <div class="text1-1">{{ activeName | comName }}</div>
               <div class="text1-2">
                 {{ ceratelist.avg || 0 }}{{ activeName | company }}
@@ -285,11 +386,11 @@
           <div class="nulllist" v-if="ceratelist.list.length == 0">
             <div class="imgboxc">
               <!-- <img class="imgboxc-img" src="/img/nullnull.png" alt="" /> -->
-              <div class="nulltext" style="font-size:14px;">暂无数据</div>
+              <div class="nulltext" style="font-size: 14px">暂无数据</div>
             </div>
           </div>
         </div>
-        <div v-else id="xxx" style="width:100%;height:400px"></div>
+        <div v-else id="xxx" style="width: 100%; height: 400px"></div>
       </div>
       <!-- <div class="you">
         <div class="title">
@@ -354,44 +455,90 @@
     </div>
 
     <!-- 五 -->
-    <div class="app-box-san" style="justify-content: space-between;">
-      <div class="zuo noflex" style="width:49%">
+    <div class="app-box-san" style="justify-content: space-between">
+      <div class="zuo noflex" style="width: 49%">
         <div class="title">
-          <div class="text1">场景执行率
-            <el-tooltip effect="light"
+          <div class="text1">
+            场景执行率
+            <el-tooltip
+              effect="light"
               content="筛选时间内，场景执行率=场景执行的接待次数/有效接待数*100%,例如：品牌介绍，10次有效接待，有5次接待中都出现了品牌介绍，场景执行率=5/10*100%=50%；"
-              placement="bottom-end">
+              placement="bottom-end"
+            >
               <i class="pop"></i>
             </el-tooltip>
           </div>
         </div>
-        <div v-if="Zxllist.length != 0" style="
+        <div
+          v-if="Zxllist.length != 0"
+          style="
             overflow-y: auto;
             height: 320px;
             width: 94%;
             margin: 0 auto;
             margin-top: 15px;
             margin-bottom: 16px;
-          ">
+          "
+        >
           <div class="jinbox" v-for="(item, i) in Zxllist" :key="i">
             <!-- <div class="jinboxtit">{{ item.name }}</div> -->
-            <span class="sequenceNum" :style="{
-              'background': i + 1 == 1 ? 'linear-gradient(180deg, #FFA395 0%, #F54D3F 100%)' : i + 1 == 2 ? 'linear-gradient(180deg, #FFBE70 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(180deg, #FFE683 0%, #FFCC00 100%)' : '#E5F0FF',
-              'color': i + 1 == 1 ? '#FFF' : i + 1 == 2 ? '#FFF' : i + 1 == 3 ? '#FFF' : '#333',
-              'box-shadow': i + 1 == 1 ? '0px 0px 6px 1px #F54D3F' : i + 1 == 2 ? '0px 0px 6px 1px #FF981E' : i + 1 == 3 ? '0px 0px 6px 1px #FFCC00' : '#E5F0FF',
-            }">{{ i + 1 }}</span>
+            <span
+              class="sequenceNum"
+              :style="{
+                background:
+                  i + 1 == 1
+                    ? 'linear-gradient(180deg, #FFA395 0%, #F54D3F 100%)'
+                    : i + 1 == 2
+                    ? 'linear-gradient(180deg, #FFBE70 0%, #FF981E 100%)'
+                    : i + 1 == 3
+                    ? 'linear-gradient(180deg, #FFE683 0%, #FFCC00 100%)'
+                    : '#E5F0FF',
+                color:
+                  i + 1 == 1
+                    ? '#FFF'
+                    : i + 1 == 2
+                    ? '#FFF'
+                    : i + 1 == 3
+                    ? '#FFF'
+                    : '#333',
+                'box-shadow':
+                  i + 1 == 1
+                    ? '0px 0px 6px 1px #F54D3F'
+                    : i + 1 == 2
+                    ? '0px 0px 6px 1px #FF981E'
+                    : i + 1 == 3
+                    ? '0px 0px 6px 1px #FFCC00'
+                    : '#E5F0FF',
+              }"
+              >{{ i + 1 }}</span
+            >
             <div class="jinboxtit">
-              <el-tooltip class="item" effect="dark" :content="item.name" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="item.name"
+                placement="top-start"
+              >
                 <span class="name">{{ item.name }}</span>
               </el-tooltip>
               <!-- <span class="name">{{ item.name }}</span> -->
             </div>
             <div class="jinbox-box">
               <!-- <div class="boxbaifenbi" :style="'width:' + item.zxl + '%;'"></div> -->
-              <div class="boxbaifenbi"
-                :style="{ 'background': i + 1 == 1 ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)' : i + 1 == 2 ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)' : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)', 'width': item.zxl + '%' }">
-              </div>
-
+              <div
+                class="boxbaifenbi"
+                :style="{
+                  background:
+                    i + 1 == 1
+                      ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)'
+                      : i + 1 == 2
+                      ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)'
+                      : i + 1 == 3
+                      ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)'
+                      : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)',
+                  width: item.zxl + '%',
+                }"
+              ></div>
             </div>
             <div class="jinboxbott">{{ item.zxl }}%</div>
           </div>
@@ -399,53 +546,109 @@
         <div class="nulllist" v-if="Zxllist.length == 0">
           <div class="imgboxc">
             <!-- <img class="imgboxc-img" src="/img/nullnull.png" alt="" /> -->
-            <div class="nulltext" style="font-size:14px;">暂无数据</div>
+            <div class="nulltext" style="font-size: 14px">暂无数据</div>
           </div>
         </div>
       </div>
-      <div class="you noflex" style="width:49%">
+      <div class="you noflex" style="width: 49%">
         <div class="title">
-          <div class="text1">指标执行率
-            <el-tooltip effect="light"
+          <div class="text1">
+            指标执行率
+            <el-tooltip
+              effect="light"
               content="筛选时间内，指标执行率=指标执行的接待次数/有效接待数*100%,例如：品牌介绍，10次有效接待，有5次接待中都出现了品牌介绍，指标执行率=5/10*100%=50%；"
-              placement="bottom-end">
+              placement="bottom-end"
+            >
               <i class="pop"></i>
             </el-tooltip>
           </div>
           <div class="text2"></div>
-          <div class="text2" style="justify-content: end;">
-            <el-select style="width: 70%;     margin-right: 20px;" @change="zxltapchang()" v-model="marketingId"
-              placeholder="请选择">
-              <el-option v-for="item in Zxllist" :key="item.marketingId" :label="item.name" :value="item.marketingId">
+          <div class="text2" style="justify-content: end">
+            <el-select
+              style="width: 70%; margin-right: 20px"
+              @change="zxltapchang()"
+              v-model="marketingId"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in Zxllist"
+                :key="item.marketingId"
+                :label="item.name"
+                :value="item.marketingId"
+              >
               </el-option>
             </el-select>
           </div>
         </div>
-        <div v-if="Zxllistchildren.length != 0" style="
+        <div
+          v-if="Zxllistchildren.length != 0"
+          style="
             overflow-y: auto;
             height: 320px;
             width: 94%;
             margin: 0 auto;
             margin-top: 15px;
             margin-bottom: 16px;
-          ">
+          "
+        >
           <div class="jinbox" v-for="(item, i) in Zxllistchildren" :key="i">
             <!-- <div class="jinboxtit">{{ item.name }}</div> -->
-            <span class="sequenceNum" :style="{
-              'background': i + 1 == 1 ? 'linear-gradient(180deg, #FFA395 0%, #F54D3F 100%)' : i + 1 == 2 ? 'linear-gradient(180deg, #FFBE70 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(180deg, #FFE683 0%, #FFCC00 100%)' : '#E5F0FF',
-              'color': i + 1 == 1 ? '#FFF' : i + 1 == 2 ? '#FFF' : i + 1 == 3 ? '#FFF' : '#333',
-              'box-shadow': i + 1 == 1 ? '0px 0px 6px 1px #F54D3F' : i + 1 == 2 ? '0px 0px 6px 1px #FF981E' : i + 1 == 3 ? '0px 0px 6px 1px #FFCC00' : '#E5F0FF',
-            }">{{ i + 1 }}</span>
+            <span
+              class="sequenceNum"
+              :style="{
+                background:
+                  i + 1 == 1
+                    ? 'linear-gradient(180deg, #FFA395 0%, #F54D3F 100%)'
+                    : i + 1 == 2
+                    ? 'linear-gradient(180deg, #FFBE70 0%, #FF981E 100%)'
+                    : i + 1 == 3
+                    ? 'linear-gradient(180deg, #FFE683 0%, #FFCC00 100%)'
+                    : '#E5F0FF',
+                color:
+                  i + 1 == 1
+                    ? '#FFF'
+                    : i + 1 == 2
+                    ? '#FFF'
+                    : i + 1 == 3
+                    ? '#FFF'
+                    : '#333',
+                'box-shadow':
+                  i + 1 == 1
+                    ? '0px 0px 6px 1px #F54D3F'
+                    : i + 1 == 2
+                    ? '0px 0px 6px 1px #FF981E'
+                    : i + 1 == 3
+                    ? '0px 0px 6px 1px #FFCC00'
+                    : '#E5F0FF',
+              }"
+              >{{ i + 1 }}</span
+            >
             <div class="jinboxtit">
-              <el-tooltip class="item" effect="dark" :content="item.name" placement="top-start">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="item.name"
+                placement="top-start"
+              >
                 <span class="name">{{ item.name }}</span>
               </el-tooltip>
               <!-- <span class="name">{{ item.name }}</span> -->
             </div>
             <div class="jinbox-box">
-              <div class="boxbaifenbi"
-                :style="{ 'background': i + 1 == 1 ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)' : i + 1 == 2 ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)' : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)', 'width': item.zxl + '%' }">
-              </div>
+              <div
+                class="boxbaifenbi"
+                :style="{
+                  background:
+                    i + 1 == 1
+                      ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)'
+                      : i + 1 == 2
+                      ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)'
+                      : i + 1 == 3
+                      ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)'
+                      : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)',
+                  width: item.zxl + '%',
+                }"
+              ></div>
 
               <!-- <div class="boxbaifenbi" :style="'width:' + item.zxl + '%;'"></div> -->
             </div>
@@ -455,7 +658,7 @@
         <div class="nulllist" v-if="Zxllistchildren.length == 0">
           <div class="imgboxc">
             <!-- <img class="imgboxc-img" src="/img/nullnull.png" alt="" /> -->
-            <div class="nulltext" style="font-size:14px;">暂无数据</div>
+            <div class="nulltext" style="font-size: 14px">暂无数据</div>
           </div>
         </div>
       </div>
@@ -465,7 +668,7 @@
 
 <script>
 import * as echarts from "echarts";
-import colorTheme from "../../util/theme.color"
+import colorTheme from "../../util/theme.color";
 export default {
   data() {
     return {
@@ -527,11 +730,11 @@ export default {
   watch: {
     ceratelist: {
       handler(newVal) {
-        this.barStatistics(newVal.list)
+        this.barStatistics(newVal.list);
       },
       immediate: true,
-      deep: true // 表示开启深度监听
-    }
+      deep: true, // 表示开启深度监听
+    },
   },
   mounted() {
     this.role = localStorage.getItem("orgType");
@@ -698,14 +901,14 @@ export default {
       });
     },
     barStatistics(e) {
-      let names = []
-      e.map(i => {
-        names.push(i.name)
-      })
-      let values = []
-      e.map(i => {
-        values.push(i.zxl)
-      })
+      let names = [];
+      e.map((i) => {
+        names.push(i.name);
+      });
+      let values = [];
+      e.map((i) => {
+        values.push(i.zxl);
+      });
 
       values = values.map((i, k) => {
         switch (k) {
@@ -713,140 +916,166 @@ export default {
             return {
               value: values[0],
               itemStyle: {
-                color: '#E6625B'
-              }
-            }
+                color: "#E6625B",
+              },
+            };
             break;
           case 1:
             return {
               value: values[1],
               itemStyle: {
-                color: '#FF981E'
-              }
-            }
+                color: "#FF981E",
+              },
+            };
           case 2:
             return {
               value: values[2],
               itemStyle: {
-                color: '#FFCC00'
-              }
-            }
+                color: "#FFCC00",
+              },
+            };
 
           default:
             return {
               value: values[k],
               itemStyle: {
-                color: '#07B79D'
-              }
-            }
+                color: "#07B79D",
+              },
+            };
             break;
         }
-      })
+      });
 
       if (this.activeName == "1") {
-        values.map(i => {
-          let m = i.value.split(":")[0]
-          let s = i.value.split(":")[1]
-          let totalS = Number(m) * 60 + Number(s)
-          i.value = totalS
-        })
+        values.map((i) => {
+          let m = i.value.split(":")[0];
+          let s = i.value.split(":")[1];
+          let totalS = Number(m) * 60 + Number(s);
+          i.value = totalS;
+        });
       }
 
       echarts.init(document.getElementById("xxx")).dispose(); // 销毁实例
-      let chartDom = document.getElementById('xxx');
+      let chartDom = document.getElementById("xxx");
       let myChart = echarts.init(chartDom);
       let option;
-      let _this = this
+      let _this = this;
       option = {
         tooltip: {
-          trigger: 'axis',
-          backgroundColor: 'rgba(255, 255, 255, 0.8)',
-          extraCssText: 'box-shadow: 0 0 8px rgba(0, 0, 0, 0.3);width:150px;padding:10px',
+          trigger: "axis",
+          backgroundColor: "rgba(255, 255, 255, 0.8)",
+          extraCssText:
+            "box-shadow: 0 0 8px rgba(0, 0, 0, 0.3);width:150px;padding:10px",
           textStyle: {
-            color: "#000"
+            color: "#000",
           },
           axisPointer: {
-            type: 'line',
+            type: "line",
           },
           formatter: function (params) {
             switch (_this.activeName) {
               case "1":
                 let s = params[0].value % 60;
                 let m = params[0].value / 60;
-                return params[0].name + '<br/>' + params[0].marker + '接待时常:' + parseInt(m) + ':' + s;
+                return (
+                  params[0].name +
+                  "<br/>" +
+                  params[0].marker +
+                  "接待时常:" +
+                  parseInt(m) +
+                  ":" +
+                  s
+                );
               case "2":
-                return params[0].name + '<br/>' + params[0].marker + '违禁次数:' + params[0].value + '次';
+                return (
+                  params[0].name +
+                  "<br/>" +
+                  params[0].marker +
+                  "违禁次数:" +
+                  params[0].value +
+                  "次"
+                );
               case "3":
-                return params[0].name + '<br/>' + params[0].marker + '执行率:' + params[0].value + '%';
+                return (
+                  params[0].name +
+                  "<br/>" +
+                  params[0].marker +
+                  "执行率:" +
+                  params[0].value +
+                  "%"
+                );
               default:
-                return params[0].name + '<br/>' + params[0].marker + '接待量:' + params[0].value + '次';
+                return (
+                  params[0].name +
+                  "<br/>" +
+                  params[0].marker +
+                  "接待量:" +
+                  params[0].value +
+                  "次"
+                );
             }
-          }
+          },
         },
         grid: {
-          left: '3%',
-          right: '4%',
+          left: "3%",
+          right: "4%",
           bottom: 18,
-          containLabel: true
+          containLabel: true,
         },
         xAxis: {
-          type: 'category',
+          type: "category",
           data: names,
           splitLine: { show: false },
           axisTick: {
-            alignWithLabel: true
-          }
+            alignWithLabel: true,
+          },
         },
         yAxis: {
-          type: 'value'
+          type: "value",
         },
         series: [
           {
             label: {
               show: true,
-              position: 'top',
+              position: "top",
               fontSize: 16,
               formatter: function (params) {
-                console.log(params)
+                console.log(params);
                 switch (_this.activeName) {
                   case "1":
                     let s = params.value % 60;
                     let m = params.value / 60;
-                    return parseInt(m) + ':' + s;
+                    return parseInt(m) + ":" + s;
                   case "2":
-                    return params.value + '次'
+                    return params.value + "次";
                   case "3":
-                    return params.value + '%';
+                    return params.value + "%";
                   default:
-                    return params.value + '次'
+                    return params.value + "次";
                 }
-              }
+              },
             },
             data: values,
-            type: 'bar',
-            barCategoryGap: '70%',
+            type: "bar",
+            barCategoryGap: "70%",
             barWidth: 32,
             itemStyle: {
               normal: {
-                color: new echarts.graphic.LinearGradient(
-                  0, 0, 0, 1,
-                  [
-                    { offset: 0, color: '#9837dd' },                   //柱图渐变色
-                    { offset: 1, color: '#e23af5' },                   //柱图渐变色
-                  ]
-                ),
-                barBorderRadius: [4, 4, 0, 0]
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  { offset: 0, color: "#9837dd" }, //柱图渐变色
+                  { offset: 1, color: "#e23af5" }, //柱图渐变色
+                ]),
+                barBorderRadius: [4, 4, 0, 0],
               },
             },
-          }
-        ]
+          },
+        ],
       };
 
-        option && myChart.setOption(option);
-        window.addEventListener("resize", () => {
-          myChart.resize();
-        });
-      
+      option && myChart.setOption(option);
+      window.addEventListener("resize", () => {
+        myChart.resize();
+      });
     },
     // 格式化时间
     formatDate(t) {
@@ -1091,7 +1320,7 @@ export default {
         legend: {
           data: [Strname],
           top: "10",
-          icon: "roundRect"
+          icon: "roundRect",
         },
         grid: {
           left: 10,
@@ -1124,15 +1353,12 @@ export default {
             type: "line",
             smooth: true,
             areaStyle: {
-              color: new echarts.graphic.LinearGradient(
-                0, 0, 0, 1,
-                [
-                  { offset: 0, color: colorTheme.colorArr[0] },
-                  { offset: 1, color: "#fff" }
-                ]
-              ),
-              opacity: 0.1
-            }
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: colorTheme.colorArr[0] },
+                { offset: 1, color: "#fff" },
+              ]),
+              opacity: 0.1,
+            },
           },
         ],
       };
@@ -1232,7 +1458,7 @@ export default {
         legend: {
           data: ["执行率/%"],
           top: "10",
-          icon: "roundRect"
+          icon: "roundRect",
         },
         grid: {
           left: 10,
@@ -1293,15 +1519,12 @@ export default {
             type: "line",
             smooth: true,
             areaStyle: {
-              color: new echarts.graphic.LinearGradient(
-                0, 0, 0, 1,
-                [
-                  { offset: 0, color: colorTheme.colorArr[0] },
-                  { offset: 1, color: "#fff" }
-                ]
-              ),
-              opacity: 0.1
-            }
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: colorTheme.colorArr[0] },
+                { offset: 1, color: "#fff" },
+              ]),
+              opacity: 0.1,
+            },
           },
         ],
       };
@@ -1327,7 +1550,7 @@ export default {
         legend: {
           data: ["执行率/%"],
           top: "10",
-          icon: "roundRect"
+          icon: "roundRect",
         },
         grid: {
           left: 10,
@@ -1388,15 +1611,12 @@ export default {
             type: "line",
             smooth: true,
             areaStyle: {
-              color: new echarts.graphic.LinearGradient(
-                0, 0, 0, 1,
-                [
-                  { offset: 0, color: colorTheme.colorArr[0] },
-                  { offset: 1, color: "#fff" }
-                ]
-              ),
-              opacity: 0.1
-            }
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: colorTheme.colorArr[0] },
+                { offset: 1, color: "#fff" },
+              ]),
+              opacity: 0.1,
+            },
           },
         ],
       };
@@ -1520,7 +1740,7 @@ export default {
   height: 24px;
   justify-content: center;
   align-items: center;
-  background: #E5F0FF;
+  background: #e5f0ff;
   border-radius: 15px;
   color: #333333;
 }
@@ -1569,7 +1789,6 @@ export default {
     display: flex;
     align-items: center;
 
-
     .textUp {
       font-size: 14px;
       display: flex;
@@ -1586,7 +1805,8 @@ export default {
         display: block;
         width: 20px;
         height: 15px;
-        background: url("../../../public/img/indexIcon/indexCardUp.png") no-repeat;
+        background: url("../../../public/img/indexIcon/indexCardUp.png")
+          no-repeat;
         background-size: 100%;
         margin-left: 12px;
       }
@@ -1607,7 +1827,8 @@ export default {
         display: block;
         width: 20px;
         height: 15px;
-        background: url("../../../public/img/indexIcon/indexCardDown.png") no-repeat;
+        background: url("../../../public/img/indexIcon/indexCardDown.png")
+          no-repeat;
         background-size: 100%;
         margin-left: 8px;
       }
@@ -1625,8 +1846,6 @@ export default {
   display: grid;
   grid-template-columns: repeat(5, 19%);
   grid-column-gap: 12px;
-
-
 }
 
 // 进度条
@@ -1654,7 +1873,7 @@ export default {
       height: 24px;
       justify-content: center;
       align-items: center;
-      background: #E5F0FF;
+      background: #e5f0ff;
       border-radius: 15px;
       margin-right: 10px;
       color: #333333;
@@ -1666,7 +1885,6 @@ export default {
       overflow: hidden;
       margin-left: 10px;
     }
-
   }
 
   .jinbox-box {
@@ -1842,7 +2060,6 @@ export default {
   background: #2671e2;
 }
 
-
 .app-top {
   background: #ffffff;
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
@@ -1892,9 +2109,9 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  margin-top: 64px;
+  // margin-top: 64px;
 
   .text1-1 {
     font-size: 16px;
@@ -1919,23 +2136,27 @@ export default {
 }
 
 .el-icon-caret-top {
-  color: #FF0000;
+  color: #ff0000;
 }
 
 .nulllist {
   height: 396px;
 }
 
-/deep/ .el-radio-button__orig-radio:checked+.el-radio-button__inner{
+/deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
   background: #2671e2 !important;
   border-color: #2671e2 !important;
 }
-.pop{
+.pop {
   display: inline-block;
   width: 18px;
   height: 18px;
-  background: url('../../../public/img/pop.png') no-repeat;
+  background: url("../../../public/img/pop.png") no-repeat;
   background-size: 100%;
   margin-left: 6px;
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/ReceptionStatistical.vue b/src/views/Statistics/ReceptionStatistical.vue
index 8232598..082da12 100644
--- a/src/views/Statistics/ReceptionStatistical.vue
+++ b/src/views/Statistics/ReceptionStatistical.vue
@@ -748,10 +748,10 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  padding-top: 10px;
-  padding-bottom: 10px;
+  // padding-top: 10px;
+  // padding-bottom: 10px;
   .text1-1 {
     color: #666666;
   }
diff --git a/src/views/Statistics/TheTeamCompared.vue b/src/views/Statistics/TheTeamCompared.vue
index aa232ca..65f5806 100644
--- a/src/views/Statistics/TheTeamCompared.vue
+++ b/src/views/Statistics/TheTeamCompared.vue
@@ -12,7 +12,7 @@
         </div>
       </div>
 
-      <div class="app-titel">
+      <!-- <div class="app-titel">
         <div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
         <div class="toptimeqhuan">
           <div :class="{ tophove: TimetoAhoose == 4 }" @click="tabtimetap(4)">
@@ -34,6 +34,32 @@
         <div style="margin-left: auto; margin-right: 10px" v-if="sta_team_downLoad">
           <el-button @click="downLoad" icon="el-icon-download">导出</el-button>
         </div>
+      </div> -->
+      <div class="app-titel projectBackend">
+        <div class="titel-text">筛选日期：</div>
+        <div style="margin-left: 14px;">
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
+            @click="tabtimetap(4)"
+            >今天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 5 }"
+            @click="tabtimetap(5)"
+            >近7天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 6 }"
+            @click="tabtimetap(6)"
+            >近30天</el-button
+          >
+        </div>
+        <div style="margin-left: 26px">
+          <el-date-picker v-model="customtime" @change="confirmtime()" type="daterange" :clearable="false"
+            range-separator="-" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd"
+            start-placeholder="开始日期" end-placeholder="结束日期">
+          </el-date-picker>
+        </div>
       </div>
     </div>
     <!-- 表格 -->
@@ -1058,10 +1084,10 @@ tbody tr {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  padding-top: 10px;
-  padding-bottom: 10px;
+  // padding-top: 10px;
+  // padding-bottom: 10px;
 
   .text1-1 {
     color: #666666;
@@ -1150,4 +1176,8 @@ tbody tr {
   background-size: 100%;
   margin-left: 6px;
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/dataScreeAge.vue b/src/views/Statistics/dataScreeAge.vue
index 2612b6f..8b65409 100644
--- a/src/views/Statistics/dataScreeAge.vue
+++ b/src/views/Statistics/dataScreeAge.vue
@@ -87,8 +87,8 @@
         <div style="line-height: 40px; font-weight: bold">时段统计</div>
         <div>
           <div class="app-titel">
-            <div class="toptimeqhuan">
-              <div :class="{ tophove: dateType1 == 1 }" @click="tabtimetap1(1)">
+            <div class="">
+              <!-- <div :class="{ tophove: dateType1 == 1 }" @click="tabtimetap1(1)">
                 近7天
               </div>
               <div :class="{ tophove: dateType1 == 3 }" @click="tabtimetap1(3)">
@@ -96,7 +96,22 @@
               </div>
               <div :class="{ tophove: dateType1 == 2 }" @click="tabtimetap1(2)">
                 近30天
-              </div>
+              </div> -->
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 1 }"
+                @click="tabtimetap1(1)"
+                >近7天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 3 }"
+                @click="tabtimetap1(3)"
+                >近15天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 2 }"
+                @click="tabtimetap1(2)"
+                >近30天</el-button
+              >
             </div>
             <div style="margin-left: 26px">
               <el-date-picker @change="confirmtime1()" v-model="customtime1" type="daterange" range-separator="-"
@@ -220,8 +235,8 @@
         <div style="line-height: 30px; font-weight: bold">整体看板</div>
         <div>
           <div class="app-titel">
-            <div class="toptimeqhuan">
-              <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
+            <div class="">
+              <!-- <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
                 近7天
               </div>
               <div :class="{ tophove: dateType == 5 }" @click="tabtimetap(5)">
@@ -229,7 +244,22 @@
               </div>
               <div :class="{ tophove: dateType == 6 }" @click="tabtimetap(6)">
                 近30天
-              </div>
+              </div> -->
+              <el-button
+                :class="{ 'el-button--primary': dateType == 4 }"
+                @click="tabtimetap(4)"
+                >近7天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 5 }"
+                @click="tabtimetap(5)"
+                >近15天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 6 }"
+                @click="tabtimetap(6)"
+                >近30天</el-button
+              >
             </div>
             <div style="margin-left: 26px">
               <el-date-picker @change="confirmtime()" v-model="customtime" type="daterange" range-separator="-"
@@ -1694,9 +1724,9 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  margin-top: 15px;
+  // margin-top: 15px;
 
   .text1-1 {
     color: #666666;
@@ -1729,4 +1759,8 @@ export default {
 /deep/ .el-button--text{
   color: #2671E2;
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/dataScreeOrg.vue b/src/views/Statistics/dataScreeOrg.vue
index fa83a7f..bcb6081 100644
--- a/src/views/Statistics/dataScreeOrg.vue
+++ b/src/views/Statistics/dataScreeOrg.vue
@@ -206,8 +206,8 @@
         <div style="line-height: 40px; font-weight: bold">时段统计</div>
         <div>
           <div class="app-titel">
-            <div class="toptimeqhuan">
-              <div :class="{ tophove: dateType1 == 1 }" @click="tabtimetap1(1)">
+            <div class="">
+              <!-- <div :class="{ tophove: dateType1 == 1 }" @click="tabtimetap1(1)">
                 近7天
               </div>
               <div :class="{ tophove: dateType1 == 3 }" @click="tabtimetap1(3)">
@@ -215,7 +215,22 @@
               </div>
               <div :class="{ tophove: dateType1 == 2 }" @click="tabtimetap1(2)">
                 近30天
-              </div>
+              </div> -->
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 1 }"
+                @click="tabtimetap1(1)"
+                >近7天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 3 }"
+                @click="tabtimetap1(3)"
+                >近15天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 2 }"
+                @click="tabtimetap1(2)"
+                >近30天</el-button
+              >
             </div>
             <div style="margin-left: 26px">
               <el-date-picker @change="confirmtime1()" v-model="customtime1" type="daterange" range-separator="-"
@@ -327,8 +342,8 @@
         <div style="line-height: 30px; font-weight: bold">整体看板</div>
         <div>
           <div class="app-titel">
-            <div class="toptimeqhuan">
-              <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
+            <div class="">
+              <!-- <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
                 近7天
               </div>
               <div :class="{ tophove: dateType == 5 }" @click="tabtimetap(5)">
@@ -336,7 +351,22 @@
               </div>
               <div :class="{ tophove: dateType == 6 }" @click="tabtimetap(6)">
                 近30天
-              </div>
+              </div> -->
+              <el-button
+                :class="{ 'el-button--primary': dateType == 4 }"
+                @click="tabtimetap(4)"
+                >近7天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 5 }"
+                @click="tabtimetap(5)"
+                >近15天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 6 }"
+                @click="tabtimetap(6)"
+                >近30天</el-button
+              >
             </div>
             <div style="margin-left: 26px">
               <el-date-picker @change="confirmtime()" v-model="customtime" type="daterange" range-separator="-"
@@ -1726,9 +1756,9 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  margin-top: 15px;
+  // margin-top: 15px;
 
   .text1-1 {
     color: #666666;
@@ -1761,4 +1791,8 @@ export default {
 /deep/ .el-button--text{
   color: #2671E2;
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/dataScreeSys.vue b/src/views/Statistics/dataScreeSys.vue
index 0fe7c81..de9a06c 100644
--- a/src/views/Statistics/dataScreeSys.vue
+++ b/src/views/Statistics/dataScreeSys.vue
@@ -3,23 +3,65 @@
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" style="margin-left: 15px">
-        <el-select v-model="houseTypes" @change="sysChange" style="width: 100px; margin-right: 10px" placeholder="请选择">
-          <el-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
+        <el-select
+          v-model="houseTypes"
+          @change="sysChange"
+          style="width: 100px; margin-right: 10px"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in options2"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
           </el-option>
         </el-select>
-        <el-select v-model="selValue" @change="selChange" style="width: 100px" placeholder="请选择">
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+        <el-select
+          v-model="selValue"
+          @change="selChange"
+          style="width: 100px"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
           </el-option>
         </el-select>
         <div style="margin-left: 26px" v-if="selValue == 1">
-          <el-select v-model="choicValue" @change="valuechange" placeholder="默认为全部" filterable clearable>
-            <el-option v-for="item in houseList" :key="item.orgCode" :label="item.name" :value="item.orgCode">
+          <el-select
+            v-model="choicValue"
+            @change="valuechange"
+            placeholder="默认为全部"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in houseList"
+              :key="item.orgCode"
+              :label="item.name"
+              :value="item.orgCode"
+            >
             </el-option>
           </el-select>
         </div>
         <div style="margin-left: 26px" v-if="selValue == 0">
-          <el-select v-model="choicValue" @change="valuechange" clearable filterable placeholder="默认为全部">
-            <el-option v-for="item in houseList" :key="item.id" :label="item.agentName" :value="item.id">
+          <el-select
+            v-model="choicValue"
+            @change="valuechange"
+            clearable
+            filterable
+            placeholder="默认为全部"
+          >
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.agentName"
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </div>
@@ -27,98 +69,242 @@
     </div>
 
     <!-- 二 -->
-    <div class="app-box-er" style="margin-top:60px">
+    <div class="app-box-er" style="margin-top: 60px">
       <div class="container">
-        <div v-if="agentissow" class="cardItem" @click="changeTab('代理商数')" :class="{ borderCss: tabName == '代理商数' }">
+        <div
+          v-if="agentissow"
+          class="cardItem"
+          @click="changeTab('代理商数')"
+          :class="{ borderCss: tabName == '代理商数' }"
+        >
           <span>代理商数</span>
           <h2>{{ firstTab.agentQuantity || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '代理商数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div v-if="agentissow" class="cardItem" @click="changeTab('服务期内代理商数')"
-          :class="{ borderCss: tabName == '服务期内代理商数' }">
+        <div
+          v-if="agentissow"
+          class="cardItem"
+          @click="changeTab('服务期内代理商数')"
+          :class="{ borderCss: tabName == '服务期内代理商数' }"
+        >
           <span>服务期内代理商数</span>
           <h2>{{ firstTab.agentQofEnough || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '服务期内代理商数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div v-if="agentissow" class="cardItem" @click="changeTab('过期代理商数')"
-          :class="{ borderCss: tabName == '过期代理商数' }">
+        <div
+          v-if="agentissow"
+          class="cardItem"
+          @click="changeTab('过期代理商数')"
+          :class="{ borderCss: tabName == '过期代理商数' }"
+        >
           <span>过期代理商数</span>
           <h2>{{ firstTab.agentQofUnenough || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '过期代理商数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('项目总数')" :class="{ borderCss: tabName == '项目总数' }">
+        <div
+          class="cardItem"
+          @click="changeTab('项目总数')"
+          :class="{ borderCss: tabName == '项目总数' }"
+        >
           <span>项目总数</span>
           <h2>{{ firstTab.houseQuantity || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '项目总数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('服务期内项目总数')" :class="{ borderCss: tabName == '服务期内项目总数' }">
+        <div
+          class="cardItem"
+          @click="changeTab('服务期内项目总数')"
+          :class="{ borderCss: tabName == '服务期内项目总数' }"
+        >
           <span>服务期内项目总数</span>
           <h2>{{ firstTab.houseQofEnough || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '服务期内项目总数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('试用项目数')" :class="{ borderCss: tabName == '试用项目数' }"
-          v-if='houseTypes == "0,1"'>
+        <div
+          class="cardItem"
+          @click="changeTab('试用项目数')"
+          :class="{ borderCss: tabName == '试用项目数' }"
+          v-if="houseTypes == '0,1'"
+        >
           <span>试用项目数</span>
           <h2>{{ firstTab.houseQuantityOfTryOut || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '试用项目数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('演示项目数')" :class="{ borderCss: tabName == '演示项目数' }"
-          v-if='houseTypes == "2,3"'>
+        <div
+          class="cardItem"
+          @click="changeTab('演示项目数')"
+          :class="{ borderCss: tabName == '演示项目数' }"
+          v-if="houseTypes == '2,3'"
+        >
           <span>演示项目数</span>
           <h2>{{ firstTab.houseQuantityOfDemo || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '演示项目数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('过期项目数')" :class="{ borderCss: tabName == '过期项目数' }">
+        <div
+          class="cardItem"
+          @click="changeTab('过期项目数')"
+          :class="{ borderCss: tabName == '过期项目数' }"
+        >
           <span>过期项目数</span>
           <h2>{{ firstTab.houseQofUnenough || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '过期项目数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('设备总数')" :class="{ borderCss: tabName == '设备总数' }">
+        <div
+          class="cardItem"
+          @click="changeTab('设备总数')"
+          :class="{ borderCss: tabName == '设备总数' }"
+        >
           <span>设备总数</span>
           <h2>{{ firstTab.equipmentQuantity || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '设备总数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('已售设备数')" :class="{ borderCss: tabName == '已售设备数' }">
+        <div
+          class="cardItem"
+          @click="changeTab('已售设备数')"
+          :class="{ borderCss: tabName == '已售设备数' }"
+        >
           <span>已售设备数</span>
           <h2>{{ firstTab.equipmentQuantityWithSold || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '已售设备数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('待售设备数')" :class="{ borderCss: tabName == '待售设备数' }">
+        <div
+          class="cardItem"
+          @click="changeTab('待售设备数')"
+          :class="{ borderCss: tabName == '待售设备数' }"
+        >
           <span>待售设备数</span>
           <h2>{{ firstTab.equipmentQuantityWithNotSold || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '待售设备数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
 
@@ -136,61 +322,148 @@
           <div class="text1">正常设备数</div>
           <div class="text2">{{ firstTab.normalequipmentQuantity || 0 }}</div>
         </div> -->
-        <div class="cardItem" @click="changeTab('用户数')" :class="{ borderCss: tabName == '用户数' }">
+        <div
+          class="cardItem"
+          @click="changeTab('用户数')"
+          :class="{ borderCss: tabName == '用户数' }"
+        >
           <span>用户数</span>
           <h2>{{ firstTab.userQuantity || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '用户数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('顾问数')" :class="{ borderCss: tabName == '顾问数' }">
+        <div
+          class="cardItem"
+          @click="changeTab('顾问数')"
+          :class="{ borderCss: tabName == '顾问数' }"
+        >
           <span>顾问数</span>
           <h2>{{ firstTab.accountQuantity || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '顾问数'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('接待量')" :class="{ borderCss: tabName == '接待量' }">
-          <span style="padding-left: 28px;">接待量
-          <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
-            <i class="pop"></i>
-          </el-tooltip>
+        <div
+          class="cardItem"
+          @click="changeTab('接待量')"
+          :class="{ borderCss: tabName == '接待量' }"
+        >
+          <span style="padding-left: 28px"
+            >接待量
+            <el-tooltip
+              effect="light"
+              content="筛选时间内，已经结束的接待条数，不包含待接单；"
+              placement="bottom-end"
+            >
+              <i class="pop"></i>
+            </el-tooltip>
           </span>
           <h2>{{ firstTab.receptionQuantity || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '接待量'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('接待客户')" :class="{ borderCss: tabName == '接待客户' }">
+        <div
+          class="cardItem"
+          @click="changeTab('接待客户')"
+          :class="{ borderCss: tabName == '接待客户' }"
+        >
           <span>接待客户</span>
           <h2>{{ firstTab.customerQuantity || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '接待客户'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('接待时长')" :class="{ borderCss: tabName == '接待时长' }">
+        <div
+          class="cardItem"
+          @click="changeTab('接待时长')"
+          :class="{ borderCss: tabName == '接待时长' }"
+        >
           <span>接待时长(小时)</span>
-          <h2> {{ Math.floor(firstTab.receptionTime / 60) || 0 }}</h2>
+          <h2>{{ Math.floor(firstTab.receptionTime / 60) || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '接待时长'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
-        <div class="cardItem" @click="changeTab('平均接待时长')" :class="{ borderCss: tabName == '平均接待时长' }">
-          <span style="padding-left: 28px;">
+        <div
+          class="cardItem"
+          @click="changeTab('平均接待时长')"
+          :class="{ borderCss: tabName == '平均接待时长' }"
+        >
+          <span style="padding-left: 28px">
             平均接待时长
-            <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
+            <el-tooltip
+              effect="light"
+              content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；"
+              placement="bottom-end"
+            >
               <i class="pop"></i>
             </el-tooltip>
           </span>
-          <h2> {{ firstTab.receptionTimeWithAvg || 0 }}</h2>
+          <h2>{{ firstTab.receptionTimeWithAvg || 0 }}</h2>
           <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>
+            <i
+              v-show="tabName == '平均接待时长'"
+              class="el-icon-check"
+              style="
+                font-size: 22px;
+                color: #fff;
+                position: absolute;
+                right: 2px;
+                bottom: -42px;
+              "
+            ></i>
           </div>
         </div>
       </div>
@@ -202,8 +475,8 @@
         <div style="line-height: 40px; font-weight: bold">时段统计</div>
         <div>
           <div class="app-titel">
-            <div class="toptimeqhuan">
-              <div :class="{ tophove: dateType1 == 1 }" @click="tabtimetap1(1)">
+            <div>
+              <!-- <div :class="{ tophove: dateType1 == 1 }" @click="tabtimetap1(1)">
                 近7天
               </div>
               <div :class="{ tophove: dateType1 == 3 }" @click="tabtimetap1(3)">
@@ -211,17 +484,49 @@
               </div>
               <div :class="{ tophove: dateType1 == 2 }" @click="tabtimetap1(2)">
                 近30天
-              </div>
+              </div> -->
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 1 }"
+                @click="tabtimetap1(1)"
+                >近7天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 3 }"
+                @click="tabtimetap1(3)"
+                >近15天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType1 == 2 }"
+                @click="tabtimetap1(2)"
+                >近30天</el-button
+              >
             </div>
             <div style="margin-left: 26px">
-              <el-date-picker @change="confirmtime1()" v-model="customtime1" type="daterange" range-separator="-"
-                :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" start-placeholder="开始日期"
-                end-placeholder="结束日期" :picker-options="pickerOptions">
+              <el-date-picker
+                @change="confirmtime1()"
+                v-model="customtime1"
+                type="daterange"
+                range-separator="-"
+                :default-time="['00:00:00', '23:59:59']"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+              >
               </el-date-picker>
             </div>
-            <el-select v-model="echarValue1" @change="echarValue1Change" style="width: 100px; margin-left: 10px"
-              placeholder="请选择">
-              <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
+            <el-select
+              v-model="echarValue1"
+              @change="echarValue1Change"
+              style="width: 100px; margin-left: 10px"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in options1"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </div>
@@ -229,12 +534,15 @@
       </div>
 
       <div class="container tabcard" v-if="echarValue1 == 0">
-
         <el-card shadow="hover" :class="{ tophovese: secindex == 1 }">
           <div @click="secondChange('1')">
             <div class="text1">
               接待量
-              <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，已经结束的接待条数，不包含待接单；"
+                placement="bottom-end"
+              >
                 <i class="pop"></i>
               </el-tooltip>
             </div>
@@ -265,7 +573,7 @@
             <div class="text2">
               {{ secondTab.activeUserQuantity || 0 }}
             </div> -->
-            <!-- <div class="text3">
+        <!-- <div class="text3">
               <span>环比 {{ cardobjs.activeCustomer || 0 }}</span>
               <span class="textUp" v-if="cardobjCycle.activeCustomer > 0">
                 +{{ cardobjCycle.activeCustomer || 0 }}
@@ -276,13 +584,17 @@
                 <i class="down"></i>
               </span>
             </div> -->
-          <!-- </div>
+        <!-- </div>
         </el-card> -->
         <el-card shadow="hover" :class="{ tophovese: secindex == 3 }">
           <div @click="secondChange('3')">
             <div class="text1">
               活跃设备数
-              <el-tooltip effect="light" content="筛选时间内，有接待并上传录音的设备;" placement="bottom-end">
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，有接待并上传录音的设备;"
+                placement="bottom-end"
+              >
                 <i class="pop"></i>
               </el-tooltip>
             </div>
@@ -302,22 +614,35 @@
             </div> -->
           </div>
         </el-card>
-
       </div>
       <div v-if="echarValue1 == 0" id="main"></div>
       <div v-if="echarValue1 == 1">
-        <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="echarList1" stripe style="width: 100%" height="640">
+        <el-table
+          :header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
+          :data="echarList1"
+          stripe
+          style="width: 100%"
+          height="640"
+        >
           <!-- <el-table-column type="index" label="序号" width="50">
         </el-table-column> -->
           <el-table-column prop="time" label="时间" align="center">
           </el-table-column>
-          <el-table-column prop="receptionQuantityInToday" label="接待量" align="center">
+          <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="activeEquipmentQuantity" label="活跃设备" align="center">
+          <el-table-column
+            prop="activeEquipmentQuantity"
+            label="活跃设备"
+            align="center"
+          >
           </el-table-column>
           <!--  scope -->
           <el-table-column label="操作" align="center" width="80">
@@ -334,8 +659,8 @@
         <div style="line-height: 30px; font-weight: bold">整体看板</div>
         <div>
           <div class="app-titel">
-            <div class="toptimeqhuan">
-              <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
+            <div class="">
+              <!-- <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
                 近7天
               </div>
               <div :class="{ tophove: dateType == 5 }" @click="tabtimetap(5)">
@@ -343,17 +668,50 @@
               </div>
               <div :class="{ tophove: dateType == 6 }" @click="tabtimetap(6)">
                 近30天
-              </div>
+              </div> -->
+
+              <el-button
+                :class="{ 'el-button--primary': dateType == 4 }"
+                @click="tabtimetap(4)"
+                >近7天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 5 }"
+                @click="tabtimetap(5)"
+                >近15天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 6 }"
+                @click="tabtimetap(6)"
+                >近30天</el-button
+              >
             </div>
             <div style="margin-left: 26px">
-              <el-date-picker @change="confirmtime()" v-model="customtime" type="daterange" range-separator="-"
-                :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" start-placeholder="开始日期"
-                end-placeholder="结束日期" :picker-options="pickerOptions">
+              <el-date-picker
+                @change="confirmtime()"
+                v-model="customtime"
+                type="daterange"
+                range-separator="-"
+                :default-time="['00:00:00', '23:59:59']"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :picker-options="pickerOptions"
+              >
               </el-date-picker>
             </div>
-            <el-select v-model="echarValue" style="width: 100px; margin-left: 10px" placeholder="请选择"
-              @change="echarChange">
-              <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value">
+            <el-select
+              v-model="echarValue"
+              style="width: 100px; margin-left: 10px"
+              placeholder="请选择"
+              @change="echarChange"
+            >
+              <el-option
+                v-for="item in options1"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </div>
@@ -379,9 +737,7 @@
         </div> -->
         <el-card shadow="hover" :class="{ tophovese: cardindex == 1 }">
           <div @click="Overviewxlick('1')">
-            <div class="text1">
-              购买服务项目数
-            </div>
+            <div class="text1">购买服务项目数</div>
             <div class="text2">
               {{ thirdTab.houseQuantity || 0 }}
             </div>
@@ -423,9 +779,7 @@
         </el-card> -->
         <el-card shadow="hover" :class="{ tophovese: cardindex == 5 }">
           <div @click="Overviewxlick('5')">
-            <div class="text1">
-              新增用户数
-            </div>
+            <div class="text1">新增用户数</div>
             <div class="text2">
               {{ thirdTab.userCountWithNewJoin || 0 }}
             </div>
@@ -446,9 +800,13 @@
           <div @click="Overviewxlick('6')">
             <div class="text1">
               接待量
-            <el-tooltip effect="light" content="筛选时间内，已经结束的接待条数，不包含待接单；" placement="bottom-end">
-              <i class="pop"></i>
-            </el-tooltip>
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，已经结束的接待条数，不包含待接单；"
+                placement="bottom-end"
+              >
+                <i class="pop"></i>
+              </el-tooltip>
             </div>
             <div class="text2">
               {{ thirdTab.receptionQuantity || 0 }}
@@ -470,9 +828,13 @@
           <div @click="Overviewxlick('7')">
             <div class="text1">
               平均接待时长
-            <el-tooltip effect="light" content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；" placement="bottom-end">
-              <i class="pop"></i>
-            </el-tooltip>
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，有效接待（不包含待接单）的平均录音时长，单位分钟；"
+                placement="bottom-end"
+              >
+                <i class="pop"></i>
+              </el-tooltip>
             </div>
             <div class="text2">
               {{ thirdTab.receptionTimeWithAvg || 0 }}
@@ -494,9 +856,13 @@
           <div @click="Overviewxlick('8')">
             <div class="text1">
               活跃设备数
-            <el-tooltip effect="light" content="筛选时间内，有接待并上传录音的设备；" placement="bottom-end">
-              <i class="pop"></i>
-            </el-tooltip>
+              <el-tooltip
+                effect="light"
+                content="筛选时间内，有接待并上传录音的设备；"
+                placement="bottom-end"
+              >
+                <i class="pop"></i>
+              </el-tooltip>
             </div>
             <div class="text2">
               {{ thirdTab.activeEquipmentQuantity || 0 }}
@@ -629,19 +995,32 @@
             {{ thirdTab.buyEquipQuantity || 0 }}
           </div>
         </div> -->
-
       </div>
 
       <div v-if="echarValue == 0" id="echar2"></div>
       <div v-if="echarValue == 1">
-        <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="echarList" stripe style="width: 100%" height="640">
+        <el-table
+          :header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
+          :data="echarList"
+          stripe
+          style="width: 100%"
+          height="640"
+        >
           <!-- <el-table-column type="index" label="序号" width="50">
         </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>
+              <span
+                @click="goDetail1(row, '购买服务项目数', 0)"
+                style="cursor: pointer"
+                >{{ row.buyHouseQuantity || 0 }}</span
+              >
             </template>
           </el-table-column>
           <!-- <el-table-column prop="activeUserQuantity" label="活跃用户数" align="center">
@@ -649,26 +1028,56 @@
               <span @click="goDetail1(row, '活跃用户数', 1)" style="cursor: pointer">{{ row.activeUserQuantity }}</span>
             </template>
           </el-table-column> -->
-          <el-table-column prop="newJoinUserQuantity" label="新增用户数" align="center">
+          <el-table-column
+            prop="newJoinUserQuantity"
+            label="新增用户数"
+            align="center"
+          >
             <template slot-scope="{ row }">
-              <span @click="goDetail1(row, '新增用户数', 2)" style="cursor: pointer">{{ row.newJoinUserQuantity || 0
-              }}</span>
+              <span
+                @click="goDetail1(row, '新增用户数', 2)"
+                style="cursor: pointer"
+                >{{ row.newJoinUserQuantity || 0 }}</span
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="receptionQuantity" label="接待量" align="center">
+          <el-table-column
+            prop="receptionQuantity"
+            label="接待量"
+            align="center"
+          >
             <template slot-scope="{ row }">
-              <span @click="goDetail1(row, '接待量', 3)" style="cursor: pointer">{{ row.receptionQuantity || 0 }}</span>
+              <span
+                @click="goDetail1(row, '接待量', 3)"
+                style="cursor: pointer"
+                >{{ row.receptionQuantity || 0 }}</span
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="avgReceptionTime" label="平均接待时长" align="center">
+          <el-table-column
+            prop="avgReceptionTime"
+            label="平均接待时长"
+            align="center"
+          >
             <template slot-scope="{ row }">
-              <span @click="goDetail1(row, '平均接待时长', 4)" style="cursor: pointer">{{ row.avgReceptionTime || 0 }}</span>
+              <span
+                @click="goDetail1(row, '平均接待时长', 4)"
+                style="cursor: pointer"
+                >{{ row.avgReceptionTime || 0 }}</span
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="activeEquipmentQuantity" label="活跃设备数" align="center">
+          <el-table-column
+            prop="activeEquipmentQuantity"
+            label="活跃设备数"
+            align="center"
+          >
             <template slot-scope="{ row }">
-              <span @click="goDetail1(row, '活跃设备数', 5)" style="cursor: pointer">{{ row.activeEquipmentQuantity || 0
-              }}</span>
+              <span
+                @click="goDetail1(row, '活跃设备数', 5)"
+                style="cursor: pointer"
+                >{{ row.activeEquipmentQuantity || 0 }}</span
+              >
             </template>
           </el-table-column>
           <!-- <el-table-column prop="buyEquipQuantity" label="销售设备数" align="center">
@@ -678,9 +1087,15 @@
           </el-table-column> -->
         </el-table>
         <div style="display: flex; justify-content: flex-end; margin-top: 10px">
-          <el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"
-            :current-page="currentPage1" :page-sizes="[10, 30, 50]" :page-size="size1"
-            layout="total, sizes, prev, pager, next, jumper" :total="total1">
+          <el-pagination
+            @size-change="handleSizeChange1"
+            @current-change="handleCurrentChange1"
+            :current-page="currentPage1"
+            :page-sizes="[10, 30, 50]"
+            :page-size="size1"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total1"
+          >
           </el-pagination>
         </div>
       </div>
@@ -688,25 +1103,67 @@
     <el-dialog :title="elTitle" :visible.sync="dialogVisible">
       <div class="cen-tab">
         <div style="font-size: 20px">{{ timeStr }}</div>
-        <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="detailList" stripe style="width: 100%" height="640">
-          <el-table-column v-if="visible1" prop="houseName" label="项目" align="center">
+        <el-table
+          :header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
+          :data="detailList"
+          stripe
+          style="width: 100%"
+          height="640"
+        >
+          <el-table-column
+            v-if="visible1"
+            prop="houseName"
+            label="项目"
+            align="center"
+          >
           </el-table-column>
-          <el-table-column v-if="visible1" prop="receptionQuantity" label="接待量" align="center">
+          <el-table-column
+            v-if="visible1"
+            prop="receptionQuantity"
+            label="接待量"
+            align="center"
+          >
           </el-table-column>
 
-          <el-table-column v-if="visible5" prop="imei" label="设备编号" align="center">
+          <el-table-column
+            v-if="visible5"
+            prop="imei"
+            label="设备编号"
+            align="center"
+          >
           </el-table-column>
-          <el-table-column v-if="visible5" prop="agentName" label="代理商" align="center">
+          <el-table-column
+            v-if="visible5"
+            prop="agentName"
+            label="代理商"
+            align="center"
+          >
           </el-table-column>
-          <el-table-column v-if="visible5" prop="houseName" label="公司" align="center">
+          <el-table-column
+            v-if="visible5"
+            prop="houseName"
+            label="公司"
+            align="center"
+          >
           </el-table-column>
-          <el-table-column v-if="visible5" prop="orgName" label="项目" align="center">
+          <el-table-column
+            v-if="visible5"
+            prop="orgName"
+            label="项目"
+            align="center"
+          >
           </el-table-column>
         </el-table>
         <div style="display: flex; justify-content: flex-end; margin-top: 10px">
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-sizes="[10, 30, 50]" :page-size="size"
-            layout="total, sizes, prev, pager, next, jumper" :total="total">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 30, 50]"
+            :page-size="size"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
           </el-pagination>
         </div>
       </div>
@@ -717,7 +1174,7 @@
 <script>
 import * as echarts from "echarts";
 import { getStore, setStore } from "@/util/store";
-import colorTheme from "../../util/theme.color"
+import colorTheme from "../../util/theme.color";
 export default {
   data() {
     return {
@@ -795,7 +1252,7 @@ export default {
       info: {},
       elTitle: "",
       timeStr: "",
-      tabName: ""
+      tabName: "",
     };
   },
   mounted() {
@@ -823,8 +1280,8 @@ export default {
     },
     echarValue1Change(e) {
       if (e == 0) {
-        this.secindex = 1
-        this.dataOverviewWithSystemWithDay()
+        this.secindex = 1;
+        this.dataOverviewWithSystemWithDay();
       }
     },
     goDetail1(row, str, idx) {
@@ -836,9 +1293,9 @@ export default {
       if (idx == 0) {
         // 跳转项目管理
         this.$router.push({
-          path: '/building/index',
-          query: { time: row.date }
-        })
+          path: "/building/index",
+          query: { time: row.date },
+        });
       } else if (idx == 1) {
         // // 跳转项目管理
         // this.$router.push({
@@ -850,9 +1307,9 @@ export default {
       } else if (idx == 4) {
       } else if (idx == 5) {
         this.$router.push({
-          path: '/Equipment/index',
-          query: { time: row.date }
-        })
+          path: "/Equipment/index",
+          query: { time: row.date },
+        });
       } else if (idx == 6) {
         this.visible1 = false;
         this.visible2 = false;
@@ -968,8 +1425,8 @@ export default {
       this.dateType1 = 1;
       this.cardindex = 1;
       this.secindex = 1;
-      this.echarValue1 = '0'
-      this.echarValue = '0'
+      this.echarValue1 = "0";
+      this.echarValue = "0";
       if (this.choicValue == "") {
       }
       if (this.selValue == 1) {
@@ -997,8 +1454,8 @@ export default {
       this.dateType = 4;
       this.cardindex = 1;
       this.secindex = 1;
-      this.echarValue1 = '0'
-      this.echarValue = '0'
+      this.echarValue1 = "0";
+      this.echarValue = "0";
       this.dateType1 = 1;
       if (this.selValue == 1) {
         this.agentissow = false;
@@ -1012,15 +1469,15 @@ export default {
       this.getList();
     },
     sysChange() {
-      this.choicValue = ''
+      this.choicValue = "";
       // this.selValue=this.options[0].value
       this.dateType = 4;
       this.cardindex = 1;
       this.secindex = 1;
-      this.echarValue1 = '0'
-      this.echarValue = '0'
+      this.echarValue1 = "0";
+      this.echarValue = "0";
       this.dateType1 = 1;
-      this.getList()
+      this.getList();
       // this.dataOverViewWithSystem();
       // this.dataOverviewWithSystemWithDay();
       // this.dataOverviewWithSystemWithLook();
@@ -1169,7 +1626,7 @@ export default {
           arr2.push(item.data);
         });
       }
-      let arr = []
+      let arr = [];
       let Strname = [];
       if (this.customtime1[0]) {
         Strname = ["时段一"];
@@ -1180,19 +1637,14 @@ export default {
             type: "line",
             smooth: true,
             areaStyle: {
-              color: new echarts.graphic.LinearGradient(
-                0, 0, 0, 1,
-                [
-                  { offset: 0, color: colorTheme.colorArr[0] },
-                  { offset: 1, color: "#fff" }
-                ]
-              ),
-              opacity: 0.1
-            }
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: colorTheme.colorArr[0] },
+                { offset: 1, color: "#fff" },
+              ]),
+              opacity: 0.1,
+            },
           },
-
         ];
-
       } else {
         Strname = ["时段一", "时段二"];
         arr = [
@@ -1209,7 +1661,6 @@ export default {
             smooth: true,
           },
         ];
-
       }
 
       // console.log(arr1,arr2);
@@ -1279,15 +1730,12 @@ export default {
           type: "line",
           smooth: true,
           areaStyle: {
-              color: new echarts.graphic.LinearGradient(
-                0, 0, 0, 1,
-                [
-                  { offset: 0, color: colorTheme.colorArr[0] },
-                  { offset: 1, color: "#fff" }
-                ]
-              ),
-              opacity: 0.1
-            }
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: colorTheme.colorArr[0] },
+              { offset: 1, color: "#fff" },
+            ]),
+            opacity: 0.1,
+          },
         },
       ];
       this.SwitchCARDS(arr, "echar2", timeDate, Strname);
@@ -1373,12 +1821,12 @@ export default {
         legend: {
           data: Strname,
           top: "10",
-          icon:"roundRect"
+          icon: "roundRect",
         },
         grid: {
           left: 10,
           right: 10,
-          bottom:18,
+          bottom: 18,
 
           containLabel: true,
         },
@@ -1479,7 +1927,6 @@ export default {
     display: flex;
     align-items: center;
 
-
     .textUp {
       font-size: 14px;
       display: flex;
@@ -1496,7 +1943,8 @@ export default {
         display: block;
         width: 20px;
         height: 15px;
-        background: url("../../../public/img/indexIcon/indexCardUp.png") no-repeat;
+        background: url("../../../public/img/indexIcon/indexCardUp.png")
+          no-repeat;
         background-size: 100%;
         margin-left: 8px;
       }
@@ -1517,7 +1965,8 @@ export default {
         display: block;
         width: 20px;
         height: 15px;
-        background: url("../../../public/img/indexIcon/indexCardDown.png") no-repeat;
+        background: url("../../../public/img/indexIcon/indexCardDown.png")
+          no-repeat;
         background-size: 100%;
         margin-left: 8px;
       }
@@ -1532,7 +1981,7 @@ export default {
 }
 
 .borderCss {
-  border: 1px solid $color1  !important;
+  border: 1px solid $color1 !important;
 }
 
 .cardItem {
@@ -1570,10 +2019,9 @@ export default {
 
     height: 0;
 
-    border-bottom: 45px solid $color1  !important;
+    border-bottom: 45px solid $color1 !important;
 
     border-left: 45px solid transparent !important;
-
   }
 }
 
@@ -1583,7 +2031,6 @@ export default {
   grid-column-gap: 12px;
   grid-row-gap: 18px;
 
-
   .pagechen {
     background: #ffffff;
     border-radius: 4px;
@@ -1645,7 +2092,6 @@ export default {
       line-height: 44px;
     }
   }
-
 }
 
 // 进度条
@@ -1838,7 +2284,7 @@ export default {
 .app-top {
   // width: 100%;
   width: calc(100% - 270px);
-  position: fixed;    
+  position: fixed;
   z-index: 999;
   margin-top: -16px;
   background: #ffffff;
@@ -1885,9 +2331,9 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  margin-top: 15px;
+  // margin-top: 15px;
 
   .text1-1 {
     color: #666666;
@@ -1903,21 +2349,25 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-/deep/ .el-dialog--center{
+/deep/ .el-dialog--center {
   border-radius: 8px;
-  .el-dialog__title{
+  .el-dialog__title {
     font-weight: bold;
   }
 }
-.pop{
+.pop {
   display: inline-block;
   width: 18px;
   height: 18px;
-  background: url('../../../public/img/pop.png') no-repeat;
+  background: url("../../../public/img/pop.png") no-repeat;
   background-size: 100%;
   margin-left: 6px;
 }
-/deep/ .el-button--text{
-  color: #2671E2;
+/deep/ .el-button--text {
+  color: #2671e2;
+}
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
 }
 </style>
diff --git a/src/views/Statistics/houseDataSys.vue b/src/views/Statistics/houseDataSys.vue
index 29d1368..fe898e8 100644
--- a/src/views/Statistics/houseDataSys.vue
+++ b/src/views/Statistics/houseDataSys.vue
@@ -97,8 +97,8 @@
     <div class="app-box-er">
       <div class="app-titel" style="margin-bottom: 10px">
         <div class="titel-text" style="text-indent: 0;min-width:64px;">项目趋势</div>
-        <div class="toptimeqhuan">
-          <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
+        <div style="margin-left:14px;">
+          <!-- <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
             近7天
           </div>
           <div :class="{ tophove: dateType == 5 }" @click="tabtimetap(5)">
@@ -106,7 +106,22 @@
           </div>
           <div :class="{ tophove: dateType == 6 }" @click="tabtimetap(6)">
             近30天
-          </div>
+          </div> -->
+          <el-button
+                :class="{ 'el-button--primary': dateType == 4 }"
+                @click="tabtimetap(4)"
+                >近7天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 5 }"
+                @click="tabtimetap(5)"
+                >近15天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 6 }"
+                @click="tabtimetap(6)"
+                >近30天</el-button
+              >
         </div>
         <div style="margin-left: 20px;">
           <el-date-picker
@@ -1088,9 +1103,9 @@ export default {
 }
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  margin-top: 15px;
+  // margin-top: 15px;
   .text1-1 {
     color: #666666;
   }
@@ -1111,4 +1126,8 @@ export default {
   justify-content: space-between;
   margin-right: 20px;
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 3dadf3d..17dfdf6 100644
--- a/src/views/Statistics/index.vue
+++ b/src/views/Statistics/index.vue
@@ -15,8 +15,8 @@
 
       <div class="app-titel2">
         <div style="text-indent: 30px;font-weight: bold;">接待时间:</div>
-        <div class="toptimeqhuan">
-          <div :class="{ tophove: TimetoAhoose == 0 }" @click="tabtimetap(0)">
+        <div style="margin-left: 38px;">
+          <!-- <div :class="{ tophove: TimetoAhoose == 0 }" @click="tabtimetap(0)">
             今日
           </div>
           <div :class="{ tophove: TimetoAhoose == 1 }" @click="tabtimetap(1)">
@@ -24,7 +24,22 @@
           </div>
           <div :class="{ tophove: TimetoAhoose == 2 }" @click="tabtimetap(2)">
             近一周
-          </div>
+          </div> -->
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 4 }"
+            @click="tabtimetap(4)"
+            >今天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 5 }"
+            @click="tabtimetap(5)"
+            >近7天</el-button
+          >
+          <el-button
+            :class="{ 'el-button--primary': TimetoAhoose == 6 }"
+            @click="tabtimetap(6)"
+            >近30天</el-button
+          >
         </div>
         <div style="margin-left: 26px">
           <el-date-picker v-model="customtime" @change="confirmtime()" type="daterange" range-separator="-"
@@ -651,4 +666,8 @@ export default {
     }
   }
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/Statistics/trend.vue b/src/views/Statistics/trend.vue
index 939066e..c3eade6 100644
--- a/src/views/Statistics/trend.vue
+++ b/src/views/Statistics/trend.vue
@@ -88,8 +88,8 @@
         <div class="titel-text" style="text-indent: 0; min-width: 64px">
           项目趋势
         </div>
-        <div class="toptimeqhuan">
-          <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
+        <div class="" style="margin-left:15px">
+          <!-- <div :class="{ tophove: dateType == 4 }" @click="tabtimetap(4)">
             近7天
           </div>
           <div :class="{ tophove: dateType == 5 }" @click="tabtimetap(5)">
@@ -97,7 +97,23 @@
           </div>
           <div :class="{ tophove: dateType == 6 }" @click="tabtimetap(6)">
             近30天
-          </div>
+          </div> -->
+          <el-button
+                :class="{ 'el-button--primary': dateType == 4 }"
+                @click="tabtimetap(4)"
+                >近7天</el-button
+              >
+              <el-button
+                :class="{ 'el-button--primary': dateType == 5 }"
+                @click="tabtimetap(5)"
+                >近15天</el-button
+              >
+              <el-button
+              style="margin-right:15px"
+                :class="{ 'el-button--primary': dateType == 6 }"
+                @click="tabtimetap(6)"
+                >近30天</el-button
+              >
         </div>
         <div style="margin-left: 20px">
           <el-date-picker
@@ -1282,9 +1298,9 @@ export default {
 }
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  margin-top: 15px;
+  // margin-top: 15px;
   .text1-1 {
     color: #666666;
   }
@@ -1313,4 +1329,8 @@ export default {
   background-size: 100%;
   margin-left: 6px;
 }
+/deep/ .el-button--primary{
+  background: #2671E2 !important;
+  border: 1px solid #2671E2 !important;
+}
 </style>
diff --git a/src/views/building/area.vue b/src/views/building/area.vue
index 9eff3f6..9c68a5e 100644
--- a/src/views/building/area.vue
+++ b/src/views/building/area.vue
@@ -356,6 +356,7 @@ export default {
     }
     .app-box {
       margin-top: 20px;
+      padding: 15px;
     }
     .block {
       width: 100%;
diff --git a/src/views/houseData/analyse.vue b/src/views/houseData/analyse.vue
index cbb7dc5..5f582ad 100644
--- a/src/views/houseData/analyse.vue
+++ b/src/views/houseData/analyse.vue
@@ -1135,10 +1135,10 @@ export default {
 
 .hejisan {
   width: 92%;
-  margin: 30px auto;
+  margin: 15px auto;
   display: flex;
-  padding-top: 10px;
-  padding-bottom: 10px;
+  // padding-top: 10px;
+  // padding-bottom: 10px;
 
   .text1-1 {
     color: #666666;
diff --git a/src/views/inspection/ProhibitedList.vue b/src/views/inspection/ProhibitedList.vue
index 45681af..71be6ef 100644
--- a/src/views/inspection/ProhibitedList.vue
+++ b/src/views/inspection/ProhibitedList.vue
@@ -369,6 +369,7 @@ export default {
         align-items: center;
 
         div {
+          margin-right: 10px;
           padding-left: 20px;
           padding-right: 20px;
           text-align: center;