From 10ce5c40ac6261585dd148b322c3217a278c25b6 Mon Sep 17 00:00:00 2001
From: Frane <yhw0508@163.com>
Date: Thu, 11 Nov 2021 14:38:02 +0800
Subject: [PATCH] =?UTF-8?q?20211111=20=E7=9B=91=E6=8E=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/indexProject.aspx    |  2 +-
 SGGL/FineUIPro.Web/indexProject.aspx.cs | 28 +++++++++++--------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx
index b8c2622c..b723039a 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@@ -234,7 +234,7 @@
                                             </f:Button>
                                         </li>
                                         <li>
-                                            <f:Button runat="server" CssClass="bgbtn" Text="视频监控" OnClick="btnDigitalSite_Click" OnClientClick="parent.removeActiveTab();"
+                                            <f:Button runat="server" CssClass="bgbtn" Text="视频监控" OnClick="btnDigitalSite_Click" OnClientClick="openVideo();"
                                                 EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnDigitalSite">
                                             </f:Button>
                                         </li>
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs
index 4866882c..46eebbc5 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs
@@ -384,7 +384,8 @@ namespace FineUIPro.Web
                         this.btnWeather.ToolTip = date + " " + city + " " + oldWeather.WeatherRef + " " + oldWeather.AllTem;
                     }
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
             }
         }
@@ -604,16 +605,14 @@ namespace FineUIPro.Web
                 this.Tab1.IFrameUrl = "~/common/mainProject.aspx";
             }
             this.CurrUser.LastProjectId = null;
-        
             if (!string.IsNullOrEmpty(type))
-            {             
+            {
                 this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
                 if (CommonService.IsHaveSystemPower(this.CurrUser.UserId, type, this.CurrUser.LoginProjectId) || type == Const.Menu_Personal)
-                {                
+                {
                     this.XmlDataSource1.DataFile = "common/" + type + ".xml";
                     this.leftPanel.Hidden = false;
                     this.Tab1.IFrameUrl = "~/common/main" + type + ".aspx";
-                    this.Tab1.Title = "首页";
                     if (type == Const.Menu_Personal)
                     {
                         this.Tab1.IFrameUrl = "~/Personal/PersonalInfo.aspx";
@@ -621,15 +620,8 @@ namespace FineUIPro.Web
                     else if (type == Const.Menu_ProjectSet)
                     {
                         this.Tab1.IFrameUrl = "~/ProjectData/ProjectSetView.aspx";
-                        this.Tab1.Title = "项目";
                     }
-                    else if (type == Const.Menu_DigitalSite)
-                    {
-                        this.Tab1.IFrameUrl = "~/Video/Video.aspx";
-                        this.leftPanel.Hidden = true;
-                        this.Tab1.Title = "视频监控";
-                    }
-                   else if (type == Const.Menu_PZHGL)
+                    if (type == Const.Menu_PZHGL)
                     {
                         //this.Tab1.IFrameUrl = "~/PZHGL/InformationProject/ConstructionPlan.aspx";
                         this.Tab1.IFrameUrl = "~/HSSE/Manager/HSSELog.aspx";
@@ -640,6 +632,10 @@ namespace FineUIPro.Web
                         this.Tab1.IFrameUrl = "~/PZHGL/GJSX/GJSXList.aspx";
                         this.Tab1.Title = "关键事项";
                     }
+                    else
+                    {
+                        this.Tab1.Title = "首页";
+                    }
                 }
                 else
                 {
@@ -714,9 +710,9 @@ namespace FineUIPro.Web
 
         protected void btnDigitalSite_Click(object sender, EventArgs e)
         {
-            //string url = ConfigurationManager.AppSettings["Video_URL"] + "#/screen";
-            //Response.Write("<script>window.open(" + url + "'',''_blank'')</script>");
-            this.MenuSwitchMethod(Const.Menu_DigitalSite);
+            string url = ConfigurationManager.AppSettings["Video_URL"] + "#/screen";
+            Response.Write("<script>window.open(" + url + "'',''_blank'')</script>");
+            //  this.MenuSwitchMethod(Const.Menu_DigitalSite);
         }
 
         protected string VideoURL