diff --git a/src/utils/DeviceManagementApi.js b/src/utils/DeviceManagementApi.js
index dc9d380170b1caa9e602edab03f486dc782af00e..6e9f5637157f84628f439b185ce0a9fb64fe50c1 100644
--- a/src/utils/DeviceManagementApi.js
+++ b/src/utils/DeviceManagementApi.js
@@ -4,6 +4,12 @@ import { deleteRequest, getRequest, postRequest } from './http'
 export function getDeviceData(query) {
   return postRequest('api/api/network/search', query)
 }
+
+// ESD设备列表
+export function getESDDeviceData(query) {
+  return postRequest('api/api/esd/search', query)
+}
+
 // 设备列表---添加设备
 export function addDevice(query) {
   return postRequest('api/api/network/add', query)
diff --git a/src/utils/config.js b/src/utils/config.js
index cc209896009eaf1a950348936fd8fb8f75207e1c..5ec6087d5705a9246857ffab86c1d910ac8b4dc8 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -2,7 +2,7 @@ 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/ESDRefionalManagement.vue b/src/views/ESD/ESDRefionalManagement.vue
index 74cd48ecfcaf7ffdeab7b30c9810f48a5de83b85..9a33a5e1780f4c2744fc1a790c8ce016ada3adf7 100644
--- a/src/views/ESD/ESDRefionalManagement.vue
+++ b/src/views/ESD/ESDRefionalManagement.vue
@@ -2,142 +2,53 @@
 <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>
-        <!-- 查询模块  /-->
-
-        <div style="float: left">
-          <el-button type="primary" icon="el-icon-edit" @click="batchEdit">
-            批量编辑
+        <div style="height: 60px">
+          <el-button type="primary" icon="el-icon-plus" style="float: left" @click="newDevice">
+            新增
           </el-button>
-          <el-button type="primary" icon="el-icon-edit" @click="batchDelete">
+          <el-button v-if="multipleSelection.length>0" type="primary" plain style="float: left" @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">
+        <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">
+            已选择{{ multipleSelection.length }}
+            <span class="clear-btn" style="padding-left: 20px" @click="clearCheck">
+              清空
+            </span>
+          </div>
+          <el-table ref="multipleTable" :data="tableData" border style="width: 100%;height: 90%;" :header-cell-style="{background:'rgba(238,241,246,0.54)',color:'rgb(96,98,102)'}" @selection-change="handleSelectionChange">
             <el-table-column
               type="selection"
-              width="55"
+              width="60"
+              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="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>
-                  </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">
+            <el-table-column label="#" type="index" align="center" width="60"></el-table-column>
+            <!--
+              <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" >
               <template slot-scope="scope">
-                <i class="el-icon-time" />
-                <span style="margin-left: 10px">{{ scope.row.updateTime }}</span>
+                <span v-if="scope.row.state === 1">公共区域</span>
+                <span v-if="scope.row.state === 0">限制区域</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="640">
+            <!--      </临时数据>       -->
+            <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>
@@ -157,7 +68,7 @@
         >
           <el-pagination
             background
-            layout="prev, pager, next"
+            layout="sizes, prev, pager, next, jumper"
             :total="pager.totalPage"
             :current-page.sync="pager.currentPage"
             @current-change="change"
@@ -168,85 +79,50 @@
         <el-dialog
           :title="ModifyDialogTitle"
           :visible.sync="ModifyDialogVisible"
-          width="550px"
+          width="750px"
           center
           :close-on-click-modal="false"
         >
-          <div style="margin-left: 15%; max-height: 450px; overflow: auto">
+          <div style="margin-left:2%; max-height: 450px; overflow: auto;padding-right: 2%">
             <el-form
               ref="modifyInfo"
               :model="modifyInfo"
               :rules="modifyInfoRules"
-              label-width="100px"
+              label-width="130px"
             >
-              <el-form-item label="设备编号" prop="deviceId">
+              <el-form-item label="区域名称" prop="areaName">
                 <el-input
-                  v-model="modifyInfo.deviceId"
+                  v-model="modifyInfo.areaName"
                   style="width: 66%"
                   auto-complete="off"
-                  placeholder="请输入设备编号"
+                  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 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-select>
               </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 label="区域考勤" required>
+                <el-radio-group v-model="modifyInfo.state">
+                  <el-radio :label="1">参与考勤</el-radio>
+                  <el-radio :label="0">不参与考勤</el-radio>
+                </el-radio-group>
               </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 label="通行权限">
+                <el-button>选择人员</el-button>
               </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 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-select>
               </el-form-item>
             </el-form>
           </div>
@@ -258,547 +134,6 @@
         <!--  修改信息弹框  /-->
 
         <!--查看操作/编辑操作   -->
-        <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-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"
-                    >
-                      <el-option
-                        v-for="item in options.programMode"
-                        :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="guidanceMode">
-                    <el-select
-                      v-model="EquipmentOperation.guidanceMode"
-                      placeholder="指导模式"
-                      style="width: 180px"
-                      :disabled="isShow"
-                    >
-                      <el-option
-                        v-for="item in options.guidanceMode"
-                        :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="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"
-                      />
-                    </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-option
-                        v-for="item in options.output2"
-                        :key="item.id"
-                        ref="option"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </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>
     </EmptyCard>
@@ -815,8 +150,8 @@ import {
   editDeviceOperateData,
   getConfigData,
   getConfigureByDeviceId,
-  getDeviceData,
-  deleteDevice
+  deleteDevice,
+  getESDDeviceData
 } from '@/utils/DeviceManagementApi'
 
 export default {
@@ -829,167 +164,54 @@ export default {
     return {
       drawer: false,
       activeName: 'first',
-      inner: { title: 'ESD设备列表' },
+      inner: { title: 'ESD区域管理' },
       searchFrom: {
         searchData: ''
       },
       tableData: [
         {
-          deviceId: '001',
-          deviceIp: '192.168.0.0',
-          port: '2011',
-          status: '关闭',
-          updateTime: '2022-03-18 18:10:11',
-          remark: '描述'
-        },
-        {
-          deviceId: '002',
-          deviceIp: '192.168.0.1',
-          port: '2012',
-          status: '运行中',
-          updateTime: '2022-03-19 18:10:11',
-          remark: '描述'
-        }, {
-          deviceId: '003',
-          deviceIp: '192.168.0.2',
-          port: '2013',
-          status: '异常',
-          updateTime: '2022-03-22 18:10:11',
-          remark: '描述'
-        }], // 表格数据
-      filterData: [{ text: '关闭', value: 0 }, { text: '运行中', value: 1 }, { text: '异常', value: 2 }],
+          areaName: '创业园',   // 区域名称
+          areaAttr: '公共区域'  // 区域属性
+        }
+      ], // 表格数据
       pager: {
         currentPage: 1,
         pageSize: 10,
-        totalPage: 10
+        totalPage: null,     //总页数
       },
       loading: false, // 加载动画
       multipleSelection: [], // 选中列表
       ModifyDialogVisible: false, // 修改信息弹框
       ModifyDialogTitle: '', // 修改信息弹框标题
       modifyInfoRules: {
-        deviceId: [{ required: true, message: '请输入设备Id', trigger: 'blur' }],
-        deviceType: [{ required: true, message: '请输入设备类型', triangle: 'blur' }],
-        customerId: [{ required: true, message: '请输入客户主编号', triangle: 'blur' }],
-        areaId: [{ required: true, message: '请输入区域编号', triangle: 'blur' }],
-        deviceIp: [{ required: true, message: '请输入IP地址', trigger: 'blur' }],
-        devicePort: [{ required: true, message: '请输入端口号', trigger: 'blur' }],
-        address: [{ required: true, message: '请输入设备位置', trigger: 'blur' }]
+        /*
+          areaName: [{ required: true, message: '请输入区域名称', trigger: 'change' }],
+          areaAttr: [{ required: true, message: '请选择区域属性', triangle: 'blur' }],
+          areaAttendance: [{ required: true, message: '请输入客户主编号', triangle: 'blur' }],
+          accessPermission: [{ required: true, message: '请输入区域编号', triangle: 'blur' }],
+          accessRule: [{ required: true, message: '请输入IP地址', trigger: 'blur' }],
+        */
+        areaName: [{ required: true, message: '请输入区域名称', trigger: 'change' }],
+        state: [{ required: true, message: '请选择区域属性' }],
+        areaAttendance: [{ required: true, message: '请输入客户主编号', triangle: 'blur' }],
+        accessPermission: [{ required: true, message: '请输入区域编号', triangle: 'blur' }],
+        accessRule: [{ required: true, message: '请输入IP地址', trigger: 'blur' }],
       },
       modifyInfo: {
+        /*areaName: '',       // 区域名称
+        areaAttr: '',       // 区域属性
+        areaAttendance: 1,  // 区域考勤
+        accessPermission: '', // 通行权限
+        accessRule: ''        // 通行规则*/
+        // 临时数据
+        areaName: '',
         deviceId: '',
-        deviceType: '',
-        customerId: '',
-        areaId: '',
-        deviceIp: '',
-        devicePort: '',
-        address: '',
-        remark: ''
+        deviceName: '',
+        deviceTypeName: '',
+        state: ''
       },
       titleOfDialog: '', // 操作弹框标题
       operationDialogVisible: false, // 操作弹框
-      EquipmentOperation: {
-        zones: '', // 报警模式
-        standbyMode: '', // 待机模式
-        programMode: '', // 程序模式
-        searchFrequency: '', // 启动时搜索频率
-        rndVolume: '', // 报警音量
-        rndTone: '', // 报警音
-        rndRate: '', // 随机报警率
-        rndDisplay: '', // 报警显示
-        rndAlmRate: '', // 报警人群随机报警
-        powerMonitoring: '', // 电源监控
-        powerLed: '', // 顶部绿灯
-        channel: '', // 频道
-        overallSensitivity: '', // 整体灵敏度
-        passageway1: '', // 通道1灵敏度
-        passageway2: '', // 通道2灵敏度
-        passageway3: '', // 通道3灵敏度
-        passageway4: '', // 通道4灵敏度
-        passageway5: '', // 通道5灵敏度
-        passageway6: '', // 通道6灵敏度
-        passageway7: '', // 通道7灵敏度
-        passageway8: '', // 通道8灵敏度
-        output1: '', // output1
-        output2: '', // output2
-        input1: '', // input1
-        input2: '', // input2
-        lowFilter: '', // 低速过滤器
-        highFilter: '', // 高速过滤器
-        locationTime: '', // 区位显示时间
-        alarmTime: '', // 报警时间
-        lightTime: '', // 灯亮时间
-        invalidPass: '', // 无效通过
-        indicatorLight: '', // 指示灯
-        guidanceMode: '', // 指导模式
-        displayMode: '', // 显示模式
-        decreaseMode: '', // 递减模式
-        countDirection: '', // 计数方向
-        volume: 0, // 音量
-        alarmTone: 0, // 报警音
-        buttonVolume: 0, // 遥控按键音量
-        minVolume: 0 // 最小音量
-      }, // 设备操作表单
-      options: {
-        channel: [],
-        powerLed: [],
-        searchFrequency: [],
-        invalidPass: [],
-        lowFilter: [],
-        decreaseMode: [],
-        standbyMode: [],
-        powerMonitoring: [],
-        indicatorLight: [],
-        input1: [],
-        input2: [],
-        output1: [],
-        output2: [],
-        rndDisplay: [],
-        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: []
@@ -1021,7 +243,7 @@ export default {
       }).catch(() => {
       })
     },
-    // 数据获取
+
     async getData() {
       this.loading = true
       try {
@@ -1032,10 +254,11 @@ export default {
           },
           searchObject: this.searchFrom.searchData
         }
-        const res = await getDeviceData(query)
-        if (res.code === 200) {
-          this.pager.totalPage = JSON.parse(JSON.stringify(res.data.result.totalPage)) * 10
-          this.tableData = res.data.result.tableData
+        const res = await getESDDeviceData(query)
+        if (res) {
+          console.log(res)
+          this.pager.totalPage = res.totalPage
+          this.tableData = res.tableData
         }
       } catch (err) {
         this.$message.error(err.message)
@@ -1043,6 +266,8 @@ export default {
         this.loading = false
       }
     },
+
+    // 获取下拉框
     async getConfigData() {
       this.options = await getConfigData()
     },
@@ -1057,6 +282,11 @@ export default {
         this.getData()
       }
     },
+    // 清空多选项
+    clearCheck() {
+      // 清空表格多选框
+      this.$refs.multipleTable.clearSelection()
+    },
     // 批量编辑操作数据
     async batchEdit() {
       if (this.multipleSelection.length < 1) {
@@ -1262,8 +492,12 @@ export default {
     background-color: #4a74ff; /*滚动条的背景颜色*/
   }
 }
-/deep/ .el-table__body-wrapper .cell {
-  height: 4.5vh;
-  line-height:4.5vh;
+
+/deep/.el-table__body tr:hover>td{
+  background-color: #e6f7ff !important;
+}
+
+/deep/.el-table__body tr.current-row>td{
+  background-color: #e6f7ff !important;
 }
 </style>