From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期五, 30 一月 2026 11:16:24 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/resource.h | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h index e81edcd..ef26aa5 100644 --- a/SourceCode/Bond/Servo/resource.h +++ b/SourceCode/Bond/Servo/resource.h @@ -49,7 +49,6 @@ #define IDD_DIALOG_RECIPE_DEVICE_BIND 167 #define IDD_PAGE_VARIABLE 168 #define IDD_PAGE_REPORT 169 -#define IDD_PAGE_ 170 #define IDD_PAGE_COLLECTION_EVENT 171 #define IDD_DIALOG_CONTROL_JOB 172 #define IDD_PAGE_GLASS_LIST 173 @@ -61,12 +60,14 @@ #define IDD_CJ_PAGE3 180 #define IDD_DIALOG_USER_MANAGER2 181 #define IDD_DIALOG_USER_EDIT2 182 -#define IDD_DIALOG1 184 +#define IDD_PROD_OVERVIEW 183 #define IDD_DIALOG_USERX_LOG 184 #define IDD_DIALOG_VARIABLE_EDIT2 186 #define IDD_DIALOG_REPORT_EDIT 187 #define IDD_DIALOG_EVENT_EDIT 188 #define IDD_PANEL_PRODUCTION 189 +#define IDD_PROD_CTRL_STATE 190 +#define IDD_DIALOG_POPUP_ALARM 191 #define IDC_SERVO_GRAPH1 1001 #define IDC_BUTTON_LOG 1002 #define IDC_EDIT_LOG 1003 @@ -323,6 +324,32 @@ #define IDC_EDIT_EVT_NAME 1244 #define IDC_EDIT_EVT_DESC 1245 #define IDC_LIST_EVT_RPTS 1246 +#define IDC_ACCORDION_WND1 1247 +#define IDC_PROD_DAY_OUTPUT 1248 +#define IDC_PROD_NIGHT_OUTPUT 1249 +#define IDC_PROD_DAY_TAKT 1250 +#define IDC_PROD_NIGHT_TAKT 1251 +#define IDC_BUTTON_OFFLINE 1252 +#define IDC_BUTTON_ONLINE_LOCAL 1253 +#define IDC_BUTTON_ONLINE_REMOTE 1254 +#define IDC_POPUP_TITLE 1255 +#define IDC_POPUP_ALARM_ID 1256 +#define IDC_POPUP_ALARM_LEVEL 1257 +#define IDC_POPUP_ALARM_DESC 1258 +#define IDC_POPUP_BTN_CLOSE 1259 +#define IDC_POPUP_BTN_CLEAR 1260 +#define IDC_BUTTON_PREV 1261 +#define IDC_BUTTON_NEXT 1262 +#define IDC_ICON_ALARM 1263 +#define IDC_ICON_TITLE 1264 +#define IDC_LABEL_LEVEL 1265 +#define IDC_LABEL_NAME 1267 +#define IDC_BUTTON_SOUND_OFF 1268 +#define IDC_BUTTON_ALARM_OFF 1269 +#define IDC_LINE2 1270 +#define IDC_LABEL_DESCRIPTION 1271 +#define IDC_LABEL_NO_ALARM 1272 +#define IDC_LABEL_JOBSTATE 1273 #define ID_MENU_HELP_ABOUT 32771 #define ID_MENU_FILE_EXIT 32772 #define ID_MENU_FILE_SECSTEST 32773 @@ -355,14 +382,18 @@ #define ID_MENU_TOOLS_CLIENT_LIST 32801 #define ID_MENU_WND_TEST_PANEL 32802 #define ID_MENU_WND_PRO_PANEL 32803 +#define ID_MENU_TEST_ALARM_ON 32804 +#define ID_MENU_TEST_ALARM_OFF 32805 +#define ID_MENU_TOOLS_CURVE_EMPTY 32806 +#define ID_MENU_TOOLS_CURVE_PRODUCTION 32807 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 191 -#define _APS_NEXT_COMMAND_VALUE 32804 -#define _APS_NEXT_CONTROL_VALUE 1247 +#define _APS_NEXT_RESOURCE_VALUE 192 +#define _APS_NEXT_COMMAND_VALUE 32808 +#define _APS_NEXT_CONTROL_VALUE 1274 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif -- Gitblit v1.9.3