增加多国语言，更新web

cust_data/web/unique/css/chunk-13e3bfb8.6542ae50.css

@@ -0,0 +1 @@
+.el-form-item__content .el-button--mini{border-radius:10px;margin-left:10px;width:unset}

pro/src/common.h

@@ -280,13 +280,13 @@ enum {
 };
 
 enum {
-    LANG_ID_CHINESE,
+    LANG_ID_CHINESE=0,
     LANG_ID_ENGLISH,
     LANG_ID_RUSSIAN,
-    LANG_ID_FRENCH,
-    LANG_ID_GERMAN,
     LANG_ID_SPANISH,
     LANG_ID_PORTYGYESE,
+    LANG_ID_GERMAN,
+    LANG_ID_FRENCH,
     LANG_ID_ITALIAN,
     LANG_ID_JAPANESE,
 

pro/src/json_handle.c

@@ -1203,7 +1203,7 @@ char* json_to_system_config_info(int tls)
 static int get_lang_id(char *lang_str)
 {
     int i;
-    char *LANG_STR[LANG_ID_MAX]={"zh-CN","en-US","ru-RU","fr","de","es","pt","it","ja"};
+    char *LANG_STR[LANG_ID_MAX]={"zh-CN","en-US","ru-RU","es","pt","de","fr","it","ja"};
 
     if(!lang_str) {
         return -1;

pro/src/language_common.h

@@ -1,175 +1,175 @@
 #ifndef __LANGUAGE_COMMON_H
 #define __LANGUAGE_COMMON_H
 
-#define LANGUAGE_TYPE 4
-#define LANGUAGE_SIZE 64
-extern const char language_root_name[LANGUAGE_TYPE][LANGUAGE_SIZE];
+#define LANG_MAX      9
+#define LANG_STR_SIZE 64
 
-extern const char language_nick_name[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_root_name[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_user_manage[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_nick_name[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_role_manage[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_user_manage[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_menu_manage[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_role_manage[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_power_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_menu_manage[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_power_sts_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_power_monitor[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_power_channel_sts_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_power_sts_monitor[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_power_switch_sts_monitor[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_power_channel_sts_monitor[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_power_history_search[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_power_switch_sts_monitor[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_sensor_monitoring[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_power_history_search[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_sensor_status_monitoring[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_sensor_monitoring[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_sensor_history_search[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_sensor_status_monitoring[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Alarm_protection[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_sensor_history_search[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Alarm_System[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Alarm_protection[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Alarm_Threshold_rule[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Alarm_System[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_log_information[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Alarm_Threshold_rule[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_log_Alarm[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_log_information[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_log_operation[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_log_Alarm[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_log_running[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_log_operation[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_communication_management[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_log_running[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_net_install[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_communication_management[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_RS485_install[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_net_install[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_serve_manage[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_RS485_install[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_SMTP_install[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_serve_manage[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_SNMP_install[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_SMTP_install[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_SNMP_TRAP_install[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_SNMP_install[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_MQTT_iot_install[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_SNMP_TRAP_install[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_NTP_install[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_MQTT_iot_install[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Timing_install[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_NTP_install[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Sequential_setting[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Timing_install[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Group_setting[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Sequential_setting[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_maintenance_equipment[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Group_setting[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Device_restart[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_maintenance_equipment[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_firmware_upgrade[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Device_restart[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_ctrlboard_upgrade[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_firmware_upgrade[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_back_factor_upgrade[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_ctrlboard_upgrade[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Configure_inport_export[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_back_factor_upgrade[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_after_sales_service[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Configure_inport_export[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_about_Equipment[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_after_sales_service[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_temperature[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_about_Equipment[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_humidity[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_temperature[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_atmosphere_gas[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_humidity[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_atmosphere_airflow[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_atmosphere_gas[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_atmosphere_pressure[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_atmosphere_airflow[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_leak[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_atmosphere_pressure[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_log_Power[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_log_Power[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_opera_log_operation[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_opera_log_operation[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_run_log_running[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_run_log_running[LANG_MAX][LANG_STR_SIZE];
 //============================================================================
-extern const char language_alarm_Ch[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_Ch[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_V[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_V[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_A[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_A[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_W[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_W[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_P[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_P[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_Up[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_Up[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_Down[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_Down[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_ctrl_Open[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_ctrl_Open[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_ctrl_Close[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_ctrl_Close[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_ctrl_OpenCH[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_ctrl_OpenCH[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_ctrl_CloseCH[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_ctrl_CloseCH[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_ctrl_Alarm[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_alarm_ctrl_Alarm[LANG_MAX][LANG_STR_SIZE] ;
 
-extern const char language_alarm_Ctrl_ALL[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_Ctrl_ALL[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_connect_ERROR[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_connect_ERROR[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_Init_Success[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_Init_Success[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_NULL_ERROR[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_NULL_ERROR[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_phase_lose[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_phase_lose[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_phaseA_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_alarm_phaseA_lose[LANG_MAX][LANG_STR_SIZE] ;
 
-extern const char language_alarm_phaseB_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_alarm_phaseB_lose[LANG_MAX][LANG_STR_SIZE] ;
 
-extern const char language_alarm_phaseC_lose[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_alarm_phaseC_lose[LANG_MAX][LANG_STR_SIZE] ;
 
-extern const char language_alarm_RS485_master[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_RS485_master[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_RS485_slave[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_RS485_slave[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_MAC_changed[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm_MAC_changed[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Role_Super_Admin[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Role_Super_Admin[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Role_Admin[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Role_Admin[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_Role_User[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_Role_User[LANG_MAX][LANG_STR_SIZE];
 
-extern const char language_alarm_Type_Power[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_alarm_Type_Power[LANG_MAX][LANG_STR_SIZE] ;
 
-extern const char language_alarm_Type_Sensor[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_alarm_Type_Sensor[LANG_MAX][LANG_STR_SIZE] ;
 
-extern const char language_alarm_Type_Network[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_alarm_Type_Network[LANG_MAX][LANG_STR_SIZE] ;
 
-extern const char language_alarm[LANGUAGE_TYPE][LANGUAGE_SIZE];
-extern const char language_exceed[LANGUAGE_TYPE][LANGUAGE_SIZE];
-extern const char language_sensor_smoke[LANGUAGE_TYPE][LANGUAGE_SIZE];
-extern const char language_sensor_access[LANGUAGE_TYPE][LANGUAGE_SIZE];
+extern const char language_alarm[LANG_MAX][LANG_STR_SIZE];
+extern const char language_exceed[LANG_MAX][LANG_STR_SIZE];
+extern const char language_sensor_smoke[LANG_MAX][LANG_STR_SIZE];
+extern const char language_sensor_access[LANG_MAX][LANG_STR_SIZE];
 
-extern const char* language_sensor_name[LANGUAGE_TYPE][8];
+extern const char* language_sensor_name[LANG_MAX][8];
 
-extern const char language_Operation_Tips_Success[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
-extern const char language_Operation_Tips_Failure[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
-extern const char language_upgrade_invalid[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
-extern const char language_upgrade_busying[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
-extern const char language_upgrade_error[LANGUAGE_TYPE][LANGUAGE_SIZE] ;
+extern const char language_Operation_Tips_Success[LANG_MAX][LANG_STR_SIZE] ;
+extern const char language_Operation_Tips_Failure[LANG_MAX][LANG_STR_SIZE] ;
+extern const char language_upgrade_invalid[LANG_MAX][LANG_STR_SIZE] ;
+extern const char language_upgrade_busying[LANG_MAX][LANG_STR_SIZE] ;
+extern const char language_upgrade_error[LANG_MAX][LANG_STR_SIZE] ;
+extern const char language_sensor_leak[LANG_MAX][LANG_STR_SIZE];
 
 #endif

pro/src/mail.c

@@ -454,7 +454,7 @@ int mail_post_alarm(int type, int subtype, int alarm_type, char *content)
                 break;
 
                 case SENSOR_TYPE_LEAK:
-                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_leak[langID], language_alarm[langID]);
+                snprintf(temp, sizeof(temp), "%s %d %s %s", prod_name, prod_id, language_sensor_leak[langID], language_alarm[langID]);
                 break;
 
                 default: