From db6ff05d90c01201b6920f5891964e55ba8b1cca Mon Sep 17 00:00:00 2001
From: zhengpengju <zhengpengju4905@dingtalk.com>
Date: Tue, 26 May 2020 13:42:40 +0800
Subject: [PATCH] fix bug

Former-commit-id: 8a6dafd2c6e415c06dd8965600dd9dafbfc38b10
---
 projects/WebSPA/wwwroot/images/button.svg     |  1 +
 projects/WebSPA/wwwroot/index.html            |  2 +-
 projects/WebSPA/wwwroot/js/message.js         |  8 +++----
 projects/WebSPA/wwwroot/pages/home.html       | 10 ++++-----
 projects/WebSPA/wwwroot/pages/iot/nodes.html  | 21 +++++++++++++------
 projects/WebSPA/wwwroot/pages/iot/scenes.html |  4 ++--
 6 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 projects/WebSPA/wwwroot/images/button.svg

diff --git a/projects/WebSPA/wwwroot/images/button.svg b/projects/WebSPA/wwwroot/images/button.svg
new file mode 100644
index 00000000..25e95c0f
--- /dev/null
+++ b/projects/WebSPA/wwwroot/images/button.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1590469865389" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1192" xmlns:xlink="http://www.w3.org/1999/xlink" width="1024" height="1024"><defs><style type="text/css"></style></defs><path d="M892.2 63.9H134.1C97 63.9 66.9 94 66.9 131v761.4c0 37 30.1 67.2 67.2 67.2h758.1c37 0 67.2-30.1 67.2-67.2V131c-0.1-37-30.2-67.1-67.2-67.1z m13.6 828.5c0 7.5-6.2 13.7-13.7 13.7h-758c-7.5 0-13.7-6.1-13.7-13.7V131c0-7.5 6.2-13.7 13.7-13.7h758.1c7.5 0 13.7 6.1 13.7 13.7-0.1 0-0.1 761.4-0.1 761.4z" p-id="1193" fill="#07c160"></path><path d="M718.8 501.1c-0.6-22-14-38.7-32.8-41.4-21.9-3.1-38 7.5-45.4 30-0.4 1.1-1.3 1.9-2.9 4.3-1.5-23.3-10.7-39.9-33.5-43.3-25-3.7-40.1 9.4-46.8 36-5.1-22.6-16.7-35.3-37.5-36.5C497.8 449 484.3 461 478 483c-0.8-2.1-1.3-2.9-1.3-3.6 0.1-51.6 0.3-103.2 0.3-154.7 0-4.6-0.1-9.2-0.8-13.7-2.6-18.6-17.5-32-37.1-33.5-16.8-1.3-33.8 9.9-38.7 26.8-2.1 7.3-3 15.2-3 22.8-0.2 91.7-0.1 183.4-0.1 275v17.8c-0.7 0.3-1.4 0.5-2 0.8-6.8-9.5-13.5-19-20.3-28.5-12.8-18-25.2-36.2-38.6-53.7-10.1-13-24-18.6-40.4-14.2-16.4 4.5-26.7 15.4-29.5 32.3-2.5 14.8 4.9 26.5 13 37.9 49.2 69.4 99.2 138.3 147.3 208.4 42 61.4 124.8 92.4 198.3 61 52.7-22.5 92.7-75.1 93.8-138.6 1.1-63.6 0.3-127.2 0.3-190.8-0.3-11-0.1-22.2-0.4-33.4z" p-id="1194" fill="#07c160"></path><path d="M353.6 423.8c3.8 2.4 7.2 3.6 10-0.9 1.5-2.5 0.5-6.3-3.6-9-1-0.7-2.4-1.5-3.6-2.3-55.1-35.7-84.4-107.1-54-175.7 21.2-50.3 68.5-83 127.9-84.4 54.2-1.3 97.2 22.8 124.6 69 39.2 66.1 20.2 144.9-42.9 189.8-1.6 1.2-3.3 2.5-4.6 3.7-1.6 1.5-2.6 4.1-1.1 6.7 1.8 3.2 4.5 3.4 7.2 2.4 1.9-0.7 4-2.1 5.8-3.4 56.4-38.2 80.7-108.1 59.9-174.2-20.9-66.5-84.8-106.4-145.9-105.2-10.7 0-20.9 0.9-30.5 3.2-89.8 19.1-139.6 101.4-117.5 189.2 9.9 39.5 33.5 69.7 68.3 91.1z" p-id="1195" fill="#07c160"></path><path d="M506.2 390.8c2-0.8 3.9-2.2 5.7-3.6 41.6-34.4 55.7-93.6 34.1-143.4-21.3-49.2-73.3-79.3-126.4-73.2-62.6 7.2-108.9 59.1-109.3 122.2-0.1 24.6 7.2 50.5 22.1 70 8.1 10.6 18.4 19.5 28.2 28.7 1.5 1.4 4 3.5 7.8 0.3 2.6-2.8 2-6.4-0.7-9-1.3-1.3-3-2.5-4.6-3.8-17.8-14.8-30.4-33.1-36.7-55.5C303.6 243.4 373.6 167 455 184.1c44.1 9.3 73.6 36.6 85.2 80.4s-1.4 81.3-34.2 112.2c-2.1 2-4.4 3.7-6.1 5.9-1.3 1.6-2 4.3 0.2 6.9 1.5 1.7 3.9 2.2 6.1 1.3z" p-id="1196" fill="#07c160"></path><path d="M489.4 350.7c-3.3 3.4-3.7 7.4-1.1 9.8 3.6 3.1 6.5 0.6 9-1.5 1.2-1 2.6-2.2 3.7-3.5 24.5-28.5 31.9-60.7 18.1-95.9-15-38.3-45-56.9-83.7-59.6-5.6 0.3-9.4 0.3-13.1 0.8-53.9 8.1-87.7 52.8-80.4 106.9 2.9 21.1 13 39 29.1 53.1 1.9 1.6 5.5 4.3 9 1.2 3.3-3.5 1.9-6.1-0.8-9.1-1-1.1-2.2-2.5-3.5-3.7-30.9-31.6-30.9-81.6 0-113 31-31.5 81.2-32.2 113.1-1.7 31.8 30.5 33.3 80.4 3.4 113-0.9 1.2-1.9 2.3-2.8 3.2z" p-id="1197" fill="#07c160"></path></svg>
\ No newline at end of file
diff --git a/projects/WebSPA/wwwroot/index.html b/projects/WebSPA/wwwroot/index.html
index 306f2d91..1efe0bb1 100644
--- a/projects/WebSPA/wwwroot/index.html
+++ b/projects/WebSPA/wwwroot/index.html
@@ -24,7 +24,7 @@
         </div>
     </div>
     <script>
