From 218f815639982ba0d89330e29cae7d737dcfa88a Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Wed, 10 Aug 2022 17:13:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=EF=BC=8C=E9=97=A8=E7=A6=81?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=B1=82=E4=BD=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/home/alarm/index.js                   | 10 +++
 .../{ => home}/securityDoor/securityDoor.js   |  0
 src/views/components/SecurityDoor.vue         |  2 +-
 src/views/components/WarehouseWarning.vue     | 84 +++++++++++--------
 src/views/storeManage/deviceManage/index.vue  |  4 +-
 src/views/storeManage/levelManage/index.vue   |  3 +-
 6 files changed, 63 insertions(+), 40 deletions(-)
 create mode 100644 src/api/home/alarm/index.js
 rename src/api/{ => home}/securityDoor/securityDoor.js (100%)

diff --git a/src/api/home/alarm/index.js b/src/api/home/alarm/index.js
new file mode 100644
index 0000000..bf4ed06
--- /dev/null
+++ b/src/api/home/alarm/index.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+export function info(params) {
+  return request({
+    url: 'api/alarm/info',
+    params,
+    method: 'get'
+  })
+}
+export default { info }
diff --git a/src/api/securityDoor/securityDoor.js b/src/api/home/securityDoor/securityDoor.js
similarity index 100%
rename from src/api/securityDoor/securityDoor.js
rename to src/api/home/securityDoor/securityDoor.js
diff --git a/src/views/components/SecurityDoor.vue b/src/views/components/SecurityDoor.vue
index ddfa206..2b2d062 100644
--- a/src/views/components/SecurityDoor.vue
+++ b/src/views/components/SecurityDoor.vue
@@ -23,7 +23,7 @@
   </div>
 </template>
 <script>
-import { securitydoor } from '@/api/securityDoor/securityDoor'
+import { securitydoor } from '@/api/home/securityDoor/securityDoor'
 export default {
   name: 'SecurityDoor',
   props: {
diff --git a/src/views/components/WarehouseWarning.vue b/src/views/components/WarehouseWarning.vue
index 10030c1..61bd66a 100644
--- a/src/views/components/WarehouseWarning.vue
+++ b/src/views/components/WarehouseWarning.vue
@@ -16,6 +16,7 @@
   </div>
 </template>
 <script>
+import alarmApi from '@/api/home/alarm'
 export default {
   name: 'WarehouseWarning',
   props: {
@@ -26,6 +27,10 @@ export default {
     height: {
       type: String,
       default: '100%'
+    },
+    storeroomId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -61,7 +66,13 @@ export default {
     }
   },
   created() {
-    this.openSocket()
+    // securitydoor().then((data) => {
+    //   this.tableData.push(...data)
+    // })
+    // this.openSocket()
+    alarmApi.info({ storeroomId: this.storeroomId }).then((data) => {
+      this.tableData.push(...data)
+    })
   },
   destroyed() {
     clearInterval(this.timer)
@@ -121,42 +132,43 @@ export default {
           // }
         }, 1000 * 3 * this.displayNum)
       }
-    },
-    openSocket() {
-      if (!('WebSocket' in window)) {
-        console.log('您的浏览器不支持WebSocket')
-      } else {
-        console.log('您的浏览器支持WebSocket')
-        const socketUrl = process.env.VUE_APP_WS_API + '/webSocket'
-        if (this.socket != null) {
-          this.socket.close()
-          this.socket = null
-        }
-        this.socket = new WebSocket(socketUrl)
-        // 打开事件
-        this.socket.onopen = () => {
-          console.log('websocket已经打开')
-          // 心跳检测重置
-          // this.heartCheck.start()
-        }
-        // 获得消息
-        this.socket.onmessage = (msg) => {
-          console.log(msg)
-          this.tableData.splice(0, this.tableData.length, ...JSON.parse(msg.data.slice(7, msg.data.length - 2)).Data)
-          // 对返回数据进行处理
-          // this.heartCheck.start()
-        }
-        // 关闭事件
-        this.socket.onclose = function() {
-          console.log('websocket已关闭')
-        }
-        // 发生了错误事件
-        this.socket.onerror = function(e) {
-          console.log('websocket发生了错误')
-          console.log(e)
-        }
-      }
     }
+    // ,
+    // openSocket() {
+    //   if (!('WebSocket' in window)) {
+    //     console.log('您的浏览器不支持WebSocket')
+    //   } else {
+    //     console.log('您的浏览器支持WebSocket')
+    //     const socketUrl = process.env.VUE_APP_WS_API + '/webSocket'
+    //     if (this.socket != null) {
+    //       this.socket.close()
+    //       this.socket = null
+    //     }
+    //     this.socket = new WebSocket(socketUrl)
+    //     // 打开事件
+    //     this.socket.onopen = () => {
+    //       console.log('websocket已经打开')
+    //       // 心跳检测重置
+    //       // this.heartCheck.start()
+    //     }
+    //     // 获得消息
+    //     this.socket.onmessage = (msg) => {
+    //       console.log(msg)
+    //       this.tableData.splice(0, this.tableData.length, ...JSON.parse(msg.data.slice(7, msg.data.length - 2)).Data)
+    //       // 对返回数据进行处理
+    //       // this.heartCheck.start()
+    //     }
+    //     // 关闭事件
+    //     this.socket.onclose = function() {
+    //       console.log('websocket已关闭')
+    //     }
+    //     // 发生了错误事件
+    //     this.socket.onerror = function(e) {
+    //       console.log('websocket发生了错误')
+    //       console.log(e)
+    //     }
+    //   }
+    // }
   }
 }
 </script>
diff --git a/src/views/storeManage/deviceManage/index.vue b/src/views/storeManage/deviceManage/index.vue
index 859155f..bcf3f8c 100644
--- a/src/views/storeManage/deviceManage/index.vue
+++ b/src/views/storeManage/deviceManage/index.vue
@@ -31,7 +31,7 @@
     </el-dialog>
     <!-- 区域列表 -->
     <el-row class="container-main" :gutter="20">
-      <el-col class="curd-in-out" style="height: calc(100vh - 190px)" :xs="10" :sm="8" :md="5" :lg="6" :xl="4">
+      <el-col class="curd-in-out" style="height: calc(100vh - 190px)" :xs="10" :sm="8" :md="4" :lg="4" :xl="4">
         <div class="crud-opts">
           <div class="crud-opts-left">
             <el-button v-permission="permission.add" size="mini" icon="el-icon-plus" :disabled="crud.selections[0] && crud.selections[0].id && crud.selections[0].id !== defaultExpandedKeys[0]" @click="crud.toAdd">
@@ -54,7 +54,7 @@
       </el-col>
       <!-- 设备详情列表 -->
       <!-- <el-col class="container-right" :xs="14" :sm="16" :md="19" :lg="18" :xl="20"> -->
-      <el-col :xs="14" :sm="16" :md="19" :lg="18" :xl="20">
+      <el-col :xs="14" :sm="16" :md="20" :lg="20" :xl="20">
         <deviceDetail ref="deviceDetail" :permission="permission" :active-add-btn="activeRightBtn" />
       </el-col>
     </el-row>
diff --git a/src/views/storeManage/levelManage/index.vue b/src/views/storeManage/levelManage/index.vue
index de204d6..36d7a94 100644
--- a/src/views/storeManage/levelManage/index.vue
+++ b/src/views/storeManage/levelManage/index.vue
@@ -69,7 +69,8 @@ export default {
     return [
       CRUD({
         url: 'api/tag/list',
-        queryOnPresenterCreated: false
+        queryOnPresenterCreated: false,
+        sort: 'position'
       })
     ]
   },