diff --git a/src/http/Exhibition/Colombia/index.ts b/src/http/Exhibition/Colombia/index.ts index 9827361..c03ee2f 100644 --- a/src/http/Exhibition/Colombia/index.ts +++ b/src/http/Exhibition/Colombia/index.ts @@ -8,5 +8,5 @@ export function columbiaDeviceList(){ //获取设备在线状态、设备列表 export function columbiaDeviceProduction(){ - return get('/creen/cisma/columbiaDeviceProduction') + return get('/screen/cisma/columbiaDeviceProduction') } \ No newline at end of file diff --git a/src/locales/index.ts b/src/locales/index.ts index 212b337..52ee9ec 100644 --- a/src/locales/index.ts +++ b/src/locales/index.ts @@ -11,11 +11,13 @@ import { createI18n } from 'vue-i18n' import enLocale from './lang/en'; import zhLocale from './lang/zh'; +import SpanishLocale from './lang/Spanish' import { getStoredLanguage, saveStoredLanguage } from "../utils/languageStorage"; const messages = { 简体中文: zhLocale, 'English/USD': enLocale, + 'Spanish/USD': SpanishLocale, } const defaultLocale = "简体中文"; diff --git a/src/locales/lang/Spanish.ts b/src/locales/lang/Spanish.ts new file mode 100644 index 0000000..e267545 --- /dev/null +++ b/src/locales/lang/Spanish.ts @@ -0,0 +1,319 @@ + +export default { + messages: { + 'energyConsume': 'Energy Consumption Real-time Monitoring System', + 'ECHistoryData' :'Energy Historical data detection System', + 'generalEnvironment': 'Environment-Convention Real-time Monitoring System', + 'InPlantProducts': 'Iot System Products in Factory', + 'Mechanics': 'Machinery Factory Equipment Monitor and Control Center', + 'MicrofactoryDev': 'Micro-Factory Equipment IoT', + 'Offsite': 'Iot System of Products in Factory', + + 'realtimeSecurity': 'security Real-time Monitoring System', + + 'FactoryView': '物联传感器分布图3D版本', + 'PaintShopView': 'Surface Finishing Environment', + 'stuffView': 'Large-Piece Processing Environment', + 'machiningView': 'Machining Environment', + 'finishView': 'Fine Machining Environment', + 'weldView': 'Welding Environment', + 'MechanicalView': 'Machinery Factory Sensor distribution', + 'MechanicalViewDajian': 'Large-Piece Processing Sensor distribution', + 'MechanicalViewHanjie': 'Welding Sensor distribution', + 'MechanicalViewJijia': 'Machining Sensor distribution', + 'MechanicalViewJingjia': 'Fine Machining Sensor distribution', + 'MechanicalViewJingshi': 'Surface Finishing Sensor distribution', + 'realtimeSecurityJixie': 'Machinery Factory security Real-time Monitoring System', + 'energyConsumejixie': 'Machinery Factory Energy Consumption Real-time Monitoring System', + 'generalEnvironmentjixiefenchang': 'Machinery Factory Environment-Convention Real-time Monitoring System', + 'electronicControl': 'Electrical Control Factory Equipment Monitor and Control Center', + 'electronicControlAmbient': 'Electrical Control Factory Real-time Monitoring System', + 'pmData': 'Dust Sensor Data detection system', + 'mechanicalPm': '机械分厂粉尘监测走势图', + 'mechanical_TVOC_CH2O': '机械分厂TVOC_CH2O监测走势图', + 'mechanical_humidity': '机械分厂温湿度监测走势图', + 'mechanical_noise': '机械分厂噪声监测走势图', + + 'performanceYOYto2023':'2023 Production Efficiency Year-on-Year\n Ratio(°/CNY10000)', + 'PowerProductionto2023':'2023 Ratio of EC of Production', + 'Productionto2023':'2023 Production Volume (CNY)', + 'Powerto2023':'Electricity Consumption (EC) (°)', + 'jixiePowerto2023':'2023 Electricity Consumption (EC) (°)', + 'waterto2023_t':'2023 Water Consumption(Ton)', + 'waterto2023':'2023 Water Consumption(m³)', + 'gasto2023':'2023 Air Consumption(m³)', + 'powerTip':'EC', + 'powerhi_du':'Electricity Consumption(°)', + 'Production_yuan':'Production(CNY)', + 'Production':'Production', + 'powerhistory':'2018-2022 Electricity Consumption(°)', + 'waterhistory':'Water Consumption(m³)', + 'gashistory':'Air Consumption(m³)', + 'waterTip':'Water Consumption', + 'gasTip':'Air Consumption', + 'noise_DB':'Noise(dB)', + 'pmHanJie':'Welding\n(pm2.5/pm10)', + 'pmJingShi':'Surface Finishing\n(pm2.5/pm10)', + 'pmDaJian':'Large-Piece Processing\n(pm2.5/pm10)', + 'TemperatureHumidity':'Temperture and Humidity', + 'TemperatureRange':'Temperature', + 'TemperatureRange_down':'Lower Limit Value', + 'TemperatureRange_up':'Upper Limit Value', + 'HumidityRange':'Humidity', + 'TemperatureHumidityexceeded':'Exceed Limit (when temperature and humidity not at normal value)', + 'noiseexceeded':'Exceed Limit', + 'noiseRange':'Within Limit', + 'fanwei':'Range', + 'onLine':'Online', + 'offline':'Offline', + 'QiCheCommunication':'AIAIM Division Data Communication', + 'FuZhuangCommunication':'GCCS Division Data Communication', + 'JiaFangCommunication':'HTCSE Division Data Communication', + 'YiFangCommunication':'MPE Division Data Communication', + 'DevNum':'Equipment Quantity', + 'FuZhuangDevSchedule':'GCCS Division\n Equipment Complete Schedule', + 'JiaFangDevSchedule':'HTCSE Division\n Equipment Complete Schedule', + 'YiFangDevSchedule':'MPE Division\n Equipment Complete Schedule', + 'QiCheDevSchedule':'AIAIM Division\n Equipment Complete Schedule', + 'InPlantProductsDevList':'Equipment List', + 'SerialNum':'Serial Number', + 'RackNum':'Serial', + 'DevName':'Machine Name', + 'JiqiName':'Machine Name', + 'ofLegion':'Affiliated Division', + 'DevStatus':'Estado maq.', + 'JiqiStatus':'Machine Status', + "RunTime":'Running hours', + 'finishSchedule':'Complete Schedule', + 'deliveryDay':'Delivery Date', + 'LoadMore':'Loading More', + 'QiCheLegionSystem':'AIAIM Division IoT Management System', + 'FuZhuangLegionSystem':'GCCS Division IoT Management System', + 'JiaFangLegionSystem':'HTCSE Division IoT Management System', + 'YiFangLegionSystem':'MPE Division IoT Management System', + 'GatewayStatus':'IoT Gateway Status', + 'QiCheLegion':'AIAIM Division', + 'YiFangLegion':'MPE Division', + 'FuZhuangLegion':'GCCS Division', + 'JiaFangLegion':'HTCSE Division', + 'TOTAL':'Total Quantity', + 'OnlineNum':'Online Quantity', + 'units':'set', + 'LegionDevList':'Division Equipment List', + 'DevType':'Equipment Type', + 'JiqiType':'Machine Type', + 'model':'Model', + 'InstallPhase':'Installation', + 'AssemblyGroup':'Assembly Group', + 'electronicGroup':'Electrical Assembly Group', + 'inspector':'Inspector', + 'DebugProgress':'Adjusting Schedule', + 'DevInfo':'Equipment Information', + 'DevDetails':'Machine Details', + 'DevMotor':'Equipment Motor', + 'DevSensors':'Equipment Sensor', + 'SupplierName':'Supplier Name', + 'SupplierSalesperson':'Machandiser of Supplier', + 'TradeType':'Trade Type', + 'ModelNo':'Machine Model', + 'productName':'Product Name', + 'OrderNo':'Order Number', + 'SoldDest':'Delivery Destination', + 'SoldDest_terminal':'Delivery Destination(Terminal)', + 'orderManufactureDate':'Order Date', + 'ClientName':'Customer Name', + 'ClientSalesman':'Salesman', + 'expectDeliveryDate':'Estimated Delivery Date', + 'JingJia_datacom':'Fine Machining-Data Communication', + 'JiJia_datacom':'Machining-Data Communication', + 'DaJian_datacom':'Large-Piece Processing-Data Communication', + 'JingShi_datacom':'Surface Finishing-Data Communication', + 'HanJie_datacom':'Welding-Data Communication', + 'JingJiaDevStatus':'Fine Machining Equipment Status', + 'JiJiaDevStatus':'Machining Equipment Status', + 'DaJianDevStatus':'Large-Piece Equipment Status', + 'JingShiDevStatus':'Surface Equipment Status', + 'HanJieDevStatus':'Welding Equipment Status', + 'work':'Trabajando', + 'STOP':'Emergency Stop', + 'halt':'Parada', + 'Standby':'Esperando', + 'firing':'启Start动', + 'DevDiagram_JiJia':'Machinery Factory Equipment IoT-Machining Workshop', + 'DevDiagram_JingJia':'Machinery Factory Equipment IoT-Fine Machining Workshop', + 'DevDiagram_DaJian':'Machinery Factory Equipment IoT-Large-Piece Processing Workshop', + 'DevDiagram_JingShi':'Machinery Factory Equipment IoT-Painting Workshop', + 'DevDiagram_HanJie':'Machinery Factory Equipment IoT-Welding Workshop', + 'machineryDevStatus':'Machinery Factory D-States', + 'procureDate':'Purchasing Date', + 'workTime':'Running hours', + 'StandbyTime':'Standby hours', + 'haltTime':'Emergency Stop hours', + 'DevRunComparison':'Running Comparison Diagram', + 'TimeUtilizationRate':'Time Utilization', + 'UtilizationRate':'Tiempo utilizado', + 'MicrofactoriesDevChart':'Micro-Factory Equipment IoT', + 'MicrofactoriesDevinfo':'Micro-Factory Equipment Information', + 'DevRunNum':'Running Equipment Quantity', + 'GatewayOff':'Gateway Offline', + 'GatewayON':'Gateway Online', + 'DevOffNum':'Offline Equipment Quantity', + 'SewingTime':'Sewing Time', + 'realityPresserFootLiftNum':'Actual Press-foot Lift times', + 'AvgPresserFootLiftNum':'Average Press-foot Lift times', + 'ratio':'Ratio', + 'realityTrimNum':'Actual Thread-trimming times', + 'AvgTrimNum':'Average Thread-trimming times', + 'runTime':'Duración trabajo', + 'datacom':'Data Communication', + 'OffSiteDevList':'Equipment List outside the factory', + 'province':'Province', + 'type':'Type', + 'OnlineOrNot':'Online or not', + 'DongGuanAffiliate':'Dongguan Branch', + 'ZheJiangAffiliate':'Zhejiang Branch', + 'DevAllNum':'Total Quantity of Equipment ', + 'OnProduct':'Online Product', + 'OffProduct':'Offline Product', + 'DongGuan_GatewayStatus':'Dongguan-IoT Gateway Status', + 'DevPreviewChart':'Equipment Preview', + 'JiqiPreviewChart':'Machine Preview', + 'OffNum':'Offline Quantity', + 'DongGuanDevList':'Dongguan Branch Devices', + 'Ex_factoryDate':'EXW Date', + 'Devsignal':'Equipment Signal', + 'DevReminder':'Equipment Warning', + 'JiqiReminder':'Machine Warning', + 'abnormal':'Abnormal', + 'NoAbnormal':'No Abnormal', + 'disconnection':'Disconnect', + 'TVOCDetection':'TVOC Test', + 'smokeDetection':'Smoke Test', + 'gasDetection':'Gas Test', + 'CH2ODetection':'Alcohol Test', + 'flameDetection':'Fire Test', + 'EastPumpPressure_Mpa':'East Pump Room Air Pressure', + 'WestPumpPressure_Mpa':'West Pump Room Air Pressure', + 'PipelinePressure_Mpa':'Pipeline Pressure', + 'normal_Tip':'Normal', + 'abnormal_Tip':'Abnormal', + 'abnormal_Tip_yishang':'Above', + 'position':'Position', + 'NormalRange':'Normal Range', + 'CurrentValue':'Current Value', + 'humitureSensor':'Temperature/Humidity Sensor', + 'noiseSensor':'Noise Sensor', + 'powerSensor':'Electricity Sensor', + 'sparkSensor':'Fire Sensor', + 'dustSensor':'Dust Sensor', + 'TVOC_CH2OSensor':'TVOC/Alcohol Sensor', + 'smokeSensor':'Smoke Sensor', + 'gasSensor':'Gas Sensor', + 'waterPressureSensor':'Water Pressure Sensor', + 'gasPressureSensor':'Air Pressure Sensor', + 'gateway':'Gateway', + 'Dev':'Equipment', + 'productStudyDevelopment':'Richsafty office', + 'machineDesign':'Mechanical Design and Administrative Office', + 'ExternalWork':'Domestic/Overseas Sales Office', + 'BigPeiTao':'Sourcing Center', + 'twoLou':'Second Floor', + 'EmployeeApartment':'Staff Apartment', + 'SecurityRoom':'Security Room', + 'WaterRoom':'Water Room', + 'SynthesizeRoom':'Office Building', + 'store':'Warehouse', + 'ControllerRoom':'Electrical Control Workshop', + 'AutomotiveDivision':'汽车部', + 'JingJiaRoom':'Fine Machining Workshop', + 'JiJiaRoom':'Machining Workshop', + 'eastAirPumpRoom':'East Pump Room', + 'DaJianRoom':'Large-Piece Processing Workshop', + 'ManualSandblastingRoom':'Manual Sandblasting Room', + 'DryingRoom':'Drying Room', + 'GrindingRoom':'Polishing Room', + 'JingShiRoom':'Painting Workshop', + 'PowderSprayingRoom':'Powder Coating Room', + 'DaJianPaintingRoom':'Spraying Room', + 'boilerRoom':'Boiler Room', + 'HanJieRoom':'Welding Workshop', + 'canteen':'Canteen', + 'Dormitory':'Dormitory', + 'JingShi_generalEnvironment':'Surface Finishing-Environment Real-time Monitoring System', + 'DaJian_generalEnvironment':'Large-Piece Processing-Environment Real-time Monitoring System', + 'JiJia_generalEnvironment':'Machining-Environment Real-time Monitoring System', + 'JingJia_generalEnvironment':'Fine Machining-Environment Real-time Monitoring System', + 'HanJie_generalEnvironment':'Welding-Environment Real-time Monitoring System', + 'noiseDetection':'Noise Test', + 'NormalValue':'Normal Value', + 'PowerConsumption_2023':'Electricity Consumption (EC) (°)', + 'Production_2023':'Production Volume (CNY)', + 'GasConsumption_2023JiXie':'Mechinery Factory AC (m³)', + 'DianKongGatewayDtatus':'Electrical Control Factory IoT Gateway Status', + 'DianKongDevList':'Electrical Control Factory List', + 'DianKongDetection':'Electrical Control Factory Real-time Monitoring System', + //补 + 'AllNum':'Total', + 'CH2Ojiance':'Alcohol Test', + 'DevList':'Devices', + 'JiqiList':'machine', + 'AlarmTime':'Alarm Time', + 'duration':'duration', + 'IoT_System':'IoT Management System', + 'environment_dust':'Environment-Dust Real-time Monitoring System', + '加载更多':'Load More', + '已调试':'Debugged', + '未调试':'No Debugged', + '服务器机房':'server room', + '料场':'Raw Material Area', + '危废暂存间':'dangerous waste temporary storage room', + '历史数据':'Historical Data', + '环境 实时监测系统':'环境 实时监测系统', + '传感器监测走势图':'传感器监测走势图', + '机械分厂设备列表':'机械分厂设备列表', + '设备状态总览':'设备状态总览', + '产品状态':'产品状态', + '产品数量':'产品数量', + '产品类型':'产品类型', + '产品信息':'产品信息', + '产品电机':'产品电机', + '产品传感器':'产品传感器', + '机器名称':'机器名称', + '机器类型':'机器类型', + '机器状态':'机器状态', + '南门水房物联监测系统':'南门水房物联监测系统', + '数据监测':'数据监测', + '进水':'进水', + '出水':'出水', + '消耗':'消耗', + '储水':'储水', + '用电':'用电', + '总体趋势图':'总体趋势图', + '近一周':'Last Week', + '近一月':'Last Month', + '近三月':'Last Three Months', + '最大值':'Max', + '最小值':'Min', + '平均值':'Avg', + '效益&效率':'Benefit&Efficiency', + '效益':'Benefit', + '效率':'Efficiency', + '微工厂缝纫设备看板':'微工厂缝纫设备看板', + '工作时间':'工作时间', + '空闲时间':'空闲时间', + '智能货架物联管理系统':'智能货架物联管理系统', + '微工厂':'微工厂', + '微工厂环境实时监测系统':'微工厂环境实时监测系统', + + '富怡物联管理平台':'Richpeace Plataforma de Gestión de IoT', + '服装模板机':'Máquina de costura automática', + '单头混合毛巾绣花机':'Bordadora con chenille', + '绘图仪':'Plotter', + '日产量':'Prod. diaria', + '计划产量':'Prod. planeada', + '实际产量':'Prod. real', + '年':'Año', + '月':'Mes', + '日':'Fecha', + } + } \ No newline at end of file diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index ad15579..4b0a7b7 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -313,5 +313,16 @@ export default { '智能货架物联管理系统':'智能货架物联管理系统', '微工厂':'微工厂', '微工厂环境实时监测系统':'微工厂环境实时监测系统', + + '富怡物联管理平台':'富怡物联管理平台', + '服装模板机':'服装模板机', + '单头混合毛巾绣花机':'单头混合毛巾绣花机', + '绘图仪':'绘图仪', + '日产量':'日产量', + '计划产量':'计划产量', + '实际产量':'实际产量', + '年':'年', + '月':'月', + '日':'日', } } \ No newline at end of file diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index cee755d..1345a61 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -313,5 +313,17 @@ export default { '智能货架物联管理系统':'智能货架物联管理系统', '微工厂':'微工厂', '微工厂环境实时监测系统':'微工厂环境实时监测系统', + '富怡物联管理平台':'富怡物联管理平台', + '服装模板机':'服装模板机', + '单头混合毛巾绣花机':'单头混合毛巾绣花机', + '绘图仪':'绘图仪', + '日产量':'日产量', + '计划产量':'计划产量', + '实际产量':'实际产量', + '年':'年', + '月':'月', + '日':'日', + + } } \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 39fa1bf..df73fc5 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -376,6 +376,7 @@ router.beforeEach(async (to: any, from, next) => { // ... let address = to.name let hash = to.query.hash + let lang = to.query?.lang||'' let arr = [ 'legionProducts', 'devItem', 'tufting', 'Winding', 'Large_Format', 'GetonAgain', 'OffsiteDevList', 'Mechanicschild', 'Mechanicsson','historyData', 'jixieHistoryData' diff --git a/src/utils/languageStorage.ts b/src/utils/languageStorage.ts index 12fc60c..cc16404 100644 --- a/src/utils/languageStorage.ts +++ b/src/utils/languageStorage.ts @@ -1,9 +1,17 @@ //获取用户保存的语言首选项 export function getStoredLanguage(): string | null { - return localStorage.getItem("selectedLanguage"); - } - //保存新的语言选择 - export function saveStoredLanguage(language: string): void { - localStorage.setItem("selectedLanguage", language); - } \ No newline at end of file + return localStorage.getItem("selectedLanguage"); +} +//保存新的语言选择 +export function saveStoredLanguage(language: string): void { + localStorage.setItem("selectedLanguage", language); +} + +export function languageHash(language: string): string { + return { + en: "English/USD", + zh: "简体中文", + es: "Spanish/USD", + }[language]; +} \ No newline at end of file diff --git a/src/views/Exhibition/Colombia/component/BarChart.vue b/src/views/Exhibition/Colombia/component/BarChart.vue index b753733..3075bb0 100644 --- a/src/views/Exhibition/Colombia/component/BarChart.vue +++ b/src/views/Exhibition/Colombia/component/BarChart.vue @@ -4,7 +4,8 @@ @@ -326,9 +348,9 @@ onUnmounted(() => { } .key-text { width: 60%; - font-size: 28px; + font-size: 22px; color: #00FFFFFE; - font-family: '华文新魏', sans-serif; + /* font-family: '华文新魏', sans-serif; */ } .value-text { diff --git a/src/views/index.vue b/src/views/index.vue index f783301..fddaaa0 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -20,9 +20,8 @@ @@ -37,7 +36,7 @@