From f35d782a7088bb7aae9ef35c9ecde8d0eb01bf1a Mon Sep 17 00:00:00 2001 From: zhengpengju Date: Fri, 3 Apr 2020 14:06:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 34dc0754de7b9ade1e7224cffc21bfd41866ca25 --- .../wwwroot/pages/iot/device/camera.html | 9 +- .../WebSPA/wwwroot/pages/iot/device/ir.html | 128 +++++++++--------- 2 files changed, 71 insertions(+), 66 deletions(-) diff --git a/projects/WebSPA/wwwroot/pages/iot/device/camera.html b/projects/WebSPA/wwwroot/pages/iot/device/camera.html index 6a1abd6c..e416d708 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/camera.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/camera.html @@ -45,7 +45,7 @@ -
+
设备信息
@@ -68,10 +68,15 @@ flvPlayer: null, decodedFrames: null, wxInlinePlayer: null, - playing: false + playing: false, }; }, mounted: function () { + // 节点页面隐藏详情 + if(router.currentRoute.path == '/pages/iot/node'){ + $('#camera-info').hide(); + } + if (this.isFlvSupported) { this.playByFlvJs(); } diff --git a/projects/WebSPA/wwwroot/pages/iot/device/ir.html b/projects/WebSPA/wwwroot/pages/iot/device/ir.html index cc4d9d7d..5250e7c0 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/ir.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/ir.html @@ -24,60 +24,60 @@
- +
@@ -85,27 +85,27 @@ @@ -113,12 +113,12 @@ @@ -126,7 +126,7 @@ 音量
- + - + - +
- + - + - +
- + - + - +
- + - + - +
- + - + - +
- +
- + - + - +
- +
- + - +
- + 频道 @@ -134,150 +134,150 @@
- + - +
- + - + - +
- +
- + {{power.name}}
- + {{pattern.name}}
- + {{wind.name}}
- + {{direction.name}}
- + {{temperature.name}} - +
- +
@@ -285,12 +285,12 @@ @@ -298,7 +298,7 @@ 音量
- + - +
- + - + - +
- + - + - +
- + - + - +
- + - + - +
- +
- + - + - +
- +
- + - +
- + 频道 @@ -306,23 +306,23 @@
- + - +
- + - + - +