Merge branch 'master' of http://git.2weisou.com/liumin/zkPCproject

src/App.vue

@@ -26,6 +26,13 @@ export default {
   .el-tooltip__popper {
     max-width: 300px;
 }
+.el-button--primary{
+  background-color: #2671E2 !important;
+  border-color: #2671E2 !important;
+}
+.el-scrollbar__wrap{
+  height: 100vh !important;
+}
 .el-table__row{
   font-size: 14px!important;
 }

src/page/index/logo.vue

@@ -58,7 +58,7 @@ export default {
   .logoIcon{
   display: block;
   width: 50px;
-  height: 36px;
+  height: 38px;
   background: url('../../../public/logoPng.png') no-repeat;
   background-size: 100%;
 }

src/page/wel.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="box-center">
-    <div class="app-titel projectBackend">
+    <div class="app-title projectBackend">
       <div class="titel-text">筛选日期：</div>
       <div class="">
         <el-button :class="{ 'el-button--primary': TimetoAhoose == 0 }" @click="tabtimetap(0)">今天</el-button>
@@ -479,11 +479,11 @@
       </div>
     </div>
 
-    <div v-if="role != 3 && info.userRoleType != 6" style="    margin-top: 52px;">
+    <div v-if="role != 3 && info.userRoleType != 6" style="margin-top: 52px;">
       <!-- 系统后台 -->
       <div style="margin-bottom: 10px; cursor: pointer" v-if="role != 2">
-        <span style="font-weight: bold; font-size: 18px">待处理</span>
-        <div class="page-container">
+        <div style="font-weight: bold; font-size: 18px;margin-bottom: -5px">待处理</div>
+        <div class="page-container" style="width: 100%;">
           <div class="pagechen" style="margin-right:14px" @click="jumpto('1')" v-if="role == 0">
             <div class="pageboxtitle1">45天到期的代理商</div>
             <div class="pageboxtitle3">
@@ -505,15 +505,14 @@
             </div>
           </div>
 
-          <div class="pagechen" style="margin-right:14px" @click="jumpto('4')">
+          <div class="pagechen" @click="jumpto('4')">
             <div class="pageboxtitle1">
               <div class="sum-top">
-              <div>低电量设备</div>
-              <el-tooltip effect="light" content="电量低于20%的设备" placement="bottom-end">
-                <i class="pop"></i>
-              </el-tooltip>
+                <div>低电量设备</div>
+                <el-tooltip effect="light" content="电量低于20%的设备" placement="bottom-end">
+                  <i class="pop"></i>
+                </el-tooltip>
               </div>
-
             </div>
             <div class="pageboxtitle3">
               {{ sysTop.lowElectricityEquipmentQuantity || 0 }}
@@ -521,10 +520,10 @@
           </div>
         </div>
       </div>
-      <div style="font-weight: bold; font-size: 18px; margin: 10px 0">
+      <div style="font-weight: bold; font-size: 18px; margin-bottom: -5px">
         数据简报
       </div>
-      <!-- <div class="app-titel projectBackend">
+      <!-- <div class="app-title projectBackend">
         <div class="titel-text">筛选日期：</div>
         <div class="">
           <el-button :class="{ 'el-button--primary': TimetoAhoose == 0 }" @click="tabtimetap(0)">今天</el-button>
@@ -1964,8 +1963,8 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 20px 15px;
-  min-width: 1000px;
+  padding: 20px 15px 40px;
+  // min-width: 1000px;
 }
 
 .house-only {
@@ -2162,6 +2161,10 @@ export default {
       font-weight: 400;
       color: #666666;
       line-height: 16px;
+      .sum-top{
+          display: flex;
+          align-items: center;
+        }
     }
 
     .projectCardItem {
@@ -2391,15 +2394,15 @@ export default {
   border-radius: 5px;
 }
 
-.app-titel {
-  // width: 100%;
-  width: calc(100% - 270px);
+.app-title {
   position: fixed;
   z-index: 999;
   margin-top: -16px;
   box-shadow: 0px 0px 10px 0px #dadada;
   display: flex;
   align-items: center;
+  left: 255px;
+  right: 15px;
 
   .titel-text {
     height: 100%;
@@ -2520,7 +2523,6 @@ export default {
   display: flex;
   align-content: center;
   justify-content: space-between;
-  padding: 0 20px;
   line-height: 55px;
 }
 

src/views/Customer/AgentManagement.vue

@@ -500,7 +500,7 @@ export default {
       currentPage4: 1,
       total: 0, //总条数
       pageNum: 1,
-      pageSize: 30,
+      pageSize: 10,
       contractStartDate: "", //开始时间
       contractEndDate: "", //结束时间
       serviceStatus: "", //状态

src/views/Customer/index.vue

@@ -25,13 +25,13 @@
         </div>
 
         <div class="div-labox">
-          <div class="labeltext">
+          <div class="labeltext" style="margin-left: 15px;">
             <!-- 时间： -->
             <el-select
               v-model="searchForm.timeType"
               @change="houseChange"
               placeholder="请选择"
-              style="width: 125px"
+              style="width: 125px;"
             >
               <el-option
                 v-for="item in timeTypeList"
@@ -851,11 +851,10 @@ export default {
 }
 .booxtop {
   width: 100%;
-  padding: 20px;
   background: #fff;
-  border-radius: 2px;
+  border-radius: 4px;
+  padding-bottom: 10px;
   margin-top: 0px;
-  padding-right: 20px;
   .app-topbox {
     width: 100%;
     display: flex;

src/views/Equipment/equipmentDetailList.vue

@@ -63,17 +63,8 @@
           padding-top: 18px;
           padding-right: 18px;
         ">
-        <span style="min-width: 80px" class="demonstration">使用时间：</span>
-        <div style="margin-left:15px">
-          <!-- <div :class="{ tophove: timeType == 4 }" @click="tabtimetap(4)">
-            近7天
-          </div>
-          <div :class="{ tophove: timeType == 5 }" @click="tabtimetap(5)">
-            近15天
-          </div>
-          <div :class="{ tophove: timeType == 6 }" @click="tabtimetap(6)">
-            近30天
-          </div> -->
+        <span class="demonstration">使用时间：</span>
+        <div>
           <el-button
                 :class="{ 'el-button--primary': timeType == 4 }"
                 @click="tabtimetap(4)"
@@ -85,23 +76,22 @@
                 >近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="-"
+        <el-date-picker style="width: 230px;margin-left: 10px" @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 style="margin-left: 10px; margin-top: 8px">
+        <div style="margin-left: 10px; margin-top: 3px">
           <el-checkbox v-model="checked" @change="radioChange">对比时间段</el-checkbox>
         </div>
         <div v-if="checked" style="
             margin-left: 20px;
             border: 1px solid #dcdfe6;
-            min-width: 220px;
+            min-width: 200px;
             height: 32px;
             border-radius: 4px;
             max-width: 360px;
@@ -1578,7 +1568,7 @@ export default {
 <style lang='less' scoped>
 .box-center {
   width: 100%;
-  padding: 20px 15px 20px;
+  padding: 20px 15px 40px;
   min-width: 1000px;
 }
 
@@ -1608,16 +1598,15 @@ export default {
 }
 
 .titlebox1 {
-  // width: 100%;
-  width: calc(100% - 270px);
   position: fixed;
   z-index: 999;
   margin-top: -16px;
   background: #ffffff;
-  // box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   box-shadow: 0px 0px 10px 0px #dadada;
-  border-radius: 8px;
-  padding-bottom: 18px;
+  border-radius: 4px;
+  padding-bottom: 15px;
+  left: 255px;
+  right: 15px;
 }
 
 .titlebox {
@@ -1626,7 +1615,7 @@ export default {
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 8px;
   margin-top: 120px;
-  padding: 10px 0;
+  padding: 15px 0;
 }
 
 .tablebox {
@@ -1640,7 +1629,6 @@ export default {
 
 .kapiannox {
   width: 98%;
-  margin-top: 20px;
 }
 
 .tabcard {

src/views/Equipment/equipmentOnlineRecordList.vue

@@ -559,7 +559,7 @@ export default {
 }
 .box-center {
   width: 100%;
-  padding: 5px 15px 20px;
+  padding: 5px 15px 40px;
   min-width: 1000px;
 }
 .toptab {

src/views/Equipment/state.vue

@@ -273,64 +273,57 @@
         </div>
       </div> -->
       <div class="app-titel" style="margin-top: 15px">
-        <!-- <div class="label" style="color: #ffffff">筛选相关：</div> -->
-        <div style="margin-left: 20px">
+        <div class="btn-group">
           <el-button type="primary" @click="screen">筛选</el-button>
         </div>
-        <div style="margin-left: 20px">
+        <div class="btn-group">
           <el-button @click="reset" type="text">清空筛选条件</el-button>      
             <el-button style="margin-left:10px;" @click="isSystoleForm" type="text">{{isOpen?'收起':'展开'}}<i style="margin-left:5px;" :class="isOpen?'el-icon-arrow-up':'el-icon-arrow-down'"></i></el-button>
-
         </div>
         <div style="margin-left: auto; margin-right: 10px;display: flex;">
-        <div style="margin-left: 20px">
+        <div class="btn-group" v-if="equ_state_open">
           <el-button
             @click="openAllLight()"
             type="primary"
-            v-if="equ_state_open"
             :disabled="multipleSelection.length == 0"
             >批量开启指示灯</el-button
           >
         </div>
-        <div style="margin-left: 20px">
+        <div class="btn-group" v-if="equ_state_off">
           <el-button
             @click="closeAllLight()"
             type="primary"
-            v-if="equ_state_off"
             :disabled="multipleSelection.length == 0"
             >批量关闭指示灯</el-button
           >
         </div>
-        <div style="margin-left: 20px">
+        <div class="btn-group" v-if="equ_state_back">
           <el-button
             @click="Batchreturn()"
             type="primary"
-            v-if="equ_state_back"
             :disabled="multipleSelection.length == 0"
             >批量归还</el-button
           >
         </div>
-        <div style="margin-left: 20px">
+        <div class="btn-group" v-if="equ_state_tranfer">
           <el-button
             @click="infoMasstransfer()"
             type="primary"
-            v-if="equ_state_tranfer"
             :disabled="multipleSelection.length == 0"
             >批量转移</el-button
           >
         </div>
-        <div style="margin-left: 20px">
+        <div class="btn-group" v-if="equ_state_unbind">
           <el-button
             @click="zkequipmentUnbind()"
             type="primary"
-            v-if="equ_state_unbind"
             :disabled="multipleSelection.length == 0"
             >批量解绑</el-button
           >
         </div>        
 
         <div
-           style="margin-left: 20px"
+           class="btn-group"
           v-if="equ_state_downLoad"
         >
           <el-button @click="downLoad" icon="el-icon-download">导出</el-button>
@@ -1510,7 +1503,7 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 5px 15px 20px;
+  padding: 5px 15px 40px;
   min-width: 1000px;
 }
 .tongji {
@@ -1548,6 +1541,9 @@ export default {
       margin-left: 15px;
       min-width: 78px;
     }
+    .btn-group{
+      margin-left: 20px;
+    }
     .toptimeqhuan {
       height: 30px;
       background: #ffffff;

src/views/Receive/index.vue

@@ -140,41 +140,22 @@
                   justify-content: center;
                   align-items: center;
                 ">
-                <el-button style="border:1px solid #2671e2;color:#2671e2" plain @click="texttap()">文本优化</el-button>
+                <el-button style="border:1px solid #2671e2;color:#2671e2;font-size: 14px" plain @click="texttap()">文本优化</el-button>
               </div>
             </div>
             <!-- box-shadow: -10px 0px 7px -7px #d1d1d1 inset; -->
             <div class="headboxbott">
               <div class="headovfu"
                 :style="{ boxShadow: tablist.length > 4 ? '-10px 0px 7px -7px #d1d1d1 inset' : '' }">
-                <div style="    width: 100%;
-    display: grid;
-    
-    grid-auto-flow: column;" class="inner-container">
-                  <!-- <div
-                    @click="tapspagek(index)"
-                    :class="{ roleindexclass: roleindex == index }"
-                    class="biaoji1"
-                    v-for="(item, index) in tablist"
-                    :key="index"
-                  >
-                    {{ item.name }}
-                  </div> -->
-                  <el-button v-for="(item, index) in tablist" style="width:82px;height: 32px;" :key="index"
+                <div class="inner-container">
+                  <el-button v-for="(item, index) in tablist" style="height: 32px;" :key="index"
                     :class="{ 'el-button--primary': roleindex == index }" @click="tapspagek(index)">{{ item.name }}
                   </el-button>
                 </div>
               </div>
               <div v-if="rec_index_flag" class="headpade">
-                <!-- <div
-                  class="biaoji"
-                  @click="biaoji()"
-                  
-                >
-                  标记
-                </div> -->
                 <el-button v-if="mg == 0"
-                  style="width: 80px;border:1px solid #E6625B;color:#E6625B" plain @click="biaoji()">标记</el-button>
+                  style="width: 80px;border:1px solid #E6625B;color:#E6625B;font-size: 14px" plain @click="biaoji()">标记</el-button>
               </div>
             </div>
             <div style="width: 100%;margin-top: 20px;border-top: 1px solid #ccc;">
@@ -237,7 +218,7 @@
             <el-button v-if="rec_index_makesure" style="margin-right: 10px;border:1px solid #2671e2;color:#2671e2" plain
               @click="Acqtap()">校准</el-button>
           </div>
-          <div class="pingfenbox" style="margin: 10px 0 20px;padding: 0px 10px 22px 10px;height:auto;">
+          <div class="pingfenbox" style="margin: 10px 0 20px;padding: 0px 10px 28px 10px;height:auto;">
             <!-- <div :class="{ activecllasscet: kehuyixiangcenterindex == 0 }" @click="customerofintention(0)">
               
             </div>
@@ -245,10 +226,10 @@
               
             </div> -->
             <el-button :class="{ activecllasscet: kehuyixiangcenterindex == 0 }" type=""
-              style="height: 40px; border-right: none;border-radius: 5px 0 0 5px;" @click="customerofintention(0)">系统分析
+              style="height: 32px; border-right: none;border-radius: 5px 0 0 5px;" @click="customerofintention(0)">系统分析
             </el-button>
             <el-button :class="{ activecllasscet: kehuyixiangcenterindex == 1 }" type=""
-              style="margin-left: 0px;height: 40px; border-left: none;border-radius: 0 5px 5px 0;"
+              style="margin-left: 0px;height: 32px; border-left: none;border-radius: 0 5px 5px 0;"
               @click="customerofintention(1)">人工校准</el-button>
           </div>
           <div v-if="Getintentionlist && Getintentionlist.length == 0"
@@ -297,7 +278,7 @@
 
         </div>
 
-        <div class="pingfenbox" style="padding: 0px 10px 22px 10px;height:auto;">
+        <div class="pingfenbox" style="padding: 0px 10px 28px 10px;height:auto;">
           <!-- <div :class="{ activecllasscet: zhixingcenterindex == 0 }" @click="recordclick(0)">
             销讲总执行率{{ userinformationlist.fraction || 0 }}%
           </div>
@@ -305,11 +286,11 @@
             禁忌执行
           </div> -->
           <el-button :class="{ activecllasscet: zhixingcenterindex == 0 }" type=""
-            style="height: 40px; border-right: none;border-radius: 5px 0 0 5px;" @click="recordclick(0)">销讲总执行率{{
+            style="height: 32px; border-right: none;border-radius: 5px 0 0 5px;" @click="recordclick(0)">销讲总执行率{{
                 userinformationlist.fraction || 0
             }}%</el-button>
           <el-button :class="{ activecllasscet: zhixingcenterindex == 1 }" type=""
-            style="margin-left: 0px;height: 40px; width: 126.5px; border-left: none;border-radius: 0 5px 5px 0;"
+            style="margin-left: 0px;height: 32px; width: 126.5px; border-left: none;border-radius: 0 5px 5px 0;"
             @click="recordclick(1)">禁忌执行</el-button>
 
         </div>
@@ -1865,21 +1846,15 @@ export default {
 }
 
 .center2 {
-  padding-left: 10px;
-  padding-right: 10px;
+  padding: 0 15px;
   width: 100%;
-  //  height: 100%;
   height: calc(80vh - 285px);
   overflow-y: scroll;
-
   .right {
-
-    // text-align: right !important;
     .content123ss {
       justify-content: end;
       flex-direction: row-reverse;
       width: 365px;
-
       span {
         margin-right: 0 !important;
         margin-left: 5px;
@@ -1956,7 +1931,7 @@ export default {
   font-size: 14px;
   padding: 5px 14px;
   border-radius: 8px;
-  // margin: 0 12px;
+  margin: 0 10px;
   line-height: 1.5;
   max-width: 365px;
 }
@@ -2241,7 +2216,7 @@ export default {
     padding: 10px;
     background: #ffffff;
     border: 1px solid #e0e0e0;
-    margin-left: 20px;
+    margin-left: 15px;
   }
 }
 
@@ -2313,7 +2288,7 @@ export default {
     .topzuo-you {
       width: 39%;
       height: 100%;
-      margin-left: 18px;
+      margin-left: 15px;
       background: #ffffff;
       border: 1px solid #e0e0e0;
     }
@@ -2325,7 +2300,7 @@ export default {
     height: 100%;
     background: #ffffff;
     border: 1px solid #e0e0e0;
-    margin-left: 20px;
+    margin-left: 15px;
   }
 }
 
@@ -2380,6 +2355,8 @@ export default {
 .inner-container {
   overflow-x: auto;
   height: 40px;
+  display: flex;
+  flex-wrap: nowrap;
 }
 
 /*滚动条样式*/

src/views/ReceivingRecords/index.vue

@@ -903,7 +903,7 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 5px 15px 20px;
+  padding: 5px 15px 40px;
   min-width: 1000px;
 }
 

src/views/Scheduling/index.vue

@@ -642,7 +642,7 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 5px 15px 20px;
+  padding: 5px 15px 40px;
   min-width: 1000px;
 }
 .cen-tab {
@@ -670,9 +670,9 @@ export default {
       font-size: 16px;
       font-weight: 400;
       color: #32363d;
-      line-height: 14px;
-      min-width: 100px;
+      line-height: 24px;
       text-align: right;
+      margin-left: 15px;
     }
     .toptimeqhuan {
       height: 30px;

src/views/Statistics/BuildingContrast.vue

@@ -728,7 +728,7 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 15px 15px 20px;
+  padding: 15px 15px 40px;
   min-width: 1000px;
 }
 
@@ -752,11 +752,13 @@ export default {
   border-radius: 4px;
   display: flex;
   align-items: center;
-  width: calc(100% - 270px);
+  // width: calc(100% - 270px);
   position: fixed;    
   box-shadow: 0px 0px 10px 0px #dadada;
   z-index: 999;
   margin-top: -10px;
+  left: 255px;
+  right: 15px;
 
   .titel-text {
     height: 100%;

src/views/Statistics/ConsultantBrand.vue

@@ -116,6 +116,7 @@
           v-if="tabFlag == 1"
           prop="prohibitedCustomer"
           label="违禁接待次数"
+          width="120"
           align="center"
           sortable
         >
@@ -128,6 +129,7 @@
           prop="prohibitedZb"
           label="违禁接待占比"
           align="center"
+          width="120"
           sortable
         >
           <template slot-scope="{ row }"> {{ row.prohibitedZb }}% </template>
@@ -150,7 +152,7 @@
           label="销讲执行率"
           align="center"
           sortable
-          width="110"
+          width="120"
         >
           <template slot-scope="{ row }" style="text-align: center;"> {{ row.fraction }}% </template>
         </el-table-column>
@@ -162,7 +164,7 @@
           align="center"
           width="100"
         >
-          <template slot-scope="{ row }"> {{ row[item.props] }}% </template>
+          <template slot-scope="{ row }"> {{ row[item.props] }}{{tabFlag == 0?'%': ''}}</template>
         </el-table-column>
       </el-table>
       <div style="display: flex; justify-content: flex-end; margin-top: 10px">
@@ -1123,7 +1125,7 @@ export default {
     }
 .box-center {
   width: 100%;
-  padding: 20px 15px;
+  padding: 20px 15px 40px;
   min-width: 1000px;
 }
 .imgboxc-img{
@@ -1144,7 +1146,6 @@ export default {
   width: 100%;
   height: 70px;
   background: #ffffff;
-  // box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 4px;
   display: flex;
   align-items: center;
@@ -1177,17 +1178,16 @@ export default {
 }
 
 .app-top {
-  // width: 100%;
-  width: calc(100% - 270px);
   position: fixed;    
   z-index: 999;
   margin-top: -16px;
   background: #ffffff;
-  box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   box-shadow: 0px 0px 10px 0px #dadada;
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+  left: 255px;
+  right: 15px;
   .app-titel {
     width: 100%;
     display: flex;

src/views/Statistics/Insightintothedetails.vue

@@ -346,9 +346,8 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 15px 15px 40px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 .cen-tab{
   width: 100%;

src/views/Statistics/MentoringAbility.vue

@@ -1337,11 +1337,11 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 20px 15px;
+  padding: 20px 15px 40px;
   min-width: 1000px;
 }
 .cen-tab {
-  width: 99%;
+  width: 100%;
   margin-top: 15px;
   padding-bottom: 15px;
 }
@@ -1387,7 +1387,7 @@ export default {
 
 .app-top {
   // width: 100%;
-  width: calc(100% - 270px);
+  // width: calc(100% - 270px);
   position: fixed;
   z-index: 999;
   margin-top: -16px;
@@ -1397,6 +1397,8 @@ export default {
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+  left: 255px;
+  right: 15px;
   .app-titel {
     width: 100%;
     display: flex;
@@ -1405,7 +1407,7 @@ export default {
       height: 100%;
       font-size: 16px;
       color: #32363d;
-      text-indent: 30px;
+      text-indent: 20px;
     }
     .toptimeqhuan {
       width: 190px;
@@ -1430,19 +1432,17 @@ export default {
 
 .app-box-san {
   width: 100%;
-  // height: 400px;
   display: flex;
+  justify-content: space-between;
   margin-top: 15px;
   .zuo {
-    flex: 1;
+    width: 49%;
     height: 100%;
-    margin-right: 15px;
     background: #ffffff;
     border-radius: 4px;
     .title {
       width: 100%;
       height: 55px;
-      // border-bottom: 1px solid #e0e0e0;
       display: flex;
       align-content: center;
       .text1 {

src/views/Statistics/ReceptionOverview.vue

@@ -1785,7 +1785,7 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 15px 15px 20px;
+  padding: 15px 15px 40px;
   min-width: 1000px;
 }
 
@@ -2112,11 +2112,13 @@ export default {
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
-  width: calc(100% - 270px);
+  // width: calc(100% - 270px);
   position: fixed;
   z-index: 999;
   box-shadow: 0px 0px 10px 0px #dadada;
   margin-top: -10px;
+  left: 255px;
+  right: 15px;
 }
 
 .app-titel {
@@ -2128,7 +2130,7 @@ export default {
     height: 100%;
     font-size: 16px;
     color: #32363d;
-    text-indent: 30px;
+    text-indent: 20px;
   }
 
   .toptimeqhuan {

src/views/Statistics/ReceptionStatistical.vue

@@ -645,7 +645,7 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 5px 15px 20px;
+  padding: 5px 15px 40px;
   min-width: 1000px;
 }
 .cen-tab {

src/views/Statistics/TheTeamCompared.vue

@@ -1248,7 +1248,7 @@ tbody tr {
 
 .box-center {
   width: 100%;
-  padding: 20px 15px;
+  padding: 20px 15px 40px;
   min-width: 1000px;
 }
 
@@ -1265,17 +1265,17 @@ tbody tr {
 }
 
 .app-top {
-  // width: 100%;
-  width: calc(100% - 270px);
   position: fixed;
   z-index: 999;
   margin-top: -16px;
   background: #ffffff;
-  box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
+  // box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   box-shadow: 0px 0px 10px 0px #dadada;
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+  left: 255px;
+  right: 15px;
 }
 
 .app-titel {
@@ -1287,7 +1287,7 @@ tbody tr {
     height: 100%;
     font-size: 16px;
     color: #32363d;
-    text-indent: 30px;
+    text-indent: 20px;
   }
 
   .toptimeqhuan {

src/views/Statistics/TrendAnalysis.vue

@@ -1322,7 +1322,7 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 20px 15px;
+  padding: 20px 15px 40px;
   min-width: 1000px;
 }
 
@@ -1501,7 +1501,7 @@ export default {
 
 .app-top {
   // width: 100%;
-  width: calc(100% - 270px);
+  // width: calc(100% - 270px);
   position: fixed;    
   z-index: 999;
   margin-top: -16px;
@@ -1511,6 +1511,8 @@ export default {
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+  left:255px;
+  right: 15px;
 }
 
 .app-titel {

src/views/Statistics/dataScreeAge.vue

@@ -1286,9 +1286,8 @@ export default {
 @import "../../components/theme.color.scss";
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 15px 15px 40px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 
 .tabcard {
@@ -1305,8 +1304,8 @@ export default {
     text-indent: 20px;
     margin-top: 10px;
     color: #666666;
-            display: flex;
-            align-items: center;
+    display: flex;
+    align-items: center;
   }
 
   .text2 {
@@ -1684,17 +1683,16 @@ export default {
 }
 
 .app-top {
-  // width: 100%;
-  width: calc(100% - 270px);
   position: fixed;    
   z-index: 999;
   margin-top: -16px;
   background: #ffffff;
-  box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   box-shadow: 0px 0px 10px 0px #dadada;
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+  left: 255px;
+  right: 15px;
 }
 
 .app-titel {

src/views/Statistics/dataScreeOrg.vue

@@ -1717,16 +1717,18 @@ export default {
 
 .app-top {
   // width: 100%;
-  width: calc(100% - 270px);
+  // width: calc(100% - 270px);
   position: fixed;    
   z-index: 999;
   margin-top: -16px;
   background: #ffffff;
-  box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
+  // box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   box-shadow: 0px 0px 10px 0px #dadada;
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+  left: 255px;
+  right: 15px;
 }
 
 .app-titel {

src/views/Statistics/dataScreeSys.vue

@@ -1889,7 +1889,7 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 20px 15px 30px;
+  padding: 20px 15px 40px;
   min-width: 1000px;
 }
 
@@ -2291,7 +2291,7 @@ export default {
 
 .app-top {
   // width: 100%;
-  width: calc(100% - 270px);
+  // width: calc(100% - 270px);
   position: fixed;
   z-index: 999;
   margin-top: -16px;
@@ -2301,6 +2301,8 @@ export default {
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+  left: 255px;
+  right: 15px;
 }
 
 .app-titel {

src/views/Statistics/index.vue

@@ -24,16 +24,7 @@
 
       <div class="app-titel2">
         <div style="text-indent: 30px;">接待时间:</div>
-        <div style="margin-left: 38px;">
-          <!-- <div :class="{ tophove: TimetoAhoose == 0 }" @click="tabtimetap(0)">
-            今日
-          </div>
-          <div :class="{ tophove: TimetoAhoose == 1 }" @click="tabtimetap(1)">
-            昨日
-          </div>
-          <div :class="{ tophove: TimetoAhoose == 2 }" @click="tabtimetap(2)">
-            近一周
-          </div> -->
+        <div style="margin-left: 20px;">
           <el-button
             :class="{ 'el-button--primary': TimetoAhoose == 0 }"
             @click="tabtimetap(0)"
@@ -113,15 +104,7 @@
         </div>
       </div>
       <div v-else>
-        <div
-          style="
-            width: 100%;
-            height: 200px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-          "
-        >
+        <div class="empty-box">
           <img class="imgboxc-img" style="width: 120px; height: 120px"  src="/img/nullnull.png" alt="" />
           <div class="nulltext" style="font-size: 14px">暂无数据</div>
         </div>
@@ -554,7 +537,7 @@ export default {
 
 .box-center {
   width: 100%;
-  padding:20px 15px;
+  padding:20px 15px 40px;
   min-width: 1000px;
 }
 
@@ -604,14 +587,11 @@ export default {
 
 .app-box {
   width: 100%;
-  padding-bottom: 20px;
   background: #ffffff;
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 4px;
-  padding-top: 20px;
-  padding-left: 30px;
-  padding-right: 30px;
-  margin-top: 20px;
+  padding: 20px 30px;
+  margin-top: 15px;
 
   .conbox {
     height: 18px;
@@ -627,12 +607,19 @@ export default {
     margin-top: 20px;
     display: flex;
     flex-wrap: wrap;
+    justify-content: flex-start;
 
     .alllist {
       width: 16.66%;
-      border: 1px solid #e0e0e0;
       padding-bottom: 2px;
       padding-top: 4px;
+      box-shadow: -1px 1px 1px #e0e0e0;
+      &:nth-child(1),&:nth-child(2),&:nth-child(3),&:nth-child(4),&:nth-child(5),&:nth-child(6){
+        border-top: 1px solid #e0e0e0;
+      }
+      &:nth-child(6n),&:last-child{
+        border-right: 1px solid #e0e0e0;
+      }
     }
 
     .alllist-text1 {
@@ -645,6 +632,14 @@ export default {
       text-align: center;
     }
   }
+  .empty-box{
+    width: 100%;
+    height: 200px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+  }
 }
 
 .box-forhtml {
@@ -654,7 +649,7 @@ export default {
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 4px;
   padding: 20px 30px;
-  margin-top: 20px;
+  margin-top: 15px;
 }
 
 .box-forhtml-flex {
@@ -788,16 +783,18 @@ export default {
 
 .app-top {
   // width: 100%;
-  width: calc(100% - 270px);
+  // width: calc(100% - 270px);
   position: fixed;
   z-index: 999;
   margin-top: -16px;
   background: #ffffff;
-  box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
+  // box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   box-shadow: 0px 0px 10px 0px #dadada;
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+  left: 255px;
+  right: 15px;
 
   .app-titel2 {
     width: 100%;

src/views/Template/PinspeakwordsList.vue

@@ -400,7 +400,7 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 5px 15px;
+  padding: 5px 15px 40px;
   min-width: 1000px;
 }
 

src/views/Template/wrongword.vue

@@ -446,7 +446,7 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 5px 15px 20px;
+  padding: 5px 15px 40px;
   min-width: 1000px;
 }
 .delclass {

src/views/admin/dept/index.vue

@@ -15,7 +15,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe height="390" style="width: 100%">
+      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="name" label="部门名称" align="center">
         </el-table-column>
         <el-table-column prop="peopleCount" label="部门人数" align="center">
@@ -47,7 +47,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="currentPage4"
-          :page-sizes="[10, 20, 30, 50,100]"
+          :page-sizes="[10, 20, 30, 40,50,100]"
           :page-size="size"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/views/building/index.vue

@@ -152,7 +152,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" height="640">
+      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="propertyName" :show-overflow-tooltip="true" width="120px" label="项目名称" align="center">
         </el-table-column>
 
@@ -180,13 +180,13 @@
           </template>
         </el-table-column>
 
-        <el-table-column :key="Math.random()" width="100" prop="managerPhone" label="管理员账号" align="center">
+        <el-table-column :key="Math.random()" width="110" prop="managerPhone" label="管理员账号" align="center">
           <template slot-scope="{ row }">
             {{ row.managerPhone || "-" }}
           </template>
         </el-table-column>
 
-        <el-table-column :key="Math.random()" prop="operationStaffName" :width="120" v-if="orgType == 0 || orgType == 1" label="运营人员"
+        <el-table-column :show-overflow-tooltip="true" :key="Math.random()" prop="operationStaffName" width="120" v-if="orgType == 0 || orgType == 1" label="运营人员"
           align="center">
         </el-table-column>
 
@@ -216,7 +216,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="residueTime" :width="100" label="服务状态" align="center">
+        <el-table-column prop="residueTime" width="100" label="服务状态" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.residueTime > 0">
               服务中({{
@@ -274,7 +274,7 @@
       </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">
+          :page-sizes="[10, 20,30, 40,50,100]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
         </el-pagination>
       </div>
     </div>
@@ -600,7 +600,7 @@ export default {
         },
       ],
       currentPage: 1,
-      size: 30,
+      size: 10,
       total: 10,
       value: "",
       input: "",
@@ -1277,7 +1277,7 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 5px 15px 100px;
+  padding: 5px 15px 40px;
   min-width: 1000px;
 }
 

src/views/houseData/analyse.vue

@@ -960,9 +960,8 @@ export default {
 
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 15px 15px 40px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 
 .cen-tab {
@@ -1018,17 +1017,17 @@ export default {
 
 .app-top {
   // width: 100%;
-  width: calc(100% - 270px);
+  // width: calc(100% - 270px);
   position: fixed;
   z-index: 999;
   margin-top: -16px;
   background: #ffffff;
-  // box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   box-shadow: 0px 0px 10px 0px #dadada;
   border-radius: 4px;
   padding-top: 15px;
-  // padding-bottom: 15px;
   padding-bottom: 6px;
+  left: 255px;
+  right: 15px;
 
   .app-titel {
     width: 100%;

src/views/houseData/count.vue

@@ -371,9 +371,8 @@ export default {
 <style scoped="scoped" lang="scss" >
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 15px 15px 40px;
   min-width: 1000px;
-  padding-bottom: 100px;
 }
 .cen-tab {
   width: 100%;

src/views/inspection/ProhibitedList.vue

@@ -335,9 +335,8 @@ export default {
 <style lang="scss" scoped>
 .box-center {
   width: 100%;
-  padding: 15px;
+  padding: 15px 15px 40px;
   min-width: 1000px;
-  padding-bottom: 100px;
 
   .app-top {
     width: 100%;