From b66ea0dc3ea19089b8cab1c126087553582134bc Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Sun, 10 Nov 2019 21:55:29 +0800
Subject: [PATCH] update

Former-commit-id: b81db0fce007722e06b980eae7ab842fb226b5d5
---
 projects/IoTCenter/Views/Home/Node.cshtml     |   8 ++++----
 projects/IoTCenter/Views/Home/Product.cshtml  |  17 ++++++++++++-----
 projects/IoTCenter/configuration.db           | Bin 12288 -> 12288 bytes
 .../StreamingAssets/wwwroot/js/product.js     |   6 ++++++
 4 files changed, 22 insertions(+), 9 deletions(-)

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 @@
             <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('一路开关')" :data-device-number="device.Number">
                 <div class="card">
                     <div class="card-header">
-                        <h3 class="card-title"><img src="/images/switch.png" />{{device.DisplayName||device.Name}}</h3>
+                        <h3 class="card-title"><img src="/images/switch1.png" />{{device.DisplayName||device.Name}}</h3>
                     </div>
                     <div class="card-body">
                         <div class="row">
@@ -595,7 +595,7 @@
             <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('二路开关')" :data-device-number="device.Number">
                 <div class="card">
                     <div class="card-header">
-                        <h3 class="card-title"><img src="/images/switch.png" />{{device.DisplayName||device.Name}}</h3>
+                        <h3 class="card-title"><img src="/images/switch2.png" />{{device.DisplayName||device.Name}}</h3>
                         <div class="card-tools">
                             <button class="btn btn-sm btn-success" v-on:click="CallApi(device.Number,'/Switch3/On')" :data-node-number="model.Number">一键开</button>
                             <button class="btn btn-sm btn-success" v-on:click="CallApi(device.Number,'/Switch3/Off')" :data-node-number="model.Number">一键关</button>
@@ -618,7 +618,7 @@
             <div class="col-md-3 col-xs-6 control" v-for="device in GetDevices('三路开关')" :data-device-number="device.Number">
                 <div class="card">
                     <div class="card-header">
-                        <h3 class="card-title"><img src="/images/switch2.png" />{{device.DisplayName||device.Name}}</h3>
+                        <h3 class="card-title"><img src="/images/switch3.png" />{{device.DisplayName||device.Name}}</h3>
                         <div class="card-tools">
                             <button class="btn btn-sm btn-success" v-on:click="CallApi(device.Number,'/Switch3/On')" :data-node-number="model.Number">一键开</button>
                             <button class="btn btn-sm btn-success" v-on:click="CallApi(device.Number,'/Switch3/Off')" :data-node-number="model.Number">一键关</button>
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 @@
         </div>
     </div>
     <div class="row">
-        <div class="col-md-12">
+        <div class="col-md-12" v-if="HasBatchCommand()">
             <div class="card">
-                <div class="card-body">
-                    <label><input type="checkbox" class="checkall" v-on:change="SelectDevice($event)" />全选</label>
-                    <button class="btn btn-sm btn-info uncheck" v-on:click="SelectDevice($event)">反选</button>
+                <div class="card-header">
+                    <div class="card-title">
+                        <label class="btn btn-sm btn-info" style="height:31px;margin-bottom:0;"><input type="checkbox" class="checkall" v-on:change="SelectDevice($event)" />全选</label>
+                        <button class="btn btn-sm btn-info uncheck" v-on:click="SelectDevice($event)">反选</button>
+                    </div>
+                    <div class="card-tools">
+                        <button>开</button>
+                        <button v-if="model.Name.indexOf('窗帘')>=0">停</button>
+                        <button>关</button>
+                    </div>
                 </div>
             </div>
         </div>
@@ -28,7 +35,7 @@
                 <div class="card-header">
                     <h3 class="card-title">{{item.Name}}</h3>
                     <div class="card-tools">
-                        <div class="custom-control custom-switch">
+                        <div class="custom-control custom-switch"  v-if="HasBatchCommand()">
                             <input type="checkbox" name="id[]" class="item" :value="item.Number" v-on:change="SelectDevice($event)">
                         </div>
                     </div>
diff --git a/projects/IoTCenter/configuration.db b/projects/IoTCenter/configuration.db
index 1e4565269aeb4d1f06b2ae22ce8eafaa399107e4..dc4203faa5ab312bf76d85bd713f643a752662d7 100644
GIT binary patch
delta 93
zcmV~$u@!_s2nE0%jJ1c)g20B03$Z0wiY57;sbyUOH*;V2_59XTk-;A2v$tqyYFREY
lMIWgoBNE7BJB-x1LXJIpLX1X}3Wv<WypsW)C%tp~mOqik7nlG5

delta 93
zcmV~$u@!(I3<ba)taXRrCy<noklGO#g^_&E*0CJGyEWImzx@i4$SP<Algbz@?3&>;
k5K$0n3S#S3t9RBSfLmBPshJKWp`IEvWg;$ak00;$1D0$TzyJUM

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')) {