From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/EAPSimulator/Resource.h |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/EAPSimulator/Resource.h b/SourceCode/Bond/EAPSimulator/Resource.h
index fec8156..96c191e 100644
--- a/SourceCode/Bond/EAPSimulator/Resource.h
+++ b/SourceCode/Bond/EAPSimulator/Resource.h
@@ -9,6 +9,11 @@
 #define IDR_MAINFRAME                   128
 #define IDD_DIALOG_TERMINAL_DISPLAY     129
 #define IDD_DIALOG_ED_EVENT_REPORT      131
+#define IDD_DIALOG_DEFINE_REPORTS       133
+#define IDD_DIALOG_ADD_IDS              135
+#define IDD_DIALOG_LINK_REPORT          137
+#define IDD_DIALOG_LINK_REPORT_DETAIL   139
+#define IDD_DIALOG_PJS                  141
 #define IDC_EDIT_LOG                    1000
 #define IDC_EDIT_IP                     1001
 #define IDC_EDIT_PORT                   1002
@@ -18,21 +23,48 @@
 #define IDC_BUTTON_DATETIME_SYNC        1006
 #define IDC_BUTTON_TERMINAL_DISPLAY     1007
 #define IDC_COMBO_TID                   1008
-#define IDC_BUTTON_ED_EVENT_REPORT      1008
 #define IDC_EDIT_TEXT                   1009
-#define IDC_BUTTON_ED_ALARM_REPORT      1009
 #define IDC_BUTTON_SEND                 1010
+#define IDC_BUTTON_LINE_REPORT          1011
 #define IDC_RADIO_ENABLE                1012
 #define IDC_RADIO_DISABLE               1013
 #define IDC_EDIT_CEID                   1014
+#define IDC_LIST1                       1015
+#define IDC_LIST2                       1016
+#define IDC_BUTTON_ADD_RPTID            1017
+#define IDC_BUTTON_DEL_REPORT           1018
+#define IDC_BUTTON_ADD_VID              1019
+#define IDC_BUTTON_DEL_VID              1020
+#define IDC_GROUP_IDS                   1021
+#define IDC_EDIT_ID                     1022
+#define IDC_EDIT_CE_DESCRIPTIONS        1023
+#define IDC_BUTTON_ED_EVENT_REPORT      1025
+#define IDC_BUTTON_ED_ALARM_REPORT      1026
+#define IDC_BUTTON_DEFINE_REPORT        1027
+#define IDC_BUTTON_LINE_REPORT2         1028
+#define IDC_BUTTON_CONFIGURE_SPOOLING   1029
+#define IDC_BUTTON_PURGE_SPOOLED_DATA   1030
+#define IDC_EDIT_CE_NAME                1031
+#define IDC_BUTTON_QUERY_PPID_LIST      1032
+#define IDC_EDIT_CE_RPTID               1033
+#define IDC_BUTTON_PROCEED_WITH_CARRIER 1034
+#define IDC_BUTTON_TRANSMIT_SPOOLED_DATA 1035
+#define IDC_BUTTON_CARRIER_RELEASE      1036
+#define IDC_BUTTON_QUERY_CJ_SPACE       1037
+#define IDC_BUTTON_QUERY_PJ_SPACE       1038
+#define IDC_BUTTON_CREATE_PJ            1039
+#define IDC_BUTTON_ADD                  1040
+#define IDC_BUTTON_CREATE_PJ2           1040
+#define IDC_BUTTON_CREATE_CJ            1040
+#define IDC_BUTTON_DELETE               1041
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        133
+#define _APS_NEXT_RESOURCE_VALUE        143
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1015
+#define _APS_NEXT_CONTROL_VALUE         1042
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--
Gitblit v1.9.3