From 746a6f752609f93abe67c1297d370096ff7847ef Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期六, 25 三月 2023 16:19:09 +0800
Subject: [PATCH] 合并

---
 WebTM/WebTM.csproj |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 271c980..940ad38 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -65,10 +65,19 @@
   </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" />
     <Content Include="layuiadmin\layui\css\layui - 澶嶅埗.css" />
+    <Content Include="layuiadmin\layui\css\layui_AllHeight.css" />
+    <Content Include="layuiadmin\layui\css\layui_TableHeight.css" />
     <Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />
     <Content Include="layuiadmin\layui\css\ReportPlatform.css" />
     <Content Include="layuiadmin\layui\css\zgqlayui.css" />
@@ -171,6 +180,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\login2.html" />
     <Content Include="views\video\1.wav" />
     <Content Include="views\video\jingbao.wav" />
     <Content Include="views\video\success.wav" />
@@ -178,8 +188,11 @@
     <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" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessSendWorkList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗WindowPrint.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_CheckList_New.html" />
     <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Check_New.html" />

--
Gitblit v1.9.1