From e7a42dd70ac5df2eafab9c55dd21891acccdfdae Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 13 三月 2023 15:06:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7bf094e..33ccdb5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -65,6 +65,13 @@
</ItemGroup>
<ItemGroup>
<Content Include="HtmlPage1.html" />
+ <Content Include="layuiadmin\ax\ax-response.css" />
+ <Content Include="layuiadmin\ax\ax.css" />
+ <Content Include="layuiadmin\ax\ax.min.js" />
+ <Content Include="layuiadmin\ax\images\login-bg.jpg" />
+ <Content Include="layuiadmin\ax\images\login-left.jpg" />
+ <Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
+ <Content Include="layuiadmin\ax\main.css" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
<Content Include="layuiadmin\layui\css\global.css" />
@@ -171,6 +178,7 @@
<Content Include="views\test\testRenderAutomationList.html" />
<Content Include="views\userfiles\images\loginBackground-New.jpg" />
<Content Include="views\user\login_anrui.html" />
+ <Content Include="views\user\login_New.html" />
<Content Include="views\video\1.wav" />
<Content Include="views\video\jingbao.wav" />
<Content Include="views\video\success.wav" />
@@ -178,6 +186,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBill_PDA_Detail.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcExchRecordBackBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcExchRecordBackBillEdit.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessSendWorkEdit.html" />
--
Gitblit v1.9.1