From 17c3611c69338c315e13fd8a94a7da8803ab1997 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 25 十月 2021 10:45:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/BaseSet.csproj.user | 1 +
LMES/ClsShowMod.cs | 8 ++++++++
LMES/LMES.csproj.user | 13 +++++++++++++
LMES/LMES.csproj | 22 ++++++++++++++++++++++
4 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/BaseSet/BaseSet.csproj.user b/BaseSet/BaseSet.csproj.user
index b159ef0..eca3abc 100644
--- a/BaseSet/BaseSet.csproj.user
+++ b/BaseSet/BaseSet.csproj.user
@@ -9,5 +9,6 @@
<ErrorReportUrlHistory />
<FallbackCulture>zh-CN</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles>
+ <ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index be9a43c..41b473c 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -6607,8 +6607,15 @@
return;
try
{
+ MessageBox.Show("gnsy:"+gnsy + "gnmc:"+ gnmc);
switch (gnsy.ToLower())
{
+ case "gy_dotcheck"://点检项目
+ Gy_DotCheck oGy_DotCheck = new Gy_DotCheck();
+ oGy_DotCheck.MdiParent = oMain;
+ oGy_DotCheck.Show();
+ oMainForm.AddTabPage(oGy_DotCheck);
+ break;
case "gy_basedemo":
//权限
Gy_BaseDemo oGy_BaseDemo = new Gy_BaseDemo();
@@ -7681,6 +7688,7 @@
oGy_QCCheckItem.Show();
oMainForm.AddTabPage(oGy_QCCheckItem);
break;
+
case "":
//
break;
diff --git a/LMES/LMES.csproj b/LMES/LMES.csproj
index afd99a9..c001e8c 100644
--- a/LMES/LMES.csproj
+++ b/LMES/LMES.csproj
@@ -11,6 +11,21 @@
<AssemblyName>LMES</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -221,6 +236,13 @@
<Name>WorkM</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/LMES/LMES.csproj.user b/LMES/LMES.csproj.user
new file mode 100644
index 0000000..51efb67
--- /dev/null
+++ b/LMES/LMES.csproj.user
@@ -0,0 +1,13 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <PublishUrlHistory />
+ <InstallUrlHistory />
+ <SupportUrlHistory />
+ <UpdateUrlHistory />
+ <BootstrapperUrlHistory />
+ <ErrorReportUrlHistory />
+ <FallbackCulture>zh-CN</FallbackCulture>
+ <VerifyUploadedFiles>false</VerifyUploadedFiles>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
--
Gitblit v1.9.1