优化

src/page/wel.vue

@@ -473,7 +473,12 @@
                 }">{{ i + 1 }}</span><span class="name">{{ item.accountName }}</span></div>
                 <div class="jinbox-box">
                   <div class="boxbaifenbi"
-                :style="{ 'background': i + 1 == 1 ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)' : i + 1 == 2 ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)' : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)', 'width': item.zxl1 + '%' }">
+                :style="{ 
+                  'background': i + 1 == 1 ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)' : 
+                  i + 1 == 2 ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)' : 
+                  i + 1 == 3 ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)' : 
+                  'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)', 
+                  'width': item.fraction + '%' }">
                   </div>
                 </div>
                 <div class="jinboxbott">{{ item.fraction }}%</div>

src/views/Customer/AgentManagement.vue

@@ -56,7 +56,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column :show-overflow-tooltip="true" width="120px" prop="agentName" label="代理商" align="center">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" width="140px" prop="provinceName,cityName" label="地区"

src/views/Customer/CompanyRecord.vue

@@ -67,7 +67,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <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">

src/views/Customer/Companymanagement.vue

@@ -86,7 +86,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="name" label="公司名称" align="center">
         </el-table-column>
         <el-table-column

src/views/Customer/SalesStage.vue

@@ -38,7 +38,7 @@
     </div>
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="houseName" label="项目名称" align="center">
         </el-table-column>
         <el-table-column prop="stageName" label="阶段名称" align="center">

src/views/Customer/source.vue

@@ -17,7 +17,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" row-key="id" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" row-key="id" height="640">
         <el-table-column label="序号" align="center">
           <template slot-scope="scope">
             {{ scope.$index + 1 }}

src/views/Equipment/equipmentDetailList.vue

@@ -606,7 +606,7 @@
     </div>
     <div class="tablebox" v-if="!selectTime1">
       <template>
-        <el-table :data="tableData" style="width: 100%" height="390">
+        <el-table :data="tableData" style="width: 100%" height="640">
           <el-table-column prop="createTime" label="日期" width="100" align="center">
           </el-table-column>
           <el-table-column prop="equipmentQuantity" label="设备总数" align="center">
@@ -665,7 +665,7 @@
 
     <div class="tablebox" v-if="selectTime1">
       <template>
-        <el-table :data="compareList" style="width: 100%" height="390">
+        <el-table :data="compareList" style="width: 100%" height="640">
           <el-table-column prop="name" label="时间" align="center">
           </el-table-column>
           <el-table-column prop="time" label="时段一" align="center">

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%" height="390">
+        <el-table :data="tableData" style="width: 100%" height="640">
           <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%" height="390">
+        <el-table :data="tableData" style="width: 100%" height="640">
           <el-table-column prop="index" label="序号" width="100" align="center">
           </el-table-column>
           <el-table-column prop="imei" label="设备编号" align="center">

src/views/Equipment/record.vue

@@ -58,7 +58,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="equipImei" label="设备编号" align="center">
         </el-table-column>
         <el-table-column prop="userName" label="领用人" align="center">

src/views/Receive/index.vue

@@ -146,8 +146,11 @@
             <!-- box-shadow: -10px 0px 7px -7px #d1d1d1 inset; -->
             <div class="headboxbott">
               <div class="headovfu"
-                :style="{ boxShadow: tablist.length > 5 ? '-10px 0px 7px -7px #d1d1d1 inset' : '' }">
-                <div style="width: 100%; display: flex" class="inner-container">
+                :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 }"
@@ -157,7 +160,7 @@
                   >
                     {{ item.name }}
                   </div> -->
-                  <el-button v-for="(item, index) in tablist" style="width:120px" :key="index"
+                  <el-button v-for="(item, index) in tablist" style="width:82px;height: 32px;" :key="index"
                     :class="{ 'el-button--primary': roleindex == index }" @click="tapspagek(index)">{{ item.name }}
                   </el-button>
                 </div>
@@ -289,7 +292,7 @@
               align-items: center;
             ">
           <div style="flex: 1; font-size: 16px; color: #333333; text-indent: 5%">
-            客户意向
+            销讲执行
           </div>
 
         </div>

src/views/ReceivingRecords/index.vue

@@ -3,25 +3,12 @@
     <!-- 头 -->
     <div class="app-top">
       <div class="app-titel" v-if="orgType != 3">
