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 @@ 聽 + + \ 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" })
@{ 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 @@ - +@**@ 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 f11e34e1..1f545614 100644 Binary files a/projects/IoTCenter/iotcenter.db and b/projects/IoTCenter/iotcenter.db differ diff --git a/projects/IoTNode/iotnode.db b/projects/IoTNode/iotnode.db index 7893c10a..4a94377f 100644 Binary files a/projects/IoTNode/iotnode.db and b/projects/IoTNode/iotnode.db differ 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": {