diff --git a/src/utils/config.js b/src/utils/config.js
index 5ec6087d5705a9246857ffab86c1d910ac8b4dc8..d6d8127dcfac237d4c8278a2ca3e1595b0c09ab4 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -1,8 +1,8 @@
 module.exports = {
   // baseUrl: 'localhost:2011'
   // baseUrl: '49.234.81.196:2011'
-  // baseUrl: '120.25.106.20:2011'
+  baseUrl: '120.25.106.20:2011'
   // baseUrl: '120.25.106.20:2011'
   // baseUrl: 'localhost:40000'
-  baseUrl: '192.168.0.102:2011'
+  // baseUrl: '192.168.0.102:2011'
 }
diff --git a/src/views/ESD/ESDPersonelManagement.vue b/src/views/ESD/ESDPersonelManagement.vue
index 2b454a58cee14b3890a2d05f824018df375c28b2..aab5497363a791074c2d4950dfc821a25047accf 100644
--- a/src/views/ESD/ESDPersonelManagement.vue
+++ b/src/views/ESD/ESDPersonelManagement.vue
@@ -2,804 +2,506 @@
 <template>
   <div class>
     <BreadCrumb :inner="inner" />
-    <!--    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">-->
-    <!--      <el-tab-pane label="安检门列表" name="first">-->
-    <!--        安检门列表-->
-    <!--      </el-tab-pane>-->
-    <!--      <el-tab-pane label="ESD列表" name="second">-->
-    <!--        ESD列表-->
-    <!--      </el-tab-pane>-->
-    <!--    </el-tabs>-->
     <EmptyCard>
       <div slot="EmptyCard">
-        <!-- 查询模块 -->
-        <el-form
-          :inline="true"
-          :model="searchFrom"
-          class="demo-form-inline"
-          style="text-align: center"
-          @submit.native.prevent
-        >
-          <el-form-item>
-            <el-input
-              v-model="searchFrom.searchData"
-              placeholder="请输入设备编号"
-              @input="inputClear"
-              @keyup.enter.native="getData"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="getData">
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <!-- 查询模块  /-->
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-card style="height: auto;">
+              <el-input
+                v-model="filterText"
+                placeholder="输入组织/部门名称"
+              />
 
-        <div style="float: left">
-          <el-button type="primary" icon="el-icon-edit" @click="batchEdit">
-            批量编辑
-          </el-button>
-          <el-button type="primary" icon="el-icon-edit" @click="batchDelete">
-            批量删除
-          </el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="newDevice">
-            设备新增
-          </el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="newDevice">
-            +绑定区域
-          </el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="drawer = true">
-            检索添加设备
-          </el-button>
-        </div>
-        <!--    检索添加设备弹窗    -->
-        <el-drawer
-          title="我是标题"
-          :visible.sync="drawer"
-          :with-header="false"
-          direction="rtl"
-          size="50%"
-        >
-          <span>我来啦!</span>
-        </el-drawer>
-        <!--    /检索添加设备弹窗    -->
-        <!-- 数据表格模块 -->
-        <div v-loading="loading" style="height: 680px">
-          <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 90%" @selection-change="handleSelectionChange">
-            <el-table-column
-              type="selection"
-              width="55"
-            />
-            <el-table-column prop="deviceId" label="设备编号" width="100" />
-            <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="address" label="在线情况" width="120" />
-            <el-table-column
-              prop="status"
-              label="在线情况"
-              :filters="filterData"
-              :filter-method="filterHandler"
-              width="100"
-            >
-              <template slot-scope="scope">
-                <div>
-                  <div v-if="scope.row.state === 1" style="display: flex">
-                    <div class="circle" />
-                    <div>运行中</div>
+              <el-tree
+                ref="tree"
+                class="filter-tree"
+                :data="data"
+                :props="defaultProps"
+                default-expand-all
+                :filter-node-method="filterNode"
+              />
+            </el-card>
+          </el-col>
+          <el-col :span="18">
+            <el-card style="height: auto;">
+              <el-tabs v-model="activeName" @tab-click="handleClick">
+                <el-tab-pane label="公司信息" name="first">
+                  <!-- 操作模块 -->
+                  <div style="height: 50px;padding-top: 10px">
+                    <el-button type="primary" icon="el-icon-plus" style="float: left" @click="newDevice">
+                      新增
+                    </el-button>
+                    <el-button v-if="multipleSelection.length>0" type="primary" plain style="float: left" @click="batchDelete">
+                      批量删除
+                    </el-button>
                   </div>
-                  <div v-else-if="scope.row.state === 0" style="display: flex">
-                    <div class="circle close" />
-                    <div>关闭</div>
-                  </div>
-                  <div v-else style="display: flex">
-                    <div class="circle abnormal" />
-                    <div>异常</div>
-                  </div>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column prop="updateTime" label="更新时间" sortable width="180">
-              <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 label="操作" width="640">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click="editInfo(scope.$index, scope.row)"
-                >
-                  编辑信息
-                </el-button>
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click="
-                    seeInfo(scope.$index, scope.row)
-                  "
-                >
-                  查看操作
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click="editOperation(scope.$index, scope.row)"
-                >
-                  编辑操作
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click.native.prevent="deleteRow(scope.$index, scope.row)"
-                >
-                  删除操作
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <!-- 数据表格模块 -->
+                  <!-- 操作模块  / -->
 
-        <!-- 分页 -->
-        <div
-          v-if="pager.totalPage > 10"
-          style="
+                  <!-- 数据表格模块 -->
+                  <div v-loading="loading" style="height: auto;">
+                    <div style="width: 97%;height: 30px;border: 1px solid #40b4fc;background-color: rgba(32,160,255,0.25);line-height: 30px;text-align: left;padding-left: 2%">
+                      已选择{{ multipleSelection.length }}
+                      <span class="clear-btn" style="padding-left: 20px" @click="clearCheck">
+                        清空
+                      </span>
+                    </div>
+                    <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 90%" @selection-change="handleSelectionChange">
+                      <el-table-column
+                        type="selection"
+                        width="55"
+                        align="center"
+                      />
+                      <el-table-column prop="deviceId" label="#" width="200" align="center" />
+                      <el-table-column prop="deviceType" label="单位部门名称" width="200" align="center" />
+                      <el-table-column label="操作" align="center">
+                        <template slot-scope="scope">
+                          <span class="btn1" @click="editInfo(scope.$index, scope.row)">
+                            编辑
+                          </span>
+                          <el-divider direction="vertical" />
+                          <span class="btn2" @click.native.prevent="deleteRow(scope.$index, scope.row)">
+                            删除
+                          </span>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                    <!-- 分页 -->
+                    <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"
-          />
-        </div>
-        <!-- 分页 /-->
-        <!--  新增/修改信息弹框  -->
-        <el-dialog
-          :title="ModifyDialogTitle"
-          :visible.sync="ModifyDialogVisible"
-          width="550px"
-          center
-          :close-on-click-modal="false"
-        >
-          <div style="margin-left: 15%; max-height: 450px; overflow: auto">
-            <el-form
-              ref="modifyInfo"
-              :model="modifyInfo"
-              :rules="modifyInfoRules"
-              label-width="100px"
-            >
-              <el-form-item label="设备编号" prop="deviceId">
-                <el-input
-                  v-model="modifyInfo.deviceId"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入设备编号"
-                  :disabled="ModifyDialogTitle === '编辑设备信息'"
-                />
-              </el-form-item>
-              <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="设备类型" prop="deviceType">
-                <el-input
-                  v-model="modifyInfo.deviceType"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入设备类型编号"
-                />
-              </el-form-item>
-              <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="客户主编号" prop="customerId">
-                <el-input
-                  v-model="modifyInfo.customerId"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入客户主编号"
-                />
-              </el-form-item>
-              <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="区域编号" prop="areaId">
-                <el-input
-                  v-model="modifyInfo.areaId"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入区域编号"
-                />
-              </el-form-item>
-              <el-form-item label="IP地址" prop="deviceIp">
-                <el-input
-                  v-model="modifyInfo.deviceIp"
-                  type="text"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入IP地址"
-                />
-              </el-form-item>
-              <el-form-item label="端口号" prop="devicePort">
-                <el-input
-                  v-model="modifyInfo.devicePort"
-                  type="text"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入端口号"
-                />
-              </el-form-item>
-              <el-form-item label="设备位置" prop="address">
-                <el-input
-                  v-model="modifyInfo.address"
-                  type="text"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入设备位置"
-                />
-              </el-form-item>
-              <el-form-item label="备注" prop="remark">
-                <el-input
-                  v-model="modifyInfo.remark"
-                  type="textarea"
-                  :rows="3"
-                  style="width: 76%"
-                  placeholder="请输入内容"
-                />
-              </el-form-item>
-            </el-form>
-          </div>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="ModifyDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="handleModify">确 定</el-button>
-          </span>
-        </el-dialog>
-        <!--  修改信息弹框  /-->
-
-        <!--查看操作/编辑操作   -->
-        <el-dialog
-          :title="titleOfDialog"
-          :visible.sync="operationDialogVisible"
-          width="1350px"
-          center
-          :close-on-click-modal="false"
-        >
-          <div v-loading="operationDialogLoading" style="max-height: 450px;overflow: auto" class="operationDialog">
-            <el-form
-              ref="EquipmentOperation"
-              :model="EquipmentOperation"
-              :rules="EquipmentOperation_Rules"
-              label-width="135px"
-            >
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="整体灵敏度：" prop="overallSensitivity">
-                    <el-input-number v-model="EquipmentOperation.overallSensitivity" :disabled="isShow" :min="1" :max="100" label="整体灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="频道：" prop="channel">
-                    <el-select
-                      v-model="EquipmentOperation.channel"
-                      placeholder="频道"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.channel"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="音量：" prop="volume">
-                    <el-input-number v-model="EquipmentOperation.volume" :disabled="isShow" :min="EquipmentOperation.minVolume" :max="8" label="音量" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="顶部绿灯：" prop="powerLed">
-                    <el-select
-                      v-model="EquipmentOperation.powerLed"
-                      placeholder="顶部绿灯"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.powerLed"
-                        :key="item.id"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="区位一灵敏度：" prop="passageway1">
-                    <el-input-number v-model="EquipmentOperation.passageway1" :disabled="isShow" :min="1" :max="100" label="通道1灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="启动时搜索频率：" prop="searchFrequency">
-                    <el-select
-                      v-model="EquipmentOperation.searchFrequency"
-                      placeholder="启动时搜索频率"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.searchFrequency"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="最小音量：" prop="minVolume">
-                    <el-input-number v-model="EquipmentOperation.minVolume" :disabled="isShow" :min="0" :max="8" label="最小音量" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="无效通过：" prop="invalidPass">
-                    <el-select
-                      v-model="EquipmentOperation.invalidPass"
-                      placeholder="请选择无效通过"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.invalidPass"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="区位二灵敏度：" prop="passageway2">
-                    <el-input-number v-model="EquipmentOperation.passageway2" :disabled="isShow" :min="1" :max="100" label="通道2灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="低速过滤器：" prop="lowFilter">
-                    <el-select
-                      v-model="EquipmentOperation.lowFilter"
-                      placeholder="低速过滤器"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.lowFilter"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="遥控按键音量：" prop="buttonVolume">
-                    <el-input-number v-model="EquipmentOperation.buttonVolume" :disabled="isShow" :min="EquipmentOperation.minVolume" :max="100" label="遥控按键音量" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="计数方向：" prop="buttonVolume">
-                    <el-select
-                      v-model="EquipmentOperation.countDirection"
-                      placeholder="计数方向"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.countDirection"
-                        :key="item.id"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="区位三灵敏度：" prop="passageway3">
-                    <el-input-number v-model="EquipmentOperation.passageway3" :disabled="isShow" :min="1" :max="100" label="通道3灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="高速过滤器：" prop="highFilter">
-                    <el-select
-                      v-model="EquipmentOperation.highFilter"
-                      placeholder="高速过滤器"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.highFilter"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="报警音调：" prop="alarmTone">
-                    <el-input-number v-model="EquipmentOperation.alarmTone" :disabled="isShow" :min="1" :max="100" label="工作报警声音" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="递减模式：" prop="decreaseMode">
-                    <el-select
-                      v-model="EquipmentOperation.decreaseMode"
-                      placeholder="递减模式"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.decreaseMode"
-                        :key="item.id"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="区位四灵敏度：" prop="passageway4">
-                    <el-input-number v-model="EquipmentOperation.passageway4" :disabled="isShow" :min="1" :max="100" label="通道4灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="随机报警率：" prop="rndRate">
-                    <el-input-number v-model="EquipmentOperation.rndRate" :disabled="isShow" :min="0" :max="100" label="随机报警率" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="报警时间：" prop="alarmTime">
-                    <!--<el-input
-                      v-model="EquipmentOperation.alarmTime"
-                      placeholder="报警时间"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    />-->
-                    <el-input-number
-                      v-model="EquipmentOperation.alarmTime"
-                      :min="0"
-                      :max="51"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="待机模式：" prop="standbyMode">
-                    <el-select
-                      v-model="EquipmentOperation.standbyMode"
-                      placeholder="待机模式"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.standbyMode"
-                        :key="item.id"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="区位五灵敏度：" prop="passageway5">
-                    <el-input-number v-model="EquipmentOperation.passageway5" :disabled="isShow" :min="1" :max="100" label="通道5灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="报警人群随机率：" prop="rndAlmRate">
-                    <el-input-number v-model="EquipmentOperation.rndAlmRate" :disabled="isShow" :min="0" :max="100" label="报警人群随机率" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="报警模式：" prop="zones">
-                    <el-select
-                      v-model="EquipmentOperation.zones"
-                      placeholder="报警模式"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.zones"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="电源监控：" prop="powerMonitoring">
-                    <el-select
-                      v-model="EquipmentOperation.powerMonitoring"
-                      placeholder="电源监控"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.powerMonitoring"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="区位六灵敏度：" prop="passageway6">
-                    <el-input-number v-model="EquipmentOperation.passageway6" :disabled="isShow" :min="1" :max="100" label="通道6灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="随机报警声音：" prop="rndTone">
-                    <el-input-number v-model="EquipmentOperation.rndTone" :disabled="isShow" :min="0" :max="100" label="随机报警声音" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="区位显示时间：" prop="locationTime">
-                    <!--<el-input
-                      v-model="EquipmentOperation.locationTime"
-                      placeholder="区位显示时间"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    />-->
-                    <el-input-number
-                      v-model="EquipmentOperation.locationTime"
-                      :min="0"
-                      :max="51"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="INPUT1：" prop="input1">
-                    <el-select
-                      v-model="EquipmentOperation.input1"
-                      placeholder="INPUT1"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.input1"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="区位七灵敏度：" prop="passageway7">
-                    <el-input-number v-model="EquipmentOperation.passageway7" :disabled="isShow" :min="1" :max="100" label="通道7灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="报警音量：" prop="rndVolume">
-                    <el-input-number v-model="EquipmentOperation.rndVolume" :disabled="isShow" :min="EquipmentOperation.minVolume" :max="100" label="报警音量" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="指示灯：" prop="indicatorLight">
-                    <el-select
-                      v-model="EquipmentOperation.indicatorLight"
-                      placeholder="指示灯"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.indicatorLight"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="INPUT2：" prop="input2">
-                    <el-select
-                      v-model="EquipmentOperation.input2"
-                      placeholder="INPUT2"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.input2"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="区位八灵敏度：" prop="passageway8">
-                    <el-input-number v-model="EquipmentOperation.passageway8" :disabled="isShow" :min="1" :max="100" label="通道8灵敏度" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="报警显示：" prop="rndDisplay">
-                    <el-select
-                      v-model="EquipmentOperation.rndDisplay"
-                      placeholder="报警显示"
-                      style="width: 180px"
-                      :disabled="isShow"
                     >
