From fb7a55b04351650071d3317a56025e088e99a09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A5=E5=B1=A5=E4=B8=8D=E5=81=9C?= <1873501479@qq.com>
Date: Wed, 7 Sep 2022 16:36:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=86=99ESD=E5=89=A9=E4=BD=99?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ESD/ESDRefionalManagement.vue |  70 +++++++--------
 src/views/ESD/ESDServiceList.vue        |   6 +-
 src/views/ESD/ESDVisitorManagement.vue  | 108 ++++++++++++------------
 3 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/src/views/ESD/ESDRefionalManagement.vue b/src/views/ESD/ESDRefionalManagement.vue
index 9a33a5e..e3b79f8 100644
--- a/src/views/ESD/ESDRefionalManagement.vue
+++ b/src/views/ESD/ESDRefionalManagement.vue
@@ -4,7 +4,7 @@
     <BreadCrumb :inner="inner" />
     <EmptyCard>
       <div slot="EmptyCard">
-        <div style="height: 60px">
+        <div style="height: 50px">
           <el-button type="primary" icon="el-icon-plus" style="float: left" @click="newDevice">
             新增
           </el-button>
@@ -13,8 +13,8 @@
           </el-button>
         </div>
         <!-- 数据表格模块 -->
-        <div v-loading="loading" style="height: 100%">
-          <div style="width: 98%;height: 40px;border: 1px solid #91d5ff; background-color: #e6f7ff; line-height: 40px;text-align: left;padding-left: 2%; margin-bottom: 20px">
+        <div v-loading="loading" style="height: auto">
+          <div style="width: 98%;height: 30px;border: 1px solid #91d5ff; background-color: #e6f7ff; line-height: 30px;text-align: left;padding-left: 2%; margin-bottom: 10px">
             已选择{{ multipleSelection.length }}
             <span class="clear-btn" style="padding-left: 20px" @click="clearCheck">
               清空
@@ -26,14 +26,14 @@
               width="60"
               align="center"
             />
-            <el-table-column label="#" type="index" align="center" width="60"></el-table-column>
+            <el-table-column label="#" type="index" align="center" width="60" />
             <!--
               <el-table-column prop="areaName" label="区域名称" align="center" />
               <el-table-column prop="areaAttr" label="区域属性" align="center" />
             -->
             <!--      <临时数据>       -->
             <el-table-column prop="areaName" label="区域名称" align="center" />
-            <el-table-column prop="state" label="区域属性" align="center" >
+            <el-table-column prop="state" label="区域属性" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.state === 1">公共区域</span>
                 <span v-if="scope.row.state === 0">限制区域</span>
@@ -52,29 +52,29 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
-        <!-- 数据表格模块 -->
-
-        <!-- 分页 -->
-        <div
-          v-if="pager.totalPage > 10"
-          style="
+          <!-- 分页 -->
+          <div
+            v-if="pager.totalPage > 10"
+            style="
               text-align: center;
               position: relative;
-              bottom: 0;
+              padding-top: 20px;
               left: 50%;
               transform: translateX(-50%)
             "
-        >
-          <el-pagination
-            background
-            layout="sizes, prev, pager, next, jumper"
-            :total="pager.totalPage"
-            :current-page.sync="pager.currentPage"
-            @current-change="change"
-          />
+          >
+            <el-pagination
+              background
+              layout="prev, pager, next"
+              :total="pager.totalPage"
+              :current-page.sync="pager.currentPage"
+              @current-change="change"
+            />
+          </div>
+          <!-- 分页 /-->
         </div>
-        <!-- 分页 /-->
+        <!-- 数据表格模块 -->
+
         <!--  新增/修改信息弹框  -->
         <el-dialog
           :title="ModifyDialogTitle"
@@ -102,15 +102,19 @@
 
               <el-form-item label="区域属性" required prop="state">
                 <el-select v-model="modifyInfo.state" placeholder="请选择区域属性">
-                  <el-option label="公共区域" :value="1"></el-option>
-                  <el-option label="限制区域" :value="0"></el-option>
+                  <el-option label="公共区域" :value="1" />
+                  <el-option label="限制区域" :value="0" />
                 </el-select>
               </el-form-item>
 
               <el-form-item label="区域考勤" required>
                 <el-radio-group v-model="modifyInfo.state">
