Merge branch 'master' of http://47.104.102.122:3000/lpf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
@@ -20530,7 +20530,7 @@
|
||||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
||||
@@ -682,7 +682,7 @@
|
||||
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 + "#/login.html?sign=" + sign , '_blank');
|
||||
} else {
|
||||
alert("该项目未关联监控信息!");
|
||||
}
|
||||
|
||||
@@ -858,7 +858,7 @@ namespace FineUIPro.Web
|
||||
{
|
||||
get
|
||||
{
|
||||
return ConfigurationManager.AppSettings["Video_URL"] + "#/screen";
|
||||
return ConfigurationManager.AppSettings["Video_URL"] ;
|
||||
}
|
||||
}
|
||||
//protected string CommandDispatchCenterURL
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<add key="ClientValidationEnabled" value="true" />
|
||||
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
|
||||
<!--连接字符串-->
|
||||
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" />
|
||||
<add key="ConnectionString" value="Server=.\MSSQLSERVER2022;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" />
|
||||
<!--版本号-->
|
||||
<add key="SystemVersion" value="WebApi_V2019-08-27-001" />
|
||||
<!--附件上传物理路径-->
|
||||
|
||||
Reference in New Issue
Block a user