-        var version = '0.1.0.202005181416'; // 版本信息全局变量
+        var version = '0.1.0.202005260900'; // 版本信息全局变量
     </script>
     <script src="js/config.js?v=0.1.0.202005181416"></script>
     <script src="lib/linq/linq.min.js"></script>
diff --git a/projects/WebSPA/wwwroot/js/message.js b/projects/WebSPA/wwwroot/js/message.js
index e9281d2f..62536c20 100644
--- a/projects/WebSPA/wwwroot/js/message.js
+++ b/projects/WebSPA/wwwroot/js/message.js
@@ -64,13 +64,13 @@ connection.on("ServerToClient", function (method, message, to, from) {
      * from: null
      */
 
-    console.log('event:');
+    console.log('message.js event:');
     console.log(event);
-    console.log('model:');
+    console.log('message.js model:');
     console.log(model);
-    console.log('to:');
+    console.log('message.js to:');
     console.log(to);
-    console.log('from:');
+    console.log('message.js from:');
     console.log(from);
 
     /**
diff --git a/projects/WebSPA/wwwroot/pages/home.html b/projects/WebSPA/wwwroot/pages/home.html
index d766d95b..a9ce7a14 100644
--- a/projects/WebSPA/wwwroot/pages/home.html
+++ b/projects/WebSPA/wwwroot/pages/home.html
@@ -71,7 +71,7 @@
                 <div class="weui-panel weui-panel_access">
                   <div class="weui-panel__bd">
                       <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg weui-cell_link">
-                        <div class="weui-media-box__hd"> <img class="weui-media-box__thumb" :src="user && user.avatar ? user.avatar : config.apigateway+'/images/avatar.svg'" /></div>
+                        <div class="weui-media-box__hd"> <img class="weui-media-box__thumb" :src="user && user.avatar ? '/UserCenter'+user.avatar : config.apigateway+'/images/avatar.svg'" /></div>
                         <div class="weui-media-box__bd">
                           <div class="weui-cell__bd">
                             <h4 class="weui-media-box__title">{{user ? user.nickName : ''}}</h4>
@@ -87,13 +87,13 @@
                         <div class="weui-cell__bd">姓名</div>
                         <span class="weui-cell__ft">{{user ? user.realName : ''}}</span> </a>
                     </div>
-                    <div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
+                    <div class="weui-panel__ft" style="display: none;"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
                         <div class="weui-cell__bd">身份证</div>
                         <span class="weui-cell__ft">{{user ? user.idCardNumber : '' }}</span> </a>
                     </div>
                     <div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
                         <div class="weui-cell__bd">性别</div>
-                        <span class="weui-cell__ft">{{ (user && user.sex === 0) ? '男' : '女' }}</span> </a>
+                        <span class="weui-cell__ft">{{ user ? (user.sex).toString().replace('0', '保密').replace('1', '男').replace('2', '女') : '' }}</span> </a>
                     </div>
                     <div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
                         <div class="weui-cell__bd">Email</div>
@@ -101,9 +101,9 @@
                     </div>
                     <div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
                         <div class="weui-cell__bd">生日</div>
-                        <span class="weui-cell__ft">{{user ? user.birthday : '' }}</span> </a>
+                        <span class="weui-cell__ft">{{user ? user.birthday.replace('T00:00:00', '') : '' }}</span> </a>
                     </div>
-                    <div class="weui-panel__ft"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
+                    <div class="weui-panel__ft" style="display: none;"> <a href="javascript:void(0);" class="weui-cell weui-cell_link">
                         <div class="weui-cell__bd">地区</div>
                         <span class="weui-cell__ft">{{user ? user.address : '' }}</span> </a>
                     </div>
diff --git a/projects/WebSPA/wwwroot/pages/iot/nodes.html b/projects/WebSPA/wwwroot/pages/iot/nodes.html
index 3125545a..ce5b28c2 100644
--- a/projects/WebSPA/wwwroot/pages/iot/nodes.html
+++ b/projects/WebSPA/wwwroot/pages/iot/nodes.html
@@ -6,13 +6,22 @@
         <h1 class="weui-header-title">智慧教室</h1>
     </div>
     <div class="main">
-        <div class="row">
-            <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-3">
-                <div class="weui-grid__icon">
-                    <img :src="node.image.replace('.png', '.svg')" style="width:32px" />
+        <div class="row p-1">
+            <div class="col-md-2 col-sm-3 col-4 p-1" v-for="node in nodes" >
+                <div class="card">                    
+                    <div class="card-header">
+                        <input type="checkbox" name="numbers[]" class="item" value="{{node.number}}">
+                        <span class="float-right text-success" v-if="node.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>
+                    <router-link :to="{path:'/pages/iot/node',query:{number:node.number}}">
+                        <div class="weui-grid__icon">
+                            <img :src="node.image.replace('.png', '.svg')" style="width:32px; margin:auto auto" />
+                        </div>
+                        <p class="weui-grid__label">{{node.name}}（{{node.count}}）</p>
+                    </router-link>
                 </div>
-                <p class="weui-grid__label">{{node.name}}（{{node.count}}）</p>
-            </router-link>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/projects/WebSPA/wwwroot/pages/iot/scenes.html b/projects/WebSPA/wwwroot/pages/iot/scenes.html
index 1ccf5679..dc4c6555 100644
--- a/projects/WebSPA/wwwroot/pages/iot/scenes.html
+++ b/projects/WebSPA/wwwroot/pages/iot/scenes.html
@@ -9,9 +9,9 @@
         <div class="row">
             <div v-for="scene in scenes" class="col-md-2 col-sm-3 col-4 p-3">
                 <div class="weui-grid__icon">
-                    <img class="weui-tabbar__icon" :src="'/IoTCenter'+scene.image" v-on:click="execScene(scene.id)" />
+                    <img class="weui-tabbar__icon" :src="scene.image.replace('.png', '.svg')" v-on:click="execScene(scene.id)" style="margin: auto auto; width: 48px;" />
                 </div>
-                <p class="weui-grid__label">{{scene.name}}</p>
+                <p class="weui-grid__label" style="text-align: center;">{{scene.name}}</p>
             </div>
         </div>
     </div>