From da7557ed1e136f4f685deaebd4105619d3910160 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Wed, 6 Nov 2019 12:12:46 +0800
Subject: [PATCH] update

Former-commit-id: 31d4729f112d42d0ecd91372dade5eb7d2570a80
---
 projects/Infrastructure/Infrastructure.csproj |   2 ++
 .../Views/Shared/EditorTemplates/Input.cshtml |   2 +-
 .../Views/Shared/_Footer.cshtml               |   2 +-
 projects/Infrastructure/libman.json           |   2 +-
 projects/Infrastructure/wwwroot/css/site.css  |  17 +++++++++++++++++
 projects/IoTCenter/iotcenter.db               | Bin 462848 -> 462848 bytes
 projects/IoTNode/iotnode.db                   | Bin 499712 -> 499712 bytes
 projects/lib/package.json                     |   4 +++-
 8 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj
index d9fd864d..8bd9d56c 100644
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@@ -40,5 +40,7 @@
   </ItemGroup>
   聽<ItemGroup>
     <EmbeddedResource Include="wwwroot\**\*" />
+  </ItemGroup><ItemGroup>
+    <Folder Include="wwwroot\lib\pace-js\themes\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml b/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
index deb1b900..6590c66b 100644
--- a/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
+++ b/projects/Infrastructure/Views/Shared/EditorTemplates/Input.cshtml
@@ -69,7 +69,7 @@
                         @Html.TextBox(prop.PropertyName, null, new { @class = inputClass })
                     }
                 }
-                @*@Html.ValidationMessage(prop.PropertyName, new { @class = "text-danger" })*@
+                @Html.ValidationMessage(prop.PropertyName, new { @class = "text-danger" })
             </div>
             <div class="col-sm-2">
                 @{
diff --git a/projects/Infrastructure/Views/Shared/_Footer.cshtml b/projects/Infrastructure/Views/Shared/_Footer.cshtml
index 64427fd4..598c52f1 100644
--- a/projects/Infrastructure/Views/Shared/_Footer.cshtml
+++ b/projects/Infrastructure/Views/Shared/_Footer.cshtml
@@ -7,7 +7,7 @@
 <script src="~/lib/linq/linq.min.js"></script>
 <script src="~/lib/jquery-validation/jquery.validate.min.js"></script>
 <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/unobtrusive-bootstrap.js"></script>
+@*<script src="~/lib/jquery-validation-unobtrusive/unobtrusive-bootstrap.js"></script>*@
 <script src="~/lib/jquery-ajax-unobtrusive/jquery.unobtrusive-ajax.min.js"></script>
 <script src="~/lib/fancybox/jquery.fancybox.min.js"></script>
 <script src="~/lib/jquery-datetimepicker/jquery.datetimepicker.full.min.js"></script>
diff --git a/projects/Infrastructure/libman.json b/projects/Infrastructure/libman.json
index 3318b366..aafe302d 100644
--- a/projects/Infrastructure/libman.json
+++ b/projects/Infrastructure/libman.json
@@ -145,7 +145,7 @@
     {
       "library": "../lib/node_modules/linq/",
       "destination": "wwwroot/lib/linq/",
-      "files": ["linq.min.js"]
+      "files": [ "linq.min.js" ]
     }
   ]
 }
