diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs index 964796a..4a2f397 100644 --- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs @@ -44,22 +44,24 @@ namespace FineUIPro.Web.common //获取CQMS数据 var cqmsData = Task.Run(() => mainSevice.GetCqmsDataAsync()).Result; - //安全云视频【待汇总】待配置 - string video_Url = string.Empty; - var sysSet16 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控地址" select x).ToList().FirstOrDefault(); - if (sysSet16 != null) - { - video_Url = sysSet16.SetValue; - } - var sysSet17 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控密码" select x).ToList().FirstOrDefault(); - if (sysSet17 != null) - { - video_Url = video_Url + "#/screen?username=admin&password=" + Funs.EncryptionPassword(sysSet17.SetValue); - } - else - { - video_Url = ""; - } + ////安全云视频【待汇总】待配置 + //string video_Url = string.Empty; + //string video_UserName = project.ProjectCode; + //string video_PassWord = project.MonitorPW; + //var sysSet16 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控地址" select x).ToList().FirstOrDefault(); + //if (sysSet16 != null) + //{ + // video_Url = sysSet16.SetValue; + //} + ////var sysSet17 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控密码" select x).ToList().FirstOrDefault(); + //if (!string.IsNullOrWhiteSpace(video_PassWord)) + //{ + // video_Url = $"{video_Url}#/screen?username={video_UserName}&password={Funs.EncryptionPassword(video_PassWord)}"; + //} + //else + //{ + // video_Url = ""; + //} //班前会 var classMeetingList = HSSEData_HSSEService.GetProjectClassMeeting(projectId); @@ -232,10 +234,12 @@ namespace FineUIPro.Web.common #region 视频监控 - string videoHost = (from x in db.Sys_Set where x.SetName == "视频监控地址" select x.SetValue).ToList().FirstOrDefault(); - string videoUserName = (from x in db.Sys_Set where x.SetName == "视频监控用户名" select x.SetValue).ToList().FirstOrDefault(); - string videoPassWord = (from x in db.Sys_Set where x.SetName == "视频监控密码" select x.SetValue).ToList().FirstOrDefault(); - videoPassWord = Funs.EncryptionPassword(videoPassWord); + string videoHost = !string.IsNullOrWhiteSpace(project.MonitorPW) ? (from x in db.Sys_Set where x.SetName == "视频监控地址" select x.SetValue).ToList().FirstOrDefault() : string.Empty; + string videoUserName = project.ProjectCode; + string videoPassWord = !string.IsNullOrWhiteSpace(project.MonitorPW) ? Funs.EncryptionPassword(project.MonitorPW) : string.Empty; + //string videoUserName = (from x in db.Sys_Set where x.SetName == "视频监控用户名" select x.SetValue).ToList().FirstOrDefault(); + //string videoPassWord = (from x in db.Sys_Set where x.SetName == "视频监控密码" select x.SetValue).ToList().FirstOrDefault(); + //videoPassWord = Funs.EncryptionPassword(videoPassWord); #endregion