From a8d40bbf7c5fae704a2998ba4ff4dc8880eb162f Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 16 Jan 2020 17:30:15 +0800
Subject: [PATCH] update

Former-commit-id: e3b3bd29bc0038d40466a11895bb7435f5bee481
---
 projects/ApiGateway/Program.cs                |  2 +-
 projects/WebApp/Startup.cs                    |  5 -
 projects/WebApp/wwwroot/css/app.css           | 16 +++-
 projects/WebApp/wwwroot/pages/home.html       | 32 +++----
 projects/WebApp/wwwroot/pages/iot/node.html   | 91 ++++++++++++++++++-
 projects/WebApp/wwwroot/pages/iot/node.js     |  3 +
 projects/WebApp/wwwroot/pages/iot/nodes.html  |  2 +-
 .../WebApp/wwwroot/pages/iot/products.html    |  2 +-
 projects/WebApp/wwwroot/pages/login.html      |  4 +-
 .../src/main/resources/application.yml        |  2 +-
 10 files changed, 121 insertions(+), 38 deletions(-)

diff --git a/projects/ApiGateway/Program.cs b/projects/ApiGateway/Program.cs
index f22bd839..86ea8e61 100644
--- a/projects/ApiGateway/Program.cs
+++ b/projects/ApiGateway/Program.cs
@@ -14,7 +14,7 @@ namespace ApiGateway
             {
                 o.Port = 80;
                 o.LogToConsole = true;
-                o.LogLevel = BeetleX.EventArgs.LogType.Error;
+                o.LogLevel = BeetleX.EventArgs.LogType.All;
             });
             Console.WriteLine("http://localhost/__system/bumblebee/routes.html");
             gateway.Open();
diff --git a/projects/WebApp/Startup.cs b/projects/WebApp/Startup.cs
index 716f24f0..4c254ff4 100644
--- a/projects/WebApp/Startup.cs
+++ b/projects/WebApp/Startup.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
diff --git a/projects/WebApp/wwwroot/css/app.css b/projects/WebApp/wwwroot/css/app.css
index 909ab424..97f0fb52 100644
--- a/projects/WebApp/wwwroot/css/app.css
+++ b/projects/WebApp/wwwroot/css/app.css
@@ -719,8 +719,16 @@ ul {
     right: 0;
     border-radius: unset;
 }