-                      <el-option
-                        v-for="item in options.rndDisplay"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
+                      <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        :total="pager.totalPage"
+                        :current-page.sync="pager.currentPage"
+                        @current-change="change"
                       />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="灯亮时间：" prop="lightTime">
-                    <!--<el-input
-                      v-model="EquipmentOperation.lightTime"
-                      placeholder="灯亮时间"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    />-->
-                    <el-input-number
-                      v-model="EquipmentOperation.lightTime"
-                      :min="0"
-                      :max="51"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="OUTPUT1：" prop="output1">
-                    <el-select
-                      v-model="EquipmentOperation.output1"
-                      placeholder="OUTPUT1"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.output1"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="6">
-                  <el-form-item label="程序模式：" prop="programMode">
-                    <el-select
-                      v-model="EquipmentOperation.programMode"
-                      placeholder="程序模式"
-                      style="width: 180px"
-                      :disabled="isShow"
+                    </div>
+                    <!-- 分页 /-->
+                  </div>
+                  <!-- 数据表格模块 -->
+
+                  <!--  新增/修改信息弹框  -->
+                  <el-dialog
+                    :title="ModifyDialogTitle"
+                    :visible.sync="ModifyDialogVisible"
+                    width="550px"
+                    center
+                    :close-on-click-modal="false"
+                  >
+                    <div style="margin-left: 15%; max-height: 450px; overflow: auto">
+                      <el-form
+                        ref="modifyInfo"
+                        :model="modifyInfo"
+                        :rules="modifyInfoRules"
+                        label-width="100px"
+                      >
+                        <el-form-item label="组织名称" prop="deviceId">
+                          <el-input
+                            v-model="modifyInfo.deviceId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入组织/部门名称"
+                            :disabled="ModifyDialogTitle === '编辑设备信息'"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="上级部门" prop="deviceType">
+                          <el-input
+                            v-model="modifyInfo.deviceType"
+                            :disabled="true"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入上级部门"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="手机号" prop="customerId">
+                          <el-input
+                            v-model="modifyInfo.customerId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入手机号"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="传真" prop="areaId">
+                          <el-input
+                            v-model="modifyInfo.areaId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入传真"
+                          />
+                        </el-form-item>
+                        <el-form-item label="地址" prop="deviceIp">
+                          <el-input
+                            v-model="modifyInfo.deviceIp"
+                            type="text"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入地址"
+                          />
+                        </el-form-item>
+                        <el-form-item label="排序" prop="devicePort">
+                          <el-input-number
+                            v-model="modifyInfo.devicePort"
+                            :min="1"
+                            :max="10"
+                            type="text"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入排序"
+                          />
+                        </el-form-item>
+                        <el-form-item label="备注" prop="remark">
+                          <el-input
+                            v-model="modifyInfo.remark"
+                            type="textarea"
+                            :rows="3"
+                            style="width: 76%"
+                            placeholder="请输入内容"
+                          />
+                        </el-form-item>
+                      </el-form>
+                    </div>
+                    <span slot="footer" class="dialog-footer">
+                      <el-button @click="ModifyDialogVisible = false">取 消</el-button>
+                      <el-button type="primary" @click="handleModify">确 定</el-button>
+                    </span>
+                  </el-dialog>
+                  <!--  修改信息弹框  /-->
+                </el-tab-pane>
+                <el-tab-pane label="人员信息" name="second">
+                  <!-- 操作模块 -->
+                  <div style="height: 50px;padding-top: 10px">
+                    <!-- 查询模块 -->
+                    <el-form
+                      :inline="true"
+                      :model="searchFrom"
+                      class="demo-form-inline"
+                      style="float: left;display: inline-block"
+                      @submit.native.prevent
                     >
-                      <el-option
-                        v-for="item in options.programMode"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
+                      <el-form-item>
+                        <el-input
+                          v-model="searchFrom.searchData"
+                          placeholder="请输入设备编号"
+                          @input="inputClear"
+                          @keyup.enter.native="getData"
+                        />
+                      </el-form-item>
+                      <el-form-item>
+                        <el-button type="primary" @click="getData">
+                          查询
+                        </el-button>
+                      </el-form-item>
+                    </el-form>
+                    <!-- 查询模块  /-->
+                    <el-button type="primary" icon="el-icon-plus" style="float: left;display: inline-block" @click="newPerson">
+                      新增
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-plus" style="float: left;display: inline-block">
+                      批量导入
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-plus" style="float: left;display: inline-block">
+                      导出
+                    </el-button>
+                    <el-button v-if="multipleSelection.length>0" type="primary" plain style="float: left;display: inline-block" @click="batchDelete">
+                      批量删除
+                    </el-button>
+                  </div>
+                  <!-- 操作模块  / -->
+
+                  <!-- 数据表格模块 -->
+                  <div v-loading="loading" style="height: auto;">
+                    <div style="width: 97%;height: 30px;border: 1px solid #40b4fc;background-color: rgba(32,160,255,0.25);line-height: 30px;text-align: left;">
+                      已选择{{ multipleSelection.length }}
+                      <span class="clear-btn" style="padding-left: 20px" @click="clearCheck">
+                        清空
+                      </span>
+                    </div>
+                    <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 90%" @selection-change="handleSelectionChange">
+                      <el-table-column
+                        type="selection"
+                        width="55"
+                        align="center"
                       />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="指导模式：" prop="guidanceMode">
-                    <el-select
-                      v-model="EquipmentOperation.guidanceMode"
-                      placeholder="指导模式"
-                      style="width: 180px"
-                      :disabled="isShow"
+                      <el-table-column prop="deviceId" label="照片" width="200" align="center" />
+                      <el-table-column prop="deviceType" label="姓名" width="200" align="center" />
+                      <el-table-column prop="deviceType" label="工作编号" width="200" align="center" />
+                      <el-table-column prop="deviceType" label="组织部门" width="200" align="center" />
+                      <el-table-column label="操作" align="center">
+                        <template slot-scope="scope">
+                          <span class="btn1" @click="editInfo(scope.$index, scope.row)">
+                            编辑
+                          </span>
+                          <el-divider direction="vertical" />
+                          <span class="btn2" @click.native.prevent="deleteRow(scope.$index, scope.row)">
+                            删除
+                          </span>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                    <!-- 分页 -->
+                    <div
+                      v-if="pager.totalPage > 10"
+                      style="
+              text-align: center;
+              position: relative;
+              padding-top: 20px;
+              left: 50%;
+              transform: translateX(-50%)
+            "
                     >
-                      <el-option
-                        v-for="item in options.guidanceMode"
-                        :key="item.value"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
+                      <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        :total="pager.totalPage"
+                        :current-page.sync="pager.currentPage"
+                        @current-change="change"
                       />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="显示模式：" prop="displayMode">
-                    <el-select
-                      v-model="EquipmentOperation.displayMode"
-                      placeholder="显示模式"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.displayMode"
-                        :key="item.id"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
+                    </div>
+                    <!-- 分页 /-->
+                  </div>
+                  <!-- 数据表格模块 -->
+
+                  <!--  新增/修改信息弹框  -->
+                  <el-dialog
+                    :title="ModifyDialogTitle"
+                    :visible.sync="ModifyDialogVisible"
+                    width="550px"
+                    center
+                    :close-on-click-modal="false"
+                  >
+                    <div style="margin-left: 15%; max-height: 450px; overflow: auto">
+                      <el-form
+                        ref="modifyInfo"
+                        :model="modifyInfo"
+                        :rules="modifyInfoRules"
+                        label-width="100px"
+                      >
+                        <el-form-item label="组织名称" prop="deviceId">
+                          <el-input
+                            v-model="modifyInfo.deviceId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入组织/部门名称"
+                            :disabled="ModifyDialogTitle === '编辑设备信息'"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="上级部门" prop="deviceType">
+                          <el-input
+                            v-model="modifyInfo.deviceType"
+                            :disabled="true"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入上级部门"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="手机号" prop="customerId">
+                          <el-input
+                            v-model="modifyInfo.customerId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入手机号"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="传真" prop="areaId">
+                          <el-input
+                            v-model="modifyInfo.areaId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入传真"
+                          />
+                        </el-form-item>
+                        <el-form-item label="地址" prop="deviceIp">
+                          <el-input
+                            v-model="modifyInfo.deviceIp"
+                            type="text"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入地址"
+                          />
+                        </el-form-item>
+                        <el-form-item label="排序" prop="devicePort">
+                          <el-input-number
+                            v-model="modifyInfo.devicePort"
+                            :min="1"
+                            :max="10"
+                            type="text"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入排序"
+                          />
+                        </el-form-item>
+                        <el-form-item label="备注" prop="remark">
+                          <el-input
+                            v-model="modifyInfo.remark"
+                            type="textarea"
+                            :rows="3"
+                            style="width: 76%"
+                            placeholder="请输入内容"
+                          />
+                        </el-form-item>
+                      </el-form>
+                    </div>
+                    <span slot="footer" class="dialog-footer">
+                      <el-button @click="ModifyDialogVisible = false">取 消</el-button>
+                      <el-button type="primary" @click="handleModify">确 定</el-button>
+                    </span>
+                  </el-dialog>
+                  <!--  修改信息弹框  /-->
+                </el-tab-pane>
+                <el-tab-pane label="失败列表" name="third">
+                  <!-- 数据表格模块 -->
+                  <div v-loading="loading" style="height: auto;">
+                    <div style="width: 97%;height: 30px;border: 1px solid #40b4fc;background-color: rgba(32,160,255,0.25);line-height: 30px;text-align: left;padding-left: 2%">
+                      已选择{{ multipleSelection.length }}
+                      <span class="clear-btn" style="padding-left: 20px" @click="clearCheck">
+                        清空
+                      </span>
+                    </div>
+                    <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 90%" @selection-change="handleSelectionChange">
+                      <el-table-column
+                        type="selection"
+                        width="55"
+                        align="center"
                       />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="OUTPUT2：" prop="output2">
-                    <el-select
-                      v-model="EquipmentOperation.output2"
-                      placeholder="OUTPUT2"
-                      style="width: 180px"
-                      :disabled="isShow"
+                      <el-table-column prop="deviceId" label="照片" width="120" align="center" />
+                      <el-table-column prop="deviceType" label="姓名" width="120" align="center" />
+                      <el-table-column prop="deviceType" label="工作编号" width="120" align="center" />
+                      <el-table-column prop="deviceType" label="失败原因" width="120" align="center" />
+                      <el-table-column prop="deviceType" label="上传日期" width="120" align="center" />
+                      <el-table-column label="操作" align="center">
+                        <template slot-scope="scope">
+                          <span class="btn1" @click="editInfo(scope.$index, scope.row)">
+                            编辑
+                          </span>
+                          <el-divider direction="vertical" />
+                          <span class="btn2" @click.native.prevent="deleteRow(scope.$index, scope.row)">
+                            删除
+                          </span>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                    <!-- 分页 -->
+                    <div
+                      v-if="pager.totalPage > 10"
+                      style="
+              text-align: center;
+              position: relative;
+              padding-top: 20px;
+              left: 50%;
+              transform: translateX(-50%)
+            "
                     >
-                      <el-option
-                        v-for="item in options.output2"
-                        :key="item.id"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
+                      <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        :total="pager.totalPage"
+                        :current-page.sync="pager.currentPage"
+                        @current-change="change"
                       />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </div>
-          <span slot="footer" class="dialog-footer" style="margin-top: -20px">
-            <el-button @click="operationDialogVisible = false">取 消</el-button>
-            <el-button
-              type="primary"
-              :disabled="isShow"
-              @click="modifyEquipmentOperation"
-            >确 定</el-button>
-          </span>
-        </el-dialog>
-        <!--查看操作/编辑操作  /-->
+                    </div>
+                    <!-- 分页 /-->
+                  </div>
+                  <!-- 数据表格模块 -->
+
+                  <!--  新增/修改信息弹框  -->
+                  <el-dialog
+                    :title="ModifyDialogTitle"
+                    :visible.sync="ModifyDialogVisible"
+                    width="550px"
+                    center
+                    :close-on-click-modal="false"
+                  >
+                    <div style="margin-left: 15%; max-height: 450px; overflow: auto">
+                      <el-form
+                        ref="modifyInfo"
+                        :model="modifyInfo"
+                        :rules="modifyInfoRules"
+                        label-width="100px"
+                      >
+                        <el-form-item label="组织名称" prop="deviceId">
+                          <el-input
+                            v-model="modifyInfo.deviceId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入组织/部门名称"
+                            :disabled="ModifyDialogTitle === '编辑设备信息'"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="上级部门" prop="deviceType">
+                          <el-input
+                            v-model="modifyInfo.deviceType"
+                            :disabled="true"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入上级部门"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="手机号" prop="customerId">
+                          <el-input
+                            v-model="modifyInfo.customerId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入手机号"
+                          />
+                        </el-form-item>
+                        <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="传真" prop="areaId">
+                          <el-input
+                            v-model="modifyInfo.areaId"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入传真"
+                          />
+                        </el-form-item>
+                        <el-form-item label="地址" prop="deviceIp">
+                          <el-input
+                            v-model="modifyInfo.deviceIp"
+                            type="text"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入地址"
+                          />
+                        </el-form-item>
+                        <el-form-item label="排序" prop="devicePort">
+                          <el-input-number
+                            v-model="modifyInfo.devicePort"
+                            :min="1"
+                            :max="10"
+                            type="text"
+                            style="width: 66%"
+                            auto-complete="off"
+                            placeholder="请输入排序"
+                          />
+                        </el-form-item>
+                        <el-form-item label="备注" prop="remark">
+                          <el-input
+                            v-model="modifyInfo.remark"
+                            type="textarea"
+                            :rows="3"
+                            style="width: 76%"
+                            placeholder="请输入内容"
+                          />
+                        </el-form-item>
+                      </el-form>
+                    </div>
+                    <span slot="footer" class="dialog-footer">
+                      <el-button @click="ModifyDialogVisible = false">取 消</el-button>
+                      <el-button type="primary" @click="handleModify">确 定</el-button>
+                    </span>
+                  </el-dialog>
+                  <!--  修改信息弹框  /-->
+                </el-tab-pane>
+              </el-tabs>
+            </el-card>
+          </el-col>
+        </el-row>
       </div>
     </EmptyCard>
   </div>
@@ -827,9 +529,49 @@ export default {
   },
   data() {
     return {
+      filterText: '',
+      data: [{
+        id: 1,
+        label: '一级 1',
+        children: [{
+          id: 4,
+          label: '二级 1-1',
+          children: [{
+            id: 9,
+            label: '三级 1-1-1'
+          }, {
+            id: 10,
+            label: '三级 1-1-2'
+          }]
+        }]
+      }, {
+        id: 2,
+        label: '一级 2',
+        children: [{
+          id: 5,
+          label: '二级 2-1'
+        }, {
+          id: 6,
+          label: '二级 2-2'
+        }]
+      }, {
+        id: 3,
+        label: '一级 3',
+        children: [{
+          id: 7,
+          label: '二级 3-1'
+        }, {
+          id: 8,
+          label: '二级 3-2'
+        }]
+      }],
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
       drawer: false,
       activeName: 'first',
-      inner: { title: 'ESD设备列表' },
+      inner: { title: 'ESD人员管理' },
       searchFrom: {
         searchData: ''
       },
@@ -860,8 +602,8 @@ export default {
       filterData: [{ text: '关闭', value: 0 }, { text: '运行中', value: 1 }, { text: '异常', value: 2 }],
       pager: {
         currentPage: 1,
-        pageSize: 10,
-        totalPage: 10
+        pageSize: 7,
+        totalPage: 7
       },
       loading: false, // 加载动画
       multipleSelection: [], // 选中列表
@@ -948,55 +690,17 @@ export default {
         guidanceMode: [],
         displayMode: []
       },
-      EquipmentOperation_Rules: {
-        zones: [{ required: true, message: '必填项', trigger: 'blur' }], // 报警模式
-        standbyMode: [{ required: true, message: '必填项', trigger: 'blur' }], // 待机模式
-        programMode: [{ required: true, message: '必填项', trigger: 'blur' }], // 程序模式
-        searchFrequency: [{ required: true, message: '必填项', trigger: 'blur' }], // 启动时搜索频率
-        rndVolume: [{ required: true, message: '必填项', trigger: 'blur' }], // 报警音量
-        rndTone: [{ required: true, message: '必填项', trigger: 'blur' }], // 报警音
-        rndRate: [{ required: true, message: '必填项', trigger: 'blur' }], // 随机报警率
-        rndDisplay: [{ required: true, message: '必填项', trigger: 'blur' }], // 报警显示
-        rndAlmRate: [{ required: true, message: '必填项', trigger: 'blur' }], // 报警人群随机报警
-        powerMonitoring: [{ required: true, message: '必填项', trigger: 'blur' }], // 电源监控
-        powerLed: [{ required: true, message: '必填项', trigger: 'blur' }], // 顶部绿灯
-        channel: [{ required: true, message: '必填项', trigger: 'blur' }], // 频道
-        overallSensitivity: '', // 整体灵敏度
-        passageway1: [{ required: true, message: '必填项', trigger: 'blur' }], // 通道1灵敏度
-        passageway2: [{ required: true, message: '必填项', trigger: 'blur' }], // 通道2灵敏度
-        passageway3: [{ required: true, message: '必填项', trigger: 'blur' }], // 通道3灵敏度
-        passageway4: [{ required: true, message: '必填项', trigger: 'blur' }], // 通道4灵敏度
-        passageway5: [{ required: true, message: '必填项', trigger: 'blur' }], // 通道5灵敏度
-        passageway6: [{ required: true, message: '必填项', trigger: 'blur' }], // 通道6灵敏度
-        passageway7: [{ required: true, message: '必填项', trigger: 'blur' }], // 通道7灵敏度
-        passageway8: [{ required: true, message: '必填项', trigger: 'blur' }], // 通道8灵敏度
-        output1: [{ required: true, message: '必填项', trigger: 'blur' }], // output1
-        output2: [{ required: true, message: '必填项', trigger: 'blur' }], // output2
-        input1: [{ required: true, message: '必填项', trigger: 'blur' }], // input1
-        input2: [{ required: true, message: '必填项', trigger: 'blur' }], // input2
-        lowFilter: [{ required: true, message: '必填项', trigger: 'blur' }], // 低速过滤器
-        highFilter: [{ required: true, message: '必填项', trigger: 'blur' }], // 高速过滤器
-        locationTime: [{ required: true, message: '必填项', trigger: 'blur' }], // 区位显示时间
-        alarmTime: [{ required: true, message: '必填项', trigger: 'blur' }], // 报警时间
-        lightTime: [{ required: true, message: '必填项', trigger: 'blur' }], // 灯亮时间
-        invalidPass: [{ required: true, message: '必填项', trigger: 'blur' }], // 无效通过
-        indicatorLight: [{ required: true, message: '必填项', trigger: 'blur' }], // 指示灯
-        guidanceMode: [{ required: true, message: '必填项', trigger: 'blur' }], // 指导模式
-        displayMode: [{ required: true, message: '必填项', trigger: 'blur' }], // 显示模式
-        decreaseMode: [{ required: true, message: '必填项', trigger: 'blur' }], // 递减模式
-        countDirection: [{ required: true, message: '必填项', trigger: 'blur' }], // 计数方向
-        volume: [{ required: true, message: '必填项', trigger: 'blur' }], // 音量
-        alarmTone: [{ required: true, message: '必填项', trigger: 'blur' }], // 报警音
-        buttonVolume: [{ required: true, message: '必填项', trigger: 'blur' }], // 遥控按键音量
-        minVolume: [{ required: true, message: '必填项', trigger: 'blur' }] // 最小音量
-      }, // 设备操作表单校验规则
       isShow: false, // 是否为查看控制是否可选
       operationDialogLoading: false,
       editArray: []
     }
   },
   computed: {},
-  watch: {},
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
   created() {
   },
   mounted() {
@@ -1004,6 +708,11 @@ export default {
     this.getConfigData()
   },
   methods: {
+    // 过滤树形节点
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
     handleClick(tab, event) {
       console.log(tab, event)
     },
@@ -1100,11 +809,16 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val
     },
+    // 清空多选项
+    clearCheck() {
+      // 清空表格多选框
+      this.$refs.multipleTable.clearSelection()
+    },
     // 筛选函数
     filterHandler(value, row, column) {
       return row.state === value
     },
-    // 设备新增
+    // 公司新增
     newDevice() {
       if (this.$refs.modifyInfo) {
         // 重置表单
@@ -1123,6 +837,25 @@ export default {
       this.ModifyDialogTitle = '新增设备'
       this.ModifyDialogVisible = true
     },
+    // 人员新增
+    newPerson() {
+      if (this.$refs.modifyInfo) {
+        // 重置表单
+        this.$refs.modifyInfo.resetFields()
+        this.modifyInfo = {
+          deviceId: '',
+          deviceType: '',
+          customerId: '',
+          areaId: '',
+          deviceIp: '',
+          devicePort: '',
+          status: '',
+          remark: ''
+        }
+      }
+      this.ModifyDialogTitle = '新增设备'
+      this.ModifyDialogVisible = true
+    },
     // 编辑设备信息
     editInfo(scope, row) {
       this.ModifyDialogTitle = '编辑设备信息'
@@ -1263,7 +996,23 @@ export default {
   }
 }
 /deep/ .el-table__body-wrapper .cell {
-  height: 4.5vh;
-  line-height:4.5vh;
+  height: 2vh;
+  line-height:2vh;
+}
+.btn1:hover{
+  color: #20a0ff;
+}
+.btn2:hover{
+  color: #20a0ff;
+}
+.clear-btn:hover{
+  color: #20a0ff;
+}
+/deep/.el-table__body tr:hover>td{
+  background-color: rgba(64, 180, 252, 0.1) !important;
+}
+
+/deep/.el-table__body tr.current-row>td{
+  background-color: rgba(64, 180, 252, 0.09) !important;
 }
 </style>
diff --git a/src/views/ESD/ESDPushSettings.vue b/src/views/ESD/ESDPushSettings.vue
index 0c4a11dcd6e1e8a8a088a17beda0a38fa8ccca86..ee526c07d475073685c39d617bcb1beb005a30cf 100644
--- a/src/views/ESD/ESDPushSettings.vue
+++ b/src/views/ESD/ESDPushSettings.vue
@@ -3,13 +3,13 @@
   <div class>
     <BreadCrumb :inner="inner" />
     <EmptyCard>
-      <div slot="EmptyCard">
+      <div slot="EmptyCard" style="height: 100%">
         <!-- 查询模块 -->
         <el-form
           :inline="true"
           :model="searchFrom"
           class="demo-form-inline"
-          style="text-align: left"
+          style="text-align: left;height: 50px"
           @submit.native.prevent
         >
           <el-form-item label="URL地址:">
@@ -36,7 +36,8 @@
         </el-form>
         <!-- 查询模块  /-->
 
-        <div style="height: 60px;text-align: left">
+        <!-- 操作模块 -->
+        <div style="height: 50px;text-align: left">
           <el-button type="primary" icon="el-icon-edit" @click="batchDelete">
             批量删除
           </el-button>
@@ -44,10 +45,12 @@
             设备新增
           </el-button>
         </div>
+        <!-- 操作模块 /-->
+
         <!-- 数据表格模块 -->
-        <div v-loading="loading" style="height: 90%">
-          <div style="width: 98%;height: 40px;border: 1px solid #40b4fc;background-color: rgba(32,160,255,0.25);line-height: 40px;text-align: left;padding-left: 2%">
-            已选择{{ multipleSelection.length }}项目
+        <div v-loading="loading" style="height: auto;">
+          <div style="width: 98%;height: 30px;border: 1px solid #40b4fc;background-color: rgba(32,160,255,0.25);line-height: 30px;text-align: left;padding-left: 2%">
+            已选择{{ multipleSelection.length }}
             <span class="clear-btn" style="padding-left: 20px" @click="clearCheck">
               清空
             </span>
@@ -55,70 +58,48 @@
           <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 90%" @selection-change="handleSelectionChange">
             <el-table-column
               type="selection"
-              width="200"
+              width="50"
+              align="center"
             />
-            <el-table-column prop="deviceId" label="URL地址" width="200" />
-            <el-table-column prop="deviceType" label="名称" width="200" />
-            <el-table-column prop="customerId" label="备注" width="200" />
-            <el-table-column prop="areaId" label="状态" width="200" />
-            <el-table-column label="操作" width="640">
+            <el-table-column prop="deviceId" label="URL地址" width="200" align="center" />
+            <el-table-column prop="deviceType" label="名称" width="200" align="center" />
+            <el-table-column prop="customerId" label="备注" width="200" align="center" />
+            <el-table-column prop="areaId" label="状态" width="200" align="center" />
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click="editInfo(scope.$index, scope.row)"
-                >
-                  编辑信息
-                </el-button>
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click="
-                    seeInfo(scope.$index, scope.row)
-                  "
-                >
-                  查看操作
-                </el-button>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @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 class="btn1" @click="editInfo(scope.$index, scope.row)">
+                  编辑
+                </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"
@@ -134,64 +115,21 @@
               :rules="modifyInfoRules"
               label-width="100px"
             >
-              <el-form-item label="设备编号" prop="deviceId">
+              <el-form-item label="URL地址" prop="deviceId">
                 <el-input
                   v-model="modifyInfo.deviceId"
                   style="width: 66%"
                   auto-complete="off"
-                  placeholder="请输入设备编号"
+                  placeholder="URL地址"
                   :disabled="ModifyDialogTitle === '编辑设备信息'"
                 />
               </el-form-item>
-              <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="设备类型" prop="deviceType">
+              <el-form-item label="名称" prop="deviceType">
                 <el-input
                   v-model="modifyInfo.deviceType"
                   style="width: 66%"
                   auto-complete="off"
-                  placeholder="请输入设备类型编号"
-                />
-              </el-form-item>
-              <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="客户主编号" prop="customerId">
-                <el-input
-                  v-model="modifyInfo.customerId"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入客户主编号"
-                />
-              </el-form-item>
-              <el-form-item v-show="ModifyDialogTitle === '新增设备'" label="区域编号" prop="areaId">
-                <el-input
-                  v-model="modifyInfo.areaId"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入区域编号"
-                />
-              </el-form-item>
-              <el-form-item label="IP地址" prop="deviceIp">
-                <el-input
-                  v-model="modifyInfo.deviceIp"
-                  type="text"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入IP地址"
-                />
-              </el-form-item>
-              <el-form-item label="端口号" prop="devicePort">
-                <el-input
-                  v-model="modifyInfo.devicePort"
-                  type="text"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入端口号"
-                />
-              </el-form-item>
-              <el-form-item label="设备位置" prop="address">
-                <el-input
-                  v-model="modifyInfo.address"
-                  type="text"
-                  style="width: 66%"
-                  auto-complete="off"
-                  placeholder="请输入设备位置"
+                  placeholder="名称"
                 />
               </el-form-item>
               <el-form-item label="备注" prop="remark">
@@ -203,6 +141,14 @@
                   placeholder="请输入内容"
                 />
               </el-form-item>
+              <el-form-item label="状态" prop="areaId">
+                <el-input
+                  v-model="modifyInfo.areaId"
+                  style="width: 66%"
+                  auto-complete="off"
+                  placeholder="状态"
+                />
+              </el-form-item>
             </el-form>
           </div>
           <span slot="footer" class="dialog-footer">
@@ -1223,7 +1169,23 @@ export default {
   }
 }
 /deep/ .el-table__body-wrapper .cell {
-  height: 4.5vh;
-  line-height:4.5vh;
+  height: 2vh;
+  line-height: 2vh;
+}
+.btn1:hover{
+  color: #20a0ff;
+}
+.btn2:hover{
+  color: #20a0ff;
+}
+.clear-btn:hover{
+  color: #20a0ff;
+}
+/deep/.el-table__body tr:hover>td{
+  background-color: rgba(64, 180, 252, 0.1) !important;
+}
+
+/deep/.el-table__body tr.current-row>td{
+  background-color: rgba(64, 180, 252, 0.09) !important;
 }
 </style>
diff --git a/src/views/ESD/ESDServiceList.vue b/src/views/ESD/ESDServiceList.vue
index a88681adfda0f721e60fd368d173b95326530995..22205afb77f2cf47120f21f475cbd1f64fd2424c 100644
--- a/src/views/ESD/ESDServiceList.vue
+++ b/src/views/ESD/ESDServiceList.vue
@@ -2,14 +2,6 @@
 <template>
   <div class>
     <BreadCrumb :inner="inner" />
-    <!--    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">-->
-    <!--      <el-tab-pane label="安检门列表" name="first">-->
-    <!--        安检门列表-->
-    <!--      </el-tab-pane>-->
-    <!--      <el-tab-pane label="ESD列表" name="second">-->
-    <!--        ESD列表-->
-    <!--      </el-tab-pane>-->
-    <!--    </el-tabs>-->
     <EmptyCard>
       <div slot="EmptyCard">
         <!-- 查询模块 -->
@@ -36,7 +28,7 @@
         </el-form>
         <!-- 查询模块  /-->
 
-        <div style="float: left">
+        <div style="float: left;height: 50px">
           <el-button type="primary" icon="el-icon-edit" @click="batchEdit">
             批量编辑
           </el-button>
@@ -57,17 +49,17 @@
           </el-button>
         </div>
         <!-- 数据表格模块 -->
-        <div v-loading="loading" style="height: 680px">
-          <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 90%" @selection-change="handleSelectionChange">
+        <div v-loading="loading" style="height: auto">
+          <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 100%" @selection-change="handleSelectionChange">
             <el-table-column
               type="selection"
               width="55"
             />
-            <el-table-column prop="deviceId" label="设备编号" width="100" />
-            <el-table-column prop="deviceType" label="设备名次" width="80" />
+            <el-table-column prop="deviceId" label="#" width="100" />
+            <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="address" label="在线情况" width="120" />
             <el-table-column
               prop="status"
               label="在线情况"
@@ -98,64 +90,60 @@
                 <span style="margin-left: 10px">{{ scope.row.updateTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="640">
+            <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"
@@ -1447,7 +1435,23 @@ export default {
   }
 }
 /deep/ .el-table__body-wrapper .cell {
-  height: 4.5vh;
-  line-height:4.5vh;
+  height: 3vh;
+  line-height:3vh;
+}
+.btn1:hover{
+  color: #20a0ff;
+}
+.btn2:hover{
+  color: #20a0ff;
+}
+.clear-btn:hover{
+  color: #20a0ff;
+}
+/deep/.el-table__body tr:hover>td{
+  background-color: rgba(64, 180, 252, 0.1) !important;
+}
+
+/deep/.el-table__body tr.current-row>td{
+  background-color: rgba(64, 180, 252, 0.09) !important;
 }
 </style>
diff --git a/src/views/ESD/ESDTrafficRules.vue b/src/views/ESD/ESDTrafficRules.vue
index c1b173a577c60eb77452677665e3e66f18081bc7..b622d8296f63c5403c79eceef0997e62fd6f6da1 100644
--- a/src/views/ESD/ESDTrafficRules.vue
+++ b/src/views/ESD/ESDTrafficRules.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>
@@ -12,23 +12,24 @@
             批量删除
           </el-button>
         </div>
+        <div style="width: 98%;height: 30px;border: 1px solid #40b4fc;background-color: rgba(32,160,255,0.25);line-height: 30px;text-align: left;font-size: 14px;padding-left: 2%">
+          已选择{{ multipleSelection.length }}
+          <span class="clear-btn" style="padding-left: 20px" @click="clearCheck">
+            清空
+          </span>
+        </div>
         <!-- 数据表格模块 -->
-        <div v-loading="loading" style="height: 100%">
-          <div style="width: 98%;height: 40px;border: 1px solid #40b4fc;background-color: rgba(32,160,255,0.25);line-height: 40px;text-align: left;padding-left: 2%">
-            已选择{{ multipleSelection.length }}项目
-            <span class="clear-btn" style="padding-left: 20px" @click="clearCheck">
-              清空
-            </span>
-          </div>
-          <el-table ref="multipleTable" :data="tableData" style="width: 100%;height: 90%;padding-top: 20px" :header-cell-style="{background:'rgba(238,241,246,0.54)',color:'rgb(96,98,102)'}" @selection-change="handleSelectionChange">
+        <div v-loading="loading" style="height:auto">
+          <el-table ref="multipleTable" :data="tableData" size="mini" style="width: 100%;height: 100%;padding-top: 10px" :header-cell-style="{background:'rgba(238,241,246,0.54)',color:'rgb(96,98,102)'}" @selection-change="handleSelectionChange">
             <el-table-column
               type="selection"
               width="100"
+              align="center"
             />
-            <el-table-column prop="deviceId" label="规则名称" width="250" align="center" />
-            <el-table-column prop="deviceType" label="开始日期" width="250" align="center" />
-            <el-table-column prop="customerId" label="结束日期" width="250" align="center" />
-            <el-table-column prop="areaId" label="可通行总次数" width="300" align="center" />
+            <el-table-column prop="deviceId" label="规则名称" min-width="200" align="center" />
+            <el-table-column prop="deviceType" label="开始日期" min-width="200" align="center" />
+            <el-table-column prop="customerId" label="结束日期" min-width="200" align="center" />
+            <el-table-column prop="areaId" label="可通行总次数" min-width="200" align="center" />
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <span class="btn1" @click="editInfo(scope.$index, scope.row)">
@@ -41,29 +42,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="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"
@@ -1150,8 +1151,9 @@ export default {
   }
 }
 /deep/ .el-table__body-wrapper .cell {
-  height: 3.5vh;
-  line-height:3.5vh;
+  padding: 0!important;
+  height: 100%;
+  line-height:100%;
 }
 .btn1:hover{
   color: #20a0ff;
diff --git a/src/views/ESD/ESDVisitorManagement.vue b/src/views/ESD/ESDVisitorManagement.vue
index 7f269547d2afcc4e9e777d8902fe72f2fd32e14f..d7122aacf34e8d977fe4916ec3a7657138726f34 100644
--- a/src/views/ESD/ESDVisitorManagement.vue
+++ b/src/views/ESD/ESDVisitorManagement.vue
@@ -2,14 +2,6 @@
 <template>
   <div class>
     <BreadCrumb :inner="inner" />
-    <!--    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">-->
-    <!--      <el-tab-pane label="安检门列表" name="first">-->
-    <!--        安检门列表-->
-    <!--      </el-tab-pane>-->
-    <!--      <el-tab-pane label="ESD列表" name="second">-->
-    <!--        ESD列表-->
-    <!--      </el-tab-pane>-->
-    <!--    </el-tabs>-->
     <EmptyCard>
       <div slot="EmptyCard">
         <!-- 查询模块 -->
@@ -17,13 +9,19 @@
           :inline="true"
           :model="searchFrom"
           class="demo-form-inline"
-          style="text-align: center"
+          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-select>
+          </el-form-item>
           <el-form-item>
             <el-input
               v-model="searchFrom.searchData"
-              placeholder="请输入设备编号"
+              placeholder="请输入姓名"
               @input="inputClear"
               @keyup.enter.native="getData"
             />
@@ -36,49 +34,46 @@
         </el-form>
         <!-- 查询模块  /-->
 
-        <div style="float: left">
-          <el-button type="primary" icon="el-icon-edit" @click="batchEdit">
-            批量编辑
-          </el-button>
-          <el-button type="primary" icon="el-icon-edit" @click="batchDelete">
-            批量删除
-          </el-button>
+        <div style="float: left;display: inline-block">
           <el-button type="primary" icon="el-icon-plus" @click="newDevice">
-            设备新增
+            新增
           </el-button>
           <el-button type="primary" icon="el-icon-plus" @click="newDevice">
-            +绑定区域
-          </el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="drawer = true">
-            检索添加设备
+            重置
           </el-button>
         </div>
-        <!--    检索添加设备弹窗    -->
-        <el-drawer
-          title="我是标题"
-          :visible.sync="drawer"
-          :with-header="false"
-          direction="rtl"
-          size="50%"
-        >
-          <span>我来啦!</span>
-        </el-drawer>
-        <!--    /检索添加设备弹窗    -->
+
         <!-- 数据表格模块 -->
         <div v-loading="loading" style="height: 680px">
           <el-table :data="tableData" stripe size="mini" style="width: 100%;height: 90%" @selection-change="handleSelectionChange">
             <el-table-column
               type="selection"
               width="55"
+              align="center"
             />
-            <el-table-column prop="deviceId" label="设备编号" width="100" />
-            <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="address" label="在线情况" width="120" />
+            <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">
+              <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">
+              <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="status"
-              label="在线情况"
+              label="状态"
               :filters="filterData"
               :filter-method="filterHandler"
               width="100"
@@ -100,13 +95,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="updateTime" label="更新时间" sortable width="180">
-              <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 label="操作" width="640">
+            <el-table-column label="操作">
               <template slot-scope="scope">
                 <el-button
                   size="mini"