-        <div
-          class="label"
-          style="color: #32363d; font-weight: 400; font-size: 16px"
-        >
+        <div class="label" style="color: #32363d; font-weight: 400; font-size: 16px">
           项目选择：
         </div>
         <div style="margin-left: 8px">
-          <el-select
-            v-model="searchForm.projectId"
-            @change="houseChange"
-            placeholder="请选择"
-            filterable
-          >
-            <el-option
-              v-for="item in houseList"
-              :key="item.id"
-              :label="item.propertyName"
-              :value="item.id"
-            >
+          <el-select v-model="searchForm.projectId" @change="houseChange" placeholder="请选择" filterable>
+            <el-option v-for="item in houseList" :key="item.id" :label="item.propertyName" :value="item.id">
             </el-option>
           </el-select>
         </div>
@@ -29,47 +16,23 @@
       <div class="app-titel" style="margin-top: 15px">
         <div class="label" style="margin-left: 20px">时间：</div>
         <div class="toptimeqhuan">
-          <el-button
-            class="btn"
-            :type="searchForm.dateType == null ? 'primary' : ''"
-            @click="tabtimetap(null)"
-          >
+          <el-button class="btn" :type="searchForm.dateType == null ? 'primary' : ''" @click="tabtimetap(null)">
             全部
           </el-button>
-          <el-button
-            class="btn"
-            :type="searchForm.dateType == 0 ? 'primary' : ''"
-            @click="tabtimetap(0)"
-          >
+          <el-button class="btn" :type="searchForm.dateType == 0 ? 'primary' : ''" @click="tabtimetap(0)">
             今日
           </el-button>
-          <el-button
-            class="btn"
-            :type="searchForm.dateType == 1 ? 'primary' : ''"
-            @click="tabtimetap(1)"
-          >
+          <el-button class="btn" :type="searchForm.dateType == 1 ? 'primary' : ''" @click="tabtimetap(1)">
             昨日
           </el-button>
-          <el-button
-            class="btn"
-            :type="searchForm.dateType == 2 ? 'primary' : ''"
-            @click="tabtimetap(2)"
-          >
+          <el-button class="btn" :type="searchForm.dateType == 2 ? 'primary' : ''" @click="tabtimetap(2)">
             近7天
           </el-button>
         </div>
         <div style="margin-left: 20px">
-          <el-date-picker
-            v-model="time"
-            type="daterange"
-            class="div-inp"
-            range-separator="-"
-            start-placeholder="开始日期"
-            :default-time="['00:00:00', '23:59:59']"
-            value-format="yyyy-MM-dd"
-            end-placeholder="结束日期"
-            @change="timeChange"
-          >
+          <el-date-picker v-model="time" type="daterange" class="div-inp" range-separator="-" start-placeholder="开始日期"
+            :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" end-placeholder="结束日期"
+            @change="timeChange">
           </el-date-picker>
         </div>
       </div>
@@ -77,73 +40,34 @@
       <div class="app-titel" style="margin-top: 15px" v-show="isOpen">
         <div class="div-lab">
           <div class="label">客户名称：</div>
-          <el-input
-            class="div-inp"
-            maxlength="10"
-            clearable
-            v-model="searchForm.name"
-          ></el-input>
+          <el-input class="div-inp" maxlength="10" clearable v-model="searchForm.name"></el-input>
         </div>
 
         <div class="div-lab">
           <div class="label">画像标签：</div>
-          <el-select
-            class="div-inp"
-            multiple
-            clearable
-            filterable
-            collapse-tags
-            v-model="searchForm.keywordsId"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in keywordsList"
-              :key="item.keywordsId"
-              :label="
-                item.isInterval == 0
-                  ? item.name + '-' + item.endName + item.unit
-                  : item.name
-              "
-              :value="item.keywordsId"
-            >
+          <el-select class="div-inp" multiple clearable filterable collapse-tags v-model="searchForm.keywordsId"
+            placeholder="请选择">
+            <el-option v-for="item in keywordsList" :key="item.keywordsId" :label="
+              item.isInterval == 0
+                ? item.name + '-' + item.endName + item.unit
+                : item.name
+            " :value="item.keywordsId">
             </el-option>
           </el-select>
         </div>
 
         <div class="div-lab">
           <div class="label">录音类型：</div>
-          <el-select
-            v-model="searchForm.recording"
-            clearable
-            filterable
-            placeholder="请选择"
-            class="div-inp"
-          >
-            <el-option
-              v-for="item in recordingList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="searchForm.recording" clearable filterable placeholder="请选择" class="div-inp">
+            <el-option v-for="item in recordingList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </div>
 
         <div class="div-lab">
           <div class="label">置业顾问：</div>
-          <el-select
-            v-model="searchForm.accountId"
-            clearable
-            filterable
-            placeholder="请选择"
-            class="div-inp"
-          >
-            <el-option
-              v-for="item in accountList"
-              :key="item.accountId"
-              :label="item.name"
-              :value="item.accountId"
-            >
+          <el-select v-model="searchForm.accountId" clearable filterable placeholder="请选择" class="div-inp">
+            <el-option v-for="item in accountList" :key="item.accountId" :label="item.name" :value="item.accountId">
             </el-option>
           </el-select>
         </div>
@@ -151,19 +75,8 @@
         <div class="div-lab">
           <!-- 默认全部 -->
           <div class="label">标记顾问：</div>
-          <el-select
-            v-model="searchForm.markAdvisor"
-            placeholder="请选择"
-            class="div-inp"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="item in options5"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="searchForm.markAdvisor" placeholder="请选择" class="div-inp" filterable clearable>
+            <el-option v-for="item in options5" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </div>
@@ -171,19 +84,8 @@
         <div class="div-lab">
           <!-- 默认全部 -->
           <div class="label">是否违禁：</div>
-          <el-select
-            v-model="searchForm.taboo"
-            placeholder="请选择"
-            class="div-inp"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="item in options11"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="searchForm.taboo" placeholder="请选择" class="div-inp" filterable clearable>
+            <el-option v-for="item in options11" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </div>
@@ -209,74 +111,30 @@
 
         <div class="div-lab">
           <div class="label">接待时长：</div>
-          <el-select
-            clearable
-            filterable
-            v-model="searchForm.recDurationInterval"
-            placeholder="请选择"
-            class="div-inp"
-          >
-            <el-option
-              v-for="item in options3"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select clearable filterable v-model="searchForm.recDurationInterval" placeholder="请选择" class="div-inp">
+            <el-option v-for="item in options3" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </div>
 
         <div class="div-lab">
           <div class="label">到访次数：</div>
-          <el-select
-            v-model="searchForm.visitRecord"
-            clearable
-            filterable
-            placeholder="请选择"
-            class="div-inp"
-          >
-            <el-option
-              v-for="item in options4"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="searchForm.visitRecord" clearable filterable placeholder="请选择" class="div-inp">
+            <el-option v-for="item in options4" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </div>
 
         <div class="div-lab">
           <div class="label">推荐案例：</div>
-          <el-select
-            v-model="searchForm.zfal"
-            clearable
-            filterable
-            placeholder="请选择"
-            class="div-inp"
-          >
-            <el-option
-              v-for="item in options14"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select v-model="searchForm.zfal" clearable filterable placeholder="请选择" class="div-inp">
+            <el-option v-for="item in options14" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </div>
         <div class="div-lab">
           <div class="label">接待标识：</div>
-          <el-select
-            v-model="searchForm.validInvalid"
-            clearable
-            filterable
-            placeholder="请选择"
-            class="div-inp"
-          >
-            <el-option
-              v-for="item in options13"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select v-model="searchForm.validInvalid" clearable filterable placeholder="请选择" class="div-inp">
+            <el-option v-for="item in options13" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </div>
       </div>
@@ -290,13 +148,11 @@
         </div>
         <div style="margin-left: 20px">
           <el-button @click="clearScreen" type="text">清空筛选条件</el-button>
-        </div>          
-        <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>
+        <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
-          style="margin-left: auto; margin-right: 10px"
-          v-if="rec_index_downLoad"
-        >
+        <div style="margin-left: auto; margin-right: 10px" v-if="rec_index_downLoad">
           <el-button @click="downLoad">导出</el-button>
         </div>
       </div>
@@ -304,15 +160,8 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
-        <el-table-column
-          prop="staTimeOfCN"
-          label="接待开始时间"
-          align="center"
-          width="200"
-          sortable
-         height="390"
-        >
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
+        <el-table-column prop="staTimeOfCN" label="接待开始时间" align="center" width="200" sortable height="390">
         </el-table-column>
         <el-table-column prop="agentName" label="顾问" align="center">
         </el-table-column>
@@ -321,16 +170,16 @@
         <el-table-column prop="visitRecordName" label="到访次数" align="center">
         </el-table-column>
 
