From 371dc324152b48b72c1f952569400bd198b79880 Mon Sep 17 00:00:00 2001
From: zhengpengju <zhengpengju4905@dingtalk.com>
Date: Tue, 23 Jun 2020 08:41:20 +0800
Subject: [PATCH] fix bug

Former-commit-id: a6ab5ca149c79c06f688d2fda839b356e60d44d1
Former-commit-id: eaecb1b74e97a8a28b0b40566b3c09aa2ce257f8
---
 projects/IoTCenter/wwwroot/index.html         | 48 ++++++++++++++-----
 projects/IoTCenter/wwwroot/redirect.js        | 25 ++--------
 projects/WebSPA/wwwroot/400.html              | 22 +++++++++
 projects/WebSPA/wwwroot/400.svg               |  1 +
 projects/WebSPA/wwwroot/pages/iot/node.html   |  8 ++--
 .../WebSPA/wwwroot/pages/iot/product.html     | 16 ++++---
 6 files changed, 76 insertions(+), 44 deletions(-)
 create mode 100644 projects/WebSPA/wwwroot/400.html
 create mode 100644 projects/WebSPA/wwwroot/400.svg

diff --git a/projects/IoTCenter/wwwroot/index.html b/projects/IoTCenter/wwwroot/index.html
index cb550980..10c607fe 100644
--- a/projects/IoTCenter/wwwroot/index.html
+++ b/projects/IoTCenter/wwwroot/index.html
@@ -15,7 +15,7 @@ body{
   height:100%;
 }
 .Center-Container {
-  background-color: #07c160;
+  background-color: #35A9FE;
   position: relative;
 }
  
