From 0b551023f9beda7b49a5937aeaea3724317edc5c Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Sat, 21 Sep 2019 18:46:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8A=82=E7=82=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80=E5=92=8C=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: dede8a3fab1109bcf078d92fe2d71c8434bb9f21 --- projects/IoTCenter/Views/Home/Node.cshtml | 19 +- projects/IoTCenter/wwwroot/node.default.html | 459 ++++++++++-------- .../StreamingAssets/IoT.Resources.csproj | 5 + .../StreamingAssets/wwwroot/images/batch.png | Bin 0 -> 338 bytes .../StreamingAssets/wwwroot/images/light2.png | Bin 0 -> 683 bytes .../StreamingAssets/wwwroot/images/ptz.png | Bin 0 -> 807 bytes .../StreamingAssets/wwwroot/images/scene.png | Bin 0 -> 571 bytes .../wwwroot/images/switch2.png | Bin 0 -> 557 bytes 8 files changed, 265 insertions(+), 218 deletions(-) create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/light2.png create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/ptz.png create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/scene.png create mode 100644 projects/IoTClient/Assets/StreamingAssets/wwwroot/images/switch2.png diff --git a/projects/IoTCenter/Views/Home/Node.cshtml b/projects/IoTCenter/Views/Home/Node.cshtml index 61be5d41..9c512072 100644 --- a/projects/IoTCenter/Views/Home/Node.cshtml +++ b/projects/IoTCenter/Views/Home/Node.cshtml @@ -73,19 +73,16 @@ padding: 11px 0; } - .btns { - padding: 10.5px; - } - - .btns .btn { - margin: 18px 0; + .ptz img, .control img { + cursor: pointer; } - .ptz img, .control img { - cursor: pointer; + form .label1 { + line-height: 50px; + vertical-align: middle; } - label.button input { + .ir label input { display: none; } @@ -102,7 +99,7 @@ input[type=range] { -webkit-appearance: none; - height: 25px; + height: 50px; } input[type=range]::-webkit-slider-runnable-track { @@ -119,7 +116,7 @@ height: 16px; width: 16px; border-radius: 50%; - background-color: Highlight; + background-color: green; margin-top: -5px; } diff --git a/projects/IoTCenter/wwwroot/node.default.html b/projects/IoTCenter/wwwroot/node.default.html index 976f167e..26be8f9f 100644 --- a/projects/IoTCenter/wwwroot/node.default.html +++ b/projects/IoTCenter/wwwroot/node.default.html @@ -1,27 +1,65 @@ -
-

{{ViewModel.Name}}

+
+
+

{{ViewModel.Name}}

+
- -
- +
+
+ +
+ +
+
+
+
+
+
+ 云台操作 +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+
-
-
+
+
- +
-
-

{{GetData('温湿度传感器',null,null,'温度','Description')}}

+
+

{{GetData('温湿度传感器',null,null,'温度','Description')}}

-
+
温度：{{GetData('温湿度传感器',null,null,'温度','Value')}}{{ GetData('温湿度传感器',null,null,'温度','Unit')}}
@@ -31,12 +69,12 @@
- +
-
-

{{GetData('温湿度传感器',null,null,'湿度','Description')}}

+
+

{{GetData('温湿度传感器',null,null,'湿度','Description')}}

-
+
湿度：{{GetData('温湿度传感器',null,null,'湿度','Value')}}{{ GetData('温湿度传感器',null,null,'温度','Unit')}}
@@ -48,12 +86,12 @@
- +
-
-

{{GetData('光强检测器',null,'前门','光照度','Description')}}

+
+

{{GetData('光强检测器',null,'前门','光照度','Description')}}

-
+
前门光照：{{GetData('光强检测器',null,'前门','光照度','Value')}}{{ GetData('光强检测器',null,'前门','光照度','Unit')}}
@@ -63,12 +101,12 @@
- +
-
-

{{GetData('光强检测器',null,'后门','光照度','Description')}}

+
+

{{GetData('光强检测器',null,'后门','光照度','Description')}}

-
+
后门光照：{{GetData('光强检测器',null,'后门','光照度','Value') }}{{ GetData('光强检测器',null,'后门','光照度','Unit')}}
@@ -80,12 +118,12 @@
- +
-
+
-
+
前门人体：{{GetData('红外感应器',null,'前门','状态','Value') }}
@@ -95,214 +133,175 @@
- +
-
+
-
+
后门人体：{{GetData('红外感应器',null,'后门','状态','Value') }}
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - -
-

该摄像头不支持云台

-
-
-
-
- -
-
-
-
-
-
- +
+
+
+
+

批量操作

+
+ + +
+
-
-
-
- +
+
+
+
+ 场景 +
+
+ +
+
+
-
-
- +
+

一路开关

+
+ +
-
-
-
-
- +
+
+
+
+ + +
+
+ {{device.Name||device.DisplayName}} +
+
+
-
-
-
-
用电:
-
-
-
-
-
-
- +
+
+
+

三路开关

+
+ +
-
-
-
-
一路开关:
-
-
-
-
-
-
-
- - -
-
- {{device.Name||device.DisplayName}} +
+
+
+
+ + + + + + +
+
+ {{device.Name||device.DisplayName}} +
+
-
- -
-
-
三路开关:
-
-
-
-
-
-
-
- - - - - - -
-
- {{device.Name||device.DisplayName}} -
-
+
+
+
+
+

插座

+
+ +
-
-
-
-
插座:
-
-
-
-
-
-
-
- - -
-
- {{device.Name||device.DisplayName}} +
+
+
+
+ + +
+
+ {{device.Name||device.DisplayName}} +
+
-
- -
- + +
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+ +
+
diff --git a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj index 2d132979..4fed1a7b 100644 --- a/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj +++ b/projects/IoTClient/Assets/StreamingAssets/IoT.Resources.csproj @@ -12,7 +12,12 @@   + + + + + \ No newline at end of file diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/batch.png new file mode 100644 index 0000000000000000000000000000000000000000..4003d3a73d40326f7ea10d920de8e18c885ff299 GIT binary patch literal 338 zcmV-Y0j>UtP)%tdr$6@w^u^R zm6WWH1z-kDjo=%gon31M&>jMbDG6&$Apl2U9;2QL7XlEed%fN4fS$BzRNVpNbgda+ z4Xl7|Bt#47WqSS=fO;p8nDPb90Civ=qx{73V1NZsGYD$Q63}{;*?|)CZmYXATM07*qoM6N<$f{by8WB>pF literal 0 HcmV?d00001 diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/light2.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/light2.png new file mode 100644 index 0000000000000000000000000000000000000000..e6f66bf88ad6e76dd059e249219d83ee5f3e312f GIT binary patch literal 683 zcmV;c0#yBpP)TMewlPw|1#Gjd zh~}Yj?KDboW|BH!Q@r&2@%zo^_vV`+Jb{Py!DwDiTL$JQ` zH|ZHfpL7G*xgXv)44PJM=U_MP; zCs6gTH6%2D*}n?O;IG6q%9UV3hk#cqWftvKhGgIe6S~QnJzfPey~z;~0s_5I!d4YB z1-xstl6UPS&0)bOOwzqnO z4WgTkYE}`F8Q){qZmFtpz7Uodj)?HO5VVSrVEP!jhl8f~?E{G476s3Y>)5rsg=#M< zm7XE^v(+_QdCL#So2uwSaX%awz_4CQg0G^!(`)*Z0H8u|%fOeoZ+B{`B!g#h-)Spz zGIKI2#VczDaw}G>(!JWXt*$b+nB{)R$I@7vt2vkDY_?C{5Yqj#_^D)d&BB$Sv1?na zzpWq~OBZDMlUt<`NLQ?i)pbdesBcqxxEAwX{#qD~AUSK#ntsSiOIHU-L5;QqTJx^M zsc9U{<9`BDR$748AOUVEbFtE9Kuex2I#oRxz$CK zD!PJpdER7jSLb3`PEk5!9+x!Pcs4)Ukz>QK#_V@aY14Q123bDb?lV3K$Y0>6l`wXO R5orJb002ovPDHLkV1oU9JPiN< literal 0 HcmV?d00001 diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/ptz.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/ptz.png new file mode 100644 index 0000000000000000000000000000000000000000..89f8b151959a14e7654240f49ae704dddb22a949 GIT binary patch literal 807 zcmV+?1K9kDP)6;9LrEZ!QtmO|Yp=A|E4^#c#GCHd_kBO_bMKGu5q%zG+0yIk#lZGi`p)-WOtF_m z?wavju|RNMfGz2MIW<=ZYp-X3iCl40;1UGDSP@PHCBj1V1Yn%QIIkZK2B9oyAq+%l z0IzeyAnAK%bDqNx10zJ5L-WpS%cMM*Ptyu zvA`)1uLOM7c_hifi@XbAo|jW|n>Pkv3{7N9t0K~p(#E*Cb^(r8W)lXIgVhg?3g?mJ zjVj<5i5H+-w0_S6e}aDw;6w*a+LdUglaxUfh~@T^kUfb?bjxeYSAmvn7uJqav#Y%- z5X%!}2=ue!Lt5LI_@6(r7` z^YLscPvYU<2QWiZAXy)vwLyxZH$NwbhO1u)-mcxzsSRaFYyaAqq-BCjg1&)FU-$0i zrA7ycb&H&Fm9T-A4Z&+|^s1K!nQB3Ez_ESnVwYsRd6t-V-txu6LIeeHcTQgC=DIEA zybuuI9;Ie{v21afW@MvW=(=GarIpDXjb*j}io)(yF*^)JtT98&A z4#1~RK-!_jXR@&eYQ(K`0ViT4-YI#T0}Pb|K7Hc1q#+WgBuAYdYMd+h4@xM2s}iks zOfx%-OVitXaUSXuG|T2H0dd})o?#<*?S)prU0Cby)n6n=j1q$Gh504x8^E2S!^4+b lwry{mytum)r0l%!`~gjg{jhK4)hPe~002ovPDHLkV1mEXbRhr$ literal 0 HcmV?d00001 diff --git a/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/scene.png b/projects/IoTClient/Assets/StreamingAssets/wwwroot/images/scene.png new file mode 100644 index 0000000000000000000000000000000000000000..bf147c4aeebf56c0ad8f8c4dd731696127d2dbcf GIT binary patch literal 571 zcmV-B0>u4^P)U;AeQbpLvfkbQ_$ zNnG6oe#g3P_Z8%;T_++tuM(io$5kYM+ls70$eZr=p(6>SrXqjXwFrL7)N7ifn$ag? z&CS~}3GD=cZ*mE+fS_tX5}K|*a3mQp0e%U+ra7p^Hn!D|h6EdqglL(A`lVf4>%l}r z7$*vsfEOhV)6V!Vti9q&1!~*tAuzm5|pmR15(jc(= z5Nvb|;-do)o@OlWDDsP~oWeo6zsiYXwn72EPlCD=veZY&)gN=+Ayi*s}QF- zOs#Z%{Nq*au*?N?KxH6FoNdW#$R5jOB^(_K@LnLTl*m=D==$s0^4mLI2s;^TwRw98 z1#z)NzAf@z5L-B41=v1|$WW#mt(2(Jj|KquXGdu{ro+h1!2Fn*d*XA&9te1h=zoZy zt%jt#rR+oDFgw-rQ{o2jerzdMU}WlbvNN>6eI`bIHfk%%+jS3DUOambd;sNh-h_3( zR|+T{C>NklDk~oVT@yL# z)M7({gA-PYiyY8RRXsDky|dFpZ29As>tjb?r@*5Mcpq*&?EgG4RIN;-=3;{H&(70# z^>kgH-w1f8H#L)I??JX*3k&*6G0vd`hKb411XUB*qVzd8m7}ye zX9T?dRl|^9p0fBnx9u(NXG00?Gz>0h1ga#57)OF3HE;x>LqV5h(@MpFX%TJG`M00000NkvXXu0mjfaWDj2 literal 0 HcmV?d00001