From 19277c2dd1afa93d008f8286dc7df2a228422d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=9A=E7=A5=96=E6=9C=9B?= <573413756@qq.com>
Date: Fri, 11 Nov 2022 16:39:29 +0800
Subject: [PATCH] fix websocket bugs

---
 .../src/api/rule/dataTransfer.js              |  2 +-
 .../src/views/rule/dataTransfer/index.vue     | 35 ++++++++++++-------
 .../src/views/terminal/PLC/monitor.vue        |  2 +-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/xiuosiot-frontend/src/api/rule/dataTransfer.js b/xiuosiot-frontend/src/api/rule/dataTransfer.js
index e9aa3a0..8f428f8 100644
--- a/xiuosiot-frontend/src/api/rule/dataTransfer.js
+++ b/xiuosiot-frontend/src/api/rule/dataTransfer.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getList(data) {
   return request({
-    url: '/alarmRule/selectAll',
+    url: '/dataForward/getRecord',
     method: 'get',
     params: data || {}
   })
diff --git a/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue b/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
index bd59db2..f33fd16 100644
--- a/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
+++ b/xiuosiot-frontend/src/views/rule/dataTransfer/index.vue
@@ -19,7 +19,7 @@
       <div class="header">
         <span>
           <svg-icon icon-class="alarm" class="alarm_icon" />
-          {{ '转发主题 xxxx' }}
+          {{ '转发主题 ' + item.topic }}
         </span>
         <div class="line" />
       </div>
@@ -30,7 +30,7 @@
           ><svg-icon icon-class="rule_name" class="content-icon" /><span
             class="font"
           >转发内容</span></span>
-          <span class="content-item">xxxxx</span>
+          <span class="content-item">{{ item.content }}</span>
         </p>
         <p class="body-content">
           <span
@@ -47,7 +47,7 @@
           ><svg-icon icon-class="rule_msg_type" class="content-icon" /><span
             class="font"
           >转发地址</span></span>
-          <span class="content-item">xxxx</span>
+          <span class="content-item">{{ item.address }}</span>
         </p>
         <p class="body-content">
           <span
@@ -55,7 +55,7 @@
           ><svg-icon icon-class="rule_status" class="content-icon" /><span
             class="font"
           >转发时间</span></span>
-          <span class="content-item">xxxx</span>
+          <span class="content-item">{{ item.time }}</span>
         </p>
       </div>
       <div class="footer">
@@ -185,9 +185,14 @@ export default {
   },
   mounted() {
     this.date = new Date().toLocaleDateString()
+    this.getList()
   },
   methods: {
-    getList() {},
+    getList() {
+      getList().then((res) => {
+        this.list = res.data
+      })
+    },
     getTitle(type) {
       switch (type) {
         case 0:
@@ -220,13 +225,15 @@ export default {
     },
     transfer() {
       const data = { ...this.form, org: this.org }
-      addRecord(data).then(res => {
-        if (res.code === '200000') {
-          this.$message.success('发送成功')
-          this.getList()
-          this.visible = false
-        }
-      }).catch(() => {})
+      addRecord(data)
+        .then((res) => {
+          if (res.code === '200000') {
+            this.$message.success('发送成功')
+            this.getList()
+            this.visible = false
+          }
+        })
+        .catch(() => {})
     }
   }
 }
@@ -288,6 +295,10 @@ export default {
         display: inline-block;
         width: 50%;
         text-align: center;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        vertical-align: top;
       }
       .font {
         font-size: 17px;
diff --git a/xiuosiot-frontend/src/views/terminal/PLC/monitor.vue b/xiuosiot-frontend/src/views/terminal/PLC/monitor.vue
index b3eb425..01f5df3 100644
--- a/xiuosiot-frontend/src/views/terminal/PLC/monitor.vue
+++ b/xiuosiot-frontend/src/views/terminal/PLC/monitor.vue
@@ -320,7 +320,7 @@ export default {
   },
   methods: {
     openSocket() {
-      const socketUrl = 'ws://localhost:8080/websocket/jxsd'
+      const socketUrl = 'ws://115.238.53.59:18080/websocket/jxsd'
       const socket = new WebSocket(socketUrl)
       socket.onopen = () => {
         console.log('socket已打开')