update

Former-commit-id: 0be94329a6ac15258d85bf4967ee43ea7d6fe5b2

projects/WebApp/WebApp.csproj

@@ -3,4 +3,11 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Content Update="wwwroot\favicon.ico">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
 </Project>

projects/WebApp/wwwroot/index.html

@@ -20,6 +20,7 @@
             <p class="weui-toast__content">加载中</p>
         </div>
     </div>
+    <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>
     <script src="lib/axios/axios.min.js"></script>
@@ -29,6 +30,9 @@
     <script src="lib/vuex/vuex.min.js"></script>
     <script src="lib/mint-ui/index.js"></script>
     <script src="lib/signalr/signalr.min.js"></script>
+    <script src="js/util.js"></script>
+    <script src="js/store.js"></script>
+    <script src="js/message.js"></script>
     <script src="js/app.js"></script>
 </body>
 </html>

projects/WebApp/wwwroot/js/app.js

@@ -1,58 +1,5 @@
-Vue.use(Vuex);
-const store = new Vuex.Store({
-    state: {
-        accessToken: localStorage.getItem("accessToken"),
-        refreshToken: localStorage.getItem("refreshToken"),
-        user: null,
-        products: [],
-        nodes: [],
-    },
-    mutations: {
-        setToken(state, data) {
-            state.accessToken = data.accessToken;
-            localStorage.setItem("accessToken", state.accessToken);
-            state.refreshToken = data.refreshToken;
-            localStorage.setItem("refreshToken", state.refreshToken);
-        },
-        logout(state) {
-            state.accessToken = null;
-            state.refreshToken = null;
-            localStorage.removeItem('accessToken');
-            localStorage.removeItem('refreshToken');
-        },
-        setUser(state, user) {
-            state.user = user;
-        },
-        setProducts(state, products) {
-            state.products = products;
-        },
-        setNodes(state, nodes) {
-            state.nodes = nodes;
-        },
-    },
-})
-///
-var userAgent = navigator.userAgent;
+var userAgent = navigator.userAgent;
 var isApp = userAgent.indexOf('isapp') !== -1;
-var hubUrl = "/IoTCenter/hub?group=page";
-var connection = new signalR.HubConnectionBuilder().withUrl(hubUrl).build();
-connection.on('Connected', function (id) {
-    connectionId = id;
-    console.log('signalR 连接Id:' + connectionId);
-});
-connection.on("ServerToClient", function (method, json, to, from) {
-    console.log(method + ':' + json);
-});
-function connect() {
-    if (connection.state === signalR.HubConnectionState.Disconnected) {
-        connection.start().then(function () {
-            console.log('signalR 连接成功');
-        }).catch(function (err) {
-            console.log(err);
-            setTimeout(connect, 15 * 1000);
-        });
-    }
-}
 
 axios.interceptors.request.use(
     function (config) {

projects/WebApp/wwwroot/js/message.js

@@ -0,0 +1,25 @@
+var hubUrl = "/IoTCenter/hub?group=page";
+var connection = new signalR.HubConnectionBuilder().withUrl(hubUrl).build();
+function connect() {
+    if (connection.state === signalR.HubConnectionState.Disconnected) {
+        connection.start().then(function () {
+            console.log('signalR 连接成功');
+        }).catch(function (err) {
+            console.log(err);
+            setTimeout(connect, 15 * 1000);
+        });
+    }
+}
+connection.on('Connected', function (id) {
+    connectionId = id;
+    console.log('signalR 连接Id:' + connectionId);
+});
+connection.on("ServerToClient", function (method, json, to, from) {
+    console.log(method);
+    console.log(json);
+    var model = JSON.parse(json);
+    if (method === 'NodeEntityUpdated') {
+        store.commit('setNode', model);
+    }
+
+});

projects/WebApp/wwwroot/js/store.js

@@ -0,0 +1,36 @@
+Vue.use(Vuex);
+const store = new Vuex.Store({
+    state: {
+        accessToken: localStorage.getItem("accessToken"),
+        refreshToken: localStorage.getItem("refreshToken"),
+        user: null,
+        products: null,
+        nodes: null,
+    },
+    mutations: {
+        setToken(state, data) {
+            state.accessToken = data.accessToken;
+            localStorage.setItem("accessToken", state.accessToken);
+            state.refreshToken = data.refreshToken;
+            localStorage.setItem("refreshToken", state.refreshToken);
+        },
+        logout(state) {
+            state.accessToken = null;
+            state.refreshToken = null;
+            localStorage.removeItem('accessToken');
+            localStorage.removeItem('refreshToken');
+        },
+        setUser(state, user) {
+            state.user = user;
+        },
+        setProducts(state, products) {
+            state.products = products;
+        },
+        setNodes(state, nodes) {
+            state.nodes = nodes;
+        },
+        setNode(state, node) {
+            findByNumberCopy(state.nodes, node);
+        },
+    },
+})

projects/WebApp/wwwroot/js/util.js

@@ -0,0 +1,13 @@
+function copy(from, to) {
+    for (var attr in to) {
+        if (from.hasOwnProperty(attr)) {
+            to[attr] = from[attr];
+        }
+    }
+}
+function findByNumberCopy(list, from) {
+    var to = Enumerable.from(list).where(function (o) { return o.number === from.number; }).firstOrDefault();
+    if (to) {
+        copy(from, to);
+    }
+}