-        <el-table-column prop="mm" label="录音时长" align="center"  width="100" sortable>
+        <el-table-column prop="mm" label="录音时长" align="center" width="100" sortable>
         </el-table-column>
         <el-table-column prop="recording" label="录音类型" align="center">
           <template slot-scope="{ row }">
             {{
-              row.recording == 0
-                ? "没有录音"
-                : row.recording == 1
-                ? "部分录音"
-                : "完整录音"
+                row.recording == 0
+                  ? "没有录音"
+                  : row.recording == 1
+                    ? "部分录音"
+                    : "完整录音"
             }}
           </template>
         </el-table-column>
@@ -340,12 +189,12 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="total" label="画像标签触达次数" align="center"  width="150" sortable>
+        <el-table-column prop="total" label="画像标签触达次数" align="center" width="150" sortable>
         </el-table-column>
         <el-table-column prop="fraction" label="执行率" align="center" sortable>
           <template slot-scope="{ row }"> {{ row.fraction || "0" }}% </template>
         </el-table-column>
-        
+
         <!-- <el-table-column prop="address" label="禁忌执行率" align="center">
         </el-table-column> -->
         <!--  scope -->
@@ -363,12 +212,7 @@
         <el-table-column prop="zfalName" label="推荐案例" align="center"></el-table-column>
         <el-table-column label="操作" align="center" width="80" fixed="right">
           <template slot-scope="{ row }">
-            <el-button
-              type="text"
-              v-if="rec_index_show"
-              @click="Receivedetailsabout(row)"
-              >查看</el-button
-            >
+            <el-button type="text" v-if="rec_index_show" @click="Receivedetailsabout(row)">查看</el-button>
             <!-- To Doing?按钮未添加权限判断 下一版本开发（删除） -->
             <!-- <el-button type="text" @click="deleteReceive(row)">删除</el-button> -->
             <!-- <el-button type="text" v-if="rec_index_text">下载文本</el-button>
@@ -377,15 +221,8 @@
         </el-table-column>
       </el-table>
       <div style="display: flex; justify-content: flex-end; margin-top: 10px">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 30, 50]"
-          :page-size="size"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        >
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 30, 50]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
         </el-pagination>
       </div>
     </div>
