From 1848da8daae48db87a0a698084e03bd3aa1e8f5f Mon Sep 17 00:00:00 2001
From: hehongxing <hehongxing@pc.com>
Date: Fri, 29 Apr 2022 15:41:09 +0800
Subject: [PATCH] commit

---
 04.系统编码/App/App.csproj                 | 18 +++++++++++++++++-
 .../App/Content/scripts/beijing/map.js         |  2 +-
 .../App/Content/scripts/menggu/map.js          |  2 +-
 .../App/Views/Shared/_Layout.cshtml            |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/04.系统编码/App/App.csproj b/04.系统编码/App/App.csproj
index f250d03..65d2c4b 100644
--- a/04.系统编码/App/App.csproj
+++ b/04.系统编码/App/App.csproj
@@ -236,6 +236,14 @@
     <Content Include="Content\styles\reset.css" />
     <Content Include="Content\styles\user-management.css" />
     <Content Include="Content\thirds\ajaxfileupload.js" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\css\bootstrap-theme.css" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\css\bootstrap-theme.min.css" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\css\bootstrap.css" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\css\bootstrap.min.css" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\fonts\glyphicons-halflings-regular.svg" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\js\bootstrap.js" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\js\bootstrap.min.js" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\js\npm.js" />
     <Content Include="Content\thirds\bootstrap-fileinput\css\fileinput-rtl.css" />
     <Content Include="Content\thirds\bootstrap-fileinput\css\fileinput-rtl.min.css" />
     <Content Include="Content\thirds\bootstrap-fileinput\css\fileinput.css" />
@@ -326,7 +334,6 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Models\" />
-    <Folder Include="Properties\PublishProfiles\" />
     <Folder Include="Views\Config\" />
     <Folder Include="Views\Task\" />
   </ItemGroup>
@@ -338,6 +345,14 @@
     <Content Include="Content\json\beijing\check.json" />
     <Content Include="Content\json\menggu\202111242105788.json" />
     <Content Include="Content\json\menggu\check.json" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\css\bootstrap-theme.css.map" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\css\bootstrap-theme.min.css.map" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\css\bootstrap.css.map" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\css\bootstrap.min.css.map" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\fonts\glyphicons-halflings-regular.eot" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\fonts\glyphicons-halflings-regular.ttf" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\fonts\glyphicons-halflings-regular.woff" />
+    <Content Include="Content\thirds\bootstrap-3.4.1-dist\fonts\glyphicons-halflings-regular.woff2" />
     <None Include="packages.config" />
     <Content Include="Views\Tiananmen\Index.cshtml" />
     <Content Include="Views\User\Login.cshtml" />
@@ -360,6 +375,7 @@
     <Content Include="Views\Register\Index.cshtml" />
     <Content Include="Views\StatisticAnalysis\Index.cshtml" />
     <Content Include="Views\UserManagement\EditPasswordDialog.cshtml" />
+    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BLL\BLL.csproj">
diff --git a/04.系统编码/App/Content/scripts/beijing/map.js b/04.系统编码/App/Content/scripts/beijing/map.js
index c8b0223..183228d 100644
--- a/04.系统编码/App/Content/scripts/beijing/map.js
+++ b/04.系统编码/App/Content/scripts/beijing/map.js
@@ -689,7 +689,7 @@ var Map = function (parent) {
         $('#capture-button').on('click', function () {
             var returned = Capture();
             if (returned === emCaptureFailed || returned === emCaptureUnknown) {
-                $('#capture-button').hide();
+                $('#capture-button').css("opacity", "1");
                 $('#download-button').css("opacity", "1");
             }
         });
diff --git a/04.系统编码/App/Content/scripts/menggu/map.js b/04.系统编码/App/Content/scripts/menggu/map.js
index 88094a7..cdca0f8 100644
--- a/04.系统编码/App/Content/scripts/menggu/map.js
+++ b/04.系统编码/App/Content/scripts/menggu/map.js
@@ -402,7 +402,7 @@ var Map = function (parent) {
         $('#capture-button').on('click', function () {
             var returned = Capture();
             if (returned === emCaptureFailed || returned === emCaptureUnknown) {
-                $('#capture-button').hide();
+                $('#capture-button').css("opacity", "1");
                 $('#download-button').css("opacity", "1");
             }
         });
diff --git a/04.系统编码/App/Views/Shared/_Layout.cshtml b/04.系统编码/App/Views/Shared/_Layout.cshtml
index b2aa046..613efa6 100644
--- a/04.系统编码/App/Views/Shared/_Layout.cshtml
+++ b/04.系统编码/App/Views/Shared/_Layout.cshtml
@@ -51,6 +51,7 @@
     <script src="~/Content/thirds/jquery-3.2.1.min.js"></script>
     <script src="~/Content/thirds/easyui/jquery.easyui.min.js"></script>
     <script src="~/Content/thirds/easyui/easyui-lang-zh_CN.js"></script>
+    <script src="~/Content/thirds/bootstrap-3.4.1-dist/js/bootstrap.min.js"></script>
     <script src="~/Content/thirds/leaflet/leaflet.js"></script>
     <script src="~/Content/thirds/leaflet/leaflet.ChineseTmsProviders.js"></script>
     <script src="~/Content/thirds/leaflet/leaflet.migrationLayer.js"></script>