-
-
- {{model.Name}}
+ +
+
+
-
+
-
+
+
+
+ 
{{model.Name}}
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+ 
+
+
+
+
+ {{GetDeviceDataValue(device.Number,'温度','Description')}} +
+ 温度：{{GetDeviceDataValue(device.Number,'温度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}
+
-
-
-
-
+
云台操作
+
+
+
-
-
+
+ 
-
-
-
+
+ | - | - |  |
- - | - |
 |
-  |
-  |
-  |
-  |
-
| - | - |  |
- - | - |
+
+ {{GetDeviceDataValue(device.Number,'湿度','Description')}} +
+ 湿度：{{GetDeviceDataValue(device.Number,'湿度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}
+
-
-
-
-
-
{{device.DisplayName||device.Name}}
-
- 
- 
-
+
+
-
-
+
+
+
+
+
+
+ 
-
-
-
+
+
+
+ + {{GetDeviceDataValue(device.Number,'PM2.5','Description')}} +
+
+ PM2.5：{{GetDeviceDataValue(device.Number,'PM2.5','Value')}}{{ GetDeviceDataValue(device.Number,'PM2.5','Unit')}}
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+ {{GetDeviceDataValue(device.Number,'PM10','Description')}} +
+ PM10：{{GetDeviceDataValue(device.Number,'PM10','Value')}}{{ GetDeviceDataValue(device.Number,'PM10','Unit')}}
+
+
+
+
+
+
+
+ 
+
+
+
+
+ + {{GetDeviceDataValue(device.Number,'光照度','Description')}} +
+
+ 光照 {{GetDeviceDataValue(device.Number,'光照度','Value')}}{{ GetDeviceDataValue(device.Number,'光照度','Unit')}}
+
+
+
+
+
+
+
+
+ 
+
+
+
+ 
+
+
+ 正常
+
+ 红外 {{GetDeviceDataValue(device.Number,'状态','Value') }}
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+ 正常
+
+ 烟雾 {{GetDeviceDataValue(device.Number,'状态','Value') }}
+
+
+
+
-
-
-
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 云台操作
+
+
+
+
+ | + | + | |
+ + | + |
|
+ |
+ |
+ |
+ |
+
| + | + | |
+ + | + |
@@ -167,9 +389,9 @@
-
-
-
-
-
-
- 批量操作
-
-
-
-
-
-
-
-
-
-
- -
- - - +
- -
- - - +
+
+
+
-
+
-
+
+
- 批量操作
+
+
+
-
-
-
-
-
+
-
-
-
-
-
- - {{GetDeviceDataValue(device.Number,'温度','Description')}} -
-
- 温度：{{GetDeviceDataValue(device.Number,'温度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}
-
-
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
-
-
- - {{GetDeviceDataValue(device.Number,'湿度','Description')}} -
-
- 湿度：{{GetDeviceDataValue(device.Number,'湿度','Value')}}{{ GetDeviceDataValue(device.Number,'温度','Unit')}}
-
-
+
+
-
+
- 
{{device.DisplayName||device.Name}}
-
+
-
-
-
-
-
-
-
- - {{GetDeviceDataValue(device.Number,'PM2.5','Description')}} -
-
- PM2.5：{{GetDeviceDataValue(device.Number,'PM2.5','Value')}}{{ GetDeviceDataValue(device.Number,'PM2.5','Unit')}}
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
- - {{GetDeviceDataValue(device.Number,'PM10','Description')}} -
-
- PM10：{{GetDeviceDataValue(device.Number,'PM10','Value')}}{{ GetDeviceDataValue(device.Number,'PM10','Unit')}}
-
+
+
+
-
+
+
- {{device.DisplayName||device.Name}}
+
+
+
-
+
-
-
-
-
-
-
-
- - {{GetDeviceDataValue(device.Number,'光照度','Description')}} -
-
- {{device.DisplayName||device.Name}} 光照 {{GetDeviceDataValue(device.Number,'光照度','Value')}}{{ GetDeviceDataValue(device.Number,'光照度','Unit')}}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
- 正常
-
- {{device.DisplayName||device.Name}} {{GetDeviceDataValue(device.Number,'状态','Value') }}
-
+
+
+
-
+
+
- 
{{device.DisplayName||device.Name}}
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
- 正常
-
- {{device.DisplayName||device.Name}} {{GetDeviceDataValue(device.Number,'状态','Value') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 
{{device.DisplayName||device.Name}}
-
- {{GetDataValue(device.Number,'状态')}}
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
- 
{{device.DisplayName||device.Name}}
-
-
-
-
- {{device.DisplayName||device.Name}}
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{device.DisplayName||device.Name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
+
-
+
+
- {{device.DisplayName||device.Name}}
+
+ {{parseFloat(GetDataValue(device.Number,'电量')).toFixed(2)}} kWh
-
-
-
-
- {{device.DisplayName||device.Name}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{device.DisplayName||device.Name}}
-
- {{parseFloat(GetDataValue(device.Number,'电量')).toFixed(2)}} kWh
-
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
+
+
- {{device.DisplayName||device.Name}}
+
+ {{GetDataValue(device.Number,'状态')}}
- p?
z>H`5$5Fsj65S=PWD2jq;4=7M4-5jVC5hNZepmJ!0R1O@fqKKjjDLo;TwPPcW)jx+%
z|IGK8e`b89YusN8khBGmJ_7Xf`bce)HKeD?h?PM{AW%*_87o!HWzAyI9WvdtmIlpiA)7JX++fxxrm|+vu~Vs`
zoLllc*S{KX5zpi?sgap^{lMKgqV2e>-i^aW3&PX)i9bPvR{_5*D%xpY)kC63i)aJd
zn3$GZmf>ckkJe&s`?y!V3@eZT01~pY1mj-#CwQ|$0_$MERPv}#I(d|g<7en8EfP2p
z{6HVYwlCTfcuX7MKk|ffmVM3vyF+H>WFB<|_4!u$^6w$f9z@?LMEx4fNh?O<%1$3v
z<<%WN?DOG>+&_%A)%O$f_%J%S5#&TKjeBduD0;OS#K7BSzk!bhL;qD%ek*Rt*V8xU
z8*oFu0ec(zbtum!aPR+ayOzLF%9_KH0|xGBUlG%yA|4Sv{I-9=IbP+}=A?Gx)}-q1
z?u7^NO}I&$0TD3;^hNEOeoRd1_sVb{8%Y1zCp{;;sRLMRjCYItWC?b7mk#0*By~ei
zc@*CejV$lp8pYnNQ4)3<|3SX78^`799&FZ#^-s?`%jDv+0uROD{h%8xApLP|O{;46
zh*^>2Kk&mGggy@S2d@N~+-XoF2q#?3dCOK2Uf`{ti{t6#vAtS+|X9r}ZQ8jUD(LO-K#(-vu$
z_)Uz_31yD4#ZES%u;V3O23w=DTV)yCpLFDtDod-B9?ARtXuH%Hvv9`F$ra9AIYHS&
z#7^2-`8{P12VQ+;uYamLB4d=Lh?7aC<1zFx=Z+M$H$@0?UWg;NzMGNod&*WqAo9q`)
zSRY@`?(rM)u*}Hy1L2|urt^0}8^96N1XSBKP@(mS%s$>=>mb)|1
zI&xeDoCCfSay?2pWA3ooR_3e{_3R#t+GprxX3-D0*KHtMyfo4Bv2QDGWPSJ!?{?04
zBkoxzBKytOqfn=oz`yMAt;sN{u&W9J9z_g{7vPEt
zdBoq0w7(g@Ocl=Gn=Lwg9shdW20yMa(=)9>C|8S7kr$JAFRx>_*%oGbKY2C2hrXRY
z>UOzt=O&oxG}AHKL4(#Hxk$41c{_-Ea5=hw{O~L!pyPD7Xqy@gky=<=t6qdi25+lk
zO?piSR-PMo^%Cdh5r5p87K~rQcrftN-;z!|ChIrb~i{$he~O?eX7x=d=&$>eBgkx;l}nQ|nywZzpsCo|mZ0s9S_Ca!Ph(S(8-~Q00UsaVnjxQELg!
w=>3!?f$x=tcjQd}Yeu?vsi~9))FqqFgXx5NYSU_c%%!Cmr4ku^fzu!0M?6vFP5=M^
diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
index fd934023..a8ecdec2 100644
--- a/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
+++ b/projects/IoTClient/Assets/StreamingAssets/wwwroot/js/node.js
@@ -211,6 +211,14 @@ function updateItem(list, item) {
list.push(item);
}
}
+function deleteItem(list, item) {
+ for (var i = 0; i < list.length; i++) {
+ if (list[i].Id == item.Id) {
+ list.splice(i, 1);
+ break;
+ }
+ }
+}
/*event*/
$(document).on('change', '#camera', function (e) {
UpdateCamera()
@@ -258,14 +266,20 @@ connection.on("ServerToClient", function (method, json, from) {
onMessage(method, json, from);
});
function onMessage(method, json, from) {
- if (method == 'DataEntityInserted' ||
- method == 'DataEntityUpdated') {
- var data = JSON.parse(json);
- var device = Enumerable.from(vm.model.Devices).firstOrDefault(function (o) { return o.Id === data.DeviceId; })
+ var item = JSON.parse(json);
+ if (method == 'DataEntityInserted' || method == 'DataEntityUpdated') {
+ var device = Enumerable.from(vm.model.Devices).firstOrDefault(function (o) { return o.Id === item.DeviceId; })
if (device) {
- updateItem(device.Data, data);
+ updateItem(device.Data, item);
}
}
+ else if (method == 'SceneEntityInserted' ||method == 'SceneEntityUpdated') {
+ updateItem(vm.model.Scenes, item);
+ }
+ else if (method == 'SceneEntityDeleted') {
+ deleteItem(vm.model.Scenes, item);
+
+ }
}
/*vue*/
function init() {
@@ -327,6 +341,14 @@ function init() {
}
return null;
},
+ GetDeviceDataValue(number, name, attr) {
+ var device = Enumerable.from(this.model.Devices).where(function (o) { return o.Number === number; }).firstOrDefault();
+ var data = Enumerable.from(device.Data).where(o => o.Name === name).firstOrDefault();
+ if (data != null) {
+ return data[attr];
+ }
+ return null;
+ },
CameraSelected() {
console.log('camera selected:' + new Date());
UpdateCamera();
diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index 74a26d5d1dc7948cedcacf5a07d1bbd36b851a78..6b70828599d1823912dce9769f7b3eaaab243d58 100644
GIT binary patch
delta 1672
zcma)+ZBSHI7{|}KFX!A{?hC{sG6pQU8!xtW_XTz_29{+3Uq&OwwI(G+e9xR+G{M#i
zrWYEg2yyBpQ-~!h%_vMLCoN+$r{RMNNfS-uw20-j2Tr@-ZL
zlsR1iN13jd1uI+u-CLBwdCA=CYI7}OzbpQT&}DRLCZx0Q(6E=RQl
zB~wjNOVo8rC&`Gx8Jt!-kd;^^)94u(fdT*^mwefPY^|1akXp`hlXZAnf`qMnTJl#)
zrxH=-DVg$Z`K-KOj>^$^{qDX#kv13eo2E64jZjMoKM9l6ZjhpM0PUE1L2FPtw3)=>
z=dGM}ffYWZ(2hmC8ZXKq&4VzFo?OfapfQ|
zrMzQ6(C=iv9uo#*V#`KVzjEY@iT$mY-s!*E`nH+Wjj$mG^3dW60hR(Q5yPn53`_3?
zsR^S=CeLjrmAWV)$&?-i7ADPvF>I^C-%?)S`BQQp;PSZwOvjs_zt8>xiThXC8
zGfTi25AJfmb7#1ZxEHu5xEyh&aKqe2Jl$yh4D9;9Af4T4Fac@c`=GO;Fz6{G)((^-
zuEfj0{`e(`D;P$}Zym@kFshk)S<7(hl4$ma=nBt{;B2z%0J4jF*wLR;_#VTNDI^Sg
z41Cy7iB751Gn^J&#c*2Cc@T|Cg3tyQ60sjWMOO5q0NvYa
zA9-}}I9iAVApn9zj3LK^c$r*{|CY1CdDsLW$KPq=(2fr$^lGocGh}HD*>d>P$~83C
zaFJLdT9kSCRV9<_nsO62{BO|C7&^oYh=L`g@-!QrQ63GSMpc|3<*-qfZ(*Zc{2I+?
zW;w+_Ngf$yTVj+?7Dd>}_F*(%6tp8O^PHc{r8m!_p=obg%eXvpVFcN+<^;0=1wnYUWNb5(3G|X@-ClBJ68ybV~s5;v}zE
zFLJHX>#1CU+eAa~N7A(buQ#ZHnit|fghx>cNCxAaHb-q#PAQ69n6TE|W12A8r7->s
z-4+{#Uj8ROms<_@f^jguJ1g-Z9q)(h;&PwTz*0PvR>kzJa3`nj((LL9HB)I*Qsq5z
zdcqqCvbo80*VJLMN`2@>{4K6U*Wpg76eWs1Vwo@|Y!XDii}!M)+y)LZ@s$$V0U{xg
zno4LGI|W_$=;T@$djzQzL`c&%?0vvhnD263IzBXU;((=Qp8c1TZ3ON^Hfd{1sT=~c
zQ^^gM#j_-m-G~e5od`b9k<19*OnRQjYsuJFyn&du;b+Z2+SKwGD@jc@n(4gPSrqR@
zmN(*J!I|&$k@p*MnD;O#tqFHa&$akjdU^`ku?@SET;BYG|BgX3w&R}>c`Jg8xB{IF
zN3dtG8N0Q8V;p@UnjJt~(F0mU_6ZfT9$1s-+F^dwk7ytDS85-AN
delta 1306
zcmXX`YfMx}7`-!h?l+g+d+)5ezN!ecySl#UE-WiptE+-2Myl3rnu_T1)M|AXU$ivJ
zR)w_j0rWA^v`7_GZKAA-O#M;asEMY6&qSNXRMW&~Mf<0k7>%8UCilllW^%rB&Ufb4
zCq~uFuM-i+apHZM_MI0KLA>bIu53k7h8T5<@yv``O-3EFn`zcyYpPXk?lB*;4(lZQ
z-TKRDH)k6?=2_Oj{A|hb3`e0M>bg-B@$?q(G&(OK;k<-l&8$U0>{Hsj_cc7_GmWvjxPWqB-{
z^@a60=((;_x9l
z#!KQbQ~Vf*UX{pf5dW$MT%xNJUJ^1^4PnuB66ONY7brzsOTa`I2)fvqPhT5jlxwIK
zy+?1bo9qa3lU4Mv{Se!Rx^)jPPJk<&%uvsnf5T++jI2vko2og@*>tO!hFgtiMvu`h
z_9Wn-+Bb#IItQcs=S9vzA?6E?!Uw`U4u9NAtjZiB1O?tLcFP!x_J3*2$0G$xuG9!L&dUWU~aAjX@+hG+a4Um?R<2Qy2QdD
zeS%mxHcV0s8ZeTD4;tvvLZIr;H^b;Iaw1MVhGz@
z`kV}q907@g(L{WFES@*#9UyqV_V++5zhnfe8)q1UjgwJQ9;db(2AJCqgDAmek^)3@Ql
zm&YE&xA0{*z@2>4D?>^KpT3?}@qruY3bHyDGr6vom>jl;-fq8|V}=DKpQ{Cv2n<)tBk#dpFXyWZY|bOiEMpyje+&0dcgJ-hr-q
ziX0j8G>bk`WbF>KE$k!aWz_o9I$>?M%B{(|({k`PnrM;yA8evL(Wz$bWwk;
-
@section scripts{
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index 92245dd417a4c66b6b32c31e75ce4aab8d329165..561a2db4ea73c832e61775913d9760b53f21adff 100644
GIT binary patch
delta 1064
zcma)4OKclO7@pV8c
-
-
- {{device.DisplayName||device.Name}}
-
-
+
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+