-                  <el-radio :label="1">参与考勤</el-radio>
-                  <el-radio :label="0">不参与考勤</el-radio>
+                  <el-radio :label="1">
+                    参与考勤
+                  </el-radio>
+                  <el-radio :label="0">
+                    不参与考勤
+                  </el-radio>
                 </el-radio-group>
               </el-form-item>
 
@@ -120,8 +124,8 @@
               </el-form-item>
               <el-form-item label="通行限制">
                 <el-select v-model="modifyInfo.state" placeholder="通行规则">
-                  <el-option label="无限制" :value="1"></el-option>
-                  <el-option label="Traffic rules" :value="0"></el-option>
+                  <el-option label="无限制" :value="1" />
+                  <el-option label="Traffic rules" :value="0" />
                 </el-select>
               </el-form-item>
             </el-form>
@@ -170,14 +174,14 @@ export default {
       },
       tableData: [
         {
-          areaName: '创业园',   // 区域名称
-          areaAttr: '公共区域'  // 区域属性
+          areaName: '创业园', // 区域名称
+          areaAttr: '公共区域' // 区域属性
         }
       ], // 表格数据
       pager: {
         currentPage: 1,
         pageSize: 10,
-        totalPage: null,     //总页数
+        totalPage: null // 总页数
       },
       loading: false, // 加载动画
       multipleSelection: [], // 选中列表
