diff --git a/北京北汽/SCP/Properties/AssemblyInfo.cs b/北京北汽/SCP/Properties/AssemblyInfo.cs index 1d95458..4b6f073 100644 --- a/北京北汽/SCP/Properties/AssemblyInfo.cs +++ b/北京北汽/SCP/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // 可以指定所有值,也可以使用“修订号”和“内部版本号”的默认值, // 方法是按如下所示使用 "*": -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.23.1023.1")] +[assembly: AssemblyFileVersion("1.23.1023.1")] diff --git a/北京北汽/SCP/Views/BasicData/Part.aspx b/北京北汽/SCP/Views/BasicData/Part.aspx index 94ae338..1007fdb 100644 --- a/北京北汽/SCP/Views/BasicData/Part.aspx +++ b/北京北汽/SCP/Views/BasicData/Part.aspx @@ -41,7 +41,7 @@ - + diff --git a/北京北汽/SCP/main.aspx.cs b/北京北汽/SCP/main.aspx.cs index f4885a3..3f6c917 100644 --- a/北京北汽/SCP/main.aspx.cs +++ b/北京北汽/SCP/main.aspx.cs @@ -63,7 +63,8 @@ namespace SCP JObject ids = GetClientIDS(regionPanel, regionTop, mainTabStrip, txtUser, txtOnlineUserCount, txtCurrentTime, btnRefresh); ids.Add("userName", GetIdentityName()); - ids.Add("userIP", Request.UserHostAddress); + var factoryModel = DB.TA_FACTORY.FirstOrDefault(p => p.FactoryId == CurrentUser.UsedDomain); + ids.Add("userIP", factoryModel != null ? factoryModel.FactoryName : Request.UserHostAddress); // ids.Add("onlineUserCount", GetOnlineCount()); if (ConfigHelper.MenuType == "accordion")