From a90207c4112e96264291d284243e5047c0629a73 Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Tue, 13 Sep 2022 11:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=91=E8=A1=8C=E7=9A=84=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8Fid=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Customer/table.js                   |  4 ++
 .../Equipment/equipmentOnlineRecordList.vue   |  4 +-
 src/views/Equipment/index.vue                 |  2 +-
 src/views/File/index.vue                      |  2 +-
 src/views/ReceivingRecords/table.js           |  6 +--
 src/views/Statistics/ReceptionStatistical.vue |  4 +-
 src/views/admin/log/index.vue                 |  7 ++--
 src/views/building/Count.vue                  | 37 +------------------
 src/views/building/area.vue                   |  2 +-
 src/views/building/index.vue                  |  4 +-
 src/views/houseData/count.vue                 |  2 +-
 11 files changed, 21 insertions(+), 53 deletions(-)

diff --git a/src/views/Customer/table.js b/src/views/Customer/table.js
index 02e9ead..e12fe18 100644
--- a/src/views/Customer/table.js
+++ b/src/views/Customer/table.js
@@ -17,6 +17,7 @@ export default {
         editBtn: false,
         viewBtn: false,
         size: "small",
+        tip: false,
         column: [
             {
                 label: "代理商",
@@ -96,6 +97,7 @@ export default {
         stripe: true,
         menuAlign: "center",
         menuWidth: 146,
+        tip: false,
         menu: true,
         align: "left",
         refreshBtn: false,
@@ -153,6 +155,7 @@ export default {
         addBtn: false,
         editBtn: false,
         viewBtn: false,
+        tip: false,
         size: "small",
         column: [
             {
@@ -228,6 +231,7 @@ export default {
         editBtn: false,
         viewBtn: false,
         size: "small",
+        tip: false,
         column: [
             {
                 label: "客户",
diff --git a/src/views/Equipment/equipmentOnlineRecordList.vue b/src/views/Equipment/equipmentOnlineRecordList.vue
index 214751d..2af9471 100644
--- a/src/views/Equipment/equipmentOnlineRecordList.vue
+++ b/src/views/Equipment/equipmentOnlineRecordList.vue
@@ -61,7 +61,7 @@
           padding-top: 18px;
         "
       >
-        <span style="line-height: 40px" class="demonstration">领用人:</span>
+        <span style="line-height: 40px;width: 80px;text-align: right;" class="demonstration">领用人:</span>
         <div style="width: 200px">
           <el-input maxlength="10" clearable placeholder="领用人" v-model="page.accountName"></el-input>
         </div>
@@ -80,7 +80,7 @@
           padding-top: 18px;
         "
       >
-        <div style="margin-left: 20px">
+        <div style="margin-left: 80px">
           <el-button
             @click="screening()"
             style="background: #2671e2; color: #ffffff"
diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue
index dc77005..a43e0b0 100644
--- a/src/views/Equipment/index.vue
+++ b/src/views/Equipment/index.vue
@@ -113,7 +113,7 @@
       </div>
       <div style="display: flex">
         <div class="app-titel" style="margin-top: 15px">
-          <div style="margin-left: 20px">
+          <div style="margin-left: 120px">
             <el-button type="primary" @click="screen">筛选</el-button>
           </div>
           <div style="margin-left: 20px">
diff --git a/src/views/File/index.vue b/src/views/File/index.vue
index 4e3fd3a..f7f1ae0 100644
--- a/src/views/File/index.vue
+++ b/src/views/File/index.vue
@@ -40,7 +40,7 @@
         </div>
       </div>
       <div class="app-titel" style="margin-top: 15px">
-        <div style="margin-left: 16px">
+        <div style="margin-left: 71px">
           <el-button type="primary" @click="noempty()">筛选</el-button>
         </div>
         <div style="margin-left: 20px">
diff --git a/src/views/ReceivingRecords/table.js b/src/views/ReceivingRecords/table.js
index 1617d03..911f846 100644
--- a/src/views/ReceivingRecords/table.js
+++ b/src/views/ReceivingRecords/table.js
@@ -21,8 +21,7 @@ export default {
             {
                 sortable: true,
                 label: '接待开始时间',
-                prop: 'staTime',
-                width: '200px',
+                prop: 'staTimeOfCN',
             },
             {
                 label: "顾问",
@@ -42,7 +41,6 @@ export default {
                 sortable: true,
                 label: "录音时长",
                 prop: "mm",
-                width: "100px",
             },
 
             {
@@ -65,14 +63,12 @@ export default {
                 sortable: true,
                 label: "画像标签触达次数",
                 prop: "total",
-                width: '150px',
             },
 
             {
                 sortable: true,
                 label: "执行率",
                 prop: "total",
-                width: '150px',
                 formatter: data => {
                     return `${data.fraction || 0}%`
                 }
diff --git a/src/views/Statistics/ReceptionStatistical.vue b/src/views/Statistics/ReceptionStatistical.vue
index a919080..9ec51f0 100644
--- a/src/views/Statistics/ReceptionStatistical.vue
+++ b/src/views/Statistics/ReceptionStatistical.vue
@@ -86,8 +86,8 @@
           </el-select>
         </div>
       </div>
-      <div class="app-titel" style="margin-top: 15px">
-        <div style="margin-left: 30px">
+      <div class="app-titel" style="margin: 15px 0 0 110px;">
+        <div>
           <el-button type="primary" size="small" @click="screen()"
             >筛选</el-button
           >
diff --git a/src/views/admin/log/index.vue b/src/views/admin/log/index.vue
index a9fd301..5d60153 100644
--- a/src/views/admin/log/index.vue
+++ b/src/views/admin/log/index.vue
@@ -4,7 +4,7 @@
     <div class="app-top">
       <div class="app-titel" style="margin-top: 5px">
         <div class="div-lab">
-          <div class="label">登录时间:</div>
+          <div class="label" style="text-align: right;">登录时间:</div>
           <el-date-picker
             v-model="time"
             type="daterange"
@@ -65,7 +65,7 @@
       </div>
       <div class="app-titel" style="margin-top: 15px">
         <!-- <div class="label" style="color: #ffffff">筛选相关:</div> -->
-        <div style="margin-left: 20px">
+        <div style="margin-left: 120px">
           <el-button type="primary" @click="screen"
             >筛选</el-button
           >
@@ -257,7 +257,8 @@ export default {
 </script>
 <style lang="scss" scoped="scoped">
 .app-top {
-  width: 100%;
+  margin: 0 auto;
+  width: 99%;
   background: #ffffff;
   box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04);
   border-radius: 4px;
diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue
index 9bee3e3..0a13ef5 100644
--- a/src/views/building/Count.vue
+++ b/src/views/building/Count.vue
@@ -39,31 +39,6 @@
             </div>
           </div>
 
-          <!--
-        <div class="div-lab" v-if="orgType!=2">
-          <el-input
-            v-model="changeValue"
-            clearable
-            placeholder="请输入"
-            maxlength="10"
-            @change="selectChange"
-            style="width: 363px"
-          >
-            <el-select
-              v-model="selflag"
-              slot="prepend"
-              class="input-with-select"
-              style="width: 115px"
-              placeholder="请选择"
-              @change="selChange"
-            >
-              <el-option label="公司名称" value="1"></el-option>
-              <el-option v-if="orgType==0&&activeTotal != 2" label="代理商名称" value="2"></el-option>
-              <el-option label="项目名称" value="3"></el-option>
-            </el-select>
-          </el-input>
-        </div> -->
-
           <div class="div-lab" v-if="orgType == 0">
             <el-input v-model="changeValue" clearable placeholder="请输入" maxlength="10" @change="selectChange"
               style="width: 363px">
@@ -89,18 +64,10 @@
         </div>
         <div class="app-titel" style="margin-top: 5px">
           <div class="div-lab">
-            <div class="label">地区:</div>
+            <div class="label" style="width: 70px;text-align: right;">地区:</div>
             <el-cascader :props="props" @change="locationsChange" placeholder="省/市" size="small" separator="/"
               v-model="provice" clearable></el-cascader>
           </div>
-          <!-- <div class="div-lab" v-if="orgType == 0">
-          <div class="label" style="min-width:70px;">系统运营:</div>
-          <el-input  maxlength="10" clearable v-model="searchForm.linkman"></el-input>
-        </div>
-        <div class="div-lab" v-if="orgType == 1">
-          <div class="label" style="min-width:70px;">售后运营:</div>
-          <el-input  maxlength="10" clearable v-model="searchForm.linkman"></el-input>
-        </div> -->
           <div v-if="orgType == 0 || orgType == 1" class="div-lab">
             <div class="label">运营人员:</div>
             <el-select v-model="searchForm.operationStaffId" placeholder="请选择" class="div-inp" filterable clearable>
@@ -110,7 +77,7 @@
           </div>
         </div>
         <div class="app-titel" style="margin-top: 15px">
-          <div style="margin-left: 20px">
+          <div style="margin-left: 85px">
             <el-button type="primary" @click="screen">筛选</el-button>
           </div>
           <div style="margin-left: 20px">
diff --git a/src/views/building/area.vue b/src/views/building/area.vue
index d3dd975..cfa6a82 100644
--- a/src/views/building/area.vue
+++ b/src/views/building/area.vue
@@ -427,7 +427,7 @@ export default {
       line-height: 6px;
     }
     .app-box {
-      margin-top: 20px;
+      // margin-top: 20px;
       padding: 15px;
     }
     .block {
diff --git a/src/views/building/index.vue b/src/views/building/index.vue
index 28af928..284745e 100644
--- a/src/views/building/index.vue
+++ b/src/views/building/index.vue
@@ -288,9 +288,9 @@
               placeholder="请选择公司"
             >
               <el-option
-                v-for="item in houseList"
+                v-for="item in orgList"
                 :key="item.id"
-                :label="item.corporateName"
+                :label="item.name"
                 :value="item.orgCode"
               >
               </el-option>
diff --git a/src/views/houseData/count.vue b/src/views/houseData/count.vue
index 9aab12f..9ff31fc 100644
--- a/src/views/houseData/count.vue
+++ b/src/views/houseData/count.vue
@@ -42,7 +42,7 @@
       </div>
 
       <div class="app-titel" style="margin-top: 10px">
-        <div class="label" style="color: #ffffff">筛选相关:</div>
+        <div class="label" style="color: #ffffff;min-width: 95px!important;"></div>
         <div style="margin-left: 5px">
           <el-button @click="screen" type="primary">筛选</el-button>
         </div>