Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
@@ -1502,6 +1502,10 @@
|
||||
<Content Include="res\indexv1\js\world.js" />
|
||||
<Content Include="SHIYE\InformationProject\SafetyBriefing.aspx" />
|
||||
<Content Include="SHIYE\InformationProject\SafetyBriefingEdit.aspx" />
|
||||
<Content Include="SmartSite\SoftManage.aspx" />
|
||||
<Content Include="SmartSite\EquipmentManage.aspx" />
|
||||
<Content Include="SmartSite\SoftManageEdit.aspx" />
|
||||
<Content Include="SmartSite\EquipmentManageEdit.aspx" />
|
||||
<Content Include="SysManage\OutputValueProject.aspx" />
|
||||
<Content Include="SysManage\ProjectToDo.aspx" />
|
||||
<Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
|
||||
@@ -12879,6 +12883,34 @@
|
||||
<Compile Include="SHIYE\InformationProject\SafetyBriefingEdit.aspx.designer.cs">
|
||||
<DependentUpon>SafetyBriefingEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SmartSite\SoftManage.aspx.cs">
|
||||
<DependentUpon>SoftManage.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="SmartSite\SoftManage.aspx.designer.cs">
|
||||
<DependentUpon>SoftManage.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SmartSite\EquipmentManage.aspx.cs">
|
||||
<DependentUpon>EquipmentManage.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="SmartSite\EquipmentManage.aspx.designer.cs">
|
||||
<DependentUpon>EquipmentManage.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SmartSite\SoftManageEdit.aspx.cs">
|
||||
<DependentUpon>SoftManageEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="SmartSite\SoftManageEdit.aspx.designer.cs">
|
||||
<DependentUpon>SoftManageEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SmartSite\EquipmentManageEdit.aspx.cs">
|
||||
<DependentUpon>EquipmentManageEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="SmartSite\EquipmentManageEdit.aspx.designer.cs">
|
||||
<DependentUpon>EquipmentManageEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="SysManage\CustomQuery.aspx.cs">
|
||||
<DependentUpon>CustomQuery.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -13887,7 +13919,7 @@
|
||||
<AutoAssignPort>True</AutoAssignPort>
|
||||
<DevelopmentServerPort>0</DevelopmentServerPort>
|
||||
<DevelopmentServerVPath>/</DevelopmentServerVPath>
|
||||
<IISUrl>http://localhost:8667/</IISUrl>
|
||||
<IISUrl>http://localhost:1773/</IISUrl>
|
||||
<NTLMAuthentication>False</NTLMAuthentication>
|
||||
<UseCustomServer>False</UseCustomServer>
|
||||
<CustomServerUrl>
|
||||
|
||||
Reference in New Issue
Block a user