-/*bootstrap4+mintuui*/
-label,h1{
-    margin-top:auto;
-    margin-bottom:auto;
+/*bootstrap4+weui*/
+[class^="weui"]{
+    box-sizing:initial;
+}
+p[class^="weui"]{
+    margin-bottom: 0;
 }
+a:hover{
+    text-decoration:none;
+}
+label,h1{
+    margin-bottom:initial;
+}
\ No newline at end of file
diff --git a/projects/WebApp/wwwroot/pages/home.html b/projects/WebApp/wwwroot/pages/home.html
index 6bc6b305..959c5f49 100644
--- a/projects/WebApp/wwwroot/pages/home.html
+++ b/projects/WebApp/wwwroot/pages/home.html
@@ -4,23 +4,21 @@
             <h2>消息</h2>
         </div>
         <div class="weui-tab__content">
-            <div class="weui-panel__hd">物联网</div>
-            <div class="weui-panel__bd">
-                <div class="col-md-12">
-                    <div class="row">
-                        <router-link to="/pages/iot/products" class="col-lg-3 col-md-4 col-sm-6 p-5">
-                            <div class="weui-grid__icon">
-                                <i class="ion ion-md-laptop weui-tabbar__icon"></i>
-                            </div>
-                            <p class="weui-grid__label">设备</p>
-                        </router-link>
-                        <router-link to="/pages/iot/nodes" class="col-lg-3 col-md-4 col-sm-6 p-5">
-                            <div class="weui-grid__icon">
-                                <i class="ion ion-md-share weui-tabbar__icon"></i>
-                            </div>
-                            <p class="weui-grid__label">智慧教室</p>
-                        </router-link>
-                    </div>
+            <div class="col-md-12 my-2">物联网</div>
+            <div class="col-md-12">
+                <div class="row">
+                    <router-link to="/pages/iot/products" class="col-md-2 col-sm-3 col-4 p-1">
+                        <div class="weui-grid__icon">
+                            <i class="ion ion-md-laptop weui-tabbar__icon"></i>
+                        </div>
+                        <p class="weui-grid__label">设备</p>
+                    </router-link>
+                    <router-link to="/pages/iot/nodes" class="col-md-2 col-sm-3 col-4 p-1">
+                        <div class="weui-grid__icon">
+                            <i class="ion ion-md-share weui-tabbar__icon"></i>
+                        </div>
+                        <p class="weui-grid__label">智慧教室</p>
+                    </router-link>
                 </div>
             </div>
         </div>
diff --git a/projects/WebApp/wwwroot/pages/iot/node.html b/projects/WebApp/wwwroot/pages/iot/node.html
index 80ad506b..0c0d9f38 100644
--- a/projects/WebApp/wwwroot/pages/iot/node.html
+++ b/projects/WebApp/wwwroot/pages/iot/node.html
@@ -15,11 +15,11 @@
             </div>
         </div>
     </div>
-    <div class="col-md-12 py-2">环境</div>
     <!--环境-->
+    <div class="col-md-12 my-2">环境</div>
     <div class="row">
         <!--光强检测器-->
-        <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('光强检测器')">
+        <div class="col-md-2 col-sm-3 col-4" v-for="device in getDevices('光强检测器')">
             <div class="card mb-4">
                 <div class="card-header">
                     {{device.displayName}}
@@ -50,7 +50,7 @@
             </div>
         </div>
         <!--温湿度传感器-->
-        <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('温湿度传感器')">
+        <div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('温湿度传感器')">
             <div class="card mb-4">
                 <div class="card-header">
                     {{device.displayName}}
@@ -93,7 +93,7 @@
             </div>
         </div>
         <!--烟雾报警器-->
-        <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('烟雾报警器')">
+        <div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('烟雾报警器')">
             <div class="card mb-4">
                 <div class="card-header">
                     {{device.displayName}}
@@ -123,7 +123,7 @@
             </div>
         </div>
         <!--人体感应器-->
-        <div class="col-lg-3 col-md-4 col-sm-6" v-for="device in getDevices('人体感应器')">
+        <div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('人体感应器')">
             <div class="card mb-4">
                 <div class="card-header">
                     {{device.displayName}}
@@ -153,6 +153,87 @@
             </div>
         </div>
     </div>
+    <!--电器-->
+    <div class="col-md-12 my-2">用电</div>
+    <div class="row">
+        <!--窗帘电机-->
+        <div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('窗帘电机')">
+            <div class="card mb-4">
+                <div class="card-header">
+                    {{device.displayName}}
+                    <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
+                    <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
+                </div>
+                <div class="card-body">
+                    <div class="row" style="height:100px;">
+                        <div class="col-md-6 col-sm-6 text-center">
+                            <img class="mh-100" src="/IoTCenter/images/switch1.png" style="width:48px;" />
+                        </div>
+                        <div class="col-md-6 col-sm-6">
+                            <div class="row" style="line-height:28px;">
+                                <img style="height:32px;" v-on:click="callApi(device.number,'/Curtain/On')" src="/IoTCenter/images/left.png" />
+                                <img style="height:32px;" v-on:click="callApi(device.number,'/Curtain/Stop')" src="/IoTCenter/images/stop.png" />
+                                <img style="height:32px;" v-on:click="callApi(device.number,'/Curtain/Off')" src="/IoTCenter/images/right.png" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--一路开关-->
+        <div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('三路开关')">
+            <div class="card mb-4">
+                <div class="card-header">
+                    {{device.displayName}}
+                    <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
+                    <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
+                </div>
+                <div class="card-body">
+                    <div class="row" style="height:100px;">
+                        <div class="col-md-6 col-sm-6 text-center">
+                            <img class="mh-100" src="/IoTCenter/images/switch1.png" style="width:48px;" />
+                        </div>
+                        <div class="col-md-6 col-sm-6">
+                            <div class="row" style="line-height:28px;">
+                                <img v-if="getDataValue(device.number,'L1状态')=='开'" v-on:click="callApi(device.number,'/Switch3/L1Off')" src="/IoTCenter/images/on.png" />
+                                <img v-if="getDataValue(device.number,'L1状态')=='关'" v-on:click="callApi(device.number,'/Switch3/L1On')" src="/IoTCenter/images/off.png" />
+                                <img v-if="getDataValue(device.number,'L2状态')=='开'" v-on:click="callApi(device.number,'/Switch3/L2Off')" src="/IoTCenter/images/on.png" />
+                                <img v-if="getDataValue(device.number,'L2状态')=='关'" v-on:click="callApi(device.number,'/Switch3/L2On')" src="/IoTCenter/images/off.png" />
+                                <img v-if="getDataValue(device.number,'L3状态')=='开'" v-on:click="callApi(device.number,'/Switch3/L3Off')" src="/IoTCenter/images/on.png" />
+                                <img v-if="getDataValue(device.number,'L3状态')=='关'" v-on:click="callApi(device.number,'/Switch3/L3On')" src="/IoTCenter/images/off.png" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--智能插座-->
+        <div class="col-md-2 col-sm-3 col-4 p-1" v-for="device in getDevices('智能插座')">
+            <div class="card mb-4">
+                <div class="card-header">
+                    {{device.displayName}}
+                    <span class="float-right text-success" v-if="device.isOnline"><i class="ion ion-ios-wifi"></i></span>
+                    <span class="float-right text-danger" v-else><i class="ion ion-ios-wifi"></i></span>
+                </div>
+                <div class="card-body">
+                    <div class="row" style="height:100px;">
+                        <div class="col-md-6 col-sm-6 text-center">
+                            <img class="mh-100" src="/IoTCenter/images/switch1.png" style="width:48px;" />
+                        </div>
+                        <div class="col-md-6 col-sm-6">
+                            <div class="row" style="line-height:28px;">
+                                <img v-if="getDataValue(device.number,'状态')==='开'" v-on:click="CallApi(device.number,'/Socket/Off')" src="/IoTCenter/images/on.png" :data-status="getDataValue(device.number,'状态')" />
+                                <img v-if="getDataValue(device.number,'状态')==='关'" v-on:click="CallApi(device.number,'/Socket/On')" src="/IoTCenter/images/off.png" :data-status="getDataValue(device.number,'状态')" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!--test-->
+    <hr />
     <div class="col-md-12" v-if="node">
         <div class="row">
             <template v-if="node">
diff --git a/projects/WebApp/wwwroot/pages/iot/node.js b/projects/WebApp/wwwroot/pages/iot/node.js
index 34abacc1..a7c12683 100644
--- a/projects/WebApp/wwwroot/pages/iot/node.js
+++ b/projects/WebApp/wwwroot/pages/iot/node.js
@@ -34,6 +34,9 @@
                         }
                         return null;
                     },
