From f040415c5fdf0f09bd597358c8e71810b297b5f9 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期三, 17 十二月 2025 11:09:57 +0800
Subject: [PATCH] 修复工序显示的问题,添加了动态显示列
---
WebTM/WebTM.csproj.user | 26 ++++++++++++++++++++++++++
WebTM/layuiadmin/Scripts/webConfig.js | 8 ++++----
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 17a8236..232b462 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,5 +2,31 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
+ <AspNetDebugging>True</AspNetDebugging>
+ <SilverlightDebugging>False</SilverlightDebugging>
+ <NativeDebugging>False</NativeDebugging>
+ <SQLDebugging>False</SQLDebugging>
+ <ExternalProgram>
+ </ExternalProgram>
+ <StartExternalURL>
+ </StartExternalURL>
+ <StartCmdLineArguments>
+ </StartCmdLineArguments>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <EnableENC>True</EnableENC>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 68e6c4f..c39b462 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,12 +7,12 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
-<<<<<<< HEAD
+
var WEBURL = "http://localhost:8080/API/"; //鐜嬩华鏈湴閰嶇疆
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
-=======
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
->>>>>>> cf4a059eee9a05b9b181e9970167f9726379c004
+
+/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
+
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
--
Gitblit v1.9.1