From 436f42b45542ee42c3d2f6036177f0d021c2074c Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 17 Apr 2019 17:41:54 +0800 Subject: [PATCH] update beta.102 --- projects/Demo/Demo/Demo.csproj | 2 +- projects/Demo/Demo/wwwroot/css/app.css | 41 +- projects/Demo/Demo/wwwroot/index.html | 467 +++++++++--------- .../{index - 复制.html => index2.html} | 426 ++++++++-------- projects/Demo/Demo/wwwroot/js/app.js | Bin 15388 -> 22552 bytes projects/IoT/IoTNode/appsettings.json | 2 +- .../IoTServices/APService/appsettings.json | 2 +- .../LiChuangService/appsettings.json | 2 +- .../src/main/resources/application.properties | 2 +- .../IoTServices/ONVIFService/appsettings.json | 2 +- .../SerialPortService/appsettings.json | 2 +- .../IoTServices/WinService/appsettings.json | 2 +- .../IoTCenter/Controllers/HomeController.cs | 9 +- projects/IoTCenter/appsettings.json | 2 +- projects/StudyCenter/appsettings.json | 2 +- projects/UserCenter/appsettings.json | 2 +- 16 files changed, 489 insertions(+), 476 deletions(-) rename projects/Demo/Demo/wwwroot/{index - 复制.html => index2.html} (65%) diff --git a/projects/Demo/Demo/Demo.csproj b/projects/Demo/Demo/Demo.csproj index d149abe4..8c310f2c 100644 --- a/projects/Demo/Demo/Demo.csproj +++ b/projects/Demo/Demo/Demo.csproj @@ -20,7 +20,7 @@ - + diff --git a/projects/Demo/Demo/wwwroot/css/app.css b/projects/Demo/Demo/wwwroot/css/app.css index 761a0470..083e9d00 100644 --- a/projects/Demo/Demo/wwwroot/css/app.css +++ b/projects/Demo/Demo/wwwroot/css/app.css @@ -1,29 +1,26 @@ -@font-face { - font-family: 'Material Icons'; - font-style: normal; - font-weight: 400; - src: url(../fonts/MaterialIcons-Regular.eot); /* For IE6-8 */ - src: local('Material Icons'), local('MaterialIcons-Regular'), url(../fonts/MaterialIcons-Regular.woff2) format('woff2'), url(../fonts/MaterialIcons-Regular.woff) format('woff'), url(../fonts/MaterialIcons-Regular.ttf) format('truetype'); -} - -.c-home-menu-list col { - text-align: center; -} - -.c-home-menu-list a { - display: block; - text-align: center; - color:#000; -} -.c-home-menu-list i { - font-size: 50px; - color:dodgerblue; -} - .field-validation-error, .field-validation-valid{ color:red; display:inline-block; height:20px; padding-right:1px; font-size:small; +} +.row{ + text-align:center; +} +.block-strong .row .button { + margin: 5px auto 0 auto; +} +.text-align-center { + text-align: center; +} +.float-left{ + float:left; +} +.float-right{ + float:right; +} +.col{ + text-align:center; + padding: 3px; } \ No newline at end of file diff --git a/projects/Demo/Demo/wwwroot/index.html b/projects/Demo/Demo/wwwroot/index.html index e418619c..3fa0fa55 100644 --- a/projects/Demo/Demo/wwwroot/index.html +++ b/projects/Demo/Demo/wwwroot/index.html @@ -19,17 +19,17 @@ - + {{Title}} - - - + + + - + - - - - - - + + + + - - - - - - - - + + + + + + @@ -148,8 +144,229 @@ @@ -165,215 +382,5 @@ - \ No newline at end of file diff --git a/projects/Demo/Demo/wwwroot/index - 复制.html b/projects/Demo/Demo/wwwroot/index2.html similarity index 65% rename from projects/Demo/Demo/wwwroot/index - 复制.html rename to projects/Demo/Demo/wwwroot/index2.html index 571cef0b..3992cc35 100644 --- a/projects/Demo/Demo/wwwroot/index - 复制.html +++ b/projects/Demo/Demo/wwwroot/index2.html @@ -2,28 +2,28 @@ - - + - - - 首页 + 首页 - - - - - - - - 科学技术学院 - +
@@ -283,226 +294,225 @@
- - - - - - - - - - - - + - - + + - + - --> + } + }); + + \ No newline at end of file diff --git a/projects/Demo/Demo/wwwroot/js/app.js b/projects/Demo/Demo/wwwroot/js/app.js index 552572b0f04b357b0b824d853852cc313bed11ec..9fb73cab75eecd73ffc7ea8adca0e8c360779205 100644 GIT binary patch delta 3170 zcmcIm-EUK67=OEUJ+<^>?beS`T)VRMv~=s|aBJrn!xBc+?|K$x(I zAzT^b`rMFcls`ZdmdTyh#(3d{iF#uQ!y7M10Aq|-!{76sbJ~3rqlu(BZQu7i@ALWl zJW}XN}SSOCw)P5ohV=z8C#Gdk z1tj^Tn56ZV9Bs5XX~XQHC2v3V=i2FE-b`P6Unft-M-ks)MNc#RYU!c(b7m^}PSb|T zN)xd?%_tPDs$N=(Md-7bkM1d+o&)LCCdNTbvHYP6ZBe zwJ*_CZ7irMWVOBroELN!%If?1k)%{>CW7N`5b@7i1HLSXgvz zQM-~)P&jKF)>LXH-vpFSBR^&7SWFn}BFu6gw;E20F^Vgp(Rn~HEZ)PzkX@7*FJUzg zZMs8P4a?6CSMlZwjo1@#*Kb78$W?$0A}&KDDNZ0{Fv&UsBv`wcs6|+wm6qyObUAUJ zj`=$1mNg6|?z)oW$nu<61R)c2&>Da$bKFpqkm-s*AwLYBZRhA%Tbx?M9-46UGU%Z? zR2N~ySAh323@jikbI3<&v!VRIG1OSgBijItJCbaaehD}gJ$e}0?mvt4z|zGUgN)>9aDNJQC;`WMA7F&impMOOPkZQ^yM5Ot#>iUXth)WI zW}_k-FSA8w2VHghgC$r%A8f=3&V5dMo0ML#t&8FnFfIn4>gP0`_K6IJ0<&X1-R4cg z3P*HCdL9-B@Fq=~sik>6%_Kk+#m+F!*1Ib+4tkM##x86~W84RNr;KVt6rr_ob)-@gYKY~4N zS~hIOK|@OvF3+HlM!Uv}gWNGdAMFb=I56Whe>Fg)Q)WMhHVrRkWRUO3mQY52MMvzZ ztsui-*}T3iF3Y5-l!>X0BJDAJ+!^VMDB~=wB2M}|;oWtl9s`*IewEk8X&y}fkcpwX zoEAkr7uvf1zG0@&gS?x=(y*iomC?M{D4@~WqP5mmJ0md#9zH4ME+gfm5-2k9Ap^Zn zE%^x}>?bE*^XGpkLCCNb)q%9F1PqW=QF3ch2U5M87=wCqw*tHAWt&RNgE2)vN4E!u zm{v!&R)p^@TvleU=EYnMIFp-bVOT#2=}Gi30L-Y{(*(c(o%P4a?te%p0tksoRuUa^cPAI1A{wN>YW$;xS6&*BDaMFkS({$4l<*~NoefT*H RUr(n@$8svY_WQs-^WO=)wwM3_ delta 381 zcmbQSfpJa+)Bk@Hm&8nFVicR4;LI|4fdS9v7A6nI$)A|TCikfFO%j*eEWl#LESSbn z%8#qYqXR zz;%szvj!gv$7Bt$AHt;!xeQ4_6-5kIKvks-ISe_I1NBuWZ?G4boF!p0d4)sg0_Q#*>32WhMt0vP_;QnKoHQOkgsXfyQJ#3%<#_^dC)(@Zc?DNCX o.Sences) .Include(o => o.Devices).ThenInclude(o => o.Data) - .Include(o => o.Devices).ThenInclude(o => o.Apis).ThenInclude(o => o.Parameters) - .FirstOrDefault(o => o.Id == id); + .FirstOrDefault(o => o.Number == number); return Json(model, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }); } } diff --git a/projects/IoTCenter/appsettings.json b/projects/IoTCenter/appsettings.json index d19ef3bc..6988b919 100644 --- a/projects/IoTCenter/appsettings.json +++ b/projects/IoTCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.101", + "version": "1.0.0-beta.102", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/projects/StudyCenter/appsettings.json b/projects/StudyCenter/appsettings.json index 1b2bde0a..2294483f 100644 --- a/projects/StudyCenter/appsettings.json +++ b/projects/StudyCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.101", + "version": "1.0.0-beta.102", "Logging": { "LogLevel": { "Default": "Warning" diff --git a/projects/UserCenter/appsettings.json b/projects/UserCenter/appsettings.json index cbad46dd..f0d88a38 100644 --- a/projects/UserCenter/appsettings.json +++ b/projects/UserCenter/appsettings.json @@ -1,5 +1,5 @@ { - "version": "1.0.0-beta.101", + "version": "1.0.0-beta.102", "Logging": { "LogLevel": { "Default": "Warning"