Compare commits

..

No commits in common. "2323e1ca782af3a6c9819d2f8c55bb93a724984e" and "c5080c2a98b02d2646e6cd8f002acac0f028ded1" have entirely different histories.

4 changed files with 7 additions and 11 deletions

View File

@ -20,8 +20,8 @@ namespace BLL
public static string Http(string url, string method = "GET", string contenttype = "application/json;charset=utf-8", Hashtable header = null, string data = null)
{
ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 |
SecurityProtocolType.Tls | SecurityProtocolType.Tls11 |
SecurityProtocolType.Tls12;
SecurityProtocolType.Tls | SecurityProtocolType.Tls11 |
SecurityProtocolType.Tls12;
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
request.Method = string.IsNullOrEmpty(method) ? "GET" : method;
request.ContentType = string.IsNullOrEmpty(contenttype) ? "application/json;charset=utf-8" : contenttype;

View File

@ -1895,7 +1895,6 @@
<Content Include="res\images\zg05.png" />
<Content Include="res\image\message.png" />
<Content Include="res\index\images\logocenter.png" />
<Content Include="res\js\crypto-js.min.js" />
<Content Include="res\js\swiper-bundle.min.css" />
<Content Include="res\js\swiper-bundle.min.js" />
<Content Include="res\js\swiper.css" />

View File

@ -20,8 +20,6 @@
<script src="~/res/lib/china.js"></script>
<script src="~/res/lib/echarts.min.js"></script>
<script src="~/res/lib/swiper.min.js"></script>
<script src="~/res/js/crypto-js.min.js"></script>
<link rel="stylesheet" href="~/res/css/company.css?v1">
<style>
.BMap_mask {
@ -561,7 +559,6 @@
</Items>
</f:SimpleForm>
</form>
<script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.1.1/crypto-js.min.js"></script>
<script type="text/javascript">
var toolRefreshClientID = '<%= toolRefresh.ClientID %>';
var toolNewWindowClientID = '<%= toolNewWindow.ClientID %>';
@ -680,9 +677,7 @@
var username = $('#<%= hfProjectCode.ClientID %>-inputEl').val()
var password = $('#<%= hfMonitorPW.ClientID %>-inputEl').val();
if (password != "") {
var sign = CryptoJS.AES.encrypt(username + "$" + password +"$" + Date.now(), "nbd").toString();
sign = encodeURIComponent(sign);
window.open(videoURL + "#/screen?sign=" + sign , '_blank');
window.open(videoURL + "#/screen?username=" + username + "&password=" + password, '_blank');
} else {
alert("该项目未关联监控信息!");
}
@ -911,7 +906,10 @@
}
}
// 点击标题栏工具图标 - 查看源代码
var videoURL ='<%=VideoURL %>'
function openVideo() {
window.open(videoURL, '_blank');
}
// 获取当前激活选项卡的ID
function getActiveTabId() {

File diff suppressed because one or more lines are too long