Browse Source

commit

master
hehongxing 3 years ago
parent
commit
1848da8daa
  1. 18
      04.系统编码/App/App.csproj
  2. 2
      04.系统编码/App/Content/scripts/beijing/map.js
  3. 2
      04.系统编码/App/Content/scripts/menggu/map.js
  4. 1
      04.系统编码/App/Views/Shared/_Layout.cshtml

18
04.系统编码/App/App.csproj

@ -236,6 +236,14 @@
<Content Include="Content\styles\reset.css" /> <Content Include="Content\styles\reset.css" />
<Content Include="Content\styles\user-management.css" /> <Content Include="Content\styles\user-management.css" />
<Content Include="Content\thirds\ajaxfileupload.js" /> <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.css" />
<Content Include="Content\thirds\bootstrap-fileinput\css\fileinput-rtl.min.css" /> <Content Include="Content\thirds\bootstrap-fileinput\css\fileinput-rtl.min.css" />
<Content Include="Content\thirds\bootstrap-fileinput\css\fileinput.css" /> <Content Include="Content\thirds\bootstrap-fileinput\css\fileinput.css" />
@ -326,7 +334,6 @@
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
<Folder Include="Models\" /> <Folder Include="Models\" />
<Folder Include="Properties\PublishProfiles\" />
<Folder Include="Views\Config\" /> <Folder Include="Views\Config\" />
<Folder Include="Views\Task\" /> <Folder Include="Views\Task\" />
</ItemGroup> </ItemGroup>
@ -338,6 +345,14 @@
<Content Include="Content\json\beijing\check.json" /> <Content Include="Content\json\beijing\check.json" />
<Content Include="Content\json\menggu\202111242105788.json" /> <Content Include="Content\json\menggu\202111242105788.json" />
<Content Include="Content\json\menggu\check.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" /> <None Include="packages.config" />
<Content Include="Views\Tiananmen\Index.cshtml" /> <Content Include="Views\Tiananmen\Index.cshtml" />
<Content Include="Views\User\Login.cshtml" /> <Content Include="Views\User\Login.cshtml" />
@ -360,6 +375,7 @@
<Content Include="Views\Register\Index.cshtml" /> <Content Include="Views\Register\Index.cshtml" />
<Content Include="Views\StatisticAnalysis\Index.cshtml" /> <Content Include="Views\StatisticAnalysis\Index.cshtml" />
<Content Include="Views\UserManagement\EditPasswordDialog.cshtml" /> <Content Include="Views\UserManagement\EditPasswordDialog.cshtml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\BLL\BLL.csproj"> <ProjectReference Include="..\BLL\BLL.csproj">

2
04.系统编码/App/Content/scripts/beijing/map.js

@ -689,7 +689,7 @@ var Map = function (parent) {
$('#capture-button').on('click', function () { $('#capture-button').on('click', function () {
var returned = Capture(); var returned = Capture();
if (returned === emCaptureFailed || returned === emCaptureUnknown) { if (returned === emCaptureFailed || returned === emCaptureUnknown) {
$('#capture-button').hide(); $('#capture-button').css("opacity", "1");
$('#download-button').css("opacity", "1"); $('#download-button').css("opacity", "1");
} }
}); });

2
04.系统编码/App/Content/scripts/menggu/map.js

@ -402,7 +402,7 @@ var Map = function (parent) {
$('#capture-button').on('click', function () { $('#capture-button').on('click', function () {
var returned = Capture(); var returned = Capture();
if (returned === emCaptureFailed || returned === emCaptureUnknown) { if (returned === emCaptureFailed || returned === emCaptureUnknown) {
$('#capture-button').hide(); $('#capture-button').css("opacity", "1");
$('#download-button').css("opacity", "1"); $('#download-button').css("opacity", "1");
} }
}); });

1
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/jquery-3.2.1.min.js"></script>
<script src="~/Content/thirds/easyui/jquery.easyui.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/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.js"></script>
<script src="~/Content/thirds/leaflet/leaflet.ChineseTmsProviders.js"></script> <script src="~/Content/thirds/leaflet/leaflet.ChineseTmsProviders.js"></script>
<script src="~/Content/thirds/leaflet/leaflet.migrationLayer.js"></script> <script src="~/Content/thirds/leaflet/leaflet.migrationLayer.js"></script>

Loading…
Cancel
Save