From 47718a637fa239dcbec0fffca736f3c3b1cf7887 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 10 十二月 2024 08:35:17 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/BondEq/BondEqDlg.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BondEq/BondEqDlg.h b/SourceCode/Bond/BondEq/BondEqDlg.h
index bcb13fd..d7827a3 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.h
+++ b/SourceCode/Bond/BondEq/BondEqDlg.h
@@ -9,6 +9,7 @@
 #include "CBaseView.h"
 #include "CRemoteEqView.h"
 #include "TopToolbar.h"
+#include "CComponentPLCDlg.h"
 
 
 // CBondEqDlg 对话框
@@ -22,8 +23,10 @@
 	void InitRxWindows();
 	void Resize();
 	void CloseView(CBaseView* pView);
+	void CloseView(CComponentDlg* pView);
 	CHomeDialog* CreateHomeDlg();
 	CBaseView* CreateRemoteEqView(BEQ::IRemoteEquipment* pEquipment);
+	CComponentPLCDlg* CreateComponentPLCDlg(CComponent* pComponent);
 	void UpdateLoginStatus();
 
 private:
@@ -35,7 +38,7 @@
 	CPanelProject* m_pPanelProject;
 	CHomeDialog* m_pHomeDialog;
 	CBaseView* m_pActiveView;
-
+	CComponentDlg* m_pActiveComponentDlg;
 
 // 对话框数据
 #ifdef AFX_DESIGN_TIME

--
Gitblit v1.9.3