This commit is contained in:
夏菊 2025-05-24 17:56:31 +08:00
parent f135a948da
commit 10c25ed463
7 changed files with 533 additions and 448 deletions

View File

@ -205,9 +205,13 @@
<value>user</value>
<comment>用户</comment>
</data>
<data name="VideoSurveillance" xml:space="preserve">
<data name="VideoSurveillance" xml:space="preserve">
<value>Video surveillance</value>
<comment>视频监控</comment>
</data>
<data name="CommandDispatchCenter" xml:space="preserve">
<value>Command dispatch center</value>
<comment>指挥调度中心</comment>
</data>
<data name="WeldingManage" xml:space="preserve">
<value>Welding manage</value>

File diff suppressed because it is too large Load Diff

View File

@ -186,6 +186,9 @@
<data name="VideoSurveillance" xml:space="preserve">
<value>视频监控</value>
</data>
<data name="CommandDispatchCenter" xml:space="preserve">
<value>指挥调度中心</value>
</data>
<data name="WeldingManage" xml:space="preserve">
<value>焊接管理</value>
</data>

View File

@ -177,6 +177,15 @@ namespace Resources {
}
}
/// <summary>
/// 查找类似 指挥调度中心 的本地化字符串。
/// </summary>
internal static string CommandDispatchCenter {
get {
return ResourceManager.GetString("CommandDispatchCenter", resourceCulture);
}
}
/// <summary>
/// 查找类似 已完成 的本地化字符串。
/// </summary>

View File