@@ -195,10 +199,10 @@ export default {
         state: [{ required: true, message: '请选择区域属性' }],
         areaAttendance: [{ required: true, message: '请输入客户主编号', triangle: 'blur' }],
         accessPermission: [{ required: true, message: '请输入区域编号', triangle: 'blur' }],
-        accessRule: [{ required: true, message: '请输入IP地址', trigger: 'blur' }],
+        accessRule: [{ required: true, message: '请输入IP地址', trigger: 'blur' }]
       },
       modifyInfo: {
-        /*areaName: '',       // 区域名称
+        /* areaName: '',       // 区域名称
         areaAttr: '',       // 区域属性
         areaAttendance: 1,  // 区域考勤
         accessPermission: '', // 通行权限
diff --git a/src/views/ESD/ESDServiceList.vue b/src/views/ESD/ESDServiceList.vue
index 22205af..0c662f3 100644
--- a/src/views/ESD/ESDServiceList.vue
+++ b/src/views/ESD/ESDServiceList.vue
@@ -59,7 +59,7 @@
             <el-table-column prop="deviceType" label="设备号" width="80" />
             <el-table-column prop="deviceType" label="设备名称" width="80" />
             <el-table-column prop="customerId" label="产品类型" width="80" />
-            <el-table-column prop="areaId" label="绑定区域" width="70" />
+            <el-table-column prop="areaId" label="绑定区域" width="80" />
             <el-table-column
               prop="status"
               label="在线情况"
@@ -1435,8 +1435,8 @@ export default {
   }
 }
 /deep/ .el-table__body-wrapper .cell {
-  height: 3vh;
-  line-height:3vh;
+  height: 2vh;
+  line-height:2vh;
 }
 .btn1:hover{
   color: #20a0ff;
diff --git a/src/views/ESD/ESDVisitorManagement.vue b/src/views/ESD/ESDVisitorManagement.vue
index d7122aa..014d40d 100644
--- a/src/views/ESD/ESDVisitorManagement.vue
+++ b/src/views/ESD/ESDVisitorManagement.vue
@@ -9,13 +9,15 @@
           :inline="true"
           :model="searchFrom"
           class="demo-form-inline"
-          style="float:left;display: inline-block"
+          style="float:left;display: inline-block;"
           @submit.native.prevent
         >
           <el-form-item>
             <el-select v-model="searchFrom.searchData" placeholder="请选择">
-              <el-option label="区域一" value="shanghai" />
-              <el-option label="区域二" value="beijing" />
+              <el-option label="全部" value="shanghai" />
+              <el-option label="未审批" value="beijing" />
+              <el-option label="已到访" value="shanghai" />
+              <el-option label="未到访" value="beijing" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -34,7 +36,7 @@
         </el-form>
         <!-- 查询模块  /-->
 
-        <div style="float: left;display: inline-block">
+        <div style="float: left;display: inline-block;">
           <el-button type="primary" icon="el-icon-plus" @click="newDevice">
             新增
           </el-button>
@@ -44,28 +46,28 @@
         </div>
 
         <!-- 数据表格模块 -->
-        <div v-loading="loading" style="height: 680px">
+        <div v-loading="loading" style="height:auto">
           <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 90%" @selection-change="handleSelectionChange">
             <el-table-column
               type="selection"
-              width="55"
+              width="50"
               align="center"
             />
-            <el-table-column prop="deviceId" label="#" width="100" align="center" />
-            <el-table-column prop="deviceType" label="头像" width="80" align="center" />
-            <el-table-column prop="customerId" label="姓名" width="80" align="center" />
-            <el-table-column prop="areaId" label="手机号码" width="70" align="center" />
-            <el-table-column prop="address" label="证件号码" width="120" align="center" />
-            <el-table-column prop="address" label="拜访人" width="120" align="center" />
-            <el-table-column prop="address" label="拜访目的" width="120" align="center" />
-            <el-table-column prop="address" label="车牌号码" width="120" align="center" />
-            <el-table-column prop="updateTime" label="开始时间" sortable width="180">
+            <el-table-column prop="deviceId" label="#" width="50" align="center" />
+            <el-table-column prop="deviceType" label="头像" width="50" align="center" />
+            <el-table-column prop="customerId" label="姓名" width="50" align="center" />
+            <el-table-column prop="areaId" label="手机号码" width="50" align="center" />
+            <el-table-column prop="address" label="证件号码" width="100" align="center" />
+            <el-table-column prop="address" label="拜访人" width="100" align="center" />
+            <el-table-column prop="address" label="拜访目的" width="100" align="center" />
+            <el-table-column prop="address" label="车牌号码" width="100" align="center" />
+            <el-table-column prop="updateTime" label="开始时间" sortable width="150">
               <template slot-scope="scope">
                 <i class="el-icon-time" />
                 <span style="margin-left: 10px">{{ scope.row.updateTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="updateTime" label="结束时间" sortable width="180">
+            <el-table-column prop="updateTime" label="结束时间" sortable width="150">
               <template slot-scope="scope">
                 <i class="el-icon-time" />
                 <span style="margin-left: 10px">{{ scope.row.updateTime }}</span>
@@ -97,62 +99,58 @@
             </el-table-column>
             <el-table-column label="操作">
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="primary"
+                <span
+                  class="btn1"
                   @click="editInfo(scope.$index, scope.row)"
                 >
-                  编辑信息
-                </el-button>
-                <el-button
-                  type="primary"
-                  size="mini"
+                  编辑
+                </span>
+                <el-divider direction="vertical" />
+                <span
+                  class="btn1"
                   @click="
                     seeInfo(scope.$index, scope.row)
                   "
                 >
                   查看操作
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="primary"
+                </span>
+                <el-divider direction="vertical" />
+                <span
+                  class="btn2"
                   @click="editOperation(scope.$index, scope.row)"
                 >
                   编辑操作
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click.native.prevent="deleteRow(scope.$index, scope.row)"
-                >
-                  删除操作
-                </el-button>
+                </span>
+                <el-divider direction="vertical" />
+                <span class="btn2" @click.native.prevent="deleteRow(scope.$index, scope.row)">
+                  删除
+                </span>
               </template>
             </el-table-column>
           </el-table>
-        </div>
-        <!-- 数据表格模块 -->
-
-        <!-- 分页 -->
-        <div
-          v-if="pager.totalPage > 10"
-          style="
+          <!-- 分页 -->
+          <div
+            v-if="pager.totalPage > 10"
+            style="
               text-align: center;
               position: relative;
-              bottom: 0;
+              padding-top: 20px;
               left: 50%;
               transform: translateX(-50%)
             "
-        >
-          <el-pagination
-            background
-            layout="prev, pager, next"
-            :total="pager.totalPage"
-            :current-page.sync="pager.currentPage"
-            @current-change="change"
-          />
+          >
+            <el-pagination
+              background
+              layout="prev, pager, next"
+              :total="pager.totalPage"
+              :current-page.sync="pager.currentPage"
+              @current-change="change"
+            />
+          </div>
+          <!-- 分页 /-->
         </div>
-        <!-- 分页 /-->
+        <!-- 数据表格模块 -->
+
         <!--  新增/修改信息弹框  -->
         <el-dialog
           :title="ModifyDialogTitle"
@@ -1252,7 +1250,7 @@ export default {
   }
 }
 /deep/ .el-table__body-wrapper .cell {
-  height: 4.5vh;
-  line-height:4.5vh;
+  height: 2vh;
+  line-height:2vh;
 }
 </style>
-- 
Gitee