feat：“机器详情页面显示更多的机器状态”

common/lang/en.js

@@ -70,20 +70,20 @@ export default {
 		openStatus:'Door opening',
 		closeStatus:'Door closing',
 		opensuccess:'open success',
-		title:'equipment status',
+		title:'Equipment status',
 		red:'Red means machine alarm',
 		green:'Green means the machine is normal',
-		sleep:'sleep state：machine sleep',
-		unsleep:'sleep state：did not sleep',
+		sleep:'Sleep state：Machine sleep',
+		unsleep:'Sleep state：Did not sleep',
 		sleepDesc:'sleep desc',
-		on:'switch：the machine is turning on',
-		off:'switch：machine shut down',
-		equipmentNo:'equipmentNo',
+		on:'Furnace state：Open',
+		off:'Furnace state：Closed state ',
+		equipmentNo:'EquipmentNo',
 		area:'area',
 		temperature :'Temperature of the furnace head',
-		equipmentTemperature:'equipmentTemperature',
-		humidity:'equipmentHumidity',
-		alarm:'alarm content',
+		equipmentTemperature:'EquipmentTemperature',
+		humidity:'EquipmentHumidity',
+		alarm:'Alarm content',
 		tip:'prompt',
 		successReturn:'Sending succeeded',
 		errorReturn:'fail in send',
@@ -111,15 +111,15 @@ export default {
 		kaiqi:'on',
 		guanbi:'off',
 		edit:'edit',
-		refreshTime:'last refresh time',
-		volume:'volume',
-		whiteSugar:'whiteSugar',
-		redSugar:'redSugar',
-		yellowSugar:'yellowSugar',
-		blueSugar:'blueSugar',
-		stick:'stick',
-		water:'water',
-		wasteWater:'wasteWater',
+		refreshTime:'Last refresh time',
+		volume:'Volume',
+		whiteSugar:'White sugar',
+		redSugar:'Red sugar',
+		yellowSugar:'Yellow sugar',
+		blueSugar:'Blue sugar',
+		stick:'Stick',
+		water:'Clean water',
+		wasteWater:'Waste water',
 		buliao:'one click to complete materials',
 		buliaoT:'implement',
 		suspendBusiness:'Suspend Business',
@@ -129,7 +129,7 @@ export default {
 		deviceName:'Device name',
 		devicePlaceholder:'Enter the last 6 digits of the device code',
 		deviceNamePlaceholder:'Enter key word',
-		search:'search',
+		search:'Search',
 	},
 	equipmentStatics:{
 		title:'Machine Sales Ranking',

common/lang/ko.js

@@ -75,8 +75,8 @@ export default {
 		sleep:'절전 상태: 절전 모드 켜짐',
 		unsleep:'절전 상태: 절전 모드가 해제됨',
 		sleepDesc:'수면 설명',
-		on:'버너헤드 상태:켜져 있음',
-		off:'버너헤드 상태:닫혔음',
+		on:'버너헤드 상태: 켜져 있음',
+		off:'버너헤드 상태: 닫혔음',
 		equipmentNo:'기계 고유 번호',
 		area:'소재지',
 		temperature :'난로 헤드의 온도',

common/lang/zh.js

@@ -75,8 +75,8 @@ export default {
 		sleep:'睡眠状态：已开启睡眠模式',
 		unsleep:'睡眠状态：已关闭睡眠模式',
 		sleepDesc:'睡眠描述',
-		on:'开/关炉头：已开启',
-		off:'开/关炉头：已关闭',
+		on:'炉头状态：已开启',
+		off:'炉头状态：已关闭',
 		equipmentNo:'机器唯一码',
 		area:'所在地',
 		temperature :'炉头温度',

packageA/pages/equipmentStatus/equipmentlist.vue

@@ -90,23 +90,25 @@
 					<!-- 睡眠 -->
 					<view style="padding: 20upx;background-color: antiquewhite;">
 						<view><span>{{$t('equipmentStatusList.equipmentNo')}}：</span><span>{{equipment.clientId}}</span></view>
+						<view><span>{{equipment.isSleep?$t('equipmentStatusList.sleep'):$t('equipmentStatusList.unsleep')}}</span></view>
 						<!-- <view><span>{{$t('equipmentStatusList.area')}}：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view> -->
-						<view><span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
-						<view><span>{{$t('equipmentStatusList.humidity')}}：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
-						<view><span>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
+						<view><span>{{equipment.eqeStatus==0?$t('equipmentStatusList.off'):$t('equipmentStatusList.on')}}</span></view>
+						<view><span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}°C</span></view>
+						<view><span>{{$t('equipmentStatusList.humidity')}}：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}%RH</span></view>
+						<view><span>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}°C</span></view>
 						<!-- 物料 -->
-						<!-- <view>
+						<view>
 							<span>{{$t('equipmentStatusList.whiteSugar')}}：</span><span>{{equipment.whiteSugar?equipment.whiteSugar:''}}% -- </span>
 							<span>{{$t('equipmentStatusList.redSugar')}}：</span><span>{{equipment.redSugar?equipment.redSugar:''}}% -- </span>
 							<span>{{$t('equipmentStatusList.yellowSugar')}}：</span><span>{{equipment.yellowSugar?equipment.yellowSugar:''}}% -- </span>
 							<span>{{$t('equipmentStatusList.blueSugar')}}：</span><span>{{equipment.blueSugar?equipment.blueSugar:''}}% </span>
 						</view>
-						<view><span>{{$t('equipmentStatusList.stick')}}:</span><span>{{equipment.stick?equipment.stick:''}}% </span></view>
+						<view><span>{{$t('equipmentStatusList.stick')}}：</span><span>{{equipment.stick?equipment.stick:''}}% </span></view>
 						<view>
-							<span>{{$t('equipmentStatusList.water')}}:</span><span>{{equipment.water?equipment.water:''}}%  -- </span>
-							<span>{{$t('equipmentStatusList.wasteWater')}}:</span><span>{{equipment.wasteWater?equipment.wasteWater:''}}%</span>
-						</view> -->
-						<view><span>{{$t('equipmentStatusList.refreshTime')}}:</span><span>{{equipment.lastUpdateTime}}</span></view>
+							<span>{{$t('equipmentStatusList.water')}}：</span><span>{{equipment.water?equipment.water:''}}%  -- </span>
+							<span>{{$t('equipmentStatusList.wasteWater')}}：</span><span>{{equipment.wasteWater?equipment.wasteWater:''}}%</span>
+						</view>
+						<view><span>{{$t('equipmentStatusList.refreshTime')}}：</span><span>{{equipment.lastUpdateTime}}</span></view>
 						<!-- <view><span>{{$t('equipmentStatusList.volume')}}:</span><span>{{equipment.volume?equipment.volume:''}}</span></view> -->
 						<view class="" v-if="equipment.hasTodayAlarm">
 							<view><span>{{$t('equipmentStatusList.alarm')}}：</span></view>

pages/User/equipmentStatusList.vue

@@ -260,13 +260,13 @@
 							<span>{{$t('equipmentStatusList.area')}}：</span><span>{{equipment.fullName?equipment.fullName:''}}</span>
 						</view>
 						<view>
-							<span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span>
+							<span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}°C</span>
 						</view>
 						<view>
-							<span>{{$t('equipmentStatusList.humidity')}}：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span>
+							<span>{{$t('equipmentStatusList.humidity')}}：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}%RH</span>
 						</view>
 						<view>
-							<span>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span>
+							<span>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}°C</span>
 						</view>
 						<view><span>plcVersion：</span><span>{{equipment.plcVersion}}</span></view>
 						<!-- 物料 -->