@ -358,6 +358,9 @@
<div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor: pointer">
<asp:Literal runat="server" Text="<%$ Resources:Lan,VideoSurveillance %>" />
</div>
<div class="n-btn-r c-n-btn-r" onclick="CommandDispatchClick();" style="cursor: pointer; width: 1.475rem; height: .305rem; line-height: .35rem;">
<asp:Literal runat="server" Text="<%$ Resources:Lan,CommandDispatchCenter %>" />
</div>
<div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor: pointer">
<asp:Literal runat="server" Text="<%$ Resources:Lan,OnSiteAttendance %>" />
</div>
@ -532,6 +535,9 @@
<f:Button runat="server" CssClass="bgbtn" Text="视频监控" OnClick="btnDigitalSite_Click" OnClientClick="openVideo();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnDigitalSite" Hidden="true">
</f:Button>
<f:Button runat="server" CssClass="bgbtn" Text="指挥调度中心" OnClick="btnCommandDispatch_Click" OnClientClick="openCommandDispatchCenter();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCommandDispatch" Hidden="true">
</f:Button>
<f:Button runat="server" CssClass="bgbtn" Text="现场考勤" OnClick="btnPDigData_Click" OnClientClick="parent.removeActiveTab();"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPDigData" Hidden="true">
</f:Button>
@ -573,6 +579,7 @@
var btnTransferClientID = '<%= btnTransfer.ClientID %>';
var btnPGJSXClientID = '<%= btnPGJSX.ClientID %>';
var btnDigitalSiteClientID = '<%= btnDigitalSite.ClientID %>';
var btnCommandDispatchClientID = '<%= btnCommandDispatch.ClientID %>';
var btnPDigDataClientID = '<%= btnPDigData.ClientID %>';
var btnOpinionClientID = '<%= btnOpinion.ClientID %>';
var btnDocClientID = '<%= btnDoc.ClientID %>';
@ -652,6 +659,12 @@
var $item = $('.f-tabstrip-header')
$item.attr('style', ";display:block !important;")
}
function CommandDispatchClick() {
parent.removeActiveTab();
F(btnCommandDispatchClientID).click();
var $item = $('.f-tabstrip-header')
$item.attr('style', ";display:block !important;")
}
// 点击标题栏工具图标 - 查看源代码
var videoURL ='<%=VideoURL %>'
@ -669,6 +682,25 @@
alert("您没有权限!");
}
}
// 点击标题栏工具图标 - 查看源代码
var dispatchCenterURL = '<%=CommandDispatchCenterURL %>'
function openCommandDispatchCenter() {
if (dispatchCenterURL) {
window.open(dispatchCenterURL, '_blank');
<%-- var username = $('#<%= hfProjectCode.ClientID %>-inputEl').val()
var password = $('#<%= hfMonitorPW.ClientID %>-inputEl').val();
if (password != "") {
window.open(videoURL + "#/screen?username=" + username + "&password=" + password, '_blank');
} else {
alert("该项目未关联监控信息!");
}--%>
}
else {
alert("您没有权限!");
}
}
function PDigDataClick() {
parent.removeActiveTab();
F(btnPDigDataClientID).click();

View File

@ -10,6 +10,7 @@ using System.Web;
using System.Web.UI.WebControls;
using System.Xml;
using System.Linq;
using FineUIPro.Web.ZHDD;
namespace FineUIPro.Web
{
@ -321,7 +322,7 @@ namespace FineUIPro.Web
var getproject = ProjectService.GetProjectByProjectName(Request.Params["projectName"]);
if (getproject != null)
{
if (getproject.ProjectState!="1")
if (getproject.ProjectState != "1")
{
ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, getproject.ProjectState, false, "1");
}
@ -356,30 +357,30 @@ namespace FineUIPro.Web
this.InitLangMenuButton();
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == this.drpProject.SelectedValue);
if (project != null && !string.IsNullOrEmpty(project.ProjectCode))
{
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == this.drpProject.SelectedValue);
if (project != null && !string.IsNullOrEmpty(project.ProjectCode))
{
this.lblProjectName.Text = project.ProjectName;
this.hfProjectCode.Text = project.ProjectCode;
}
if (project != null && !string.IsNullOrEmpty(project.MonitorPW))
{
this.hfMonitorPW.Text = Funs.EncryptionPassword(project.MonitorPW);
}
else
{
this.hfMonitorPW.Text = "";
}
this.hfProjectCode.Text = project.ProjectCode;
}
if (project != null && !string.IsNullOrEmpty(project.MonitorPW))
{
this.hfMonitorPW.Text = Funs.EncryptionPassword(project.MonitorPW);
}
else
{
this.hfMonitorPW.Text = "";
}
if (CurrUser.UserId == Const.hfnbdId)
{
var sysSet17 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控密码" select x).ToList().FirstOrDefault();
if (sysSet17 != null)
{
this.hfProjectCode.Text = "admin";
this.hfMonitorPW.Text = Funs.EncryptionPassword(sysSet17.SetValue);
}
}
if (CurrUser.UserId == Const.hfnbdId)
{
var sysSet17 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控密码" select x).ToList().FirstOrDefault();
if (sysSet17 != null)
{
this.hfProjectCode.Text = "admin";
this.hfMonitorPW.Text = Funs.EncryptionPassword(sysSet17.SetValue);
}
}
//GetWeather();
if (Request.Cookies["SelectLan"] != null)
@ -841,6 +842,11 @@ namespace FineUIPro.Web
Response.Write("<script>window.open(" + url + "'',''_blank'')</script>");
// this.MenuSwitchMethod(Const.Menu_DigitalSite);
}
protected void btnCommandDispatch_Click(object sender, EventArgs e)
{
string url = "ZHDD/ZHDD.aspx";
Response.Write("<script>window.open(" + url + "'',''_blank'')</script>");
}
protected void btnDoc_Click(object sender, EventArgs e)
{
this.MenuSwitchMethod(Const.Menu_Doc);
@ -852,6 +858,24 @@ namespace FineUIPro.Web
return ConfigurationManager.AppSettings["Video_URL"] + "#/screen";
}
}
protected string CommandDispatchCenterURL
{
get
{
string username = "rdys_test";
string password = "Runde.2024";
var res1 = APIGetHttpService.Http("https://caps.runde.pro/api/index.php?ctl=tool&act=get_pkey&user_name=" + username + "&pwd=" + password, "POST");
var j1 = JsonConvert.DeserializeObject<dynamic>(res1);
string data = j1.data;
var res2 = APIGetHttpService.Http("https://caps.runde.pro/api/index.php?ctl=tool&act=get_token&user_name=" + username + "&pkey=" + j1.data, "POST");
var j2 = JsonConvert.DeserializeObject<dynamic>(res2);
string session_id = j2.session_id;
string token = j2.token;
string url = "https://caps.runde.pro/login/#token=" + session_id + "&user_name=" + username + "target=home";
return url;
}
}
protected void btnPDigData_Click(object sender, EventArgs e)
{
@ -905,9 +929,9 @@ namespace FineUIPro.Web
protected void btnHelp_Click(object sender, EventArgs e)
{
if (this.CurrUser.UserId==Const.hfnbdId)
if (this.CurrUser.UserId == Const.hfnbdId)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Help&menuId={1}",Const.UnitId_CWCEC, BLL.Const.SysConstSetMenuId)));
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Help&menuId={1}", Const.UnitId_CWCEC, BLL.Const.SysConstSetMenuId)));
}
else
@ -923,7 +947,8 @@ namespace FineUIPro.Web
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnPhoneClick(object sender, EventArgs e) {
protected void btnPhoneClick(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/ProjectData/ProjectUserContact.aspx")));
}

View File

@ -500,6 +500,15 @@ namespace FineUIPro.Web
/// </remarks>
protected global::FineUIPro.Button btnDigitalSite;
/// <summary>
/// btnCommandDispatch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCommandDispatch;
/// <summary>
/// btnPDigData 控件。
/// </summary>