@@ -35,6 +35,22 @@ body{
 <img src="loading.svg?v=202004211141" class="Absolute-Center" />
 </body>
 <script>
+/**
+ * [通过参数名获取url中的参数值]
+ * 示例URL:http://iot.edusoa.com/IoTCenter/index.html?organname=测试学校
+ * @param  {[string]} queryName [参数名]
+ * @return {[string]}           [参数值]
+ */
+function GetQueryValue(queryName) {
+    var reg = new RegExp("(^|&)" + queryName + "=([^&]*)(&|$)", "i");
+    var r = window.location.search.substr(1).match(reg);
+    if ( r != null ){
+       return decodeURIComponent(r[2]);
+    }else{
+       return null;
+    }
+}
+
 /* 
  * username    账号
  * realname    姓名
@@ -47,27 +63,33 @@ body{
 
 var baseUrl= "http://221.194.113.154:8100/IoTCenter/api/v1/Project/Update";
 var timestamp = parseInt(new Date().getTime() / 1000); // 秒级时间戳
-var query = "username=cuishuying&realname="+encodeURIComponent('崔淑英')+"&organname="+encodeURIComponent('唐山市税东中学')+"&organnumber=1234567&timestamp=" +timestamp+ "&role=" + encodeURIComponent('市级管理员,区管理员');
+// var query = "username=cuishuying&realname="+encodeURIComponent('崔淑英')+"&organname="+encodeURIComponent('唐山市税东中学')+"&organnumber=1234567&timestamp=" +timestamp+ "&role=" + encodeURIComponent('市级管理员,区管理员');
+var query = "username=" +GetQueryValue('username')+ "&realname="+encodeURIComponent(GetQueryValue('realname'))+"&organname="+encodeURIComponent(GetQueryValue('organname'))+"&organnumber=" +GetQueryValue('organnumber')+ "&timestamp=" +GetQueryValue('timestamp')+ "&role=" + encodeURIComponent(GetQueryValue('role'));
+
+// console.log(GetQueryValue('role'));
 
 /*
  * 算法 MD5盐值 salt=123456
  * https://cdn.bootcdn.net/ajax/libs/blueimp-md5/2.16.0/js/md5.js
  */
-var salt = "123456";
-var token =  md5(query + ',' + salt); // 加盐方式
+
+var token = GetQueryValue('token');
 
 var url = baseUrl + "?" + query + "&token=" + token;
-console.log(url);
+// alert(url);
 var api_url = "http://221.194.113.154:8100/IoTCenter/api/v1/Project/Update" + "?" + query + "&token=" + token;
 axios.get(api_url).then(function (response) {
-    console.log(response);
-    localStorage.setItem('accessToken', response.data.accessToken);
-    localStorage.setItem('refreshToken', response.data.refreshToken);
-
-    var secScript = document.createElement("script");
-    secScript.setAttribute("type", "text/javascript");
-    secScript.setAttribute("src", 'redirect.js?v=' + new Date().toLocaleTimeString());
-    document.body.insertBefore(secScript, document.body.lastChild);
+	console.log(response);
+    if(response.data.accessToken){
+        localStorage.setItem('accessToken', response.data.accessToken);
+        localStorage.setItem('refreshToken', response.data.refreshToken);
+        var secScript = document.createElement("script");
+        secScript.setAttribute("type", "text/javascript");
+        secScript.setAttribute("src", 'redirect.js?v=' + new Date().toLocaleTimeString());
+        document.body.insertBefore(secScript, document.body.lastChild);
+    }else{
+        window.location.href="/400.html?v=3" 
+    }
 });
 
 </script>
diff --git a/projects/IoTCenter/wwwroot/redirect.js b/projects/IoTCenter/wwwroot/redirect.js
index b7b3d3d1..2aef3341 100644
--- a/projects/IoTCenter/wwwroot/redirect.js
+++ b/projects/IoTCenter/wwwroot/redirect.js
@@ -1,29 +1,12 @@
-/**
- * [通过参数名获取url中的参数值]
- * 示例URL:http://iot.edusoa.com/IoTCenter/index.html?organ=测试学校
- * @param  {[string]} queryName [参数名]
- * @return {[string]}           [参数值]
- */
-function GetQueryValue(queryName) {
-    var reg = new RegExp("(^|&)" + queryName + "=([^&]*)(&|$)", "i");
-    var r = window.location.search.substr(1).match(reg);
-    if ( r != null ){
-       return decodeURI(r[2]);
-    }else{
-       return null;
-    }
-}
+
 var url = '';
-var school = GetQueryValue('organ').replace(/\'/g, '');
+var school = (GetQueryValue('organname') || '').replace(/\'/g, '');
 
 switch(school) {
-     case '东师理想':
-        url = 'http://iot.edusoa.com'
-        break;
      case '唐山市税东中学':
-		url = 'http://tsssdzx.iot.edusoa.com'
+	   url = 'http://221.194.113.154:8100'
         break;
      default:
-        url = 'http://iot.edusoa.com'
+        url = 'http://221.194.113.154:8100'
 }
 window.location.href = url;
\ No newline at end of file
diff --git a/projects/WebSPA/wwwroot/400.html b/projects/WebSPA/wwwroot/400.html
new file mode 100644
index 00000000..e05b548b
--- /dev/null
+++ b/projects/WebSPA/wwwroot/400.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<head>
+<link rel="stylesheet" href="lib/weui/weui.min.css">
+<link rel="stylesheet" href="css/weui.ext.css">
+</head>
+<div class="page js_show">
+    <div style="background-color: #fff; height: 100%; min-height: 480px;">
+        <div class="weui-header" v-if="typeof api !== 'undefined'">
+            <div class="weui-header-left"> <a class="icon icon-109" style="color:#fff" href="javascript:" v-on:click="closeWindow()">关闭</a> </div>
+            <h1 class="weui-header-title"></h1>
+            <div class="weui-header-right"></div>
+        </div> 
+<img src="400.svg" style="maring:20px;">
+        <div class="weui-footer weui-footer_fixed-bottom">
+            <p class="weui-footer__text">Copyright © 2020 Ver 0.1.0.202006220919</p>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/projects/WebSPA/wwwroot/400.svg b/projects/WebSPA/wwwroot/400.svg
new file mode 100644
index 00000000..335955d0
--- /dev/null
+++ b/projects/WebSPA/wwwroot/400.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="1591327943726" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8335" xmlns:xlink="http://www.w3.org/1999/xlink" width="1024" height="1024"><defs><style type="text/css"></style></defs><path d="M69.659734 446.015363v-7.340757C69.659734 197.17413 265.435294 1.395092 506.939248 1.395092h7.340757c241.500475 0 437.279514 195.779039 437.279514 437.279514v7.340757c0 241.503954-195.779039 437.279514-437.279514 437.279513h-7.340757C265.435294 883.294876 69.659734 687.519317 69.659734 446.015363" fill="#E4EBF7" p-id="8336"></path><path d="M208.782739 459.60794a28.987293 28.987293 0 1 1-57.685827-5.813462 28.987293 28.987293 0 0 1 57.682348 5.813462" fill="#FFFFFF" p-id="8337"></path><path d="M209.203702 559.483987a19.851356 19.851356 0 1 1-39.500928-3.983492 19.851356 19.851356 0 0 1 39.500928 3.983492M271.245277 503.068006a19.993996 19.993996 0 1 1-39.786208-4.007845 19.993996 19.993996 0 0 1 39.786208 4.011324M416.366133 95.44376l104.454452-0.045228a16.069648 16.069648 0 1 0-0.013916-32.139296l-104.454453 0.045228a16.073127 16.073127 0 0 0 0.013917 32.139296m39.953201 64.229886l104.450974-0.045227a16.073127 16.073127 0 1 0-0.013916-32.139297l-104.454453 0.045228a16.069648 16.069648 0 1 0 0.013916 32.139296" fill="#FFFFFF" p-id="8338"></path><path d="M464.634221 95.398532v-0.006958l55.281816-0.024353a16.069648 16.069648 0 1 0 0.017395 32.139296l-55.288774 0.024354v-0.006958a16.066169 16.066169 0 0 0-0.013916-32.125381m127.464769 148.45029h-13.843068a16.661084 16.661084 0 0 1-16.608898-16.612377 16.657605 16.657605 0 0 1 16.608898-16.608898h13.843068a16.661084 16.661084 0 0 1 16.612377 16.608898 16.661084 16.661084 0 0 1-16.612377 16.612377" fill="#FFFFFF" p-id="8339"></path><path d="M666.964276 105.185049c0-57.02829 46.232854-103.257665 103.261145-103.257665 57.02829 0 103.257665 46.229375 103.257665 103.257665 0 57.031769-46.229375 103.261144-103.257665 103.261145s-103.257665-46.229375-103.257666-103.257666" fill="#FF603B" p-id="8340"></path><path d="M777.841021 67.614984l-2.351825 52.307244a5.267254 5.267254 0 0 1-10.527551 0l-2.348346-52.307244a7.61908 7.61908 0 1 1 15.227722 0m-0.918464 67.416679c1.784743 1.659498 2.678855 3.826935 2.678854 6.50579s-0.894111 4.846291-2.678854 6.634514c-1.913468 1.656019-4.209629 2.55013-6.759759 2.55013a8.854136 8.854136 0 0 1-6.50579-2.678855c-1.913468-1.788222-2.8041-3.95218-2.804099-6.505789 0-2.678855 0.890632-4.846291 2.804099-6.50579 1.784743-1.784743 3.955659-2.55013 6.50579-2.55013 2.678855 0 4.975016 0.765387 6.759759 2.55013" fill="#FFFFFF" p-id="8341"></path><path d="M484.708234 463.66797c15.398195-2.080461 12.566263-4.188754 14.190971-16.622814 2.348347-18.021385-10.812831-58.917404-28.743761-87.386322-3.785187-37.295221-43.828843-39.104318-43.828843-39.104318s15.001585 17.029861 14.598017 56.356837c4.863687 18.240564 2.797142 50.27201 2.797142 50.27201s18.282312 39.553113 40.982995 36.484607" fill="#FFB594" p-id="8342"></path><path d="M420.847126 318.714108s5.089824-2.028276 11.171171 2.024797c28.110577 4.863687 36.070602 23.330388 39.31306 39.549634 6.484915 4.460119 6.484915 8.106144 6.484915 12.162695 1.269847 2.703208 5.270733 10.541467 5.270733 10.541467s-25.136005 6.081348-38.109314 23.511297c-4.867166-22.300594-24.130565-87.793369-24.130565-87.793369" fill="#FFFFFF" p-id="8343"></path><path d="M396.716561 314.852383l3.545133-20.23057-32.111464-41.310025-18.205774 19.416477-9.021129 34.313691s29.189077 17.840475 55.793234 7.813906" fill="#FFB594" p-id="8344"></path><path d="M358.179325 272.115956s-15.853948-9.977863-8.506233-23.977488c5.67778-10.809352 15.784368 3.962617 15.784367 3.962617s1.823013-12.740215 10.920681-12.740214c1.819534-3.639067 5.458601-14.556269 5.458601-14.55627s40.03322 9.097668 47.314834 10.917202c-0.003479 18.195337-8.060917 67.942013-27.428687 69.472787-31.102545 2.456196-43.543563-33.078635-43.543563-33.078634" fill="#FFC6A0" p-id="8345"></path><path d="M427.899123 251.335698c9.101147-7.281614 12.138342-34.007536 12.138342-34.007536s-8.669747-1.711684-23.226016-7.173764c-16.379282-7.278135-44.764703-16.598461-61.143985 3.416409-33.189964 15.34253-7.173764 69.337105-7.173764 69.337105l9.494278-10.565819s-13.76305-11.494721-7.278135-21.837883c7.594727-12.107031 13.717823 3.757354 13.717823 3.757354s2.22658-8.349676 12.524515-11.689547c1.238535-2.484029 3.618193-9.358596 5.009806-13.470811a3.757354 3.757354 0 0 1 4.41837-2.459676c8.384467 1.948258 30.347595 7.062435 39.720107 9.309889 1.823013 0.438358 3.047632 2.153521 2.870201 4.021761l-1.071542 11.362518z" fill="#520038" p-id="8346"></path><path d="M421.807338 266.194643c-0.361819 2.132647-2.035234 3.632109-3.743438 3.339871-1.704726-0.285281-2.800621-2.247455-2.44228-4.38358 0.361819-2.132647 2.035234-3.632109 3.743438-3.34335 1.708205 0.28876 2.800621 2.250934 2.44228 4.38358m-24.214061-5.006327c-0.361819 2.132647-2.035234 3.632109-3.743439 3.339871-1.704726-0.285281-2.800621-2.247455-2.44228-4.38358 0.361819-2.132647 2.035234-3.632109 3.743438-3.339871 1.708205 0.285281 2.800621 2.247455 2.442281 4.38358" fill="#552950" p-id="8347"></path><path d="M341.462577 304.338749s22.704162 17.297746 57.299654 8.648873c0 0 33.318688 3.548612 40.134112 18.515407 18.647611 40.948205 1.889114 128.150138 0 139.029071 12.162695 14.107474-1.621229 29.512627-1.621229 29.512627-54.356394-12.343605-124.584131-2.087419-124.584131-2.087419-16.869825-12.336647-4.254856-31.464364-4.254856-31.464364L286.681741 383.806794c-8.645394-52.975218 2.898034-68.895268 12.347084-72.165558 10.541467-3.649504 27.971416-4.460119 27.971416-4.460118 1.7256-0.201784 3.757354-0.264406 4.766274-0.810615 8.210515-4.460119 9.696062-2.028276 9.696062-2.028275" fill="#FFFFFF" p-id="8348"></path><path d="M298.677443 312.451851s-23.918344 1.61775-26.405852 28.374984c-1.621229 30.813785 10.541467 38.109315 10.541467 38.109315s21.135119 76.893562 58.433819 79.868134c29.189077-7.570373 16.553234-23.316471 16.215767-39.730544-0.810614-39.326976-24.728958-58.785201-24.728958-58.785201s-14.653682-47.836688-34.056243-47.836688" fill="#FFC6A0" p-id="8349"></path><path d="M319.161983 432.182732s2.974572 39.187815 34.191925 22.565001c16.577587-8.822825 26.37454-48.108052 34.056242-78.514791 5.06547-20.067056 8.975902-42.433752 8.975903-42.433752l-17.301226-5.945665s-8.377509 19.19034-27.028598 42.705116c-15.081603 19.019867-31.812267 38.652044-32.894246 61.624091" fill="#FFC6A0" p-id="8350"></path><path d="M498.492159 457.586623s-1.485547 9.504715-40.948205 6.891962c-52.836057-3.499906-88.109961-11.306854-88.109961-11.306854l3.245937-20.178385s2.51534 0.747992 33.781399-0.236574c41.355252-1.297679 65.106602-21.117723 86.850551-3.55557 14.05181 11.352081 5.180278 28.3889 5.180279 28.3889" fill="#FFC6A0" p-id="8351"></path><path d="M314.026932 316.501444s-19.458225-16.487132-38.457219 9.323805c-11.543428 25.129047 1.798659 53.173523 9.268141 68.112486-1.0785 12.97331 8.106144 14.998106 8.106145 14.998106s0.375735 3.113734 5.274212 9.323806c14.187492-24.457594 23.379094-31.888806 47.701006-43.647934-1.141122-2.282245-6.530143-11.359039-6.349234-13.105513 0.608831-5.879564-4.460119-9.125501-4.460118-9.125501s-0.995003-0.542729-4.053073-9.525589c-2.741477-8.047001-7.083309-18.010948-17.02986-26.353666" fill="#FFFFFF" p-id="8352"></path><path d="M383.579736 1002.055108s16.8907 8.029606 28.921192 4.018282c11.091154-3.698211 17.812643 2.626669 27.839213 4.630591 10.023091 2.007401 27.028598 4.324437 45.947574-4.954141-0.407047-21.66741-27.087742-15.652164-47.029553-26.398894-10.071797-5.42729-14.87634-18.564114-14.145743-34.595493H388.144226s-5.472517 41.365689-4.56449 57.299655" fill="#CBD1D1" p-id="8353"></path><path d="M383.492761 1001.380176s9.549942 4.999369 26.576324 2.567525c12.023534-1.718642 11.21292 2.296161 25.807458 4.460119 14.594539 2.160479 45.547485-0.674932 49.868443-3.91739 1.621229 4.320958-1.349864 8.106144-1.349865 8.106144s-5.945665 2.3727-18.918975 3.242458c-7.984378 0.535771-28.1732 0.960213-35.277383-2.160479-7.027644-5.406416-17.026382-5.270733-21.082933-0.814093-15.401674 3.739959-24.993365-1.0785-24.993365-1.0785l-0.629704-10.405784z" fill="#2B0849" p-id="8354"></path><path d="M412.097361 947.190776h12.162695s-0.407047 26.350187 17.836996 33.645717c-18.244043 2.435322-33.649196-9.052441-29.999691-33.645717" fill="#A4AABA" p-id="8355"></path><path d="M224.215724 946.4567s-7.681702 27.045994-16.358408 44.876032c-6.554496 13.477769-15.405153 27.324316 19.931374 27.324316 24.248852 0 32.650714-1.749953 27.073826-24.064463-5.580367-22.317989 0.97065-48.135885 0.97065-48.135885h-31.617442z" fill="#CBD1D1" p-id="8356"></path><path d="M202.092561 1009.88293s7.646912 4.261814 24.193187 4.261814c22.182307 0 30.079709-6.018725 30.07971-6.018726s2.19179 4.063509-2.257892 7.897403c-3.618193 3.120692-13.11595 5.803025-26.945102 5.63951-15.123351-0.173952-21.27428-2.063066-24.568923-4.258335-3.005884-2.007401-2.504903-5.764756-0.50098-7.521666" fill="#2B0849" p-id="8357"></path><path d="M227.412955 953.397368s0.121766 5.538619-1.144602 10.680628c-1.269847 5.183757-3.931306 11.324249-4.119174 15.098998-0.212221 4.195712 16.542796 5.764756 18.797209 0.125246 2.261371-5.64299 4.721046-23.438238 6.978938-26.447601 2.254413-3.009363-17.882224-7.730409-20.512371 0.542729" fill="#A4AABA" p-id="8358"></path><path d="M380.949588 965.674872l48.355064 0.330508s4.693214-197.062801 6.697136-232.778543c2.003922-35.71922 13.648242-156.737343 3.625152-228.172304l-45.356139-2.327472-82.581779 2.818016s-1.572522 14.333611-4.324436 36.060165c-0.226137 1.791701-2.463155 3.040674-2.703208 4.929788-0.271364 2.115251 1.527295 4.894998 1.155038 7.111141-8.541023 50.887799-20.167948 113.889587-28.722887 162.947415-0.420963 2.410969-4.460119 3.646025-5.270733 9.727373-0.146119 1.092416 0.765387 5.510786 0.403568 6.488395-24.840287 67.747187-42.451147 183.000555-54.481639 233.75615l52.797787-0.052186s7.939151-35.294778 14.559749-65.65281c10.165731-46.580757 83.538513-307.268093 83.538513-307.268093l10.899806-3.318996-0.549687 168.969619s-0.810614 4.460119 1.217662 7.299008c2.028276 2.835411-2.021318 4.06003-1.419445 8.109624l1.419445 6.484915s-1.621229 25.94662-3.242458 42.973002c-1.624708 17.029861 3.983491 141.561806 3.983491 141.561806" fill="#7BB2F9" p-id="8359"></path><path d="M439.063336 494.42957c-10.534508-1.701247-65.492775-9.546463-126.007054 0.695806a2.174395 2.174395 0 0 0-1.802139 2.240497c0.219179 4.547095 0.153077 8.151372 0.052186 10.4197a2.146563 2.146563 0 0 0 2.490986 2.212665c11.491242-1.857803 59.272266-8.391425 124.076193-0.925423 1.207224 0.139161 2.296161-0.744513 2.40749-1.948258a142.849048 142.849048 0 0 0 0.591435-10.537987 2.143084 2.143084 0 0 0-1.809097-2.157" fill="#192064" p-id="8360"></path><path d="M405.031447 505.378083l0.010437-17.75002a2.932824 2.932824 0 0 0-2.814537-2.94674 396.971451 396.971451 0 0 0-28.322798-0.048707 2.957177 2.957177 0 0 0-2.852806 2.94674l-0.010437 17.732626c0 1.656019 1.349864 2.98153 3.005883 2.939782 8.621041-0.222658 17.972679-0.233095 27.936626 0.059143a2.950219 2.950219 0 0 0 3.047632-2.932824" fill="#FFFFFF" p-id="8361"></path><path d="M400.999249 502.01038l0.006958-11.115506a2.320514 2.320514 0 0 0-2.237018-2.33791 345.902742 345.902742 0 0 0-21.20122-0.03479 2.348347 2.348347 0 0 0-2.275286 2.337909l-0.006959 11.10507c0 1.308116 1.061105 2.355305 2.365742 2.327472 6.46752-0.146119 13.477769-0.149598 20.943772 0.041749 1.308116 0.03479 2.400532-1.012398 2.404011-2.323994" fill="#192064" p-id="8362"></path><path d="M389.64021 302.515736s19.051178-2.83889 26.350187-15.8122c4.512304-1.200266 2.504903 7.695618-1.14808 12.771526-2.435322 3.37814-3.513822 5.406416-3.513823 5.406416s0.674932 1.0785 0.53925 2.838889c-0.184389 2.424885-0.608831 2.271808-0.946296 3.646026-0.281802 1.165476 0.375735 2.285724 0 3.649504-0.160035 0.591435-0.688848 1.739516-1.32899 3.05459-0.417484 0.866279-0.25049 2.390095-0.695807 3.298122-0.803656 1.631666-5.434248 6.50579-9.122021 9.932636-13.310776 12.364479-17.457782 5.719528-20.87767-1.419445-3.110254-6.488394-2.29964-17.836996-3.040674-23.918344-1.217661-10.137899-9.122022-10.541467-6.690179-15.408632 1.193308-2.383137 9.984821 2.400532 11.352081 6.081348 2.633627 7.097225 10.270102 6.286611 9.122022 5.879564" fill="#FFC6A0" p-id="8363"></path><path d="M374.840408 434.071846s-7.299009-6.75628-17.836996-9.459487c-10.541467-2.703208-12.43406-0.53925-19.19034 0.271364-6.75628 0.810614-13.516039-3.242458-12.705424 2.435323 0.810614 5.670822 17.569111 3.513822 18.11184 7.295529 0.53925 3.781708-22.161433 9.727373-28.921192 7.566895-2.703208 2.703208 1.621229 6.484915 7.027644 7.566894 0.810614 5.406416 7.838259 5.406416 7.838259 5.406415s2.431843 3.513822 9.188123 3.785187c8.648873 4.592322 31.081671-2.435322 38.109315-5.406415 7.027644-2.974572-1.621229-19.461704-1.621229-19.461705" fill="#FFC6A0" p-id="8364"></path><path d="M731.218515 736.785887h-5.580367a13.996145 13.996145 0 0 1-13.954396-13.954397V611.196316a13.996145 13.996145 0 0 1 13.950917-13.950918h5.583846a13.996145 13.996145 0 0 1 13.954397 13.950918v111.635174a13.996145 13.996145 0 0 1-13.950918 13.950918" fill="#A3B4C6" p-id="8365"></path><path d="M897.057006 740.953767a16.74458 16.74458 0 0 1-16.744581 16.744581h-301.409403a16.74458 16.74458 0 0 1 0-33.489161h301.409403a16.74458 16.74458 0 0 1 16.744581 16.74458" fill="#A3B4C6" p-id="8366"></path><path d="M605.771585 661.350039h245.316973v-294.385238h-245.316973z" fill="#A3B4C6" p-id="8367"></path><path d="M852.191411 661.350039H604.665253a11.199004 11.199004 0 0 1-11.160735-11.164213V584.199029a11.199004 11.199004 0 0 1 11.160735-11.167692h247.526158a11.199004 11.199004 0 0 1 11.164213 11.167692v65.986797a11.199004 11.199004 0 0 1-11.167692 11.164213m0.003479-206.181343H604.665253a11.195525 11.195525 0 0 1-11.160735-11.160735v-65.990276a11.199004 11.199004 0 0 1 11.160735-11.164213h247.526158a11.199004 11.199004 0 0 1 11.164213 11.167692v65.986797a11.195525 11.195525 0 0 1-11.167692 11.160735" fill="#BFCDDD" p-id="8368"></path><path d="M624.784494 419.383374a8.37403 8.37403 0 1 1 0-16.74458 8.37403 8.37403 0 0 1 0 16.74458m25.803979 0a8.37403 8.37403 0 1 1 0-16.74458 8.37403 8.37403 0 0 1 0 16.74458m25.803979 0a8.37403 8.37403 0 1 1 0-16.74458 8.37403 8.37403 0 0 1 0 16.74458m167.487552 0h-78.142535a2.790184 2.790184 0 0 1-2.790183-2.790184v-11.160734c0-1.541211 1.248972-2.793663 2.790183-2.793662h78.139056c1.54469 0 2.793663 1.252451 2.793662 2.793662v11.160734c0 1.541211-1.252451 2.790184-2.790183 2.790184" fill="#FFFFFF" p-id="8369"></path><path d="M852.191411 558.259367H604.665253a11.195525 11.195525 0 0 1-11.160735-11.164213v-65.986797a11.199004 11.199004 0 0 1 11.160735-11.164213h247.526158a11.199004 11.199004 0 0 1 11.164213 11.164213v65.986797a11.195525 11.195525 0 0 1-11.167692 11.164213" fill="#BFCDDD" p-id="8370"></path><path d="M624.784494 525.466013a8.37403 8.37403 0 1 1 0-16.748059 8.37403 8.37403 0 0 1 0 16.748059m25.803979 0a8.37403 8.37403 0 1 1 0-16.748059 8.37403 8.37403 0 0 1 0 16.748059m25.803979 0a8.37403 8.37403 0 1 1 0.003479-16.748059 8.37403 8.37403 0 0 1 0 16.748059m167.484073 0h-78.142535a2.790184 2.790184 0 0 1-2.790183-2.790183v-11.164214c0-1.541211 1.248972-2.790184 2.790183-2.790183h78.139056c1.54469 0 2.793663 1.252451 2.793662 2.790183v11.164214c0 1.541211-1.252451 2.790184-2.790183 2.790183m-219.09551 100.714493a8.37403 8.37403 0 1 1 0-16.74458 8.37403 8.37403 0 0 1 0 16.74458m25.803979 0a8.37403 8.37403 0 1 1 0-16.74458 8.37403 8.37403 0 0 1 0 16.74458m25.803979 0a8.37403 8.37403 0 1 1 0-16.74458 8.37403 8.37403 0 0 1 0 16.74458m167.487552 0h-78.142535a2.790184 2.790184 0 0 1-2.790183-2.790183v-11.164213c0-1.541211 1.248972-2.790184 2.790183-2.790184h78.139056c1.54469 0 2.793663 1.252451 2.793662 2.790184v11.164213c0 1.541211-1.252451 2.790184-2.790183 2.790183" fill="#FFFFFF" p-id="8371"></path><path d="M776.042362 769.241775h-95.22806a8.394904 8.394904 0 0 1-8.370551-8.374029v-39.827957a8.398383 8.398383 0 0 1 8.370551-8.37403h95.22806a8.398383 8.398383 0 0 1 8.374029 8.37403V760.864266a8.394904 8.394904 0 0 1-8.374029 8.37403" fill="#BFCDDD" p-id="8372"></path><path d="M636.300089 932.01176a32.779438 32.779438 0 0 1-32.779438-32.779439v-51.559252a32.782917 32.782917 0 0 1 65.562355 0v51.559252a32.782917 32.782917 0 0 1-32.782917 32.779439" fill="#5BA02E" p-id="8373"></path><path d="M665.339568 931.789101a32.779438 32.779438 0 0 1-32.779438-32.782917v-11.960911a32.782917 32.782917 0 0 1 65.562355 0v11.960911a32.782917 32.782917 0 0 1-32.779438 32.782917" fill="#92C110" p-id="8374"></path><path d="M700.443 1021.673368h-96.410931a11.164213 11.164213 0 0 1-11.164213-11.167692V938.608004a11.164213 11.164213 0 0 1 11.164213-11.167692h96.407452a11.164213 11.164213 0 0 1 11.164213 11.167692v71.90463a11.164213 11.164213 0 0 1-11.164213 11.164213" fill="#F2D7AD" p-id="8375"></path></svg>
\ No newline at end of file
diff --git a/projects/WebSPA/wwwroot/pages/iot/node.html b/projects/WebSPA/wwwroot/pages/iot/node.html
index b954a6e9..61bb8804 100644
--- a/projects/WebSPA/wwwroot/pages/iot/node.html
+++ b/projects/WebSPA/wwwroot/pages/iot/node.html
@@ -131,8 +131,8 @@
                                 </div>
                                 <div class="col-5 align-self-center">
                                     <div class="row" style="line-height:28px; text-align: right;">
-                                        <img style="height:32px;width:32px;padding:5px;border:solid #cccccc 1px;border-radius:50%;margin-left: 10px;" v-if="getDeviceDataValue(device,'状态')=='开'" v-on:click="execApi(device.number,'/Switch/Off')" src="/images/on.svg" />
-                                        <img style="height:32px;width:32px;padding:5px;border:solid #cccccc 1px;border-radius:50%;margin-left: 10px;" v-if="getDeviceDataValue(device,'状态')=='关'" v-on:click="execApi(device.number,'/Switch/On')" src="/images/off.svg" />
+                                        <img style="height:32px;width:32px;padding:5px;border:solid #cccccc 1px;border-radius:50%;margin-left: 0px;" v-if="getDeviceDataValue(device,'状态')=='开'" v-on:click="execApi(device.number,'/Switch/Off')" src="/images/on.svg" />
+                                        <img style="height:32px;width:32px;padding:5px;border:solid #cccccc 1px;border-radius:50%;margin-left: 0px;" v-if="getDeviceDataValue(device,'状态')=='关'" v-on:click="execApi(device.number,'/Switch/On')" src="/images/off.svg" />
                                     </div>
                                 </div>
                             </div>
@@ -166,8 +166,8 @@
                                 </div>
                                 <div class="col-5 align-self-center">
                                     <div class="row" style="line-height:28px;">
-                                        <img style="height:32px;width:32px;padding:5px;border:solid #cccccc 1px;border-radius:50%;margin-left: 10px;" v-if="getDeviceDataValue(device,'状态')==='开'" v-on:click="execApi(device.number,'/Socket/Off')" :src="config.apigateway+'/IoTCenter/images/on.png'" />
-                                        <img style="height:32px;width:32px;padding:5px;border:solid #cccccc 1px;border-radius:50%;margin-left: 10px;" v-else="getDeviceDataValue(device,'状态')==='关'" v-on:click="execApi(device.number,'/Socket/On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
+                                        <img style="height:32px;width:32px;padding:5px;border:solid #cccccc 1px;border-radius:50%;margin-left: 0px;" v-if="getDeviceDataValue(device,'状态')==='开'" v-on:click="execApi(device.number,'/Socket/Off')" :src="config.apigateway+'/IoTCenter/images/on.png'" />
+                                        <img style="height:32px;width:32px;padding:5px;border:solid #cccccc 1px;border-radius:50%;margin-left: 0px;" v-else="getDeviceDataValue(device,'状态')==='关'" v-on:click="execApi(device.number,'/Socket/On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
                                     </div>
                                 </div>
                             </div>
diff --git a/projects/WebSPA/wwwroot/pages/iot/product.html b/projects/WebSPA/wwwroot/pages/iot/product.html
index b84007f8..a61453a7 100644
--- a/projects/WebSPA/wwwroot/pages/iot/product.html
+++ b/projects/WebSPA/wwwroot/pages/iot/product.html
@@ -7,13 +7,17 @@
     </div>
     <div class="main">
         <div class="row" v-if="product">
-            <router-link v-for="device in product.devices" :to="{path:'/pages/iot/device',query:{number:device.number}}" class="col-lg-3 col-md-4 col-sm-6 p-3">
-                <div class="weui-grid__icon">
-                    <img v-if="product.name === '一路开关' && device.data[0].value === '关'" :src="product.image.replace('.png', '.svg')" class="grayscale" />
-                    <img v-if="(product.name !== '一路开关') || (device.data[0].value !== '关')" :src="product.image.replace('.png', '.svg')" />
+            <div v-for="device in product.devices" class="col-md-3 col-sm-4 col-6 p-1">
+                <div class="card">
+                    <router-link :to="{path:'/pages/iot/device',query:{number:device.number}}">
+                        <div class="weui-grid__icon">
+                            <img v-if="product.name === '一路开关' && device.data[0].value === '关'" :src="product.image.replace('.png', '.svg')" class="grayscale" />
+                            <img v-if="(product.name !== '一路开关') || (device.data[0].value !== '关')" :src="product.image.replace('.png', '.svg')" />
+                        </div>
+                        <p class="weui-grid__label">{{device.displayName}}</p>
+                    </router-link>
                 </div>
-                <p class="weui-grid__label">{{device.displayName}}</p>
-            </router-link>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file