From f7e9e403b042c4677bf1db7f898fc345efba6fee Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Thu, 20 Mar 2025 22:27:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vue/public/index.html | 5 +-
.../components/player/deviceLiveStream.vue | 324 +++++-----
vue/src/views/components/player/player.vue | 583 +++++++++---------
vue/src/views/iot/device/device-edit.vue | 2 +-
vue/src/views/iot/device/index.vue | 2 +-
vue/src/views/iot/product/product-edit.vue | 2 -
6 files changed, 460 insertions(+), 458 deletions(-)
diff --git a/vue/public/index.html b/vue/public/index.html
index dff1813c..9e24e1ce 100644
--- a/vue/public/index.html
+++ b/vue/public/index.html
@@ -7,7 +7,10 @@
-
+
+
+
+
<%= webpackConfig.name %>
diff --git a/vue/src/views/components/player/deviceLiveStream.vue b/vue/src/views/components/player/deviceLiveStream.vue
index 41667ddf..5b6c59e6 100644
--- a/vue/src/views/components/player/deviceLiveStream.vue
+++ b/vue/src/views/components/player/deviceLiveStream.vue
@@ -1,181 +1,173 @@
-
-
- 通道名称:
-
-
-
- 开启拉流:
-
-
-
-
+
+
+
+
+
+
+
+
+ 开启拉流:
+
+
+
+
+
+
diff --git a/vue/src/views/components/player/player.vue b/vue/src/views/components/player/player.vue
index 5a01e93a..d205cb0d 100644
--- a/vue/src/views/components/player/player.vue
+++ b/vue/src/views/components/player/player.vue
@@ -1,331 +1,340 @@
-
-
diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index 9de3b4d6..d717709e 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -135,7 +135,7 @@
-
+
设备用户
diff --git a/vue/src/views/iot/device/index.vue b/vue/src/views/iot/device/index.vue
index bc7bd5c2..007b74f8 100644
--- a/vue/src/views/iot/device/index.vue
+++ b/vue/src/views/iot/device/index.vue
@@ -452,7 +452,7 @@ export default {
deviceId: deviceId,
isSubDev: isSubDev,
pageNum: this.queryParams.pageNum,
- activeName: 'sipChannel',
+ activeName: 'videoLive',
},
});
} else {
diff --git a/vue/src/views/iot/product/product-edit.vue b/vue/src/views/iot/product/product-edit.vue
index eb19bf1b..bf32b9dc 100644
--- a/vue/src/views/iot/product/product-edit.vue
+++ b/vue/src/views/iot/product/product-edit.vue
@@ -180,7 +180,6 @@ import productThingsModel from "./product-things-model";
import productApp from "./product-app";
import productAuthorize from "./product-authorize";
import imageUpload from "../../../components/ImageUpload/index";
-import business from "../business/index";
import configSip from '../sip/sipconfig.vue';
import {
listProtocol
@@ -209,7 +208,6 @@ export default {
productApp,
productAuthorize,
imageUpload,
- business,
configSip,
},
data() {