\ No newline at end of file
diff --git a/projects/Infrastructure/wwwroot/css/site.css b/projects/Infrastructure/wwwroot/css/site.css
index f1397bd6..05e8e04e 100644
--- a/projects/Infrastructure/wwwroot/css/site.css
+++ b/projects/Infrastructure/wwwroot/css/site.css
@@ -1,3 +1,20 @@
+/*加载中*/
+.overlay i:before {
+    color: lightblue;
+}
+.overlay i {
+    color: lightblue;
+    -webkit-animation: rotation 2s infinite linear;
+}
+@-webkit-keyframes rotation {
+    from {
+        -webkit-transform: rotate(0deg);
+    }
+
+    to {
+        -webkit-transform: rotate(359deg);
+    }
+}
 /*表单label右对齐*/
 .col-form-label{
     text-align:right;
diff --git a/projects/IoTCenter/iotcenter.db b/projects/IoTCenter/iotcenter.db
index f11e34e1bdbc888ba2a48fd7dfd1b8885092ca63..1f54561416ecb86cd91ec6af763a8382c884c6a6 100644
GIT binary patch
delta 225
zcmV<703QE<pd5gp9DsxYgaU*Egam{Iv<A^B0yZ?4?jQy<w+AW)OS`vHwE<27x1i?+
z`2x3@x&gTZw^Hr~yb%%wN)6o##0Dh`It#T9O9;CKxV0b$9t8{rAOH*i7Y`o+6BBKh
zCk6*M0W+6h1_w3=U`PyA022|HSOo_z2skn5iL&UhgO&*gB?|@y1_lTS2K)d80GIp*
z2R#BcIF~yI2QinG1_x&Z2&DjUmIntp0ys6dI|m2G0|hcLE;TflkOT)bmpTgvJp?i_
bE;5&U3kP%sF*z<XGMB6k2QjxL3<ui-6FEGS

delta 241
zcmZozAkzRuEsQNpEzB(}Ev#GEE^0Cv8cctuz-F?YU5m|oHy4K}0}ya<goaLM<YZUb
z-td%7l9iET`>a=NC89!X>b!Tkj<EgVw&LE(=gqO3HE^o}yBw<&>lOxK2629QMqy!&
zcn_XX24Vh0FeN;FKP$T)vyrLE^!KdnI&2CIX$;bW)90|U8!=i=zre<>!^;K)92^`=
z8Q6g)O!s1CH)k}Q-o(moHhn4^dpb*=Gf(I=c6Li9bEECn?Ci&wSq&}p42-5vU|~0z
jZpF=R%L3$EOt0o<FJUz@)H5@gzJ{0GaJwoG`)y_b(?>WY

diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db
index 7893c10aa2afffaa45aa8164608ce3595e1c7075..4a94377ff8e04a0473bc053c4cd457a6dcdc32d8 100644
GIT binary patch
delta 324
zcmV-K0lWTyz#f3W9)N@agaU*Egam{Iv<8SJ0XMgaB?i)~1TthWF}GjQ2C4`MG-fb3
zIAbt3w-MR~^J)k%HZV9aVK6wi3`GYh4!1P30Zsz9f>j6k0=Ij(0l5RWG+YPG6G;F7
z03iV;01uK6CJws}APtWV7z~;W9t(*J4GMV){t1%_AqcPtK?l|cUjZft=mvKN3<aSD
zJ_OJNX#@fTn*%fg%>rft{sEVhArRb`LU;#04>dUExxeMQrW8_0CFH%1mq986B)55T
z2d4uFV1YvnRR9wamne1zE(ka==!vrEu!EOi)&?b)gmwqkmyvM?I|VU0E;BNh(QyYe
zm(6zvJOnZ^E;5%5cn39?0&)jF1u`%$H8ht+atAb*vv>z<m$YyPH~}-4?QjP+w;p*1
W;s%!^aR)d8HZ+%AaR)S}fCnJg?Pa<E

delta 353
zcmW-cO(+Cm9LDGK{lE6Z(#GZ@Vui!@&g|~Yh_-wcIcm#AEUm+m+Jl|J%F2)}k&pVH
zIZzykt@rBAg~J}4BxP?74o=GC={f(N-&1;MEqQfCS8`=nan%ahi;5O6N6E{zVk8;k
zGtcCTQj;;WFU~C9_)5NW)SPE#HqHzl7=`Y7A8iu6P?}C-rb;^b+$6N9BIU&?*oln8
zw9qb8WU(W38tSP(2>u3lgEX-3|M9Q;K7C6*vF@<0RjAN=NuopWC?1h7;*vJ?PMuIb
zlntd>zLCeIH)-{xy&;E#4p^dwYYrHAya|@1F?`yD1lk4YS9L9BB#;*%ju{&URLzPp
z9nWn@aLmJ{9Lj7B2hu_~+#>!9W2!<r17j;$J(;ML?`pT(I9nxAJX?XPU!Wu2t>v^3
uX~b~{m}KZ!biAor0aA*Gwy@WRBzEN?C7C)d<Uzx#4U7ENfp>CIg0?^Yt!5Vh

diff --git a/projects/lib/package.json b/projects/lib/package.json
index 86363502..cfe6a8f2 100644
--- a/projects/lib/package.json
+++ b/projects/lib/package.json
@@ -7,6 +7,7 @@
     "@fancyapps/fancybox": "3.5.7",
     "@fortawesome/fontawesome-free": "5.11.2",
     "@microsoft/signalr": "3.0.0",
+    "@aspnet/signalr": "1.0.3",
     "admin-lte": "3.0.0",
     "axios": "0.19.0",
     "bootstrap": "4.3.1",
@@ -30,7 +31,8 @@
     "tree-multiselect": "2.6.1",
     "urijs": "1.19.2",
     "vue": "2.6.10",
-    "metro4": "4.3.3"
+    "metro4": "4.3.3",
+    "pace-js": "1.0.2"
   },
   "devDependencies": {},
   "scripts": {