Compare commits

..

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

2 changed files with 11 additions and 31 deletions

View File

@ -9,7 +9,6 @@
<script src="lib/flex.js"></script> <script src="lib/flex.js"></script>
<link rel="stylesheet" href="css/safetyproduction.css"/> <link rel="stylesheet" href="css/safetyproduction.css"/>
<link rel="stylesheet" href="../res/assets/css/xfk.css"/> <link rel="stylesheet" href="../res/assets/css/xfk.css"/>
<script src="~/res/js/crypto-js.min.js"></script>
</head> </head>
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
@ -452,12 +451,9 @@
} else if (type == 'Video') { } else if (type == 'Video') {
var videoURL = '<%=VideoURL %>' var videoURL ='<%=VideoURL %>'
var username = 'admin' window.open(videoURL + "#/screen", '_blank'); //视频监控
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');
} }
else if (type == 'HighRiskWorkPermit') { else if (type == 'HighRiskWorkPermit') {
@ -985,6 +981,6 @@
aPassChart.setOption(opt); aPassChart.setOption(opt);
} }
</script> </script>

View File

@ -14,28 +14,6 @@ namespace FineUIPro.Web.common
{ {
public partial class main_new0 : PageBase 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>(); public static List<Model.Solution_LargerHazard> LargerHazard = new List<Model.Solution_LargerHazard>();
/// <summary> /// <summary>
@ -188,7 +166,13 @@ namespace FineUIPro.Web.common
} }
} }
protected string VideoURL
{
get
{
return ConfigurationManager.AppSettings["Video_URL"] + "#/screen";
}
}
#region #region
protected void getProjectInfo() protected void getProjectInfo()