Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0

Former-commit-id: b301dab8f6e97b225b4c6f6fb81b7d755358aa2d

projects/WebSPA/wwwroot/index.html

@@ -24,9 +24,9 @@
         </div>
     </div>
     <script>
-    var version = '0.1.0.202005091640'; // 版本信息全局变量
+    var version = '0.1.0.202005181416'; // 版本信息全局变量
     </script>
-    <script src="js/config.js?v=0.1.0.202004281125"></script>
+    <script src="js/config.js?v=0.1.0.202005181416"></script>
     <script src="lib/linq/linq.min.js"></script>
     <script src="lib/jquery/jquery.min.js"></script>
     <script src="lib/jquery-serializejson/jquery.serializejson.min.js"></script>
@@ -39,10 +39,10 @@
     <script src="lib/Chart.js/Chart.bundle.min.js"></script>
     <script src="lib/flv.js/flv.min.js"></script>
     <script src="lib/WXInlinePlayer/index.js"></script>
-    <script src="js/util.js?v=0.1.0.202004281125"></script>
+    <script src="js/util.js?v=0.1.0.202005181416"></script>
-    <script src="js/store.js?v=0.1.0.202004281125"></script>
+    <script src="js/store.js?v=0.1.0.202005181416"></script>
-    <script src="js/message.js?v=0.1.0.202004281125"></script>
+    <script src="js/message.js?v=0.1.0.202005181416"></script>
-    <script src="js/iot.js?v=0.1.0.202004281125"></script>
+    <script src="js/iot.js?v=0.1.0.202005181416"></script>
-    <script src="js/app.js?v=0.1.0.202004281125"></script>
+    <script src="js/app.js?v=0.1.0.202005181416"></script>
 </body>
 </html>

projects/WebSPA/wwwroot/js/app.js

@@ -27,7 +27,7 @@ axios.interceptors.request.use(
         }else{
             config.url += `?v=${version}`
         }
-        $('#loading').show();
+        // $('#loading').show(); 
         return config;
     },
     function (error) {
@@ -291,6 +291,9 @@ const app = new Vue({
             // 
             router.push({path:'/pages/login'})
         }
+    },    
+    destroyed: function(){
+        alert('des');
     },
     methods: {
     },

projects/WebSPA/wwwroot/js/message.js

@@ -1,5 +1,5 @@
 var hubUrl = config.hubUrl;
-var connection = new signalR.HubConnectionBuilder().withUrl(hubUrl).withAutomaticReconnect().build();
+var connection = new signalR.HubConnectionBuilder().withUrl(hubUrl).build();
 var connectionId;
 
 function connect() {
@@ -8,11 +8,14 @@ function connect() {
             console.log('signalR 连接成功');
         }).catch(function (err) {
             console.log(err);
-            setTimeout(connect, 15 * 1000);
+            setTimeout(connect, 5000);
         });
     }
 }
-connection.on('Connected', function (id) {
+connection.onclose(function () {
+    console.log('connect closed');
+    connect();
+});connection.on('Connected', function (id) {
     connectionId = id;
     console.log('signalR 连接Id:' + connectionId);
 });