diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index a5be88e..3e8f302 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -154,57 +154,125 @@ export default { rowLeftInnerTube: 'row the left inner tube', rowRightInnerTube: 'row the right inner tube', rowRightOuterTire: 'row the right outer tire', - currentTirePosition:'当前轮胎位置', - tyreNumber:'轮胎编号', - tireBrand:'轮胎品牌', - specificationAndModel:'规格型号', - SensorID:'传感器ID', - mileage:'里程', - ModifiedPatternDepth:'修改花纹深度', - InstallationReplacement:'安装/更换', - UnloadingTire:'卸载轮胎', - serviceTime:'使用时间', - AllTimeHighTirePressure:'历史最高胎压', - EstimatedRemainingMileage:'预计剩余里程', - TheHighestFetalTemperatureEverRecorded:'历史最高胎温', - NumberOfAlarms:'报警次数', - run:'已行驶', - ThatsXOfTheEntireLifeCycle:'约占整个生命周期的%{key}%', - TireMounting:'安装轮胎', - ChangeTire:'更换轮胎', - EndPoint:'终点', - left:'左侧', - right:'右侧', - outer:'外', - inner:'内', - row:'排', - tire:'胎', - MaterialCode: '物料编码', - MaterialName: '物料名称', - QualityControlStatus: '质控状态', - unit: '单位', - specification: '规格', - hierarchy: '层级', - SpeedClass: '速度级别', - LoadIndex: '负荷指数', - RimSize: '轮辋尺寸', - StandardWeight: '标准重量', - SectionWidth: '断面宽', - OuterDiameter: '外直径', - FlatteningRate: '扁平率', - EnhancedType: '加强型', - InnerTubeOrNot: '有无内胎', - PackingQuantity: '装箱量', - TyreType: '轮胎类型', - AuthenticationInformation: '认证信息', - CustomsDeclarationSpecification: '报关规格', - EmbryoCoding: '胎胚编码', - EmbryoDescription: '胎胚描述', - ProductionPlant: '生产工厂', + currentTirePosition:'Current tire position', + tyreNumber:'Tyre number', + tireBrand:'Tire brand', + specificationAndModel:'Specification and model', + SensorID:'Sensor ID', + mileage:'mileage', + ModifiedPatternDepth:'Modified pattern depth', + InstallationReplacement:'Installation/replacement', + UnloadingTire:'Unloading tire', + serviceTime:'Service time', + AllTimeHighTirePressure:'All-time high tire pressure', + EstimatedRemainingMileage:'Estimated remaining mileage', + TheHighestFetalTemperatureEverRecorded:'The highest fetal temperature ever recorded', + NumberOfAlarms:'Number of alarms', + run:'run', + ThatsXOfTheEntireLifeCycle:"That's about %{key}% of the entire life cycle", + TireMounting:'Tire mounting', + ChangeTire:'Change a tire', + EndPoint:'End point', + left:'left', + right:'right', + outer:'outer', + inner:'inner', + row:'row', + tire:'tire', + MaterialCode: 'Material code', + MaterialName: 'Material name', + QualityControlStatus: 'Quality control status', + unit: 'unit', + specification: 'specification', + hierarchy: 'hierarchy', + SpeedClass: 'Speed class', + LoadIndex: 'Load index', + RimSize: 'Rim size', + StandardWeight: 'Standard weight', + SectionWidth: 'Section width', + OuterDiameter: 'Outer diameter', + FlatteningRate: 'Flattening rate', + EnhancedType: 'Enhanced type', + InnerTubeOrNot: 'Inner tube or not', + PackingQuantity: 'Packing quantity', + TyreType: 'Tyre type', + AuthenticationInformation: 'Authentication information', + CustomsDeclarationSpecification: 'Customs declaration specification', + EmbryoCoding: 'Embryo coding', + EmbryoDescription: 'Embryo description', + ProductionPlant: 'Production plant', + trailer:'trailer', + locomotive:'locomotive', + SetUpTrailer:'Set up trailer', + BindingReceiver:'Binding receiver', + FirstTrailer:'First Trailer', + SecondTrailer:'Second Trailer', + ThirdTrailer:'Third Trailer', + InternetOfThingsCardNumber:'Internet of Things card number', + GPSReceiver:'GPS receiver', + TirePressureSensor:'Tire pressure sensor', + SaveSuccessfully:'Save successfully', + DeletedSuccessfully:'Deleted successfully', + deactivate:'deactivate', + enable:'enable', + TireRow:'Tire row', + EnableOrNot:'Enable or not', + TyreLayout:'Tyre layout', + oneRow:'oneRow', + SecondRow:'Second Row', + ThreeRow:'Three Row', + FourRow:'Four Row', + FiveRow:'Five Row', + SixRow:'Six Row', + SingleTyre:'Single Tyre', + DoubleTyre:'Single Tyre', + MobilePhoneCardNumber: 'Mobile phone card number', + AvailabilityOrNot: 'Availability or not', + SIMCardNumber: 'SIM card number', + VehicleInformation: 'Vehicle information', + FleetName: 'Fleet name', + RealTimePosition: 'Real-time position', + VehiclesWithOnBoardEquipment: 'Vehicles with on-board equipment', + WheelPositionDescription: 'Wheel position description', + TotalMileage: 'Total mileage', + BatteryVoltage: 'Battery voltage', + temperature: 'temperature', + pressure: 'pressure', + InstallationTime: 'Installation time', + time: 'time', + AlarmProcessing: 'Alarm processing', + AlarmInformation: 'Alarm information', + HighPressure: 'High pressure', + LowPressure: 'Low pressure', + HighTemperature: 'High temperature', + SelectAVehicle: 'Select a vehicle', + FirstShaftHighPressureThreshold: 'First shaft high pressure threshold', + FirstShaftLowPressureThreshold: 'First shaft low pressure threshold', + HighPressureThresholdForOtherShafts: 'High pressure threshold for other shafts', + LowPressureThresholdsForOtherShafts: 'Low pressure thresholds for other shafts', + HighTemperatureThreshold: 'High temperature threshold', + SetEffectiveTime: 'Set effective time', + CreateImmediately: 'Create immediately', + SelectDate: 'Select date', + NewFence: 'New fence', + empty: 'empty', + transceiver: 'transceiver', + GPSTime: 'GPS time', + SerialNumber: 'Serial number', + TransceiverID: 'Transceiver ID', + altitude: 'altitude', + speed: 'speed', + MeanPressure: 'Mean pressure', + MeanTemperature: 'Mean temperature', + AverageVelocity: 'Average velocity', }, other:{ tireInformationImport:'Tire information import', - theTireNumberCannotBeEmpty:'The tire number cannot be empty' + theTireNumberCannotBeEmpty:'The tire number cannot be empty', + TheLicensePlateNumberCannotBeEmpty:'车牌号不能为空', + PleaseEnterTheCorrectFormat:'请輸入正确的格式', + TheCarTypeCannotBeEmpty:'所属车型不能为空', + TheNameCannotBeEmpty:'名称不能为空' }, tireManagement: { info: { diff --git a/ruoyi-ui/src/lang/zhCn.js b/ruoyi-ui/src/lang/zhCn.js index a13475b..bb199eb 100644 --- a/ruoyi-ui/src/lang/zhCn.js +++ b/ruoyi-ui/src/lang/zhCn.js @@ -201,10 +201,78 @@ export default { EmbryoCoding: '胎胚编码', EmbryoDescription: '胎胚描述', ProductionPlant: '生产工厂', + trailer: '挂车', + locomotive: '车头', + SetUpTrailer: '设置挂车', + BindingReceiver: '绑定接收器', + FirstTrailer: '挂1', + SecondTrailer: '挂2', + ThirdTrailer: '挂3', + InternetOfThingsCardNumber: '物联网卡号', + GPSReceiver: 'GPS接收机', + TirePressureSensor: '胎压传感器', + SaveSuccessfully: '保存成功', + DeletedSuccessfully: '删除成功', + deactivate: '停用', + enable: '启用', + TireRow: '轮胎排数', + EnableOrNot: '是否启用', + TyreLayout: '轮胎布局图', + oneRow: '一排', + SecondRow: '二排', + ThreeRow: '三排', + FourRow: '四排', + FiveRow: '五排', + SixRow: '六排', + SingleTyre: '单胎', + DoubleTyre: '双胎', + MobilePhoneCardNumber: '手机卡号', + AvailabilityOrNot: '是否可用', + SIMCardNumber: 'SIM卡号', + VehicleInformation: '车辆信息', + FleetName: '车队名称', + RealTimePosition: '实时位置', + VehiclesWithOnBoardEquipment: '有车载设备车辆', + WheelPositionDescription: '轮位描述', + TotalMileage: '总里程', + BatteryVoltage: '电池电压', + temperature: '温度', + pressure: '压力', + InstallationTime: '安装时间', + time: '时间', + AlarmProcessing: '报警处理', + AlarmInformation: '报警信息', + HighPressure: '高压', + LowPressure: '低压', + HighTemperature: '高温', + SelectAVehicle: '选择车辆', + FirstShaftHighPressureThreshold: '第一轴高气压阀值', + FirstShaftLowPressureThreshold: '第一轴低气压阀值', + HighPressureThresholdForOtherShafts: '其他轴高气压阀值', + LowPressureThresholdsForOtherShafts: '其他轴低气压阀值', + HighTemperatureThreshold: '高温阀值', + SetEffectiveTime: '设置生效时间', + CreateImmediately: '立即创建', + SelectDate: '选择日期', + NewFence: '新建围栏', + empty: '清空', + transceiver: '收发器', + GPSTime: 'GPS时间', + SerialNumber: '序号', + TransceiverID: '收发器ID', + altitude: '海拔', + speed: '速度', + MeanPressure: '平均压力', + MeanTemperature: '平均温度', + AverageVelocity: '平均速度', }, other: { tireInformationImport: '轮胎信息导入', - theTireNumberCannotBeEmpty: '胎号不能为空' + theTireNumberCannotBeEmpty: '胎号不能为空', + TheLicensePlateNumberCannotBeEmpty: '车牌号不能为空', + PleaseEnterTheCorrectFormat: '请輸入正确的格式', + TheCarTypeCannotBeEmpty: '所属车型不能为空', + TheNameCannotBeEmpty: '名称不能为空' }, tireManagement: { info: { @@ -215,6 +283,7 @@ export default { tireSpecificationModel: '轮胎规格型号', sensorNumber: '传感器编号', numberPlate: '车牌号', + creationTime: '创建时间' } }, tireManagement1: { diff --git a/ruoyi-ui/src/views/GPS/car/index.vue b/ruoyi-ui/src/views/GPS/car/index.vue index 032e1b0..61df508 100644 --- a/ruoyi-ui/src/views/GPS/car/index.vue +++ b/ruoyi-ui/src/views/GPS/car/index.vue @@ -3,32 +3,32 @@ - + - + - + @@ -55,22 +55,22 @@ - + - - - - - - diff --git a/ruoyi-ui/src/views/GPS/tyre/index.vue b/ruoyi-ui/src/views/GPS/tyre/index.vue index b49f0ad..2d6bec8 100644 --- a/ruoyi-ui/src/views/GPS/tyre/index.vue +++ b/ruoyi-ui/src/views/GPS/tyre/index.vue @@ -3,21 +3,21 @@ - + - + @@ -46,17 +46,17 @@ - - + - - - - diff --git a/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue b/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue index 03f8a97..25cfba1 100644 --- a/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue +++ b/ruoyi-ui/src/views/carManagement/fleetManagement/index.vue @@ -72,12 +72,12 @@
- - + + @@ -91,7 +91,7 @@ @@ -180,7 +180,7 @@ const queryParams = ref({ // 表单验证规则 const rules = { - title: [{required: true, message: "名称不能为空", trigger: "blur"}], + title: [{required: true, message: t('other.TheNameCannotBeEmpty'), trigger: "blur"}], } // 表单数据 diff --git a/ruoyi-ui/src/views/carManagement/info/index.vue b/ruoyi-ui/src/views/carManagement/info/index.vue index 5158b23..0e76cd2 100644 --- a/ruoyi-ui/src/views/carManagement/info/index.vue +++ b/ruoyi-ui/src/views/carManagement/info/index.vue @@ -70,14 +70,14 @@ - + - + - 设置挂车 + {{ t('web.SetUpTrailer') }} - 绑定接收器 + {{ t('web.BindingReceiver') }} @@ -110,9 +110,9 @@ @pagination="getList" /> - + - 搜索 + {{ t('option.search') }} - - + + @@ -194,10 +194,10 @@ - + - + - + - + - + - - - - + + + @@ -340,15 +340,15 @@ const SetTrailerForm = ref({ const option1 = [ { value: 1, - label: '挂1' + label: t('web.FirstTrailer') }, { value: 2, - label: '挂2' + label: t('web.SecondTrailer') }, { value: 3, - label: '挂3' + label: t('web.ThirdTrailer') }, ] // 搜索参数 @@ -365,13 +365,13 @@ const queryParams1 = ref({ // 表单验证规则 const rules = { - carLicense: [{required: true, message: "车牌号不能为空", trigger: "blur"}, + carLicense: [{required: true, message: t('other.TheLicensePlateNumberCannotBeEmpty'), trigger: "blur"}, { pattern: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z][A-Z][A-Z0-9]{4}[A-Z0-9挂学警港澳]$/, - message: '请輸入正确的格式', + message: t('other.PleaseEnterTheCorrectFormat'), trigger: 'blur' }], - carTypeId: [{required: true, message: "所属车型不能为空", trigger: "blur"}], + carTypeId: [{required: true, message: t('other.TheCarTypeCannotBeEmpty'), trigger: "blur"}], } // 表单数据 @@ -450,7 +450,7 @@ const saveTrailer = () => { carLicenseParent: thisCarId.value.carLicense, carQueueId: thisCarId.value.carQueueId, ...SetTrailerForm.value, }).then(val => { - proxy.$modal.msgSuccess('保存成功'); + proxy.$modal.msgSuccess(t('web.SaveSuccessfully')); getList(); listBaseCar({carLicenseParent:thisCarId.value.carLicense}).then(val => { postList1.value = val.rows @@ -464,7 +464,7 @@ const delTrailer = (e) => { return delBaseCar(e); }).then(() => { getList(); - proxy.$modal.msgSuccess('删除成功'); + proxy.$modal.msgSuccess(t('web.DeletedSuccessfully')); listBaseCar({carLicenseParent:thisCarId.value.carLicense}).then(val => { postList1.value = val.rows }) diff --git a/ruoyi-ui/src/views/carManagement/type/index.vue b/ruoyi-ui/src/views/carManagement/type/index.vue index f5bd451..b85e7b1 100644 --- a/ruoyi-ui/src/views/carManagement/type/index.vue +++ b/ruoyi-ui/src/views/carManagement/type/index.vue @@ -63,7 +63,7 @@ @@ -106,7 +106,7 @@ - + - + -
轮胎布局图
+
{{ t('web.TyreLayout') }}
- @@ -139,17 +139,17 @@ - + + :placeholder="t('common.pleaseEnter') "/> - + + :placeholder="t('common.pleaseEnter') "/> - + - + @@ -192,21 +192,21 @@ const {proxy} = getCurrentInstance(); const options = [ { value: 0, - label: 'GPS接收机', + label: t('web.GPSReceiver'), }, { value: 1, - label: '胎压传感器', + label: t('web.TirePressureSensor'), }, ] const options1 = [ { value: 0, - label: '启用', + label: t('web.enable'), }, { value: 1, - label: '停用', + label: t('web.deactivate'), }, ] diff --git a/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue index 769c171..a8e9e5f 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue @@ -6,7 +6,7 @@ - + - + - + - + - + - + - + - 立即创建 + {{ t('web.CreateImmediately') }} {{ t('option.reset') }} diff --git a/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue index 42ee35f..cff5d79 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue @@ -3,23 +3,23 @@ - + - + @@ -38,7 +38,7 @@ plain type="success" @click="handleUpdate" - >报警处理 + >{{ t('web.AlarmProcessing') }} @@ -57,25 +57,25 @@ - - - - - - - + diff --git a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue index 78f149b..845b7e6 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/carMonitoring/index.vue @@ -3,10 +3,10 @@ -

车辆信息

-

车队名称:{{ cardInfo.name }}

+

{{ t('web.VehicleInformation') }}

+

{{ t('web.FleetName') }}:{{ cardInfo.name }}

-

实时位置

+

{{ t('web.RealTimePosition') }}

@@ -118,10 +118,10 @@ type="card" @tab-click="resetQuery" > - + - + {{ tyreInfo.outerTireNumber }} {{ tyreInfo.tyrePosition }} {{ tyreInfo.sensorId }} {{ tyreInfo.brand }} {{ tyreInfo.internationalization2 }} {{ tyreInfo.size }} {{ tyreInfo.pattern }} {{ tyreInfo.currentTextureDepth }}mm {{ tyreInfo.internationalization2 }} {{ tyreInfo.temperature }}℃ {{ tyreInfo.pressure }} {{ tyreInfo.internationalization2 }} diff --git a/ruoyi-ui/src/views/realTimeMonitoring/electronicFence/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/electronicFence/index.vue index 0b920a9..9488dc2 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/electronicFence/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/electronicFence/index.vue @@ -3,21 +3,21 @@ - + - + @@ -27,9 +27,9 @@ - 新建围栏 - 清空 - 保存 + {{ t('web.NewFence') }} + {{ t('web.empty') }} + {{ t('option.save') }}
diff --git a/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue index d3560cf..2e6dd3c 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/historicalRoute/index.vue @@ -3,21 +3,21 @@ - + - + diff --git a/ruoyi-ui/vite.config.js b/ruoyi-ui/vite.config.js index c06b2cf..f7daf09 100644 --- a/ruoyi-ui/vite.config.js +++ b/ruoyi-ui/vite.config.js @@ -34,9 +34,9 @@ export default defineConfig(({mode, command}) => { // open: true, proxy: { '/dev-api': { - // target: 'https://ticptest.tercelo.com/dev-api', + target: 'https://ticptest.tercelo.com/dev-api', // target: 'http://47.94.93.46/dev-api', - target: 'http://10.11.41.249:8080', + // target: 'http://10.11.41.249:8080', // target: 'http://localhost:8080', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '')