diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml index 86cc7558..3ee17009 100644 --- a/projects/IoTCenter/Views/Home/Node.cshtml +++ b/projects/IoTCenter/Views/Home/Node.cshtml @@ -77,7 +77,7 @@ .ptz td { text-align: center; - height: 53px; + height: 46px; } .ir td { @@ -578,7 +578,7 @@
-

{{device.DisplayName||device.Name}}

+

{{device.DisplayName||device.Name}}

@@ -595,7 +595,7 @@
-

{{device.DisplayName||device.Name}}

+

{{device.DisplayName||device.Name}}

@@ -618,7 +618,7 @@
-

{{device.DisplayName||device.Name}}

+

{{device.DisplayName||device.Name}}

diff --git a/projects/IoTCenter/Views/Home/Product.cshtml b/projects/IoTCenter/Views/Home/Product.cshtml index 40d17dda..547d74d8 100644 --- a/projects/IoTCenter/Views/Home/Product.cshtml +++ b/projects/IoTCenter/Views/Home/Product.cshtml @@ -15,11 +15,18 @@
-
+
-
- - +
+
+ + +
+
+ + + +
@@ -28,7 +35,7 @@

{{item.Name}}

-
+
diff --git a/projects/IoTCenter/configuration.db b/projects/IoTCenter/configuration.db index 1e456526..dc4203fa 100644 Binary files a/projects/IoTCenter/configuration.db and b/projects/IoTCenter/configuration.db differ diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/product.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/product.js index d404fe69..0b9fb2ab 100644 --- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/product.js +++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/product.js @@ -310,6 +310,12 @@ function init() { }); }, methods: { + HasBatchCommand() { + return this.model.Name === '调色灯' + || this.model.Name.indexOf('窗帘') >= 0 + || this.model.Name.indexOf('开关') >= 0 + || this.model.Name.indexOf('插座') >= 0; + }, SelectDevice(e) { var checkbox = $(e.target); if (checkbox.hasClass('checkall')) {