From 74ed146f35d0c1a3e8c21ce334ee39c64592d37d Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Mon, 8 Aug 2022 14:37:40 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Statistics/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 1706688..6ac7a16 100644
--- a/src/views/Statistics/index.vue
+++ b/src/views/Statistics/index.vue
@@ -463,6 +463,7 @@ export default {
             legend: {
               show: true,
               bottom: "0",
+              type: 'scroll',
             },
             graphic: [
               {

From 9eb1778144cb6d2bafb7255a9fbd908a201ce270 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Mon, 8 Aug 2022 15:45:02 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3echarts=20legend?=
 =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=8C=A4=E5=8E=8B=E4=B8=80=E8=B5=B7=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Statistics/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 6ac7a16..0fd34ba 100644
--- a/src/views/Statistics/index.vue
+++ b/src/views/Statistics/index.vue
@@ -501,8 +501,9 @@ export default {
                 name: "",
                 type: "pie",
                 radius: ["48%", "70%"],
-                avoidLabelOverlap: false,
+                avoidLabelOverlap: true,
                 data: objoptlis,
+                
               },
             ],
           };

From 866837bf59ea9f568963d48252d6b3fb31a2559a Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Mon, 8 Aug 2022 17:58:42 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E8=A1=A8=E6=A0=BC=E7=9A=84=E9=AB=98=E5=BA=A6=20bug?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B75733?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/const/crud/admin/log.js              |  2 ++
 src/views/Customer/AgentManagement.vue   |  2 +-
 src/views/Customer/CompanyRecord.vue     |  2 +-
 src/views/Customer/Companymanagement.vue |  2 +-
 src/views/Customer/index.vue             |  1 +
 src/views/Equipment/batch.vue            |  2 +-
 src/views/Equipment/state.vue            |  1 +
 src/views/File/index.vue                 |  1 +
 src/views/ReceivingRecords/index.vue     |  1 +
 src/views/Scheduling/index.vue           |  1 +
 src/views/Template/PinspeakwordsList.vue |  2 +-
 src/views/Template/taboo.vue             |  2 +-
 src/views/Template/wrongword.vue         |  2 +-
 src/views/admin/log/log.vue              | 40 +++++++++++++-----------
 src/views/admin/user/index.vue           |  1 +
 src/views/building/Count.vue             | 12 +++----
 src/views/building/index.vue             |  2 +-
 src/views/houseData/count.vue            |  2 +-
 18 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/src/const/crud/admin/log.js b/src/const/crud/admin/log.js
index 3df6bfe..31f5453 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",
@@ -61,6 +62,7 @@ export const tableOption1 = {
   index: true,
   indexLabel: "序号",
   stripe: true,
+  height: 527,
   menuAlign: "center",
   menuWidth: 150,
   menu:false,
diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue
index 3889a7c..460c9d2 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 :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="地区"
diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue
index 699b5c6..a034183 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 :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">
diff --git a/src/views/Customer/Companymanagement.vue b/src/views/Customer/Companymanagement.vue
index cdc4bac..5c19e98 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" :data="tableData" stripe style="width: 100%">
         <el-table-column prop="name" label="公司名称" align="center">
         </el-table-column>
         <el-table-column
diff --git a/src/views/Customer/index.vue b/src/views/Customer/index.vue
index fd87352..748e66a 100644
--- a/src/views/Customer/index.vue
+++ b/src/views/Customer/index.vue
@@ -271,6 +271,7 @@
     <div class="cen-tab">
       <el-table
         :data="tableData"
+         height="572px"
         stripe
         style="width: 100%"
         @selection-change="handleSelectionChange"
diff --git a/src/views/Equipment/batch.vue b/src/views/Equipment/batch.vue
index 7e3381e..b0374e7 100644
--- a/src/views/Equipment/batch.vue
+++ b/src/views/Equipment/batch.vue
@@ -31,7 +31,7 @@
         <el-table
           :data="tableData"
           stripe
-         height="390"
+          height="550px"
           style="width: 100%">
           <el-table-column
             prop="batchId"
diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue
index 102760a..fba4c90 100644
--- a/src/views/Equipment/state.vue
+++ b/src/views/Equipment/state.vue
@@ -342,6 +342,7 @@
       </div>
       <el-table
         :data="tableData"
+        height="527px"
         stripe
         @selection-change="handleSelectionChange"
         style="width: 100%"
diff --git a/src/views/File/index.vue b/src/views/File/index.vue
index 420786e..786b854 100644
--- a/src/views/File/index.vue
+++ b/src/views/File/index.vue
@@ -40,6 +40,7 @@
         <el-table
           :data="tableData"
           stripe
+          height="527px"
           style="width: 100%">
             <el-table-column
               type="selection"
diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue
index a05a270..e6a74f4 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -306,6 +306,7 @@
       <el-table
         :header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
         :data="tableData"
+         height="550px"
         stripe
         style="width: 100%"
       >
diff --git a/src/views/Scheduling/index.vue b/src/views/Scheduling/index.vue
index e74e778..19ec8da 100644
--- a/src/views/Scheduling/index.vue
+++ b/src/views/Scheduling/index.vue
@@ -84,6 +84,7 @@
     <div class="cen-tab">
       <el-table
         :data="tableData"
+        height="572px"
         stripe
         @selection-change="handleSelectionChange"
         style="width: 100%"
diff --git a/src/views/Template/PinspeakwordsList.vue b/src/views/Template/PinspeakwordsList.vue
index dcdb215..e282486 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" :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">
diff --git a/src/views/Template/taboo.vue b/src/views/Template/taboo.vue
index 2166d14..be6db63 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" :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">
diff --git a/src/views/Template/wrongword.vue b/src/views/Template/wrongword.vue
index 9f4d4d2..5f069ea 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" :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">
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..b154c8a 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -190,6 +190,7 @@
       <div v-if="choseFlag">
           <el-table
         :data="tableData"
+        height="533px"
         border
         @selection-change="handleSelectionChange"
         style="width: 100%"
diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue
index 3085d1d..3d4b722 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" :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>
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index b75679a..46d8c1e 100644
--- a/src/views/building/index.vue
+++ b/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%">
+      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" height="572px" stripe style="width: 100%">
         <el-table-column prop="propertyName" :show-overflow-tooltip="true" width="120px" label="项目名称" align="center">
         </el-table-column>
 
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>

From 670bebddb94f9132e17f55a55babb12aa19b93ec Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Mon, 8 Aug 2022 18:25:56 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=B8=8A=E7=9A=84=E5=B1=9E=E6=80=A7=E4=B8=8E=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91=E7=A9=BA=E6=A0=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Customer/CompanyRecord.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue
index a034183..90a4248 100644
--- a/src/views/Customer/CompanyRecord.vue
+++ b/src/views/Customer/CompanyRecord.vue
@@ -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="请选择">

From dc403a68063b83a8e9e7cca3159dd47232579483 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Tue, 9 Aug 2022 16:27:43 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/building/index.vue | 4 ++++
 vue.config.js                | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index 46d8c1e..e8545b3 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -308,6 +308,9 @@
         <el-form-item label="联系人" prop="linkman">
           <el-input v-model="ruleForm.linkman" maxlength="20" placeholder="联系人" 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" type="tel" placeholder="联系手机" maxlength="11"
             onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"></el-input>
@@ -653,6 +656,7 @@ export default {
         provinceId: "", //省id
         cityId: "", //市id
         agentId: localStorage.getItem("agentId"),
+        closeTime: '', // 接待时长（自动结束）
       },
       ruleForm1: {},
       optionsagentId: [],
diff --git a/vue.config.js b/vue.config.js
index fe9317d..9df20e2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://62.234.122.43:9999' //正式
 // const url = 'http://81.70.55.170:9999' // 新测试服务器IP
-// const url = 'http://192.168.31.86:9999' // 胜浩
+// const url = 'http://192.168.31.149:9999' // 胜浩
 // const url = 'https://zanyong.hfju.com' // 正式域名
 // const url = 'http://127.0.0.1:9999' // 本地
 const url = 'http://81.70.55.170:9999' // 新测试

From b0883f9096b0cc354bddb13e6b39bf4c69e985d4 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Tue, 9 Aug 2022 17:27:27 +0800
Subject: [PATCH 06/13] =?UTF-8?q?.el-scrollbar=5F=5Fwrap=20=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E5=BC=BA=E5=88=B6100vh=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 5513637..03e2ef2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -31,7 +31,7 @@ export default {
   border-color: #2671E2 !important;
 }
 .el-scrollbar__wrap{
-  height: 100vh !important;
+  height: 100vh;
 }
 .el-table__row{
   font-size: 14px!important;

From e5d9bc0936aa05ae04ca582702559adb78f71450 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Tue, 9 Aug 2022 19:22:59 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=985733?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Customer/AgentManagement.vue        |  7 ++++-
 src/views/Customer/CompanyRecord.vue          |  7 ++++-
 src/views/Customer/Companymanagement.vue      |  7 ++++-
 src/views/Customer/SalesStage.vue             |  6 ++++-
 src/views/Customer/index.vue                  |  6 +++++
 src/views/Equipment/batch.vue                 |  5 ++++
 .../Equipment/equipmentOnlineRecordList.vue   |  8 ++++--
 src/views/Equipment/record.vue                |  6 ++++-
 src/views/Equipment/state.vue                 |  5 ++++
 src/views/File/index.vue                      |  5 ++++
 src/views/ReceivingRecords/index.vue          |  5 ++++
 src/views/Scheduling/index.vue                |  5 ++++
 src/views/Statistics/BuildingContrast.vue     |  2 +-
 src/views/Statistics/MentoringAbility.vue     | 26 ++++++++++---------
 src/views/Statistics/ReceptionStatistical.vue |  7 ++++-
 src/views/Template/PinspeakwordsList.vue      |  9 +++++--
 src/views/Template/taboo.vue                  |  7 ++++-
 src/views/Template/wrongword.vue              |  7 ++++-
 src/views/admin/user/index.vue                |  5 ++++
 src/views/building/Count.vue                  |  6 ++++-
 src/views/building/index.vue                  |  7 ++++-
 21 files changed, 121 insertions(+), 27 deletions(-)

diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue
index 460c9d2..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" height="500px" 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 90a4248..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'}" height="572px" :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">
@@ -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 5c19e98..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'}" height="572px" :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 748e66a..cb97647 100644
--- a/src/views/Customer/index.vue
+++ b/src/views/Customer/index.vue
@@ -272,6 +272,7 @@
       <el-table
         :data="tableData"
          height="572px"
+         ref="table"
         stripe
         style="width: 100%"
         @selection-change="handleSelectionChange"
@@ -705,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 b0374e7..e73b0f2 100644
--- a/src/views/Equipment/batch.vue
+++ b/src/views/Equipment/batch.vue
@@ -31,6 +31,7 @@
         <el-table
           :data="tableData"
           stripe
+          ref="table"
           height="550px"
           style="width: 100%">
           <el-table-column
@@ -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 892809b..ee78669 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">
@@ -226,7 +226,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">
@@ -540,6 +540,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 fba4c90..a8b82d1 100644
--- a/src/views/Equipment/state.vue
+++ b/src/views/Equipment/state.vue
@@ -342,6 +342,7 @@
       </div>
       <el-table
         :data="tableData"
+        ref="table"
         height="527px"
         stripe
         @selection-change="handleSelectionChange"
@@ -1093,6 +1094,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 786b854..ec7eef9 100644
--- a/src/views/File/index.vue
+++ b/src/views/File/index.vue
@@ -40,6 +40,7 @@
         <el-table
           :data="tableData"
           stripe
+          ref="table"
           height="527px"
           style="width: 100%">
             <el-table-column
@@ -246,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 e6a74f4..b673f2b 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -305,6 +305,7 @@
     <div class="cen-tab">
       <el-table
         :header-cell-style="{ background: '#F5F7FA', color: '#333333' }"
+        ref="table"
         :data="tableData"
          height="550px"
         stripe
@@ -755,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 19ec8da..6e9e52c 100644
--- a/src/views/Scheduling/index.vue
+++ b/src/views/Scheduling/index.vue
@@ -84,6 +84,7 @@
     <div class="cen-tab">
       <el-table
         :data="tableData"
+        ref="table"
         height="572px"
         stripe
         @selection-change="handleSelectionChange"
@@ -522,6 +523,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 ef095b4..b93b7e4 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%">
+      <el-table height="527px" :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" stripe style="width: 100%">
          <el-table-column prop="batchId" label="序号" align="center">
           <template slot-scope="scope">
             {{
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 2b31a8a..559fa6a 100644
--- a/src/views/Statistics/ReceptionStatistical.vue
+++ b/src/views/Statistics/ReceptionStatistical.vue
@@ -109,7 +109,7 @@
     </div>
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" style="width: 100%">
+      <el-table 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">
             {{
@@ -524,6 +524,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/Template/PinspeakwordsList.vue b/src/views/Template/PinspeakwordsList.vue
index e282486..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'}" height="572px" :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 be6db63..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'}" height="572px" :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 5f069ea..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'}" height="572px" :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/user/index.vue b/src/views/admin/user/index.vue
index b154c8a..ef8b19e 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -190,6 +190,7 @@
       <div v-if="choseFlag">
           <el-table
         :data="tableData"
+        ref="table"
         height="533px"
         border
         @selection-change="handleSelectionChange"
@@ -1727,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 3d4b722..6feec0b 100644
--- a/src/views/building/Count.vue
+++ b/src/views/building/Count.vue
@@ -126,7 +126,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table height="427px" :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 0" :data="tableData"
+      <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>
@@ -616,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 e8545b3..9e753a4 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -152,7 +152,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :header-cell-style="{background:'#F5F7FA',color:'#333333'}" :data="tableData" height="572px" stripe style="width: 100%">
+      <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>
 
@@ -1161,6 +1161,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;
       });
     },

From b7a2c0e3d951d1527f97471326597e8cc2787534 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 10 Aug 2022 14:32:55 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=94=BB=E5=83=8F=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                    |  4 +---
 src/views/Statistics/Insightintothedetails.vue |  2 +-
 src/views/Statistics/index.vue                 |  8 +++++++-
 vue.config.js                                  | 13 ++++++-------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 03e2ef2..bbae2af 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,9 +30,7 @@ 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/views/Statistics/Insightintothedetails.vue b/src/views/Statistics/Insightintothedetails.vue
index fd28988..f5d2014 100644
--- a/src/views/Statistics/Insightintothedetails.vue
+++ b/src/views/Statistics/Insightintothedetails.vue
@@ -163,7 +163,7 @@ export default {
      // 权限
       this.sta_idx_download = this.permissions["sta_idx_download"];
       var isnull=this.$route.query.flag;
-      this.TimetoAhoose=isnull.TimetoAhoose;
+      if (isnull.TimetoAhoose) this.TimetoAhoose=isnull.TimetoAhoose;
       this.customtime=isnull.customtime;
       this.fromobj.starttime=isnull.starttime;
       this.fromobj.endoftime=isnull.endoftime;
diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue
index 0fd34ba..ff56188 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 },
@@ -413,6 +418,7 @@ export default {
       this.namelist = [];
       this.numlist = [];
       this.objlist = [];
+      this.alllist = [];
       var dateType = "";
       if (this.TimetoAhoose == 7) {
         dateType = "";
diff --git a/vue.config.js b/vue.config.js
index 9df20e2..33e6862 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,15 +3,14 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://192.168.31.161:9999' //长龙
-// const url = 'http://192.168.31.211:9999' // 泽明
-// const url = 'http://192.168.31.100:9999' //王笑
-// const url = 'http://62.234.122.43:9999' //正式
-// const url = 'http://81.70.55.170:9999' // 新测试服务器IP
 // const url = 'http://192.168.31.149:9999' // 胜浩
-// const url = 'https://zanyong.hfju.com' // 正式域名
 // 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 = {

From 458bf77cf1c033a667298ea28799374c6cf00a2a Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Wed, 10 Aug 2022 16:27:39 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=94=BB=E5=83=8F?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Statistics/Insightintothedetails.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/Statistics/Insightintothedetails.vue b/src/views/Statistics/Insightintothedetails.vue
index f5d2014..69a85ca 100644
--- a/src/views/Statistics/Insightintothedetails.vue
+++ b/src/views/Statistics/Insightintothedetails.vue
@@ -164,11 +164,14 @@ export default {
       this.sta_idx_download = this.permissions["sta_idx_download"];
       var isnull=this.$route.query.flag;
       if (isnull.TimetoAhoose) this.TimetoAhoose=isnull.TimetoAhoose;
-      this.customtime=isnull.customtime;
+      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: {

From 6e695c5fe85684b201258d32fbfa0a6668d858d1 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 11 Aug 2022 17:59:42 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E5=88=A4=E6=96=AD=20500=20=E4=B9=9F?=
 =?UTF-8?q?=E5=8E=BB=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/axios.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/axios.js b/src/router/axios.js
index d8ecc09..9743413 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -64,7 +64,7 @@ axios.interceptors.response.use(res => {
   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({

From e7362fe992da562a786a656697dd09f1be73235e Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 11 Aug 2022 18:09:13 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E5=88=A4=E6=96=AD=20500=20=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/axios.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/router/axios.js b/src/router/axios.js
index 9743413..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 || status === 500) {
     idx++
     if(idx==1){
       Message({
-        message: message,
+        message: '当前登录状态异常，请重新登录~',
         type: 'error'
       })
     }

From fb5beb2de58044bab36c867be2397abb578cf6bd Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 12 Aug 2022 14:24:50 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=8E=A5=E5=BE=85=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/building/index.vue | 12 +++++++++++-
 vue.config.js                |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index 9e753a4..d0bfdab 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -656,7 +656,7 @@ export default {
         provinceId: "", //省id
         cityId: "", //市id
         agentId: localStorage.getItem("agentId"),
-        closeTime: '', // 接待时长（自动结束）
+        closeTime: '120', // 接待时长（自动结束）
       },
       ruleForm1: {},
       optionsagentId: [],
@@ -933,6 +933,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
diff --git a/vue.config.js b/vue.config.js
index 33e6862..24cc19c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,11 +6,11 @@
 // 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://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 url = 'https://zanyong.hfju.com' // 正式域名
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 module.exports = {

From 015b99c916e88dbcea1d1b796cb6cb9866d55d3f Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 12 Aug 2022 16:39:02 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 24cc19c..33e6862 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,11 +6,11 @@
 // 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://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 url = 'https://zanyong.hfju.com' // 正式域名
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 module.exports = {