From 58907537d38388a49ad507af2f873eaefb9e4c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=9A=E7=A5=96=E6=9C=9B?= <573413756@qq.com>
Date: Thu, 1 Dec 2022 13:51:15 +0800
Subject: [PATCH] fix bugs

---
 xiuosiot-frontend/src/api/terminal/qjdqMonitor.js   |  9 +++++++++
 .../src/views/rule/ruleManage/index.vue             |  2 +-
 .../src/views/terminal/qjdqMonitor/index.vue        | 13 +++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 xiuosiot-frontend/src/api/terminal/qjdqMonitor.js

diff --git a/xiuosiot-frontend/src/api/terminal/qjdqMonitor.js b/xiuosiot-frontend/src/api/terminal/qjdqMonitor.js
new file mode 100644
index 0000000..d4669a7
--- /dev/null
+++ b/xiuosiot-frontend/src/api/terminal/qjdqMonitor.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getList(data) {
+  return request({
+    url: '/data/getQJDQ',
+    method: 'get',
+    params: data || {}
+  })
+}
diff --git a/xiuosiot-frontend/src/views/rule/ruleManage/index.vue b/xiuosiot-frontend/src/views/rule/ruleManage/index.vue
index 6e01711..da592f3 100644
--- a/xiuosiot-frontend/src/views/rule/ruleManage/index.vue
+++ b/xiuosiot-frontend/src/views/rule/ruleManage/index.vue
@@ -197,7 +197,7 @@
             </el-row>
             <el-row>
               <el-col :span="10">
-                <el-form-item label="推送主题：">
+                <el-form-item label="推送内容：">
                   <el-input v-if="type === 0 || type === 1" v-model="form.noticeContent" />
                   <span v-else>{{ form.noticeContent }}</span>
                 </el-form-item>
diff --git a/xiuosiot-frontend/src/views/terminal/qjdqMonitor/index.vue b/xiuosiot-frontend/src/views/terminal/qjdqMonitor/index.vue
index 80f4c90..af5fe13 100644
--- a/xiuosiot-frontend/src/views/terminal/qjdqMonitor/index.vue
+++ b/xiuosiot-frontend/src/views/terminal/qjdqMonitor/index.vue
@@ -33,6 +33,8 @@
 </template>
 
 <script>
+import { getList } from '@/api/terminal/qjdqMonitor'
+
 export default {
   data() {
     return {
@@ -197,9 +199,20 @@ export default {
     }
   },
   mounted() {
+    this.getList()
     this.openSocket()
   },
   methods: {
+    getList() {
+      getList().then(res => {
+        if (res.code === '200000') {
+          const valueList = res.data
+          this.data.forEach((item, index) => {
+            item.value = valueList[index + 1] ? valueList[index + 1] : 0
+          })
+        }
+      })
+    },
     guid() {
       return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
         var r = Math.random() * 16 | 0; var v = c == 'x' ? r : (r & 0x3 | 0x8)