lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lpf:dc3f0bdc974df852d76508f57bca1f2bacb8b63a
Branches Tags
lpf:master
..
compare: lpf:190467701e3775197dcd40316330e7947f8223e1
Branches Tags
lpf:master

No commits in common. "dc3f0bdc974df852d76508f57bca1f2bacb8b63a" and "190467701e3775197dcd40316330e7947f8223e1" have entirely different histories.
dc3f0bdc97 ... 190467701e

2 changed files with 11 additions and 31 deletions
Show Stats Expand all files Collapse all files

8
SGGL/FineUIPro.Web/common/main_new0.aspx
View File

@ -9,7 +9,6 @@
<script src="lib/flex.js"></script>
<link rel="stylesheet" href="css/safetyproduction.css"/>
<link rel="stylesheet" href="../res/assets/css/xfk.css"/>
<script src="~/res/js/crypto-js.min.js"></script>
</head>
<body>
<form id="form1" runat="server">
@ -453,11 +452,8 @@
} else if (type == 'Video') {
var videoURL ='<%=VideoURL %>'
var username = 'admin'
var password = '<%=PassWord %>';
var sign = CryptoJS.AES.encrypt(username + "$" + password + "$" + Date.now(), "nbd").toString();
sign = encodeURIComponent(sign);
window.open(videoURL + "login.html?sign=" + sign, '_blank');
window.open(videoURL + "#/screen", '_blank'); //视频监控
}
else if (type == 'HighRiskWorkPermit') {

30
SGGL/FineUIPro.Web/common/main_new0.aspx.cs
View File

@ -14,28 +14,6 @@ namespace FineUIPro.Web.common
{
public partial class main_new0 : PageBase
{
protected string VideoURL
{
get
{
return ConfigurationManager.AppSettings["Video_URL"] ;
}
}
protected string PassWord
{
get
{
var sysSet17 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控密码" select x).ToList().FirstOrDefault();
if (sysSet17 != null)
{
return Funs.EncryptionPassword(sysSet17.SetValue);
}
return "";
}
}
public static List<Model.Solution_LargerHazard> LargerHazard = new List<Model.Solution_LargerHazard>();
/// <summary>
@ -188,7 +166,13 @@ namespace FineUIPro.Web.common
}
}
protected string VideoURL
{
get
{
return ConfigurationManager.AppSettings["Video_URL"] + "#/screen";
}
}
#region 加载项目信息
protected void getProjectInfo()