From 9adf1ed58cce3683cb620e1d49337c26edba75b4 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Sat, 24 May 2025 18:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=8C=A5=E8=B0=83=E5=BA=A6=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../版本日志/SGGLDB_WH_2025-05-23-xiaj.sql | 17 ++++++
SGGL/BLL/Common/Const.cs | 4 ++
.../common/Menu_CommandDispatchCenter.xml | 5 ++
SGGL/FineUIPro.Web/indexProject.aspx | 16 +++---
SGGL/FineUIPro.Web/indexProject.aspx.cs | 54 +++++++++++--------
5 files changed, 64 insertions(+), 32 deletions(-)
create mode 100644 SGGL/FineUIPro.Web/common/Menu_CommandDispatchCenter.xml
diff --git a/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql
index 5fe5e2fc..4c244a9a 100644
--- a/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql
+++ b/DataBase/版本日志/SGGLDB_WH_2025-05-23-xiaj.sql
@@ -11,3 +11,20 @@ update JDGL_MonthPlan set IsOK =1 where RealDate is not null
update JDGL_MonthPlan set IsOK =0 where RealDate is null
GO
+--1ָӵ
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '09E6A03F-65C8-4FAC-9659-7A0B56D8CC19')
+BEGIN
+ --ָӵ
+ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+ VALUES('09E6A03F-65C8-4FAC-9659-7A0B56D8CC19','ָӵ','ZHDD/ZHDD.aspx',10,'0','Menu_CommandDispatchCenter',0,1,1)
+END
+GO
+
+ --1ָӵ
+IF NOT EXISTS (SELECT * FROM Sys_Const WHERE ID = '182BC982-F98F-41B3-A2D2-9DD834BF5833')
+BEGIN
+ --ָӵ
+ INSERT INTO dbo.Sys_Const(ID,ConstText,ConstValue,SortIndex,GroupId)
+ VALUES('182BC982-F98F-41B3-A2D2-9DD834BF5833','ָӵ','Menu_CommandDispatchCenter',11,'MenuType_P')
+END
+GO
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index b9c0676f..a8b04aa0 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -796,6 +796,10 @@ namespace BLL
///
public const string Menu_Opinion = "Menu_Opinion";
///
+ /// 指挥调度中心
+ ///
+ public const string Menu_CommandDispatchCenter = "Menu_CommandDispatchCenter";
+ ///
/// 文档管理
///
public const string Menu_Doc = "Menu_Doc";
diff --git a/SGGL/FineUIPro.Web/common/Menu_CommandDispatchCenter.xml b/SGGL/FineUIPro.Web/common/Menu_CommandDispatchCenter.xml
new file mode 100644
index 00000000..febd6a2a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/common/Menu_CommandDispatchCenter.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx
index 1b0525e6..06fda710 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@@ -535,7 +535,10 @@
-
+ --%>
+
-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();
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs
index 60b5a868..cb87cef0 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs
@@ -739,6 +739,12 @@ namespace FineUIPro.Web
this.Tab1.IFrameUrl = "~/Opinion/OpinionCollection.aspx";
this.Tab1.Title = "意见收集";
}
+ else if (type == Const.Menu_CommandDispatchCenter)
+ {
+ this.leftPanel.Hidden = true;
+ this.Tab1.IFrameUrl = "~/ZHDD/ZHDD.aspx";
+ this.Tab1.Title = "指挥调度中心";
+ }
else if (type == Const.Menu_Doc)
{
this.Tab1.IFrameUrl = "~/DocManage/DocManage.aspx";
@@ -842,11 +848,6 @@ namespace FineUIPro.Web
Response.Write("");
// this.MenuSwitchMethod(Const.Menu_DigitalSite);
}
- protected void btnCommandDispatch_Click(object sender, EventArgs e)
- {
- string url = "ZHDD/ZHDD.aspx";
- Response.Write("");
- }
protected void btnDoc_Click(object sender, EventArgs e)
{
this.MenuSwitchMethod(Const.Menu_Doc);
@@ -858,24 +859,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(res1);
- string data = j1.data;
+ //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(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(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;
- }
- }
+ // 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(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)
{
@@ -891,6 +892,15 @@ namespace FineUIPro.Web
{
this.MenuSwitchMethod(Const.Menu_Opinion);
}
+ protected void btnCommandDispatch_Click(object sender, EventArgs e)
+ {
+ this.MenuSwitchMethod(Const.Menu_CommandDispatchCenter);
+ }
+ //protected void btnCommandDispatch_Click(object sender, EventArgs e)
+ //{
+ // string url = "ZHDD/ZHDD.aspx";
+ // Response.Write("");
+ //}
protected void btnTodo_Click(object sender, EventArgs e)
{