@@ -398,7 +235,7 @@ import { exportMethodPost } from "@/util/util";
 export default {
   data() {
     return {
-      isOpen:false,
+      isOpen: false,
       TimetoAhoose: 2,
       time: [],
       houseList: [],
@@ -500,7 +337,7 @@ export default {
           label: "全部",
           value: "",
         },
-        
+
         {
           label: "有效接待",
           value: "0",
@@ -573,7 +410,7 @@ export default {
       console.log("时间");
     }
 
-    
+
 
     this.rec_index_show = this.permissions["rec_index_show"];
     this.rec_index_text = this.permissions["rec_index_text"];
@@ -581,29 +418,32 @@ export default {
     this.rec_index_downLoad = this.permissions["rec_index_downLoad"];
   },
   mounted() {
-    if(this.$route.query.validInvalid){
+    if (this.$route.query.validInvalid) {
       this.searchForm.validInvalid = this.$route.query.validInvalid;
     }
-    if(this.$route.query.markAdvisor){
+    if (this.$route.query.markAdvisor) {
       this.searchForm.markAdvisor = this.$route.query.markAdvisor;
     }
-    if(this.$route.query.dateType){
+    if (this.$route.query.dateType) {
       this.searchForm.dateType = this.$route.query.dateType;
     }
-    if(this.$route.query.staDate){
-      this.searchForm.dateType = this.$route.query.dateType;
+    if (this.$route.query.staDate) {
+      // this.searchForm.dateType = this.$route.query.dateType;
       this.searchForm.staDate = this.$route.query.staDate;
     }
-    if(this.$route.query.endDate){
-      this.searchForm.dateType = this.$route.query.dateType;
+    if (this.$route.query.endDate) {
+      // this.searchForm.dateType = this.$route.query.dateType;
       this.searchForm.endDate = this.$route.query.endDate;
+    }
+     if (this.$route.query.houseId) {
+      this.searchForm.projectId = this.$route.query.houseId;
     }
     // 获取项目列表
     this.zkhousePage();
   },
 
   methods: {
-    isSystoleForm(){
+    isSystoleForm() {
       this.isOpen = !this.isOpen
     },
     // 清除上次进入遗留的数据
@@ -652,10 +492,11 @@ export default {
         type: 1,
         ...this.searchForm,
       };
+      if (this.$route.query.houseId) {
+        obj.projectId = this.$route.query.houseId;
+      }
       obj.keywordIds = obj.keywordsId.join(",");
-      (obj.dateType = this.searchForm.staDate
-        ? null
-        : this.searchForm.dateType),
+      obj.dateType = this.searchForm.staDate? null: this.searchForm.dateType
         this.$api.api.findbypage(obj).then((res) => {
           // console.log(res)
           this.tableData = res.data.records;
@@ -683,6 +524,9 @@ export default {
             ? localStorage.getItem("houseId")
             : this.houseList[0].id,
       };
+      if (this.$route.query.houseId) {
+        this.searchForm.projectId = this.$route.query.houseId;
+      }
       this.findbypage();
     },
     houseChange() {
@@ -733,7 +577,11 @@ export default {
           // console.log(res)
           this.houseList = res.data;
           if (localStorage.getItem("orgType") == 3) {
-            this.searchForm.projectId = localStorage.getItem("houseId");
+            if (this.$route.query.houseId) {
+              this.searchForm.projectId = this.$route.query.houseId;
+            }else{
+              this.searchForm.projectId = localStorage.getItem("houseId");
+            }
           } else {
             this.searchForm.projectId = res.data[0].id;
           }
@@ -811,16 +659,19 @@ export default {
   min-width: 1000px;
   padding-bottom: 100px;
 }
+
 .cen-tab {
   width: 100%;
   padding: 15px;
   background: #ffffff;
   margin-top: 15px;
 }
+
 .tophove {
   color: #ffffff;
   background: #2671e2;
 }
+
 .app-top {
   width: 100%;
   background: #ffffff;
@@ -828,11 +679,13 @@ export default {
   border-radius: 4px;
   padding-top: 15px;
   padding-bottom: 15px;
+
   .app-titel {
     width: 100%;
     display: flex;
     align-items: center;
     flex-wrap: wrap;
+
     .label {
       font-size: 14px;
       font-weight: 400;
@@ -842,12 +695,14 @@ export default {
       min-width: 100px;
       text-align: right;
     }
+
     .toptimeqhuan {
       height: 30px;
       background: #ffffff;
       display: flex;
       align-items: center;
     }
+
     .toptimeqhuan div {
       padding-left: 20px;
       padding-right: 20px;
@@ -858,6 +713,7 @@ export default {
       border-radius: 4px;
       border: 1px solid #e0e0e0;
     }
+
     .toptimeqhuan .btn {
       padding-left: 20px;
       padding-right: 20px;
@@ -870,17 +726,20 @@ export default {
     }
   }
 }
+
 .div-lab {
   display: flex;
   margin: 5px;
 }
+
 .div-inp {
   width: 250px;
 }
-/deep/ .el-table__header-wrapper{
-  thead{
-    tr{
-      th{
+
+/deep/ .el-table__header-wrapper {
+  thead {
+    tr {
+      th {
         background: #F5F7FA;
         color: #333333;
       }

src/views/Statistics/BuildingContrast.vue

@@ -41,7 +41,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" show-summary :summary-method="getSummaries" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" show-summary :summary-method="getSummaries" height="640">
         <el-table-column prop="batchId" label="序号" align="center">
           <template slot-scope="scope">
             <span> {{ scope.$index + 1 }}</span>

src/views/Statistics/ConsultantBrand.vue

@@ -88,7 +88,7 @@
           <el-button @click="downLoad">导出</el-button>
         </div>
       </div>
-      <el-table max-height="300" :data="tableData" stripe style="width: 100%"  height="390">
+      <el-table max-height="300" :data="tableData" stripe style="width: 100%"  height="640">
         <el-table-column prop="batchId" label="序号" align="center">
           <template slot-scope="scope">
             {{
@@ -227,7 +227,7 @@
                 :style="'width:' + item.zxl1 + '%;'"
               ></div> -->
               <div class="boxbaifenbi" 
-                :style="{ 'background': i + 1 == 1 ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)' : i + 1 == 2 ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)' : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)', 'width': item.zxl1 + '%' }">
+                :style="{ 'background': i + 1 == 1 ? 'linear-gradient(270deg, #F88881 0%, #E6625B 100%)' : i + 1 == 2 ? 'linear-gradient(270deg, #FFC940 0%, #FF981E 100%)' : i + 1 == 3 ? 'linear-gradient(270deg, #FFE800 0%, #FFCC00 100%)' : 'inear-gradient(270deg, #7BB1FF 0%, #618FFF 100%)', 'width': item.zxl + '%' }">
                </div>
              
             </div>

src/views/Statistics/MentoringAbility.vue

@@ -300,7 +300,7 @@
             <el-button @click="downLoad" icon="el-icon-upload">导出</el-button>
           </div>
         </div>
-        <el-table max-height="300" :data="tableData" stripe style="width: 100%" height="390">
+        <el-table max-height="300" :data="tableData" stripe style="width: 100%" height="640">
           <el-table-column prop="statDate" label="日期" align="center">
             <template slot-scope="scope">
               {{

src/views/Statistics/ReceptionStatistical.vue

@@ -108,7 +108,7 @@
     </div>
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" style="width: 100%" height="390">
+      <el-table :data="tableData" style="width: 100%" height="640">
         <el-table-column prop="batchId" label="序号" align="center">
           <template slot-scope="scope">
             {{

src/views/Statistics/TrendAnalysis.vue

@@ -336,7 +336,7 @@
     <div class="app-box-san" v-if="Confirmthecontrast && aliasclass != 3 && aliasclass != 4">
       <div class="santitle">对比报表</div>
       <div class="santab">
-        <el-table :data="tableData" height="390" border style="width: 100%">
+        <el-table :data="tableData" height="640" border style="width: 100%">
           <el-table-column prop="name" label="时间" align="center">
           </el-table-column>
           <el-table-column prop="shiduan1" label="时段1" align="center">

src/views/Statistics/dataScreeAge.vue

@@ -246,7 +246,7 @@
       </div>
       <div id="main" v-if="echarValue1 == 0"></div>
       <div v-if="echarValue1 == 1">
-        <el-table :data="echarList1" stripe style="width: 100%"  height="390">
+        <el-table :data="echarList1" stripe style="width: 100%"  height="640">
           <!-- <el-table-column type="index" label="序号" width="50">
         </el-table-column> -->
           <el-table-column prop="time" label="时间" align="center">
@@ -624,7 +624,7 @@
 
       <div id="echar2" v-if="echarValue == 0"></div>
       <div v-if="echarValue == 1">
-        <el-table :data="echarList" stripe style="width: 100%" height="390">
+        <el-table :data="echarList" stripe style="width: 100%" height="640">
           <!-- <el-table-column type="index" label="序号" width="50">
         </el-table-column> -->
           <el-table-column prop="date" label="日期" align="center">
@@ -680,7 +680,7 @@
     <el-dialog :title="elTitle" :visible.sync="dialogVisible">
       <div class="cen-tab">
         <div style="font-size: 20px">{{ timeStr }}</div>
-        <el-table :data="detailList" stripe style="width: 100%" height="390">
+        <el-table :data="detailList" stripe style="width: 100%" height="640">
           <el-table-column v-if="visible1" prop="houseName" label="项目" align="center">
           </el-table-column>
           <el-table-column v-if="visible1" prop="receptionQuantity" label="接待量" align="center">

src/views/Statistics/dataScreeOrg.vue

@@ -363,7 +363,7 @@
       </div>
       <div id="main" v-if="echarValue1 == 0"></div>
       <div v-if="echarValue1 == 1">
-        <el-table :data="echarList1" stripe style="width: 100%" height="390">
+        <el-table :data="echarList1" stripe style="width: 100%" height="640">
           <!-- <el-table-column type="index" label="序号" width="50">
         </el-table-column> -->
           <el-table-column prop="time" label="时间" align="center">
@@ -630,7 +630,7 @@
 
       <div id="echar2" v-if="echarValue == 0"></div>
       <div v-if="echarValue == 1">
-        <el-table :data="echarList" stripe style="width: 100%" height="390">
+        <el-table :data="echarList" stripe style="width: 100%" height="640">
           <!-- <el-table-column type="index" label="序号" width="50">
         </el-table-column> -->
           <el-table-column prop="date" label="日期" align="center">
@@ -715,7 +715,7 @@
     <el-dialog :title="elTitle" :visible.sync="dialogVisible">
       <div class="cen-tab">
         <div style="font-size: 20px">{{ timeStr }}</div>
-        <el-table :data="detailList" stripe style="width: 100%" height="390">
+        <el-table :data="detailList" stripe style="width: 100%" height="640">
           <el-table-column v-if="visible1" prop="houseName" label="项目" align="center">
           </el-table-column>
           <el-table-column v-if="visible1" prop="receptionQuantity" label="接待量" align="center">

src/views/Statistics/dataScreeSys.vue

@@ -392,7 +392,7 @@
       </div>
       <div v-if="echarValue1 == 0" id="main"></div>
       <div v-if="echarValue1 == 1">
-        <el-table :data="echarList1" stripe style="width: 100%" height="390">
+        <el-table :data="echarList1" stripe style="width: 100%" height="640">
           <!-- <el-table-column type="index" label="序号" width="50">
         </el-table-column> -->
           <el-table-column prop="time" label="时间" align="center">
@@ -810,7 +810,7 @@
 
       <div v-if="echarValue == 0" id="echar2"></div>
       <div v-if="echarValue == 1">
-        <el-table :data="echarList" stripe style="width: 100%" height="390">
+        <el-table :data="echarList" stripe style="width: 100%" height="640">
           <!-- <el-table-column type="index" label="序号" width="50">
         </el-table-column> -->
           <el-table-column prop="date" label="日期" align="center">
@@ -864,7 +864,7 @@
     <el-dialog :title="elTitle" :visible.sync="dialogVisible">
       <div class="cen-tab">
         <div style="font-size: 20px">{{ timeStr }}</div>
-        <el-table :data="detailList" stripe style="width: 100%" height="390">
+        <el-table :data="detailList" stripe style="width: 100%" height="640">
           <el-table-column v-if="visible1" prop="houseName" label="项目" align="center">
           </el-table-column>
           <el-table-column v-if="visible1" prop="receptionQuantity" label="接待量" align="center">

src/views/Statistics/houseDataSys.vue

@@ -208,7 +208,7 @@
 
     <div class="app-box-er" v-if="selectTime1">
       <template>
-        <el-table :data="tableData" style="width: 100%" height="390">
+        <el-table :data="tableData" style="width: 100%" height="640">
           <el-table-column prop="time" label="时间" align="center">
           </el-table-column>
           <el-table-column prop="data1" label="时段一" align="center">

src/views/Statistics/index.vue

@@ -212,23 +212,23 @@ export default {
       goTo(i){
 				if(i==1){
           if(this.TimetoAhoose==6){
-            Router.push(`/ReceivingRecords/index?alidInvalid=0&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}`)
+            Router.push(`/ReceivingRecords/index?validInvalid=0&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}&houseId=${this.houseId}`)
           }else{
-            Router.push(`/ReceivingRecords/index?alidInvalid=0&dateType=${this.TimetoAhoose}`)
+            Router.push(`/ReceivingRecords/index?validInvalid=0&dateType=${this.TimetoAhoose}&houseId=${this.houseId}`)
           }
           
 				}else if(i==2){
            if(this.TimetoAhoose==6){
-            Router.push(`/ReceivingRecords/index?markAdvisor=1&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}`);
+            Router.push(`/ReceivingRecords/index?markAdvisor=1&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}&houseId=${this.houseId}`);
            }else{
-            Router.push(`/ReceivingRecords/index?markAdvisor=1&dateType=${this.TimetoAhoose}`);
+            Router.push(`/ReceivingRecords/index?markAdvisor=1&dateType=${this.TimetoAhoose}&houseId=${this.houseId}`);
            }
 					
 				}else{
           if(this.TimetoAhoose==6){
-            Router.push(`/ReceivingRecords/index?markAdvisor=0&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}`);
+            Router.push(`/ReceivingRecords/index?markAdvisor=0&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}&houseId=${this.houseId}`);
           }else{
-            Router.push(`/ReceivingRecords/index?markAdvisor=0&dateType=${this.TimetoAhoose}`);
+            Router.push(`/ReceivingRecords/index?markAdvisor=0&dateType=${this.TimetoAhoose}&houseId=${this.houseId}`);
           }
 					
 				}

src/views/Statistics/trend.vue

@@ -411,7 +411,7 @@
 
     <div class="app-box-er" v-if="selectTime1">
       <template>
-        <el-table :data="tableData" style="width: 100%" height="390">
+        <el-table :data="tableData" style="width: 100%" height="640">
           <el-table-column prop="time" label="时间" align="center">
           </el-table-column>
           <el-table-column prop="data1" label="时段一" align="center">

src/views/Template/PinspeakwordsList.vue

@@ -32,7 +32,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="houseName" label="项目名称" align="center">
         </el-table-column>
         <el-table-column prop="name" label="状态" align="center">

src/views/Template/taboo.vue

@@ -47,7 +47,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="words" label="敏感词" align="center">
         </el-table-column>
         <el-table-column prop="houseName" label="项目名称" align="center">

src/views/Template/wrongword.vue

@@ -61,7 +61,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%"  height="390">
+      <el-table :data="tableData" stripe style="width: 100%"  height="640">
         <el-table-column type="index" label="序号" width="50">
         </el-table-column>
         <el-table-column prop="correctWord" label="正确词" align="center">

src/views/building/Count.vue

@@ -123,7 +123,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table v-if="activeTotal == 0" :data="tableData" stripe style="width: 100%" height="390">
+      <el-table v-if="activeTotal == 0" :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="propertyName" label="项目名称" align="center">
         </el-table-column>
         <el-table-column prop="orgName" label="公司名称" align="center">
@@ -188,7 +188,7 @@
         </el-table-column>
       </el-table>
 
-      <el-table v-if="activeTotal == 2" :data="tableData" stripe style="width: 100%" height="390">
+      <el-table v-if="activeTotal == 2" :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="orgName" label="公司名称" align="center">
         </el-table-column>
         <el-table-column prop="houseQuantityOfEnough" label="服务期内项目" align="center" width="140">
@@ -234,7 +234,7 @@
         </el-table-column>
       </el-table>
 
-      <el-table v-if="activeTotal == 1" :data="tableData" stripe style="width: 100%" height="390">
+      <el-table v-if="activeTotal == 1" :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="agentName" label="代理商名称" align="center">
         </el-table-column>
         <el-table-column prop="area" label="地区" align="center">

src/views/building/index.vue

@@ -152,7 +152,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="propertyName" :show-overflow-tooltip="true" width="120px" label="项目名称" align="center">
         </el-table-column>
 

src/views/contentManage/updateRecord/list.vue

@@ -48,7 +48,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="title" label="标题" align="center"></el-table-column>
         <el-table-column prop="pageView" label="阅读数" align="center"></el-table-column>
         <el-table-column prop="createUser" label="发布人" align="center"></el-table-column>

src/views/houseData/analyse.vue

@@ -278,7 +278,7 @@
           >导出</el-button
         > -->
       </div>
-      <el-table :data="tableData" @selection-change="handleSelectionChange" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" @selection-change="handleSelectionChange" stripe style="width: 100%" height="640">
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column prop="houseName" label="项目名称" align="center">
         </el-table-column>

src/views/houseData/count.vue

@@ -54,7 +54,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="operationName" label="运营" align="center" sortable></el-table-column>
         <el-table-column prop="houseQuantityInService" label="服务中项目数" width="120" align="center" sortable></el-table-column>
         <el-table-column prop="wrongWordAddCount" width="120" label="常错词添加数" align="center" sortable></el-table-column>
@@ -143,7 +143,7 @@
            </div>
         </div>
         <div style="width:100%;margin-top: 8px;">
-          <el-table :data="infodata" stripe style="width: 100%;overflow-y:scroll;" height="390"
+          <el-table :data="infodata" stripe style="width: 100%;overflow-y:scroll;" height="640"
 	        :header-cell-style="{background:'#E0E0E0'}">
             <el-table-column
               prop="createTime"

src/views/inspection/ProhibitedList.vue

@@ -119,7 +119,7 @@
 
     <!-- 表格 -->
     <div class="cen-tab">
-      <el-table :data="tableData" stripe style="width: 100%" height="390">
+      <el-table :data="tableData" stripe style="width: 100%" height="640">
         <el-table-column prop="batchId" label="序号" width="70" align="center">
           <template slot-scope="scope">
             <span> {{ scope.$index + 1 }}</span>

vue.config.js

@@ -2,14 +2,14 @@
  * 配置参考:
  * https://cli.vuejs.org/zh/config/
  */
-// const url = 'http://192.168.31.167:9999' //长龙
+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.89:9999' //sh
 // const url = 'https://zanyong.hfju.com' // 正式域名
-const url = 'http://81.70.55.170:9999' // 新测试
+// const url = 'http://81.70.55.170:9999' // 新测试
 // const url = 'http://82.156.35.22:9999' // 新正式ip
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']