From 10477ebe905fb9581863bdd5bad2652409366c59 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Sat, 26 Oct 2019 18:37:41 +0800 Subject: [PATCH] update Former-commit-id: a2aa3463ceb8cc030280a16d50e7c8b5655bb3e8 --- projects/Infrastructure/Infrastructure.csproj | 1 + .../Shared/EditorTemplates/Object.cshtml | 2 - .../Views/Shared/_Footer.cshtml | 3 + .../Views/Shared/_Header.cshtml | 2 +- .../Views/Shared/_Layout.cshtml | 2 +- .../wwwroot/lib/linq.js/linq.js | 3042 ----------------- .../wwwroot/lib/linq.js/linq.min.js | 126 +- .../IoTCenter/Controllers/HomeController.cs | 95 +- projects/IoTCenter/Views/Home/Index.cshtml | 77 +- projects/IoTCenter/Views/Home/Node.cshtml | 144 +- projects/IoTCenter/Views/Home/Nodes.cshtml | 75 + projects/IoTCenter/Views/Home/Product.cshtml | 136 +- projects/IoTCenter/Views/Shared/_Menu.cshtml | 23 + projects/IoTCenter/appsettings.json | 2 +- projects/IoTCenter/configuration.db | Bin 12288 -> 12288 bytes projects/IoTCenter/iotcenter.db | Bin 544768 -> 544768 bytes projects/IoTCenter/wwwroot/node.html | 57 +- projects/IoTNode/Views/Shared/_Menu.cshtml | 16 +- projects/IoTNode/appsettings.json | 2 +- projects/IoTNode/iotnode.db | Bin 491520 -> 491520 bytes 20 files changed, 326 insertions(+), 3479 deletions(-) delete mode 100644 projects/Infrastructure/wwwroot/lib/linq.js/linq.js create mode 100644 projects/IoTCenter/Views/Home/Nodes.cshtml create mode 100644 projects/IoTCenter/Views/Shared/_Menu.cshtml diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj index f7f4d1d6..fbe94a45 100644 --- a/projects/Infrastructure/Infrastructure.csproj +++ b/projects/Infrastructure/Infrastructure.csproj @@ -43,6 +43,7 @@   + \ No newline at end of file diff --git a/projects/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml b/projects/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml index 1205c574..3be55674 100644 --- a/projects/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml +++ b/projects/Infrastructure/Views/Shared/EditorTemplates/Object.cshtml @@ -25,12 +25,10 @@ { BackUrl = Url.Action("Index", null); - 返回 } @if (controller == "Account" && action == "Login") diff --git a/projects/Infrastructure/Views/Shared/_Footer.cshtml b/projects/Infrastructure/Views/Shared/_Footer.cshtml index ef2997fe..81c109a4 100644 --- a/projects/Infrastructure/Views/Shared/_Footer.cshtml +++ b/projects/Infrastructure/Views/Shared/_Footer.cshtml @@ -1,5 +1,8 @@ + + + diff --git a/projects/Infrastructure/Views/Shared/_Header.cshtml b/projects/Infrastructure/Views/Shared/_Header.cshtml index 9b921993..d3f1b6b5 100644 --- a/projects/Infrastructure/Views/Shared/_Header.cshtml +++ b/projects/Infrastructure/Views/Shared/_Header.cshtml @@ -1,4 +1,4 @@ - + diff --git a/projects/Infrastructure/Views/Shared/_Layout.cshtml b/projects/Infrastructure/Views/Shared/_Layout.cshtml index 1b7f754f..8e73b1e8 100644 --- a/projects/Infrastructure/Views/Shared/_Layout.cshtml +++ b/projects/Infrastructure/Views/Shared/_Layout.cshtml @@ -7,7 +7,7 @@ @RenderSection("styles", required: false) -
+