+                    getDataValue: function (number, name) {
+                        return this.getDeviceDataAttr(number, name, 'value');
+                    },
                 },
                 computed: {
                     node: function () {
diff --git a/projects/WebApp/wwwroot/pages/iot/nodes.html b/projects/WebApp/wwwroot/pages/iot/nodes.html
index 29bfb740..a73ef357 100644
--- a/projects/WebApp/wwwroot/pages/iot/nodes.html
+++ b/projects/WebApp/wwwroot/pages/iot/nodes.html
@@ -6,7 +6,7 @@
     </mt-header>
     <div class="col-md-12">
         <div class="row">
-            <router-link v-for="node in nodes" :to="{path:'/pages/iot/node',query:{number:node.number}}" class="col-lg-3 col-md-4 col-sm-6 p-5">
+            <router-link v-for="node in nodes" :to="{path:'/pages/iot/node',query:{number:node.number}}" class="col-md-2 col-sm-3 col-4 p-1">
                 <div class="weui-grid__icon">
                     <img :src="'/IoTCenter'+node.image" />
                 </div>
diff --git a/projects/WebApp/wwwroot/pages/iot/products.html b/projects/WebApp/wwwroot/pages/iot/products.html
index 3350eb57..d4710d13 100644
--- a/projects/WebApp/wwwroot/pages/iot/products.html
+++ b/projects/WebApp/wwwroot/pages/iot/products.html
@@ -6,7 +6,7 @@
     </mt-header>
     <div class="col-md-12">
         <div class="row">
-            <router-link v-for="product in products" :to="{path:'/pages/iot/product',query:{number:product.number}}" class="col-lg-3 col-md-4 col-sm-6 p-5">
+            <router-link v-for="product in products" :to="{path:'/pages/iot/product',query:{number:product.number}}" class="col-md-2 col-sm-3 col-4 p-1">
                 <div class="weui-grid__icon">
                     <img :src="'/IoTCenter'+product.image" />
                 </div>
diff --git a/projects/WebApp/wwwroot/pages/login.html b/projects/WebApp/wwwroot/pages/login.html
index bc55ba8c..c9dddb86 100644
--- a/projects/WebApp/wwwroot/pages/login.html
+++ b/projects/WebApp/wwwroot/pages/login.html
@@ -19,9 +19,7 @@
                 </div>
             </div>
         </div>
-        <div class="weui-form__opr-area">
-            <a class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips" v-on:click="submit()">确定</a>
-        </div>
+        <a class="weui-btn weui-btn_primary my-3" href="javascript:" id="showTooltips" v-on:click="submit()">确定</a>
     </form>
     <div class="weui-footer weui-footer_fixed-bottom">
         <p class="weui-footer__text">Copyright © 2020</p>
diff --git a/projects/gateway/src/main/resources/application.yml b/projects/gateway/src/main/resources/application.yml
index f402d14c..b2dd223f 100644
--- a/projects/gateway/src/main/resources/application.yml
+++ b/projects/gateway/src/main/resources/application.yml
@@ -59,7 +59,7 @@ spring:
           filters:
             - StripPrefix=0
         - id: WebUI
-          uri: http://localhost:8020/
+          uri: http://localhost:8030/
           predicates:
             - Path=/**
           filters: