From 66a2954438f70ac1b44bab2fde6e4fadd74ffc9e Mon Sep 17 00:00:00 2001 From: dd <535915157@qq.com> Date: Fri, 1 Apr 2022 21:48:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=BE=E5=A4=87=E6=9C=AA?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceVariableVMs/DeviceVariableListVM.cs | 4 +++- IoTGateway/iotgateway.db | Bin 311296 -> 311296 bytes iotgateway.db | Bin 311296 -> 311296 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs index 6515368..c94f34d 100644 --- a/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs +++ b/IoTGateway.ViewModel/BasicData/DeviceVariableVMs/DeviceVariableListVM.cs @@ -45,10 +45,12 @@ namespace IoTGateway.ViewModel.BasicData.DeviceVariableVMs foreach (var item in device.Children) { var deviceThread = deviceService.DeviceThreads.Where(x => x._device.ID.ToString() == (string)item.Value).FirstOrDefault(); + if (deviceThread != null) + item.Icon = deviceThread._device.AutoStart ? (deviceThread._driver.IsConnected ? "layui-icon-link" : "layui-icon-unlink") : "layui-icon-pause"; item.Text = item.Text; - item.Icon = deviceThread._device.AutoStart ? (deviceThread._driver.IsConnected ? "layui-icon-link" : "layui-icon-unlink") : "layui-icon-pause"; item.Expended = true; + } } DevicesTree = GetLayuiTree(AllDevices); diff --git a/IoTGateway/iotgateway.db b/IoTGateway/iotgateway.db index f132ff4e3c85a1aec11d0a6ce964379ee79358cc..a3604a0b657bc894150e5e2a0ca3634dcde9d0ea 100644 GIT binary patch delta 885 zcmZo@5N>D?-oRqO#>hUMfqnXBE`wh7&gg;`Yw$^L2$e8GyjV$;iUR*v&xK z%+1tE*TmA)RoBtg*;Uuv*uvG+$iTwL+`!ExwJb9^H7v0xGchSA)hDyKB+S<{FS7)~ zn*L@vi;Ap?u7RO~k)f4|p_P%To~4DQrG=@ngIUv?lZV0rr|VX*#7qyVVo}wBnG)t( ztcT59J%qs;(+k$INKW=O=bGMM%_6Ohq%{Vs*5qQVoXosb1yh6R`SDB=D$e;usd`R{ z#i;>_>8U9Y*CrV0x#XkSVW|L88H1)$4{n?>#Jps%dEp_x&iQ#IsTC!9&PAz-C8=S) z8X=VhsS07fAWBEUKPf9UxkSM;1;&hy1#*gY6kIZsOEUBG5{oJmj1DQ zIjMC&@edd76CD9?V8m<)uMXANbK${W_$+X7Q zX!_Y|7F9`Dh=V*_l%JE6S_F)ql++4%%y3UXwt_`KA0c0i7BdJLcyJn8POqzB5oa{o zKCOnuka7CF`7G>;j^Lp2O)bgDPjM`+%uBXQkB|4sPY1?ZjiFJzp~iH9Iu`NC1$G?M zAH^}rO>bDwQak;_d=}p6+hUk9L6Q>Fed<{@PQMk)WDen8k7n}YwX!ng0;Y0C{u>PZ zH#T!QT;f+DCdD@eYzttVD?-oRqO#vs7Jz}L5#%b=HiJLgQ6?`$j#42(t7C(UEp3S=?tobElJX)6~O zkO@-B-?o{{;S&G!sQFAPO##~i80YviMo*tRpV3p)P}j&r!O+CY#L~*pLeIj$%);En Vu>JRZMj&PaV&?6?=d-XX000FvBsTy6 diff --git a/iotgateway.db b/iotgateway.db index 1fe84383c3456420936c8e3b5427366a89b30d98..a3604a0b657bc894150e5e2a0ca3634dcde9d0ea 100644 GIT binary patch delta 9062 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 delta 3798 zcmZu!33O9c8ot}xx3p;~r7dY8bi4nb8cSlyZ`(D@BhE={_iF4 zp@-}bJ!EgqO34NQRIwwU9U?m%Pu%2#*)P>@GE`zL1jeVvK4YD+usx-^$w(}8EMe9J zFfJO0jBQ4OSr-|J#DLj6umPYiZ>8r;63!oHE26K1FzDNYteRDW~Y{? zv7}ud`gem)Sc{wwSMR8X{7^C(7?T;^9flOof@;j+Kmj^wEgYOSZ*DB(S zvJvBM8Cx;pcXan!Sd{K@dHuN_f7l-idx9lFcWJQ9?=i2fg{n;e#wNXwe$Ldl!4)cl z6SbHmMKU58FH&5_22`ldOwrUg0a8@r+8Ew#Yh?8Cr(UU$G7tebjwLzCC- z^|(A~I9qEeHT; zErYO)YKW)Ul$ax@pbPlfOteIgmt-g`+1xJMl2o+OAaTqov2=&M%UIhJ&C}*&ve;h` zzqF$Ut+A&P%PP8&#B~#^^YJt^D3f0al9+KWj#IiLRk@gtn2K&Q;tg1h_3dYmN0KaC zdZUlEIqBVVY_S0UoPnZRV_Nq_?^||zPc$e)mRz z7jz|-lN0O8`nE-`FbmzGgE?AvB41e-+OsSoYIh=;CCuJG8x7JL6eZTraijdX*=V93 zPn8+C!#*XMaHi!e<)A5gJWWz!nU3^^!}-xrO;EENb8KJ zRS4nXW=AFLk9#i8C>AmX4up%1un?hRBf zh{_|#u3d(E@dQ+lkLlBdvhtX zo84(U*v6ci=-BbNkegY6V^Si1(wR7Qwuo>!ppZT|0y{|&j-fV0*tUgOa9xTc(vEE`=n2|<02L;NT_`4s%rF;LF-+TC>Pu7p#^Tn~ zGt7@}53nS=|Fw=7FEUznUyinZnhO$nxqa#SmzmqN2I-$r!n{kH}g$uwCa9l*|(LDSP$tJ70MlQnj;`Z_b z`DKDz5QJmG^XmQT7_k5x2OV%6EHX}TPbtqBTlpQrb>k7EhM!7nw&6m*_9lLs>?gCd zRpg4+tPR(CtKX@I)Q$gdpuX@u!6Vnx4cqXC1icHkFv&L2x@oL)t6s(}gg*rqGSmE| z&K+T<^Xzska|oB15AMVS(G^#b%6S1m>Gb_exS#cR>N0)eP1Jd|KXK%=ldEC2)k*zl zUcvX#>Pp7@=~!o{mh%30w`$NpIoDMWQ_k zikS}iNge+38oTq$598a39!lD2H9Kht8qI6sq`NHAw$aq zm1HLnqhhx3t#D9SC(IQ_2~L`O6sNUtK29cQ_=RNWujDwboBDEnnm$NR)7rF%`jz^& zx<OM$0 zNyQiN9^8iS#y8_$=xc=EMo*htkK*%?R{w*<0zVs0{gB zp-8l})K}^8S44tfC%yg?Zpn{ED*V1kY0%}4MguOtr_$%DC=Ie@C|D6F9Ts6oQLuwv zl9)(`uHkW*Uzilh-1z~nWAZk3sk9fOBBJf>F807e;^e@3CS+39Y=~TD#V2?_)CY(& zt=4(LSZv&Bcxms`IA2zCmG70q%0{J{PB@MGAaQ1UUM?q^Gtc8TpLl&G;AYYfCljHJuxkToq zlhRUYlB9@dJNs{%*lldg%N2T zK5s*!ecol;{WC5i`X^m0+jV^8m!2}k4*X-T0H=U{Pz5wQmw5AqV*Vfe1AISjE@5vc z_${`*JOX%*3`F>+u{`xwdIjp3AqPyOfLw{&}(Enq|sf>k2}(3 zq^oz4@mBirR+#zqE+Rns^BZKmxu}4|MQkJ2*n^YgF$9^Ub1h&?N~|AyU9;ZTBoT^Z zhR3M86g%le_O$GSXUv(?93C)WZe7##8FdX)XEjYPnbJ7x-l^eIcbR)YW8LIL^G7|X zw~X}9V^0v@ud!kSV?n>i9}HAPT+y4|<~2XzM=HX40QvKPKhK|MMV#d6$G0Opz1BuH zv$DlW=3gn9BtAo0NiGkCRX|w9yjBSI)~P*gv4VaX(TK3tWtUjFAkk9gq(|qH5$OS6 z*zGIv`rT!rU})&{C_FV|+gqk<9ytUP@t}*|Kc5ubILV~9EFccHvYV$DkQ|bz9r852 U@+|31TPLD?+E9bSI2`u;7Z{J;`Tzg`