diff --git a/DataBase/Information_UrgeReport_2023-02-01.sql b/DataBase/Information_UrgeReport_2023-02-01.sql
new file mode 100644
index 00000000..791b1b01
--- /dev/null
+++ b/DataBase/Information_UrgeReport_2023-02-01.sql
@@ -0,0 +1,44 @@
+ 
+
+CREATE TABLE [dbo].[Information_UrgeReport](
+	[UrgeReportId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[ReprotType] [nvarchar](50) NULL,
+	[YearId] [nvarchar](50) NULL,
+	[MonthId] [nvarchar](50) NULL,
+	[QuarterId] [nvarchar](50) NULL,
+	[HalfYearId] [nvarchar](50) NULL,
+	[UrgeDate] [datetime] NULL,
+	[IsComplete] [bit] NULL,
+	[IsCancel] [bit] NULL,
+ CONSTRAINT [PK_Information_UrgeReport] PRIMARY KEY CLUSTERED 
+(
+	[UrgeReportId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+ALTER TABLE [dbo].[Information_UrgeReport]  WITH CHECK ADD  CONSTRAINT [FK_Information_UrgeReport_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Information_UrgeReport] CHECK CONSTRAINT [FK_Information_UrgeReport_Base_Unit]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'催报id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport', @level2type=N'COLUMN',@level2name=N'UrgeReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N' 报表类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport', @level2type=N'COLUMN',@level2name=N'ReprotType'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否上报' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport', @level2type=N'COLUMN',@level2name=N'IsComplete'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'安全信息催报表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_UrgeReport'
+GO
+
+
diff --git a/DataBase/View_Training_TestTrainingItem_2023-02-01.sql b/DataBase/View_Training_TestTrainingItem_2023-02-01.sql
new file mode 100644
index 00000000..57b68aca
--- /dev/null
+++ b/DataBase/View_Training_TestTrainingItem_2023-02-01.sql
@@ -0,0 +1,41 @@
+ 
+
+
+
+ALTER VIEW [dbo].[View_Training_TestTrainingItem]  AS 
+/*培训试题信息视图*/
+SELECT Training.TrainingId
+	,Training.TrainingCode
+	,Training.TrainingName
+	,Item.TrainingItemId	
+	,Item.TrainingItemCode
+	,Item.TrainingItemName
+	,Item.Abstracts
+	,Item.AbstractsEng
+	,Item.AttachUrl
+	,Item.VersionNum
+	,Item.TestType
+	,Item.WorkPostIds
+	,Item.WorkPostNames
+	,Item.AItem
+	,Item.BItem
+	,Item.CItem
+	,Item.DItem
+	,Item.EItem
+	,Item.AItemEng
+	,Item.BItemEng
+	,Item.CItemEng
+	,Item.DItemEng
+	,Item.EItemEng
+	--,Item.Score
+	,Item.AnswerItems
+	,Item.DepartIds
+	,Item.DepartNames
+ FROM dbo.Training_TestTrainingItem AS Item
+ LEFT JOIN Training_TestTraining AS Training ON Item.TrainingId = Training.TrainingId
+
+
+
+ 
+
+
diff --git a/SGGL/BLL/Common/CommonService.cs b/SGGL/BLL/Common/CommonService.cs
index c2d3e08b..166cdc4d 100644
--- a/SGGL/BLL/Common/CommonService.cs
+++ b/SGGL/BLL/Common/CommonService.cs
@@ -637,6 +637,9 @@ namespace BLL
         /// <returns></returns>
         public static string CreateGetHttpResponse(string url)
         {
+            ServicePointManager.Expect100Continue = true;
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+            ServicePointManager.ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true;
             HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;//鍒涘缓璇锋眰瀵硅薄
             request.Method = "Get";//璇锋眰鏂瑰紡
             request.ContentType = "application/x-www-form-urlencoded";//閾炬帴绫诲瀷
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 62f0d0af..771cd0e5 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1638,3 +1638,41 @@ IP鍦板潃:::1
 
 鍑洪敊鏃堕棿:01/13/2023 09:07:08
 
+
+閿欒淇℃伅寮�濮�=====>
+閿欒绫诲瀷:NullReferenceException
+閿欒淇℃伅:鏈皢瀵硅薄寮曠敤璁剧疆鍒板璞＄殑瀹炰緥銆�
+閿欒鍫嗘爤:
+   鍦� FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\indexProject.aspx.cs:琛屽彿 354
+   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
+   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
+   鍦� System.Web.UI.Control.LoadRecursive()
+   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+鍑洪敊鏃堕棿:02/01/2023 14:45:44
+鍑洪敊鏂囦欢:http://localhost:8119/indexProject.aspx
+IP鍦板潃:::1
+
+鍑洪敊鏃堕棿:02/01/2023 14:45:44
+
+
+
+閿欒淇℃伅寮�濮�=====>
+閿欒绫诲瀷:InvalidCastException
+閿欒淇℃伅:鏃犳硶灏嗙被鍨嬩负鈥淪ystem.String鈥濈殑瀵硅薄寮哄埗杞崲涓虹被鍨嬧�淣ewtonsoft.Json.Linq.JObject鈥濄��
+閿欒鍫嗘爤:
+   鍦� FineUIPro.Web.ProjectData.ProjectMonitorList.get_Devices() 浣嶇疆 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ProjectData\ProjectMonitorList.aspx.cs:琛屽彿 48
+   鍦� FineUIPro.Web.ProjectData.ProjectMonitorList.BindGrid() 浣嶇疆 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ProjectData\ProjectMonitorList.aspx.cs:琛屽彿 157
+   鍦� FineUIPro.Web.ProjectData.ProjectMonitorList.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\ProjectData\ProjectMonitorList.aspx.cs:琛屽彿 103
+   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
+   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
+   鍦� System.Web.UI.Control.LoadRecursive()
+   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+鍑洪敊鏃堕棿:02/01/2023 15:55:02
+鍑洪敊鏂囦欢:http://localhost:8119/ProjectData/ProjectMonitorList.aspx?ProjectCode=E22039&Id=19&URLToken=O3oKppv2KKXDL5EcBs7re7C2JCwujSEhBzJelpGw-EV.oxNjc1ODQyODk5LCJwIjoiNGEyZDhmYThiNWU1ZDNkMGFjNTAxODA5YmRjMWE5MzI3N2EyZDk1ZGM4ZDc0OWUxNjkxZTcxMDcyOGE0M2Q1NyIsInQiOjE2NzUyMzgwOTksInUiOiIxOTc4ZDBmMmU5In0eyJlIj.GciOiJIUzI1NiIsInR5cCI6IkpXVCJ9eyJhb
+IP鍦板潃:::1
+鎿嶄綔浜哄憳:JT
+
+鍑洪敊鏃堕棿:02/01/2023 15:55:02
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index da83cf27..c6bf7486 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1391,6 +1391,7 @@
     <Content Include="ProjectData\MainItemView.aspx" />
     <Content Include="ProjectData\ProjectInformation.aspx" />
     <Content Include="ProjectData\ProjectList.aspx" />
+    <Content Include="ProjectData\ProjectMonitorList.aspx" />
     <Content Include="ProjectData\ProjectSet.aspx" />
     <Content Include="ProjectData\ProjectSetMap.aspx" />
     <Content Include="ProjectData\ProjectSetSave.aspx" />
@@ -13787,6 +13788,13 @@
     <Compile Include="ProjectData\ProjectList.aspx.designer.cs">
       <DependentUpon>ProjectList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ProjectData\ProjectMonitorList.aspx.cs">
+      <DependentUpon>ProjectMonitorList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ProjectData\ProjectMonitorList.aspx.designer.cs">
+      <DependentUpon>ProjectMonitorList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ProjectData\ProjectSet.aspx.cs">
       <DependentUpon>ProjectSet.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16207,7 +16215,6 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-   
   <!-- 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">
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
index 74dfa500..a724fb18 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx
@@ -125,6 +125,9 @@
           <f:MenuButton ID="btnEnter" EnablePostBack="true" runat="server"  Icon="Outline" Text="杩涘叆椤圭洰"
                 OnClick="btnEnter_Click">
             </f:MenuButton>
+        <f:MenuButton ID="btnMonitor" EnablePostBack="true" runat="server"  Icon="Outline" Text="鍏宠仈鎽勫儚澶�"
+                OnClick="btnMonitor_Click">
+          </f:MenuButton>
          <f:MenuButton ID="btnView" EnablePostBack="true" runat="server"  Icon="Find" Text="鏌ョ湅"
                 OnClick="btnView_Click">
             </f:MenuButton>
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
index 084a506a..91c55d4f 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs
@@ -1,6 +1,8 @@
 锘縰sing BLL;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
@@ -9,6 +11,20 @@ namespace FineUIPro.Web.ProjectData
 {
     public partial class ProjectList : PageBase
     {
+        /// <summary>
+        /// 瀹氫箟椤�
+        /// </summary>
+        public string URLToken
+        {
+            get
+            {
+                return (string)ViewState["URLToken"];
+            }
+            set
+            {
+                ViewState["URLToken"] = value;
+            }
+        }
         #region 鍔犺浇
         /// <summary>
         /// 鍔犺浇椤甸潰
@@ -116,6 +132,47 @@ namespace FineUIPro.Web.ProjectData
             }
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSetView.aspx?ProjectId={0}", Grid1.SelectedRowID, "鏌ョ湅 - ")));
         }
+        /// <summary>
+        /// 鍏宠仈鎽勫儚澶� 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMonitor_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
+            {
+                string url = ConfigurationManager.AppSettings["Video_URL"];
+                string username = ConfigurationManager.AppSettings["Video_USER"];
+                string password = ConfigurationManager.AppSettings["Video_PW"];
+                if (string.IsNullOrEmpty(URLToken))
+                {
+                    String res = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/login?username=" + username + "&password=" + Funs.EncryptionPassword(password));
+                    Dictionary<string, string> dicres = JsonConvert.DeserializeObject<Dictionary<string, string>>(res);
+                    URLToken = dicres["URLToken"];
+                }
+                var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == Grid1.SelectedRowID);
+
+                string resUserInfor = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/info?token=" + URLToken + "&username=" + project.ProjectCode);
+                if ("user not found".Equals(resUserInfor) || "杩滅▼鏈嶅姟鍣ㄨ繑鍥為敊璇�: (400) 閿欒鐨勮姹傘��".Equals(resUserInfor))
+                {
+                    string resUserSave = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/save?token=" + URLToken + "&ID=0&Username=" + project.ProjectCode + "&Role=鎿嶄綔鍛�,瑙備紬&Enable=true");
+                    Dictionary<string, string> dicUserSave = JsonConvert.DeserializeObject<Dictionary<string, string>>(resUserSave);
+                    project.MonitorId = dicUserSave["ID"];
+                    string newPassWord = Funs.EncryptionPassword(DateTime.Now.Ticks.ToString());
+                    newPassWord = newPassWord.Substring(newPassWord.Length - 9, 8);
+                    string resResPS = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/resetpassword?token=" + URLToken + "&id=" + dicUserSave["ID"] + "&password="+ newPassWord);
+                    project.MonitorPW = newPassWord;
+                    Funs.DB.SubmitChanges();
+                }
+
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectMonitorList.aspx?ProjectCode={0}&Id={1}&URLToken={2}", project.ProjectCode, project.MonitorId, URLToken, "鏌ョ湅 - ")));
+
+            }
+            else
+            {
+                ShowNotify("璇烽�夋嫨椤圭洰杩涘叆锛�", MessageBoxIcon.Warning);
+            }
+        }
 
         /// <summary>
         /// 鏌ョ湅
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs
index e5b836ab..47c943fc 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData {
-    
-    
-    public partial class ProjectList {
-        
+namespace FineUIPro.Web.ProjectData
+{
+
+
+    public partial class ProjectList
+    {
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ckState 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.RadioButtonList ckState;
-        
+
         /// <summary>
         /// txtProjectName 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectName;
-        
+
         /// <summary>
         /// btnOut 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// lblCM 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblCM;
-        
+
         /// <summary>
         /// Label1 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
-        
+
         /// <summary>
         /// Label2 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-        
+
         /// <summary>
         /// ToolbarSeparator1 鎺т欢銆�
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 鎺т欢銆�
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 鎺т欢銆�
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 鎺т欢銆�
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnEnter 鎺т欢銆�
         /// </summary>
@@ -173,7 +175,16 @@ namespace FineUIPro.Web.ProjectData {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton btnEnter;
-        
+
+        /// <summary>
+        /// btnMonitor 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMonitor;
+
         /// <summary>
         /// btnView 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx
new file mode 100644
index 00000000..2d93e473
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx
@@ -0,0 +1,84 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectMonitorList.aspx.cs" Inherits="FineUIPro.Web.ProjectData.ProjectMonitorList" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>椤圭洰娓呭崟</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />  
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }     
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1"  runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" 
+       ShowHeader="false"  Layout="VBox" BoxConfigAlign="Stretch" >
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="椤圭洰淇℃伅"  IsFluid="true"
+                runat="server" BoxFlex="1"  EnableColumnLines="true" 
+                DataKeyNames="id" DataIDField="id" AllowSorting="true" SortField="id" SortDirection="DESC"  EnableCheckBoxSelect="true" 
+                OnSort="Grid1_Sort"  AllowPaging="true" IsDatabasePaging="true"  PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" 
+                OnRowSelect="Grid1_RowSelect"   EnableMultiSelect="true" EnableRowSelectEvent="true"  
+                 EnableRowDeselectEvent  ="true" OnRowDeselect="Grid1_RowDeselect"
+                EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                        <Items> 
+                            <f:TextBox runat="server" Label="椤圭洰鍚嶇О" ID="txtProjectName" EmptyText="杈撳叆鏌ヨ鏉′欢" 
+                                   Width="200px" LabelWidth="80px"></f:TextBox>    
+                             <f:Button ID="btnSearch" OnClick="btnSearch_Click" runat="server" ToolTip="鎼滅储" Icon="SystemSearch"
+                                EnableAjax="false" DisableControlBeforePostBack="false">
+                            </f:Button>                
+                             
+                            
+                        </Items>
+                    </f:Toolbar>
+                      
+                </Toolbars>
+                <Columns>
+                   <f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="搴忓彿" HeaderTextAlign="Center"
+                        TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+                     <f:RenderField Width="200px" ColumnID="serial" DataField="serial" SortField="serial"
+                        FieldType="String" HeaderText="閫氶亾鍥芥爣缂栫爜"  HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField> 
+                     <f:RenderField Width="200px" ColumnID="deviceName" DataField="deviceName"  HeaderTextAlign="Center" SortField="deviceName" FieldType="String" TextAlign="Left"
+                        HeaderText="椤圭洰鍚嶇О">
+                    </f:RenderField>
+                    <f:RenderField Width="200px" ColumnID="name" DataField="name" SortField="name" FieldType="String" HeaderTextAlign="Center" ExpandUnusedSpace="true" TextAlign="Left"
+                        HeaderText="璁惧鍚嶇О">
+                    </f:RenderField> 
+                   
+                </Columns>
+                
+            <PageItems>
+                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                </f:ToolbarSeparator>
+                <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
+                </f:ToolbarText>
+                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                  
+                </f:DropDownList>        
+            </PageItems>            
+            </f:Grid>
+        </Items>
+    </f:Panel> 
+     
+    </form>
+    <script type="text/javascript">       
+         
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx.cs
new file mode 100644
index 00000000..5bc9928d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx.cs
@@ -0,0 +1,216 @@
+锘縰sing BLL;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.ProjectData
+{
+    public partial class ProjectMonitorList : PageBase
+    {
+
+        /// <summary>
+        /// 瀹氫箟椤�
+        /// </summary>
+        public string ProjectCode
+        {
+            get
+            {
+                return (string)ViewState["ProjectCode"];
+            }
+            set
+            {
+                ViewState["ProjectCode"] = value;
+            }
+        }
+        public string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        public string Devices
+        {
+            get
+            {
+                string url = ConfigurationManager.AppSettings["Video_URL"];
+                string res = APIGetHttpService.Http(url + "api/v1/user/channellist?token=" + URLToken + "&id=" + Id + "&related=true");
+                string devices = "";
+                JObject jObject = (JObject)JsonConvert.DeserializeObject(res);
+                JArray channelList = jObject.Value<JArray>("ChannelList");
+                HashSet<string> set = new HashSet<string>();
+                foreach (var c in channelList)
+                {
+                    set.Add(c["DeviceID"] + ":" + c["ID"]);
+                }
+                if (set.Count > 0)
+                {
+                    devices = string.Join(",", set);
+                }
+                return devices;
+            }
+            set
+            {
+                ViewState["Devices"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 瀹氫箟椤�
+        /// </summary>
+        public string URLToken
+        {
+            get
+            {
+                return (string)ViewState["URLToken"];
+            }
+            set
+            {
+                ViewState["URLToken"] = value;
+            }
+        }
+
+        #region 鍔犺浇
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectCode = Request.QueryString["ProjectCode"];
+                this.URLToken = Request.QueryString["URLToken"];
+                this.Id = Request.QueryString["Id"];
+                Funs.DropDownPageSize(this.ddlPageSize);
+                if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
+                {
+                    Grid1.PageSize = this.CurrUser.PageSize.Value;
+                }
+                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 缁戝畾琛ㄦ牸
+
+                this.BindGrid();
+            }
+        }
+        #endregion
+
+        #region 缁戝畾鏁版嵁
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        private void BindGrid()
+        {
+
+
+            DataTable dt = new DataTable();
+            dt.Columns.Add("id");
+            dt.Columns.Add("name");
+            dt.Columns.Add("serial");
+            dt.Columns.Add("deviceName");
+            string url = ConfigurationManager.AppSettings["Video_URL"];
+            List<string> urls = new List<string>();
+            string res = APIGetHttpService.Http(url + "api/v1/device/channeltree?token=" + URLToken);
+
+            List<Dictionary<string, string>> jsonNvr = JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(res);
+            foreach (Dictionary<string, string> nvr in jsonNvr)
+            {
+                if (string.IsNullOrEmpty(txtProjectName.Text.Trim()) || nvr["customName"].Contains(txtProjectName.Text.Trim()))
+                {
+                    string jsonCameras = APIGetHttpService.Http(url + "api/v1/device/channeltree?token=" + URLToken + "&serial=" + nvr["serial"]);
+                    List<Dictionary<string, string>> jsonDiv = JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(jsonCameras);
+                    foreach (Dictionary<string, string> div in jsonDiv)
+                    {
+                        var rowDiv = dt.NewRow();
+                        rowDiv["id"] = div["id"];
+                        rowDiv["deviceName"] = nvr["customName"];
+                        if (!string.IsNullOrEmpty(div["customName"]))
+                        {
+                            rowDiv["name"] = div["customName"];
+                        }
+                        else
+                        {
+                            rowDiv["name"] = div["name"];
+                        }
+                        rowDiv["serial"] = div["code"];
+
+                        dt.Rows.Add(rowDiv);
+                    }
+                }
+            }
+
+
+
+            Grid1.RecordCount = dt.Rows.Count;
+            Grid1.DataSource = this.GetPagedDataTable(Grid1, dt);
+            Grid1.DataBind();
+            if (!string.IsNullOrEmpty(Devices))
+            {
+                Grid1.SelectedRowIDArray = Devices.Split(',');
+            }
+        }
+        #endregion
+
+        #region Grid
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+
+        protected void Grid1_RowSelect(object sender, GridRowSelectEventArgs e)
+        {
+            string url = ConfigurationManager.AppSettings["Video_URL"];
+            APIGetHttpService.Http(url + "api/v1/user/savechannels?token=" + URLToken + "&id=" + Id + "&channels[]=" + e.RowID);
+
+        }
+
+
+
+        protected void Grid1_RowDeselect(object sender, GridRowSelectEventArgs e)
+        {
+
+            string url = ConfigurationManager.AppSettings["Video_URL"];
+            APIGetHttpService.Http(url + "api/v1/user/removechannels?token=" + URLToken + "&id=" + Id + "&channels[]=" + e.RowID);
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx.designer.cs
new file mode 100644
index 00000000..48fc148f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectMonitorList.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ProjectData
+{
+
+
+    public partial class ProjectMonitorList
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProjectName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// btnSearch 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// lblNumber 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 677f3811..93742687 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -26,7 +26,9 @@
     <!--闄勪欢涓婁紶鐗╃悊璺緞-->
     <add key="localRoot" value="D:\ChengDa\SGGL_CD\SGGL\FineUIPro.Web\" />
     <!--瑙嗛鏈嶅姟鍣�-->
-    <add key="Video_URL" value="http://sggljk.chengda.com:10000/" />
+    <add key="Video_URL" value="https://sggl.hfnbd.com/" />
+    <add key="Video_USER" value="admin"/>
+    <add key="Video_PW" value="admin"/>
     <!--璺宠浆灏忕▼搴忕被鍨嬶細developer涓哄紑鍙戠増锛泃rial涓轰綋楠岀増锛沠ormal涓烘寮忕増锛涢粯璁や负姝ｅ紡鐗�-->
     <add key="miniprogram_state" value="developer" />
   </appSettings>
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx
index a74fcb72..ade4ec30 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@@ -420,6 +420,13 @@
             EnableMaximize="true" EnableResize="false">
         </f:Window>
         <asp:XmlDataSource ID="XmlDataSource1" runat="server" EnableCaching="false"></asp:XmlDataSource>
+         <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false" Hidden="true"
+                    LabelWidth="80px" BodyPadding="5px" Width="350px">
+             <Items>
+                     <f:HiddenField     runat="server" ID="hfProjectCode" ></f:HiddenField>
+                    <f:HiddenField   runat="server" ID="hfMonitorPW" ></f:HiddenField>
+            </Items>
+             </f:SimpleForm>
     </form>
     <script type="text/javascript">
         var toolRefreshClientID = '<%= toolRefresh.ClientID %>';
@@ -640,12 +647,18 @@
         var videoURL ='<%=VideoURL %>'
         function openVideo() {
             if (videoURL) {
-                window.open(videoURL, '_blank');
-            }
-            else {
-                alert("鎮ㄦ病鏈夋潈闄愶紒");
-            }
-        }
+                var username = $('#<%= hfProjectCode.ClientID %>-inputEl').val()
+              var password = $('#<%= hfMonitorPW.ClientID %>-inputEl').val();
+              if (password != "") {
+                  window.open(videoURL + "login.html?username=" + username + "&password=" + password, '_blank');
+              } else {
+                  alert("璇ラ」鐩湭鍏宠仈鐩戞帶淇℃伅锛�");
+              }
+          }
+          else {
+              alert("鎮ㄦ病鏈夋潈闄愶紒");
+          }
+      }
 
         // 婵�娲婚�夐」鍗★紝骞跺埛鏂板叾涓殑鍐呭锛岀ず渚嬶細琛ㄦ牸鎺т欢->鏉傞」->鍦ㄦ柊鏍囩椤典腑鎵撳紑锛堝叧闂悗鏇存柊鐖堕�夐」鍗′腑鐨勮〃鏍硷級
         function activeTabAndUpdate(tabId, param1) {
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs
index 0ef3a720..ef36d7b6 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Text;
 using System.Web;
@@ -387,7 +388,31 @@ namespace FineUIPro.Web
                     Alert.ShowInTop("褰撳墠瀵嗙爜涓嶅畨鍏紝璇峰敖蹇洿鏀癸紒", MessageBoxIcon.Warning);
                 }
 
-                
+                if (CurrUser.IsOffice.HasValue && CurrUser.IsOffice.Value)
+                {
+
+                    string username = ConfigurationManager.AppSettings["Video_USER"];
+                    string password = ConfigurationManager.AppSettings["Video_PW"];
+                    this.hfProjectCode.Text = username;
+                    this.hfMonitorPW.Text = Funs.EncryptionPassword(password);
+                }
+                else
+                {
+                    var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
+                    if (project != null && !string.IsNullOrEmpty(project.ProjectCode))
+                    {
+                        this.hfProjectCode.Text = project.ProjectCode;
+                    }
+                    if (project != null && !string.IsNullOrEmpty(project.MonitorPW))
+                    {
+                        this.hfMonitorPW.Text = Funs.EncryptionPassword(project.MonitorPW);
+                    }
+                    else
+                    {
+                        this.hfMonitorPW.Text = "";
+                    }
+                }
+
 
             }
         }
@@ -587,6 +612,31 @@ namespace FineUIPro.Web
             this.CurrUser.LoginProjectId = this.drpProject.SelectedValue;            
             PageContext.RegisterStartupScript("parent.removeActiveTab();");
             MenuSwitchMethod(this.CurrUser.LastMenuType);
+
+            if (CurrUser.IsOffice.HasValue && CurrUser.IsOffice.Value)
+            {
+
+                string username = ConfigurationManager.AppSettings["Video_USER"];
+                string password = ConfigurationManager.AppSettings["Video_PW"];
+                this.hfProjectCode.Text = username;
+                this.hfMonitorPW.Text = Funs.EncryptionPassword(password);
+            }
+            else
+            {
+                var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
+                if (project != null && !string.IsNullOrEmpty(project.ProjectCode))
+                {
+                    this.hfProjectCode.Text = project.ProjectCode;
+                }
+                if (project != null && !string.IsNullOrEmpty(project.MonitorPW))
+                {
+                    this.hfMonitorPW.Text = Funs.EncryptionPassword(project.MonitorPW);
+                }
+                else
+                {
+                    this.hfMonitorPW.Text = "";
+                }
+            }
         }
 
         /// <summary>
@@ -776,7 +826,7 @@ namespace FineUIPro.Web
             {
                 if (CommonService.IsHaveSystemPower(this.CurrUser.UserId, Const.Menu_Video, this.drpProject.SelectedValue))
                 {
-                    return ConfigurationManager.AppSettings["Video_URL"] + "#/screen";
+                    return ConfigurationManager.AppSettings["Video_URL"] ;
                 }
                 else
                 {
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
index 2db2c7e5..9867be4f 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
@@ -499,5 +499,32 @@ namespace FineUIPro.Web
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.XmlDataSource XmlDataSource1;
+
+        /// <summary>
+        /// SimpleForm1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.SimpleForm SimpleForm1;
+
+        /// <summary>
+        /// hfProjectCode 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hfProjectCode;
+
+        /// <summary>
+        /// hfMonitorPW 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hfMonitorPW;
     }
 }
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 54d06e18..e1c5554f 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -23849,6 +23849,10 @@ namespace Model
 		
 		private System.Nullable<decimal> _Progress;
 		
+		private string _MonitorPW;
+		
+		private string _MonitorId;
+		
 		private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
 		
 		private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@@ -24467,6 +24471,10 @@ namespace Model
     partial void OnProjectState2Changed();
     partial void OnProgressChanging(System.Nullable<decimal> value);
     partial void OnProgressChanged();
+    partial void OnMonitorPWChanging(string value);
+    partial void OnMonitorPWChanged();
+    partial void OnMonitorIdChanging(string value);
+    partial void OnMonitorIdChanged();
     #endregion
 		
 		public Base_Project()
@@ -25378,6 +25386,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonitorPW", DbType="NVarChar(50)")]
+		public string MonitorPW
+		{
+			get
+			{
+				return this._MonitorPW;
+			}
+			set
+			{
+				if ((this._MonitorPW != value))
+				{
+					this.OnMonitorPWChanging(value);
+					this.SendPropertyChanging();
+					this._MonitorPW = value;
+					this.SendPropertyChanged("MonitorPW");
+					this.OnMonitorPWChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonitorId", DbType="NVarChar(50)")]
+		public string MonitorId
+		{
+			get
+			{
+				return this._MonitorId;
+			}
+			set
+			{
+				if ((this._MonitorId != value))
+				{
+					this.OnMonitorIdChanging(value);
+					this.SendPropertyChanging();
+					this._MonitorId = value;
+					this.SendPropertyChanged("MonitorId");
+					this.OnMonitorIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
 		{
@@ -389192,10 +389240,6 @@ namespace Model
 		
 		private string _WorkPostNames;
 		
-		private string _DepartIds;
-		
-		private string _DepartNames;
-		
 		private string _AItem;
 		
 		private string _BItem;
@@ -389218,6 +389262,10 @@ namespace Model
 		
 		private string _AnswerItems;
 		
+		private string _DepartIds;
+		
+		private string _DepartNames;
+		
 		public View_Training_TestTrainingItem()
 		{
 		}
@@ -389430,38 +389478,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartIds", DbType="NVarChar(4000)")]
-		public string DepartIds
-		{
-			get
-			{
-				return this._DepartIds;
-			}
-			set
-			{
-				if ((this._DepartIds != value))
-				{
-					this._DepartIds = value;
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartNames", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
-		public string DepartNames
-		{
-			get
-			{
-				return this._DepartNames;
-			}
-			set
-			{
-				if ((this._DepartNames != value))
-				{
-					this._DepartNames = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AItem", DbType="NVarChar(500)")]
 		public string AItem
 		{
@@ -389637,6 +389653,38 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartIds", DbType="NVarChar(4000)")]
+		public string DepartIds
+		{
+			get
+			{
+				return this._DepartIds;
+			}
+			set
+			{
+				if ((this._DepartIds != value))
+				{
+					this._DepartIds = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartNames", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string DepartNames
+		{
+			get
+			{
+				return this._DepartNames;
+			}
+			set
+			{
+				if ((this._DepartNames != value))
+				{
+					this._DepartNames = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Training_TrainingItem")]