1、系统菜单调整;

2、系统看板UI调整;
3、事故事件功能
4、其他
This commit is contained in:
2025-12-10 15:58:02 +08:00
parent 3d00bb7a94
commit 6619f1e004
276 changed files with 131707 additions and 50045 deletions
+24 -145
View File
@@ -171,6 +171,8 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Accident\AccidentWarning.aspx" />
<Content Include="Accident\AccidentWarningEdit.aspx" />
<Content Include="AttachFile\dist\add-on\jplayer.playlist.js" />
<Content Include="AttachFile\dist\add-on\jplayer.playlist.min.js" />
<Content Include="AttachFile\dist\add-on\jquery.jplayer.inspector.js" />
@@ -301,9 +303,6 @@
<Content Include="common\lib\flex.js" />
<Content Include="common\lib\jquery.js" />
<Content Include="common\lib\world.js" />
<Content Include="common\main3.aspx" />
<Content Include="common\main2.aspx" />
<Content Include="common\mainMenu_CQMS_1.aspx" />
<Content Include="common\mainMenu_FiveStarts.aspx" />
<Content Include="common\mainMenu_HJGL2.aspx" />
<Content Include="common\mainMenu_Staff.aspx" />
@@ -311,18 +310,12 @@
<Content Include="common\mainMenu_SubPackManage.aspx" />
<Content Include="common\mainMenu_SYHSE.aspx" />
<Content Include="common\mainMenu_SYHSEN.aspx" />
<Content Include="common\mainProjectNew.aspx" />
<Content Include="common\mainProjectSY.aspx" />
<Content Include="common\mainProjects.aspx" />
<Content Include="common\mains.aspx" />
<Content Include="common\main_copy_index_1.aspx" />
<Content Include="common\Menu_FiveStarts.xml" />
<Content Include="common\Menu_SubPackManage.xml" />
<Content Include="common\Menu_SYHSE.xml" />
<Content Include="common\todolist.aspx" />
<Content Include="common\Menu_ToDo.xml" />
<Content Include="common\todo.aspx" />
<Content Include="common\mainI.aspx" />
<Content Include="common\mainMenu_DigitalSite.aspx" />
<Content Include="common\mainMenu_HJGL.aspx" />
<Content Include="common\mainMenu_PDigData.aspx" />
@@ -332,12 +325,8 @@
<Content Include="common\mainMenu_JDGL.aspx" />
<Content Include="common\mainMenu_CQMS.aspx" />
<Content Include="common\mainMenu_HSSE.aspx" />
<Content Include="common\mainProject0.aspx" />
<Content Include="common\mainIII.aspx" />
<Content Include="common\mainProject1.aspx" />
<Content Include="common\main.aspx" />
<Content Include="common\mainProject.aspx" />
<Content Include="common\main_copy_index.aspx" />
<Content Include="common\Menu_CQMS.xml" />
<Content Include="common\Menu_DigData.xml" />
<Content Include="common\Menu_DigitalSite.xml" />
@@ -2372,12 +2361,8 @@
<Content Include="Images\Test_Null.jpg" />
<Content Include="Images\wrong.jpg" />
<Content Include="index.aspx" />
<Content Include="indexShiYe.aspx" />
<Content Include="indexProjectShiYe.aspx" />
<Content Include="indexs.aspx" />
<Content Include="indexProject.aspx" />
<Content Include="font\iconfont.svg" />
<Content Include="indexProjects.aspx" />
<Content Include="InformationProject\ConstructionLog.aspx" />
<Content Include="InformationProject\ConstructionLogEdit.aspx" />
<Content Include="InformationProject\PersonStarList.aspx" />
@@ -2685,6 +2670,11 @@
<Content Include="res\css\mainindex.css" />
<Content Include="res\css\projectIndex.css" />
<Content Include="res\DataInTable.js" />
<Content Include="res\homecss\common.css" />
<Content Include="res\homecss\head.css" />
<Content Include="res\homecss\index.css" />
<Content Include="res\homecss\layout.css" />
<Content Include="res\homecss\safe.css" />
<Content Include="res\images\01\01.png" />
<Content Include="res\images\01\01bj.png" />
<Content Include="res\images\01\01headbj1.png" />
@@ -3076,8 +3066,10 @@
<Content Include="res\js\optionV2.js" />
<Content Include="res\lib\china.js" />
<Content Include="res\lib\echarts.min.js" />
<Content Include="res\lib\flex.js" />
<Content Include="res\lib\flexlib.js" />
<Content Include="res\lib\jquery.js" />
<Content Include="res\lib\vue.min.js" />
<Content Include="res\lib\world.js" />
<Content Include="res\ol\bd09.js" />
<Content Include="res\ol\ol.css" />
@@ -3633,7 +3625,6 @@
<SubType>Designer</SubType>
</Content>
<Content Include="common\ShowUpFile.aspx" />
<Content Include="common\main0.aspx" />
<Content Include="common\source.aspx" />
<Content Include="common\source_file.aspx" />
<Content Include="common\Menu_Server.xml">
@@ -7639,6 +7630,20 @@
</Content>
</ItemGroup>
<ItemGroup>
<Compile Include="Accident\AccidentWarning.aspx.cs">
<DependentUpon>AccidentWarning.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Accident\AccidentWarning.aspx.designer.cs">
<DependentUpon>AccidentWarning.aspx</DependentUpon>
</Compile>
<Compile Include="Accident\AccidentWarningEdit.aspx.cs">
<DependentUpon>AccidentWarningEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Accident\AccidentWarningEdit.aspx.designer.cs">
<DependentUpon>AccidentWarningEdit.aspx</DependentUpon>
</Compile>
<Compile Include="AttachFile\fileupload.ashx.cs">
<DependentUpon>fileupload.ashx</DependentUpon>
</Compile>
@@ -8027,27 +8032,6 @@
<Compile Include="BaseInfo\WorkStage.aspx.designer.cs">
<DependentUpon>WorkStage.aspx</DependentUpon>
</Compile>
<Compile Include="common\main3.aspx.cs">
<DependentUpon>main3.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\main3.aspx.designer.cs">
<DependentUpon>main3.aspx</DependentUpon>
</Compile>
<Compile Include="common\main2.aspx.cs">
<DependentUpon>main2.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\main2.aspx.designer.cs">
<DependentUpon>main2.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_CQMS_1.aspx.cs">
<DependentUpon>mainMenu_CQMS_1.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainMenu_CQMS_1.aspx.designer.cs">
<DependentUpon>mainMenu_CQMS_1.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_FiveStarts.aspx.cs">
<DependentUpon>mainMenu_FiveStarts.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -8097,41 +8081,6 @@
<Compile Include="common\mainMenu_SYHSEN.aspx.designer.cs">
<DependentUpon>mainMenu_SYHSEN.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainProjectNew.aspx.cs">
<DependentUpon>mainProjectNew.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainProjectNew.aspx.designer.cs">
<DependentUpon>mainProjectNew.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainProjectSY.aspx.cs">
<DependentUpon>mainProjectSY.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainProjectSY.aspx.designer.cs">
<DependentUpon>mainProjectSY.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainProjects.aspx.cs">
<DependentUpon>mainProjects.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainProjects.aspx.designer.cs">
<DependentUpon>mainProjects.aspx</DependentUpon>
</Compile>
<Compile Include="common\mains.aspx.cs">
<DependentUpon>mains.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mains.aspx.designer.cs">
<DependentUpon>mains.aspx</DependentUpon>
</Compile>
<Compile Include="common\main_copy_index_1.aspx.cs">
<DependentUpon>main_copy_index_1.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\main_copy_index_1.aspx.designer.cs">
<DependentUpon>main_copy_index_1.aspx</DependentUpon>
</Compile>
<Compile Include="common\todolist.aspx.cs">
<DependentUpon>todolist.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -8146,13 +8095,6 @@
<Compile Include="common\todo.aspx.designer.cs">
<DependentUpon>todo.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainI.aspx.cs">
<DependentUpon>mainI.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainI.aspx.designer.cs">
<DependentUpon>mainI.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainMenu_DigitalSite.aspx.cs">
<DependentUpon>mainMenu_DigitalSite.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -8216,27 +8158,6 @@
<Compile Include="common\mainMenu_HSSE.aspx.designer.cs">
<DependentUpon>mainMenu_HSSE.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainProject0.aspx.cs">
<DependentUpon>mainProject0.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainProject0.aspx.designer.cs">
<DependentUpon>mainProject0.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainIII.aspx.cs">
<DependentUpon>mainIII.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainIII.aspx.designer.cs">
<DependentUpon>mainIII.aspx</DependentUpon>
</Compile>
<Compile Include="common\mainProject1.aspx.cs">
<DependentUpon>mainProject1.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\mainProject1.aspx.designer.cs">
<DependentUpon>mainProject1.aspx</DependentUpon>
</Compile>
<Compile Include="common\main.aspx.cs">
<DependentUpon>main.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -8251,13 +8172,6 @@
<Compile Include="common\mainProject.aspx.designer.cs">
<DependentUpon>mainProject.aspx</DependentUpon>
</Compile>
<Compile Include="common\main_copy_index.aspx.cs">
<DependentUpon>main_copy_index.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\main_copy_index.aspx.designer.cs">
<DependentUpon>main_copy_index.aspx</DependentUpon>
</Compile>
<Compile Include="common\themes.aspx.cs">
<DependentUpon>themes.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -16044,27 +15958,6 @@
<Compile Include="index.aspx.designer.cs">
<DependentUpon>index.aspx</DependentUpon>
</Compile>
<Compile Include="indexShiYe.aspx.cs">
<DependentUpon>indexShiYe.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="indexShiYe.aspx.designer.cs">
<DependentUpon>indexShiYe.aspx</DependentUpon>
</Compile>
<Compile Include="indexProjectShiYe.aspx.cs">
<DependentUpon>indexProjectShiYe.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="indexProjectShiYe.aspx.designer.cs">
<DependentUpon>indexProjectShiYe.aspx</DependentUpon>
</Compile>
<Compile Include="indexs.aspx.cs">
<DependentUpon>indexs.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="indexs.aspx.designer.cs">
<DependentUpon>indexs.aspx</DependentUpon>
</Compile>
<Compile Include="indexProject.aspx.cs">
<DependentUpon>indexProject.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -16072,13 +15965,6 @@
<Compile Include="indexProject.aspx.designer.cs">
<DependentUpon>indexProject.aspx</DependentUpon>
</Compile>
<Compile Include="indexProjects.aspx.cs">
<DependentUpon>indexProjects.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="indexProjects.aspx.designer.cs">
<DependentUpon>indexProjects.aspx</DependentUpon>
</Compile>
<Compile Include="InformationProject\ConstructionLog.aspx.cs">
<DependentUpon>ConstructionLog.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -17420,13 +17306,6 @@
<Compile Include="common\ShowUpFile.aspx.designer.cs">
<DependentUpon>ShowUpFile.aspx</DependentUpon>
</Compile>
<Compile Include="common\main0.aspx.cs">
<DependentUpon>main0.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\main0.aspx.designer.cs">
<DependentUpon>main0.aspx</DependentUpon>
</Compile>
<Compile Include="common\source.aspx.cs">
<DependentUpon>source.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -20110,7 +19989,7 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">