diff --git a/src/App.vue b/src/App.vue
index 6b7b710..6a9f5ad 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,9 +30,6 @@ export default {
   background-color: #2671E2 !important;
   border-color: #2671E2 !important;
 }
-.el-scrollbar__wrap{
-  height: 100vh ;
-}
 .el-table__row{
   font-size: 14px!important;
 }
diff --git a/src/const/crud/admin/log.js b/src/const/crud/admin/log.js
index f3b9f3e..ad5abae 100644
--- a/src/const/crud/admin/log.js
+++ b/src/const/crud/admin/log.js
@@ -1,6 +1,7 @@
 export const tableOption = {
   border: true,
   index: true,
+  height: 527,
   indexLabel: "序号",
   stripe: true,
   menuAlign: "center",
@@ -81,6 +82,7 @@ export const tableOption1 = {
   index: true,
   indexLabel: "序号",
   stripe: true,
+  height: 527,
   menuAlign: "center",
   menuWidth: 150,
   menu:false,
diff --git a/src/router/axios.js b/src/router/axios.js
index d8ecc09..47ff382 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -63,12 +63,11 @@ axios.interceptors.response.use(res => {
   NProgress.done()
   const status = Number(res.status) || 200
   const message = res.data.msg || errorCode[status] || errorCode['default']
-
-  if (status === 401) {
+  if (status === 401 || status === 500) {
     idx++
     if(idx==1){
       Message({
-        message: message,
+        message: '当前登录状态异常，请重新登录~',
         type: 'error'
       })
     }
diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue
index 3889a7c..566eb7b 100644
--- a/src/views/Customer/AgentManagement.vue
+++ b/src/views/Customer/AgentManagement.vue
@@ -56,7 +56,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
+      <el-table ref="table" :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" height="500px" stripe style="width: 100%">
         <el-table-column :show-overflow-tooltip="true" width="120" prop="agentName" label="代理商" align="center">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" width="140" prop="provinceName,cityName" label="地区"
@@ -1080,6 +1080,11 @@ export default {
         .then((res) => {
           this.tableData = res.data.records;
           this.total = res.data.total;
+          
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
         });
     },
     handleSizeChange(val) {
diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue
index 699b5c6..04a8dec 100644
--- a/src/views/Customer/CompanyRecord.vue
+++ b/src/views/Customer/CompanyRecord.vue
@@ -67,7 +67,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
+      <el-table ref="table" :header-cell-style="{background:'#F5F7FA',color:'#333333'}" height="572px" :data="tableData" stripe style="width: 100%">
         <el-table-column :show-overflow-tooltip="true" width="120px" prop="name" label="公司名称" align="center">
         </el-table-column>
         <el-table-column prop="operatorName" label="代理商" align="center">
@@ -180,7 +180,7 @@
           </el-select>
           </el-form-item> -->
         <el-form-item label="详细地址：" prop="address">
-          <el-input v-model="addagentobj.address" placeholder="详细地址"type="textarea" maxlength="60" show-word-limit></el-input>
+          <el-input v-model="addagentobj.address" placeholder="详细地址" type="textarea" maxlength="60" show-word-limit></el-input>
         </el-form-item>
         <!-- <el-form-item label="运营人员：" prop="operationStaff">
               <el-select v-model="addagentobj.operationStaff" placeholder="请选择">
@@ -1119,6 +1119,11 @@ export default {
         console.log(res.data);
         this.tableData = res.data.records;
         this.total = res.data.total;
+        
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     handleSizeChange(val) {
diff --git a/src/views/Customer/Companymanagement.vue b/src/views/Customer/Companymanagement.vue
index cdc4bac..7db8ef9 100644
--- a/src/views/Customer/Companymanagement.vue
+++ b/src/views/Customer/Companymanagement.vue
@@ -86,7 +86,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
+      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" height="572px" ref="table" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="name" label="公司名称" align="center">
         </el-table-column>
         <el-table-column
@@ -997,6 +997,11 @@ export default {
         console.log(res.data);
         this.tableData = res.data.records;
         this.total = res.data.total;
+        
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     locationsChange1(e) {
diff --git a/src/views/Customer/SalesStage.vue b/src/views/Customer/SalesStage.vue
index 1938025..5b75f28 100644
--- a/src/views/Customer/SalesStage.vue
+++ b/src/views/Customer/SalesStage.vue
@@ -38,7 +38,7 @@
     </div>
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
+      <el-table :data="tableData" height="527px" ref="table" stripe style="width: 100%" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
         <el-table-column prop="houseName" label="项目名称" align="center">
         </el-table-column>
         <el-table-column prop="stageName" label="阶段名称" align="center">
@@ -162,6 +162,10 @@ computed: {
       };
       this.$api.api.lifeTrackDefineList(obj).then((res) => {
         this.tableData = res.data;
+                  // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     //删除
diff --git a/src/views/Customer/index.vue b/src/views/Customer/index.vue
index fd87352..cb97647 100644
--- a/src/views/Customer/index.vue
+++ b/src/views/Customer/index.vue
@@ -271,6 +271,8 @@
     <div class="cen-tab">
       <el-table
         :data="tableData"
+         height="572px"
+         ref="table"
         stripe
         style="width: 100%"
         @selection-change="handleSelectionChange"
@@ -704,6 +706,11 @@ export default {
           // console.log(res)
           this.tableData = res.data.records;
           this.total = res.data.total;
+          
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
         });
     },
     clearScreen() {
diff --git a/src/views/Equipment/batch.vue b/src/views/Equipment/batch.vue
index 7e3381e..e73b0f2 100644
--- a/src/views/Equipment/batch.vue
+++ b/src/views/Equipment/batch.vue
@@ -31,7 +31,8 @@
         <el-table
           :data="tableData"
           stripe
-         height="390"
+          ref="table"
+          height="550px"
           style="width: 100%">
           <el-table-column
             prop="batchId"
@@ -261,6 +262,10 @@ export default {
           console.log(res.data);
           this.tableData=res.data.records;
           this.total=res.data.total
+                    // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
         });
     },
       handleSizeChange(val) {
diff --git a/src/views/Equipment/equipmentOnlineRecordList.vue b/src/views/Equipment/equipmentOnlineRecordList.vue
index 9b2f7ad..214751d 100644
--- a/src/views/Equipment/equipmentOnlineRecordList.vue
+++ b/src/views/Equipment/equipmentOnlineRecordList.vue
@@ -97,7 +97,7 @@
     </div>
     <div class="tablebox" v-if="activeTotal == 0">
       <template>
-        <el-table :data="tableData" style="width: 100%"  :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
+        <el-table height="450px" :data="tableData" ref="table" style="width: 100%"  :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
           <el-table-column prop="index" label="序号" width="100" align="center">
           </el-table-column>
           <el-table-column prop="imei" label="设备编号" align="center">
@@ -223,7 +223,7 @@
     </div>
     <div class="tablebox" v-if="activeTotal == 1">
       <template>
-        <el-table :data="tableData" style="width: 100%"  :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
+        <el-table height="450px" :data="tableData" style="width: 100%"  :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
           <el-table-column prop="index" label="序号" width="100" align="center">
           </el-table-column>
           <el-table-column prop="imei" label="设备编号" align="center">
@@ -537,6 +537,10 @@ export default {
         });
         this.tableData = res.data.records;
         this.page.total = res.data.total;
+                  // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
   },
diff --git a/src/views/Equipment/record.vue b/src/views/Equipment/record.vue
index 39449f9..28e82c7 100644
--- a/src/views/Equipment/record.vue
+++ b/src/views/Equipment/record.vue
@@ -58,7 +58,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="640" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
+      <el-table :data="tableData" ref="table" stripe style="width: 100%" height="540" :header-cell-style="{background:'#F5F7FA',color:'#333333'}">
         <el-table-column prop="equipImei" label="设备编号" align="center">
         </el-table-column>
         <el-table-column prop="userName" label="领用人" align="center">
@@ -251,6 +251,10 @@ export default {
         // console.log(res);
         this.tableData = res.data.records;
         this.total = res.data.total;
+                  // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     handleSelectionChange(val) {
diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue
index 8bb5c08..4e73686 100644
--- a/src/views/Equipment/state.vue
+++ b/src/views/Equipment/state.vue
@@ -342,6 +342,8 @@
       </div>
       <el-table
         :data="tableData"
+        ref="table"
+        height="527px"
         stripe
         @selection-change="handleSelectionChange"
         style="width: 100%"
@@ -1101,6 +1103,10 @@ export default {
           this.offLineCount = res.data.offLineCount;
           this.workingCount = res.data.workingCount;
           this.total = res.data.list.total;
+                    // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
         });
     },
     valuechange() {
diff --git a/src/views/File/index.vue b/src/views/File/index.vue
index 420786e..ec7eef9 100644
--- a/src/views/File/index.vue
+++ b/src/views/File/index.vue
@@ -40,6 +40,8 @@
         <el-table
           :data="tableData"
           stripe
+          ref="table"
+          height="527px"
           style="width: 100%">
             <el-table-column
               type="selection"
@@ -245,6 +247,10 @@ export default {
          })
           this.tableData=res.data.records;
           this.total=res.data.total
+                    // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
         })
     },
      handleSizeChange(val) {
diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue
index a05a270..b673f2b 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -305,7 +305,9 @@
     <div class="cen-tab">
       <el-table
         :header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
+        ref="table"
         :data="tableData"
+         height="550px"
         stripe
         style="width: 100%"
       >
@@ -754,6 +756,10 @@ export default {
         // console.log(res)
         this.tableData = res.data.records;
         this.total = res.data.total;
+                  // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     clearScreen() {
diff --git a/src/views/Scheduling/index.vue b/src/views/Scheduling/index.vue
index 32e99cd..5edfb73 100644
--- a/src/views/Scheduling/index.vue
+++ b/src/views/Scheduling/index.vue
@@ -84,6 +84,8 @@
     <div class="cen-tab">
       <el-table
         :data="tableData"
+        ref="table"
+        height="572px"
         stripe
         @selection-change="handleSelectionChange"
         style="width: 100%"
@@ -522,6 +524,10 @@ export default {
         console.log(res);
         this.tableData = res.data.records;
         this.total = res.data.total;
+                  // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     screening(){
diff --git a/src/views/Statistics/BuildingContrast.vue b/src/views/Statistics/BuildingContrast.vue
index ade081f..5810b4d 100644
--- a/src/views/Statistics/BuildingContrast.vue
+++ b/src/views/Statistics/BuildingContrast.vue
@@ -67,7 +67,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" @sort-change="customTabLast">
+      <el-table height="527px" :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" @sort-change="customTabLast">
          <el-table-column prop="batchId" label="序号" align="center">
           <template slot-scope="scope">
             {{
diff --git a/src/views/Statistics/Insightintothedetails.vue b/src/views/Statistics/Insightintothedetails.vue
index fd28988..69a85ca 100644
--- a/src/views/Statistics/Insightintothedetails.vue
+++ b/src/views/Statistics/Insightintothedetails.vue
@@ -163,12 +163,15 @@ export default {
      // 权限
       this.sta_idx_download = this.permissions["sta_idx_download"];
       var isnull=this.$route.query.flag;
-      this.TimetoAhoose=isnull.TimetoAhoose;
-      this.customtime=isnull.customtime;
+      if (isnull.TimetoAhoose) this.TimetoAhoose=isnull.TimetoAhoose;
+      if (isnull.customtime) this.customtime=isnull.customtime;
       this.fromobj.starttime=isnull.starttime;
       this.fromobj.endoftime=isnull.endoftime;
       this.fromobj.projectId=isnull.houseId;
       this.fromobj.keywords=isnull.keywordsId;
+      if (!isnull.TimetoAhoose && isnull.starttime && isnull.endoftime) {
+        this.TimetoAhoose = 6
+      }
       this.Accesstolevel()
   },
   computed: {
diff --git a/src/views/Statistics/MentoringAbility.vue b/src/views/Statistics/MentoringAbility.vue
index 166c68d..0ad254c 100644
--- a/src/views/Statistics/MentoringAbility.vue
+++ b/src/views/Statistics/MentoringAbility.vue
@@ -122,10 +122,7 @@
       </div>
     </div>
 
-    <div
-      :style="{ 'margin-top': role != 3 ? '150px' : '110px' }"
-      v-if="consultantlistid"
-    >
+    <div v-if="consultantlistid">
       <div class="app-box-san">
         <div class="zuo">
           <div class="title">
@@ -340,7 +337,9 @@
           <el-table
             :header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
             :data="tableData"
+            height="527px"
             stripe
+            ref="table"
             style="width: 100%"
           >
             <el-table-column prop="statDate" label="日期" align="center">
@@ -686,6 +685,10 @@ export default {
         })
         .then((res) => {
           this.tableData = res.data.records;
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
           // 数据处理
           // 需要两个数组，一个用来展示
           this.deailDate();
@@ -1292,9 +1295,9 @@ export default {
     //切换时间
     tabtimetap(index) {
       this.TimetoAhoose = index;
-      
+
       if (index == 0) {
-        this.customtime = []
+        this.customtime = [];
       }
       if (index == 4) {
         let starTime = new Date().getTime() - 24 * 60 * 60 * 1000 * 7;
@@ -1388,17 +1391,16 @@ export default {
 .app-top {
   // width: 100%;
   // width: calc(100% - 270px);
-  position: fixed;
+  position: sticky;
+  top: 0;
   z-index: 999;
-  margin-top: -16px;
+  // 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;
@@ -1567,13 +1569,13 @@ export default {
   height: 500px;
   background: #fff;
   text-align: center;
-  margin-top: 110px;
+  margin-top: 20px;
   overflow: hidden;
 }
 .imgboxc {
   margin-top: 100px;
   color: #999999;
-  .imgboxc-img{
+  .imgboxc-img {
     width: 120px;
     height: 120px;
   }
diff --git a/src/views/Statistics/ReceptionStatistical.vue b/src/views/Statistics/ReceptionStatistical.vue
index ab0280e..7d0340e 100644
--- a/src/views/Statistics/ReceptionStatistical.vue
+++ b/src/views/Statistics/ReceptionStatistical.vue
@@ -115,12 +115,7 @@
     </div>
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table
-        :header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
-        :data="tableData"
-        style="width: 100%"
-        @sort-change="customTabLast"
-      >
+      <el-table @sort-change="customTabLast" ref="table" height="527px" :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" style="width: 100%">
         <el-table-column prop="batchId" width="120" label="序号" align="center">
           <template slot-scope="scope">
             {{
@@ -560,6 +555,11 @@ export default {
         })
         .then((res) => {
           this.tableData = res.data.records;
+          
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
           // 数据处理
           // 需要两个数组，一个用来展示
           this.deailDate();
diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 9d33f02..6c1b688 100644
--- a/src/views/Statistics/index.vue
+++ b/src/views/Statistics/index.vue
@@ -335,13 +335,18 @@ export default {
     },
     Toview(item, index) {
       let Userrecord = {
-        TimetoAhoose: this.TimetoAhoose,
         keywordsId: item.matchKeywords[index].keywordsId,
         customtime: this.customtime,
         starttime: this.fromobj.starttime,
         endoftime: this.fromobj.endoftime,
         houseId: this.houseId,
       };
+      if (this.TimetoAhoose == 0) {
+        Userrecord.TimetoAhoose = this.TimetoAhoose
+      }
+      if (this.TimetoAhoose == 4) {
+        Userrecord.TimetoAhoose = 2
+      }
       this.$router.push({
         path: "/Statistics/Insightintothedetails",
         query: { flag: Userrecord },
@@ -464,6 +469,7 @@ export default {
             legend: {
               show: true,
               bottom: "0",
+              type: 'scroll',
             },
             graphic: [
               {
@@ -501,8 +507,9 @@ export default {
                 name: "",
                 type: "pie",
                 radius: ["48%", "70%"],
-                avoidLabelOverlap: false,
+                avoidLabelOverlap: true,
                 data: objoptlis,
+                
               },
             ],
           };
diff --git a/src/views/Template/PinspeakwordsList.vue b/src/views/Template/PinspeakwordsList.vue
index dcdb215..3b41cf7 100644
--- a/src/views/Template/PinspeakwordsList.vue
+++ b/src/views/Template/PinspeakwordsList.vue
@@ -31,7 +31,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
+      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" height="572px" ref="table" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="houseName" label="项目名称" align="center">
         </el-table-column>
         <el-table-column prop="name" label="状态" align="center">
@@ -315,7 +315,12 @@ export default {
       }
       this.$api.http.templatefindByPage(parmest).then((res) => {
         this.tableData = res.data.records;
-        this.total = res.data.total
+        this.total = res.data.total;
+        
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     //templatedel删除模板
diff --git a/src/views/Template/taboo.vue b/src/views/Template/taboo.vue
index 2166d14..c58189e 100644
--- a/src/views/Template/taboo.vue
+++ b/src/views/Template/taboo.vue
@@ -47,7 +47,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
+      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" height="572px" ref="table" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="words" label="敏感词" align="center">
         </el-table-column>
         <el-table-column prop="houseName" label="项目名称" align="center">
@@ -201,6 +201,11 @@ export default {
           return item.words;
         });
         this.total = res.data.total;
+        
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     screening() {
diff --git a/src/views/Template/wrongword.vue b/src/views/Template/wrongword.vue
index 9f4d4d2..f14df14 100644
--- a/src/views/Template/wrongword.vue
+++ b/src/views/Template/wrongword.vue
@@ -63,7 +63,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
+      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" height="572px" ref="table" :data="tableData" stripe style="width: 100%">
         <el-table-column type="index" label="序号" width="50">
         </el-table-column>
         <el-table-column prop="correctWord" label="正确词" align="center">
@@ -417,6 +417,11 @@ export default {
         this.total = res.data.total;
 
         console.log(this.mistakenList, this.correctList);
+        
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
       });
     },
     addinfo() {
diff --git a/src/views/admin/log/log.vue b/src/views/admin/log/log.vue
index f406498..dd691ae 100644
--- a/src/views/admin/log/log.vue
+++ b/src/views/admin/log/log.vue
@@ -3,6 +3,7 @@
   <div class="log">
     <basic-container>
       <avue-crud
+      height="100px"
         ref="crud"
         :page.sync="page"
         :data="tableData"
@@ -25,7 +26,7 @@
 import { delObj, fetchList1 } from "@/api/admin/log";
 import { tableOption } from "@/const/crud/admin/log";
 import { mapGetters } from "vuex";
-import { exportMethodPost} from "@/util/util";
+import { exportMethodPost } from "@/util/util";
 
 export default {
   name: "Log",
@@ -41,7 +42,7 @@ export default {
         flag: "1",
         name: "",
         params: "",
-        title:''
+        title: "",
       },
       page: {
         total: 0, // 总页数
@@ -60,22 +61,23 @@ export default {
       };
     },
   },
-    created() {
+  created() {
     this.admin_log_downLoad = this.permissions["admin_log_downLoad"];
   },
   methods: {
-          downLoad(){
-        let obj=Object.assign(
-          {
-            descs: "create_time",
-            orgType: localStorage.getItem("orgType"),
-            orgCode: localStorage.getItem("orgCode"),
-            agentId: localStorage.getItem("agentId"),
-            houseId: localStorage.getItem("houseId"),
-          },
-          this.searchForm)
+    downLoad() {
+      let obj = Object.assign(
+        {
+          descs: "create_time",
+          orgType: localStorage.getItem("orgType"),
+          orgCode: localStorage.getItem("orgCode"),
+          agentId: localStorage.getItem("agentId"),
+          houseId: localStorage.getItem("houseId"),
+        },
+        this.searchForm
+      );
       // exportMethodPost()
-      exportMethodPost('/admin/log/operateLogPageExport','操作日志',obj)
+      exportMethodPost("/admin/log/operateLogPageExport", "操作日志", obj);
     },
     selChange(e) {
       this.value = "";
@@ -117,10 +119,10 @@ export default {
         remoteAddr: "",
         name: "",
         params: "",
-        title:''
+        title: "",
       };
       this.value = "";
-      this.time=[]
+      this.time = [];
       this.getList(this.page);
     },
     timeChange(e) {
@@ -227,8 +229,8 @@ export default {
 .div-inp {
   width: 250px;
 }
-/deep/ .el-button--primary{
-  background: #2671E2 !important;
-  border: 1px solid #2671E2 !important;
+/deep/ .el-button--primary {
+  background: #2671e2 !important;
+  border: 1px solid #2671e2 !important;
 }
 </style>
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index cb92bff..ef8b19e 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -190,6 +190,8 @@
       <div v-if="choseFlag">
           <el-table
         :data="tableData"
+        ref="table"
+        height="533px"
         border
         @selection-change="handleSelectionChange"
         style="width: 100%"
@@ -1726,6 +1728,10 @@ export default {
             if (res.code == 0) {
               this.tableData1 = res.data.records;
               this.page.total = res.data.total;
+                        // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
             } else {
               this.$message.waring(res.msg);
             }
diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue
index 3085d1d..6feec0b 100644
--- a/src/views/building/Count.vue
+++ b/src/views/building/Count.vue
@@ -1,11 +1,6 @@
 <template>
   <div class="box-center">
-    <div style="
-    width: calc(100% - 270px);
-    position: fixed;    
-    z-index: 999;
-    margin-top: -16px;
-    ">
+    <div>
       <div class="toptab" style="cursor: pointer" v-if="orgType != 2">
         <div @click="tapclickyab(0)" :class="{ activecllasscet: activeTotal == 0 }"
           :style="{ background: activeTotal == 0 ? '#2671E2' : '#ffffff' }">
@@ -125,12 +120,13 @@
             <el-button @click="downLoad" icon="el-icon-download">导出</el-button>
           </div>
         </div>
+        
       </div>
     </div>
 
     <!-- 表格 -->
-    <div class="cen-tab" :style="{ marginTop: orgType != 2 ? '230px' : '170px' }">
-      <el-table :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 0" :data="tableData"
+    <div class="cen-tab">
+      <el-table height="427px" ref="table" :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 0" :data="tableData"
         stripe style="width: 100%">
         <el-table-column prop="propertyName" width="120"  label="项目名称" align="center">
         </el-table-column>
@@ -620,6 +616,10 @@ export default {
           // console.log(res);
           this.tableData = res.data.records;
           this.total = res.data.total;
+                    // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
         });
       }
     },
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index 9e0a543..225aacd 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -246,19 +246,8 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <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 :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" ref="table" height="572px" stripe style="width: 100%">
+        <el-table-column prop="propertyName" :show-overflow-tooltip="true" width="120px" label="项目名称" align="center">
         </el-table-column>
 
         <el-table-column
@@ -579,6 +568,9 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item label="接待时长" prop="linkman">
+          <el-input v-model="ruleForm.closeTime" maxlength="10" placeholder="接待时长(分钟)" clearable></el-input>
+        </el-form-item>
         <el-form-item label="联系手机" prop="linkmanPhone">
           <el-input
             v-model="ruleForm.linkmanPhone"
@@ -1059,6 +1051,7 @@ export default {
         cityId: "", //市id
         agentId: localStorage.getItem("agentId"),
         time: "22:00", // 日报推送时间
+        closeTime: '120', // 接待时长（自动结束）
       },
       ruleForm1: {},
       optionsagentId: [],
@@ -1339,6 +1332,16 @@ export default {
             return;
           }
           this.loadingFlag = true;
+          if (this.ruleForm.closeTime && this.ruleForm.closeTime < 30) {
+            this.$message.error('自动结束接待时长限制最小为30分钟')
+            this.loadingFlag = false;
+            return
+          }
+          if (this.ruleForm.closeTime && this.ruleForm.closeTime > 720) {
+            this.$message.error('自动结束接待时长限制最大为720分钟')
+            this.loadingFlag = false;
+            return
+          }
           // 编辑
           if (this.editFlag) {
             this.$api.api
@@ -1581,6 +1584,11 @@ export default {
       this.$api.api.zkhousePage(obj).then((res) => {
         // console.log(res)
         this.tableData = res.data.records;
+        
+          // 表格中设置ref属性，在数据渲染之后或者updated()之后
+          this.$nextTick(() => {
+            this.$refs.table.doLayout();
+          });
         this.total = res.data.total;
       });
     },
diff --git a/src/views/houseData/count.vue b/src/views/houseData/count.vue
index c299671..9aab12f 100644
--- a/src/views/houseData/count.vue
+++ b/src/views/houseData/count.vue
@@ -54,7 +54,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%" height="640">
+      <el-table height="527px" :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="operationName" label="运营" align="center" sortable></el-table-column>
         <el-table-column prop="houseQuantityInService" label="项目数" width="120" align="center" sortable></el-table-column>
         <el-table-column prop="wrongWordAddCount" width="120" label="常错词添加数" align="center" sortable></el-table-column>
diff --git a/vue.config.js b/vue.config.js
index c4fb753..33e6862 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,11 +3,14 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://192.168.31.161:9999' //长龙
-// const url = 'http://192.168.31.147:9999' // 胜浩
-// const url = 'https://zanyong.hfju.com' // 正式域名
+// const url = 'http://192.168.31.149:9999' // 胜浩
 // const url = 'http://127.0.0.1:9999' // 本地
-const url = 'http://81.70.55.170:9999' // 新测试
-// const url = 'http://82.156.35.22:9999' // 新正式ip
+
+const url = 'http://81.70.55.170:9999' // 测试服务器
+
+// const url = 'http://62.234.122.43:9999' //正式服务器1
+// const url = 'http://82.156.35.22:9999' // 正式服务器2
+// const url = 'https://zanyong.hfju.com' // 正式域名
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 module.exports = {