From 04ece5d48211801043b258d5f8d000dfae05ea1f Mon Sep 17 00:00:00 2001 From: zhengpengju Date: Wed, 29 Apr 2020 17:15:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5BUG?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=EF=BC=8CPNG=20?= =?UTF-8?q?=E8=BD=AC=20=E4=B8=BA=20SVG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: f071dbc3aa6ca91e167bd6f2abba39d14a1783e3 --- projects/WebSPA/wwwroot/css/app.css | 4 +++- projects/WebSPA/wwwroot/images/camera.svg | 1 + projects/WebSPA/wwwroot/images/classroom.svg | 1 + projects/WebSPA/wwwroot/images/control.svg | 1 + projects/WebSPA/wwwroot/images/curtain.svg | 1 + projects/WebSPA/wwwroot/images/down.svg | 1 + projects/WebSPA/wwwroot/images/gateway.svg | 1 + projects/WebSPA/wwwroot/images/humiture.svg | 1 + projects/WebSPA/wwwroot/images/infrared.svg | 1 + projects/WebSPA/wwwroot/images/left.svg | 1 + projects/WebSPA/wwwroot/images/light.svg | 1 + projects/WebSPA/wwwroot/images/person.svg | 1 + projects/WebSPA/wwwroot/images/right.svg | 1 + projects/WebSPA/wwwroot/images/serialport.svg | 1 + projects/WebSPA/wwwroot/images/smoke.svg | 1 + projects/WebSPA/wwwroot/images/socket.svg | 1 + projects/WebSPA/wwwroot/images/stop.svg | 1 + projects/WebSPA/wwwroot/images/switch1.svg | 1 + projects/WebSPA/wwwroot/images/up.svg | 1 + projects/WebSPA/wwwroot/images/zoomin.svg | 1 + projects/WebSPA/wwwroot/images/zoomout.svg | 1 + projects/WebSPA/wwwroot/index.html | 2 +- projects/WebSPA/wwwroot/js/app.js | 1 + projects/WebSPA/wwwroot/js/store.js | 6 ++++-- projects/WebSPA/wwwroot/pages/home.html | 6 +++--- projects/WebSPA/wwwroot/pages/home.js | 14 ++++++++++++-- projects/WebSPA/wwwroot/pages/iot/device.js | 3 ++- .../wwwroot/pages/iot/device/color-light.html | 4 ++-- .../WebSPA/wwwroot/pages/iot/device/curtain.html | 2 +- .../WebSPA/wwwroot/pages/iot/device/gateway.html | 2 +- .../wwwroot/pages/iot/device/humiture.html | 2 +- .../WebSPA/wwwroot/pages/iot/device/light.html | 2 +- .../WebSPA/wwwroot/pages/iot/device/person.html | 2 +- .../WebSPA/wwwroot/pages/iot/device/smoke.html | 2 +- .../WebSPA/wwwroot/pages/iot/device/socket.html | 2 +- .../WebSPA/wwwroot/pages/iot/device/switch.html | 2 +- .../WebSPA/wwwroot/pages/iot/device/switch3.html | 2 +- projects/WebSPA/wwwroot/pages/iot/node.js | 16 ++++++++++++++-- projects/WebSPA/wwwroot/pages/iot/nodes.html | 2 +- projects/WebSPA/wwwroot/pages/iot/product.html | 2 +- projects/WebSPA/wwwroot/pages/iot/products.html | 4 ++-- projects/WebSPA/wwwroot/pages/login.html | 2 +- 42 files changed, 76 insertions(+), 28 deletions(-) create mode 100644 projects/WebSPA/wwwroot/images/camera.svg create mode 100644 projects/WebSPA/wwwroot/images/classroom.svg create mode 100644 projects/WebSPA/wwwroot/images/control.svg create mode 100644 projects/WebSPA/wwwroot/images/curtain.svg create mode 100644 projects/WebSPA/wwwroot/images/down.svg create mode 100644 projects/WebSPA/wwwroot/images/gateway.svg create mode 100644 projects/WebSPA/wwwroot/images/humiture.svg create mode 100644 projects/WebSPA/wwwroot/images/infrared.svg create mode 100644 projects/WebSPA/wwwroot/images/left.svg create mode 100644 projects/WebSPA/wwwroot/images/light.svg create mode 100644 projects/WebSPA/wwwroot/images/person.svg create mode 100644 projects/WebSPA/wwwroot/images/right.svg create mode 100644 projects/WebSPA/wwwroot/images/serialport.svg create mode 100644 projects/WebSPA/wwwroot/images/smoke.svg create mode 100644 projects/WebSPA/wwwroot/images/socket.svg create mode 100644 projects/WebSPA/wwwroot/images/stop.svg create mode 100644 projects/WebSPA/wwwroot/images/switch1.svg create mode 100644 projects/WebSPA/wwwroot/images/up.svg create mode 100644 projects/WebSPA/wwwroot/images/zoomin.svg create mode 100644 projects/WebSPA/wwwroot/images/zoomout.svg diff --git a/projects/WebSPA/wwwroot/css/app.css b/projects/WebSPA/wwwroot/css/app.css index ef232a31..3d9fc470 100644 --- a/projects/WebSPA/wwwroot/css/app.css +++ b/projects/WebSPA/wwwroot/css/app.css @@ -1173,12 +1173,14 @@ a:hover{ background-color: #f5f5f5; } .weui-grid__icon .weui-tabbar__icon{ - -webkit-filter: grayscale(100%); + width: 32px; +/* -webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); -ms-filter: grayscale(100%); -o-filter: grayscale(100%); filter: grayscale(100%); filter: gray; + */ } .weui-tabbar__item p { margin: 0; diff --git a/projects/WebSPA/wwwroot/images/camera.svg b/projects/WebSPA/wwwroot/images/camera.svg new file mode 100644 index 00000000..e736ea6a --- /dev/null +++ b/projects/WebSPA/wwwroot/images/camera.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/classroom.svg b/projects/WebSPA/wwwroot/images/classroom.svg new file mode 100644 index 00000000..1ee2e2a5 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/classroom.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/control.svg b/projects/WebSPA/wwwroot/images/control.svg new file mode 100644 index 00000000..05d1b467 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/control.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/curtain.svg b/projects/WebSPA/wwwroot/images/curtain.svg new file mode 100644 index 00000000..604f1d5d --- /dev/null +++ b/projects/WebSPA/wwwroot/images/curtain.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/down.svg b/projects/WebSPA/wwwroot/images/down.svg new file mode 100644 index 00000000..94bb6542 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/gateway.svg b/projects/WebSPA/wwwroot/images/gateway.svg new file mode 100644 index 00000000..9c8b31bb --- /dev/null +++ b/projects/WebSPA/wwwroot/images/gateway.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/humiture.svg b/projects/WebSPA/wwwroot/images/humiture.svg new file mode 100644 index 00000000..b10f0cb8 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/humiture.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/infrared.svg b/projects/WebSPA/wwwroot/images/infrared.svg new file mode 100644 index 00000000..d16ad53e --- /dev/null +++ b/projects/WebSPA/wwwroot/images/infrared.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/left.svg b/projects/WebSPA/wwwroot/images/left.svg new file mode 100644 index 00000000..d6d4afd2 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/light.svg b/projects/WebSPA/wwwroot/images/light.svg new file mode 100644 index 00000000..48a1abad --- /dev/null +++ b/projects/WebSPA/wwwroot/images/light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/person.svg b/projects/WebSPA/wwwroot/images/person.svg new file mode 100644 index 00000000..e1207f42 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/person.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/right.svg b/projects/WebSPA/wwwroot/images/right.svg new file mode 100644 index 00000000..80d0a769 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/serialport.svg b/projects/WebSPA/wwwroot/images/serialport.svg new file mode 100644 index 00000000..8994cae0 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/serialport.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/smoke.svg b/projects/WebSPA/wwwroot/images/smoke.svg new file mode 100644 index 00000000..22ec2f3f --- /dev/null +++ b/projects/WebSPA/wwwroot/images/smoke.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/socket.svg b/projects/WebSPA/wwwroot/images/socket.svg new file mode 100644 index 00000000..11bbd4b8 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/socket.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/stop.svg b/projects/WebSPA/wwwroot/images/stop.svg new file mode 100644 index 00000000..e2994b17 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/stop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/switch1.svg b/projects/WebSPA/wwwroot/images/switch1.svg new file mode 100644 index 00000000..18ec7309 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/switch1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/up.svg b/projects/WebSPA/wwwroot/images/up.svg new file mode 100644 index 00000000..89c18ed8 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/up.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/zoomin.svg b/projects/WebSPA/wwwroot/images/zoomin.svg new file mode 100644 index 00000000..db3d4edb --- /dev/null +++ b/projects/WebSPA/wwwroot/images/zoomin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/images/zoomout.svg b/projects/WebSPA/wwwroot/images/zoomout.svg new file mode 100644 index 00000000..045ce5b2 --- /dev/null +++ b/projects/WebSPA/wwwroot/images/zoomout.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/index.html b/projects/WebSPA/wwwroot/index.html index f69b112a..55f8fc0c 100644 --- a/projects/WebSPA/wwwroot/index.html +++ b/projects/WebSPA/wwwroot/index.html @@ -22,7 +22,7 @@ diff --git a/projects/WebSPA/wwwroot/js/app.js b/projects/WebSPA/wwwroot/js/app.js index ef2ba7f6..bc190ce6 100644 --- a/projects/WebSPA/wwwroot/js/app.js +++ b/projects/WebSPA/wwwroot/js/app.js @@ -162,6 +162,7 @@ var onReturnBack = function (){ ) } } + // indexedDB兼容 var indexedDB = window.indexedDB || window.webkitindexedDB || window.msIndexedDB || mozIndexedDB || null; diff --git a/projects/WebSPA/wwwroot/js/store.js b/projects/WebSPA/wwwroot/js/store.js index b402974e..8c58730a 100644 --- a/projects/WebSPA/wwwroot/js/store.js +++ b/projects/WebSPA/wwwroot/js/store.js @@ -35,6 +35,7 @@ const store = new Vuex.Store({ update(context, model) { console.log('#########################################'+model.event+'#########################################'); console.log(model) + // alert('update'); context.commit(model.event, model); }, @@ -191,9 +192,10 @@ const store = new Vuex.Store({ */ dataEntityUpdated(state, data) { var model = data.model; + // alert('dataEntityUpdated'); // 节点 if (state.node) { - //alert('dataEntityUpdated node !!') + // alert('dataEntityUpdated node !!') let device = Enumerable.from(state.node.devices).where(function (o) { return o.id === model.deviceId; }).firstOrDefault(); if (device) { updateByKey(device.data, model); @@ -212,7 +214,7 @@ const store = new Vuex.Store({ * 接收数据上报状态变更 */ if (state.device) { - //alert('dataEntityUpdated device !!') + // alert('dataEntityUpdated device !!') let device = state.device.id === model.deviceId ? state.device : null; if (device) { updateByKey(device.data, model); diff --git a/projects/WebSPA/wwwroot/pages/home.html b/projects/WebSPA/wwwroot/pages/home.html index a9a184de..085b1ea1 100644 --- a/projects/WebSPA/wwwroot/pages/home.html +++ b/projects/WebSPA/wwwroot/pages/home.html @@ -2,7 +2,7 @@
-
关闭
+
关闭

消息({{store.state.messages.length}})

@@ -34,7 +34,7 @@
-
关闭
+
关闭

应用

@@ -63,7 +63,7 @@
-
关闭
+
关闭

我的

diff --git a/projects/WebSPA/wwwroot/pages/home.js b/projects/WebSPA/wwwroot/pages/home.js index 632365b4..ac5e0f25 100644 --- a/projects/WebSPA/wwwroot/pages/home.js +++ b/projects/WebSPA/wwwroot/pages/home.js @@ -4,7 +4,7 @@ // 异步加载本地消息 var timer; var height; - axios.get("/pages/home.html?v=3").then(function (response) { + axios.get("/pages/home.html").then(function (response) { resolve({ template: response.data, data() { @@ -47,7 +47,17 @@ logout: function () { store.commit('logout'); router.push('/login'); - } + }, + closeWindow: function () { + if(window.api){ + window.api.execScript( + { + name: window.api.winName, + script: "api.closeWin()" + } + ) + } + }, }, computed: { /* diff --git a/projects/WebSPA/wwwroot/pages/iot/device.js b/projects/WebSPA/wwwroot/pages/iot/device.js index 3f5bfed9..f6a1e69c 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device.js +++ b/projects/WebSPA/wwwroot/pages/iot/device.js @@ -113,8 +113,9 @@ }), onMessage: function (event, model, to, from) { // event : execApiResponse | dataEntityUpdated - console.log('@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') + console.log('@@@@ device.js @@@@') console.log(event) + console.log('@@@@ device.js @@@@') if(event === 'dataEntityUpdated'){ console.log('%%%%%%%%') console.log(event) diff --git a/projects/WebSPA/wwwroot/pages/iot/device/color-light.html b/projects/WebSPA/wwwroot/pages/iot/device/color-light.html index 8c2be7d4..ebc9aa89 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/color-light.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/color-light.html @@ -18,8 +18,8 @@
- - + +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/curtain.html b/projects/WebSPA/wwwroot/pages/iot/device/curtain.html index 27edfd8e..636ec3b2 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/curtain.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/curtain.html @@ -8,7 +8,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/gateway.html b/projects/WebSPA/wwwroot/pages/iot/device/gateway.html index 657a0ccb..d7806160 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/gateway.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/gateway.html @@ -6,7 +6,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/humiture.html b/projects/WebSPA/wwwroot/pages/iot/device/humiture.html index 21ca1636..948c7c53 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/humiture.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/humiture.html @@ -8,7 +8,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/light.html b/projects/WebSPA/wwwroot/pages/iot/device/light.html index ce838541..6cc7f3d9 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/light.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/light.html @@ -8,7 +8,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/person.html b/projects/WebSPA/wwwroot/pages/iot/device/person.html index 1e893403..42657217 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/person.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/person.html @@ -8,7 +8,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/smoke.html b/projects/WebSPA/wwwroot/pages/iot/device/smoke.html index 979abd07..23ac9df1 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/smoke.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/smoke.html @@ -8,7 +8,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/socket.html b/projects/WebSPA/wwwroot/pages/iot/device/socket.html index ab81c9c6..d82f037d 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/socket.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/socket.html @@ -8,7 +8,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/switch.html b/projects/WebSPA/wwwroot/pages/iot/device/switch.html index 4620e0e9..9d2df4f8 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/switch.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/switch.html @@ -8,7 +8,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/device/switch3.html b/projects/WebSPA/wwwroot/pages/iot/device/switch3.html index f358f1e9..f8f6b08c 100644 --- a/projects/WebSPA/wwwroot/pages/iot/device/switch3.html +++ b/projects/WebSPA/wwwroot/pages/iot/device/switch3.html @@ -8,7 +8,7 @@
- +
diff --git a/projects/WebSPA/wwwroot/pages/iot/node.js b/projects/WebSPA/wwwroot/pages/iot/node.js index 34f690b7..fec5b235 100644 --- a/projects/WebSPA/wwwroot/pages/iot/node.js +++ b/projects/WebSPA/wwwroot/pages/iot/node.js @@ -51,8 +51,20 @@ }); }); }), - onMessage: function () { - // + onMessage: function (event, model, to, from) { + // event : execApiResponse | dataEntityUpdated + console.log('@@@@ node.js @@@@') + console.log(event) + console.log('@@@@ node.js @@@@') + if(event === 'dataEntityUpdated'){ + console.log('%%%%%%%%') + console.log(event) + console.log(model) + console.log(to) + console.log(from) + store.dispatch('update', {event, model, to, from}); + } + //alert(event) } } } \ No newline at end of file diff --git a/projects/WebSPA/wwwroot/pages/iot/nodes.html b/projects/WebSPA/wwwroot/pages/iot/nodes.html index 62f321e2..3125545a 100644 --- a/projects/WebSPA/wwwroot/pages/iot/nodes.html +++ b/projects/WebSPA/wwwroot/pages/iot/nodes.html @@ -9,7 +9,7 @@
- +

{{node.name}}（{{node.count}}）

 diff --git a/projects/WebSPA/wwwroot/pages/iot/product.html b/projects/WebSPA/wwwroot/pages/iot/product.html index 43ac6b30..ef762f34 100644 --- a/projects/WebSPA/wwwroot/pages/iot/product.html +++ b/projects/WebSPA/wwwroot/pages/iot/product.html @@ -9,7 +9,7 @@
- +

{{device.displayName}}

 diff --git a/projects/WebSPA/wwwroot/pages/iot/products.html b/projects/WebSPA/wwwroot/pages/iot/products.html index 921a54a6..b998faed 100644 --- a/projects/WebSPA/wwwroot/pages/iot/products.html +++ b/projects/WebSPA/wwwroot/pages/iot/products.html @@ -1,4 +1,4 @@ -
+
@@ -9,7 +9,7 @@
- +

{{product.name}}（{{product.count}}）

 diff --git a/projects/WebSPA/wwwroot/pages/login.html b/projects/WebSPA/wwwroot/pages/login.html index 93d73d77..e39041fc 100644 --- a/projects/WebSPA/wwwroot/pages/login.html +++ b/projects/WebSPA/wwwroot/pages/login.html @@ -1,6 +1,6 @@ 
-
+
关闭