fix bug

Former-commit-id: a6ab5ca149c79c06f688d2fda839b356e60d44d1
Former-commit-id: eaecb1b74e97a8a28b0b40566b3c09aa2ce257f8

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);
+	console.log(response);
-    localStorage.setItem('accessToken', response.data.accessToken);
+    if(response.data.accessToken){
-    localStorage.setItem('refreshToken', response.data.refreshToken);
+        localStorage.setItem('accessToken', response.data.accessToken);
-
+        localStorage.setItem('refreshToken', response.data.refreshToken);
-    var secScript = document.createElement("script");
+        var secScript = document.createElement("script");
-    secScript.setAttribute("type", "text/javascript");
+        secScript.setAttribute("type", "text/javascript");
-    secScript.setAttribute("src", 'redirect.js?v=' + new Date().toLocaleTimeString());
+        secScript.setAttribute("src", 'redirect.js?v=' + new Date().toLocaleTimeString());
-    document.body.insertBefore(secScript, document.body.lastChild);
+        document.body.insertBefore(secScript, document.body.lastChild);
+    }else{
+        window.location.href="/400.html?v=3" 
+    }
 });
 
 </script>

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;

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>

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: 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: 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/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: 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: 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-else="getDeviceDataValue(device,'状态')==='关'" v-on:click="execApi(device.number,'/Socket/On')" :src="config.apigateway+'/IoTCenter/images/off.png'" />
                                     </div>
                                 </div>
                             </div>

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 v-for="device in product.devices" class="col-md-3 col-sm-4 col-6 p-1">
-                <div class="weui-grid__icon">
+                <div class="card">
-                    <img v-if="product.name === '一路开关' && device.data[0].value === '关'" :src="product.image.replace('.png', '.svg')" class="grayscale" />
+                    <router-link :to="{path:'/pages/iot/device',query:{number:device.number}}">
-                    <img v-if="(product.name !== '一路开关') || (device.data[0].value !== '关')" :src="product.image.replace('.png', '.svg')" />
+                        <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>
+            </div>
-            </router-link>
         </div>
     </div>
 </div>