From 4e97c437b502b7e373cdaa511f42f339e958686c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A5=E5=B1=A5=E4=B8=8D=E5=81=9C?= <1873501479@qq.com>
Date: Mon, 22 Aug 2022 20:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ESD=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E9=80=9A=E8=A1=8C=E8=A7=84=E5=88=99=E5=92=8C=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/config.js               |   4 +-
 src/views/ESD/ESDPushSettings.vue | 100 +++++++++---------------------
 src/views/ESD/ESDTrafficRules.vue |  65 +++----------------
 3 files changed, 42 insertions(+), 127 deletions(-)

diff --git a/src/utils/config.js b/src/utils/config.js
index 1525246..cc20989 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.104:2011'
+  // baseUrl: '192.168.0.102:2011'
 }
diff --git a/src/views/ESD/ESDPushSettings.vue b/src/views/ESD/ESDPushSettings.vue
index 6a8e57f..0c4a11d 100644
--- a/src/views/ESD/ESDPushSettings.vue
+++ b/src/views/ESD/ESDPushSettings.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,21 @@
           :inline="true"
           :model="searchFrom"
           class="demo-form-inline"
-          style="text-align: center"
+          style="text-align: left"
           @submit.native.prevent
         >
-          <el-form-item>
+          <el-form-item label="URL地址:">
             <el-input
               v-model="searchFrom.searchData"
-              placeholder="请输入设备编号"
+              placeholder="请输入URL地址"
+              @input="inputClear"
+              @keyup.enter.native="getData"
+            />
+          </el-form-item>
+          <el-form-item label="名称:">
+            <el-input
+              v-model="searchFrom.searchData"
+              placeholder="请输入名称"
               @input="inputClear"
               @keyup.enter.native="getData"
             />
@@ -36,76 +36,31 @@
         </el-form>
         <!-- 查询模块  /-->
 
-        <div style="float: left">
-          <el-button type="primary" icon="el-icon-edit" @click="batchEdit">
-            批量编辑
-          </el-button>
+        <div style="height: 60px;text-align: left">
           <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">
+        <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 }}项目
+            <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"
+              width="200"
             />
-            <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">
-              <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="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">
               <template slot-scope="scope">
                 <el-button
@@ -829,7 +784,7 @@ export default {
     return {
       drawer: false,
       activeName: 'first',
-      inner: { title: 'ESD设备列表' },
+      inner: { title: 'ESD推送设置' },
       searchFrom: {
         searchData: ''
       },
@@ -1051,6 +1006,11 @@ export default {
       this.pager.currenPage = val
       this.getData()
     },
+    // 清空多选项
+    clearCheck() {
+      // 清空表格多选框
+      this.$refs.multipleTable.clearSelection()
+    },
     // 输入框清空回调
     inputClear(val) {
       if (val === '') {
diff --git a/src/views/ESD/ESDTrafficRules.vue b/src/views/ESD/ESDTrafficRules.vue
index edf7e64..c1b173a 100644
--- a/src/views/ESD/ESDTrafficRules.vue
+++ b/src/views/ESD/ESDTrafficRules.vue
@@ -50,8 +50,9 @@
           style="
               text-align: center;
               position: relative;
+              bottom: 0;
               left: 50%;
-              transform: translateX(-50%);
+              transform: translateX(-50%)
             "
         >
           <el-pagination
@@ -76,7 +77,7 @@
               ref="modifyInfo"
               :model="modifyInfo"
               :rules="modifyInfoRules"
-              label-width="100px"
+              label-width="130px"
             >
               <el-form-item label="规则名称" prop="deviceId">
                 <el-input
@@ -111,65 +112,19 @@
                   </el-form-item>
                 </el-col>
               </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="请输入设备类型编号"
+                  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 label="通行限制：类型" prop="customerId">
+                <el-radio-group v-model="modifyInfo.customerId">
+                  <el-radio label="每天" />
+                  <el-radio label="每周" />
+                </el-radio-group>
               </el-form-item>
             </el-form>
           </div>
-- 
Gitee