xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaju:c5a80c95bf3d565a7650c93d96448180149780c4
Branches Tags
xiaju:master
..
compare: xiaju:a060f614dce49c84f3de54ab37b2268ae5e50c57
Branches Tags
xiaju:master

No commits in common. "c5a80c95bf3d565a7650c93d96448180149780c4" and "a060f614dce49c84f3de54ab37b2268ae5e50c57" have entirely different histories.
c5a80c95bf ... a060f614dc

1 changed files with 20 additions and 24 deletions
Show Stats Expand all files Collapse all files

44
SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
View File

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