From 90b165775efd352a6391bb57b6523354c4e31589 Mon Sep 17 00:00:00 2001
From: gx_ma <1773945958@qq.com>
Date: Mon, 5 Aug 2024 10:57:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E5=AE=9E=E6=97=B6=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/iot/device/device-edit.vue | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index d4ec78b8..594ca989 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -122,6 +122,12 @@
 
                 <sipid ref="sipidGen" :product="form" @addGenEvent="getSipIDData($event)" />
             </el-tab-pane>
+
+            <el-tab-pane name="runningStatus" v-if="form.deviceType !== 3 && !isSubDev">
+                <span slot="label">运行状态</span>
+                <running-status ref="runningStatus" :device="form" @statusEvent="getDeviceStatusData($event)"/>
+              </el-tab-pane>
+
             <!-- <el-tab-pane :disabled="form.deviceId === 0" v-if="form.deviceType === 3" name="sipPlayer">
         <span slot="label"><span style="color:red;">￥ </span>设备直播</span>
         <business ref="business"/>
@@ -151,11 +157,6 @@
                 <device-func ref="deviceFuncLog" :device="form" />
             </el-tab-pane>
 
-            <el-tab-pane name="deviceMonitor" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3 && hasShrarePerm('monitor')">
-                <span slot="label">实时监测</span>
-                <device-monitor ref="deviceMonitor" :device="form" />
-            </el-tab-pane>
-
             <!-- 用于设置间距 -->
             <el-tab-pane disabled>
                 <span slot="label">
@@ -228,7 +229,6 @@ import productList from './product-list';
 import deviceLog from './device-log';
 import deviceUser from './device-user';
 import runningStatus from './running-status';
-import deviceMonitor from './device-monitor';
 
 import deviceTimer from './device-timer';
 import DeviceFunc from './device-functionlog';
@@ -252,8 +252,6 @@ export default {
         DeviceFunc,
         deviceLog,
         deviceUser,
-        deviceMonitor,
-
         runningStatus,
         productList,
         deviceTimer,
@@ -491,10 +489,10 @@ export default {
             this.$mqttTool.unsubscribe(topics);
         },
 
-        // 获取子组件订阅的设备状态
-        // getDeviceStatusData(status) {
-        //   this.form.status = status;
-        // },
+        //获取子组件订阅的设备状态
+        getDeviceStatusData(status) {
+          this.form.status = status;
+        },
         getPlayerData(data) {
             this.activeName = data.tabName;
             this.channelId = data.channelId;