Ver código fonte

修复海外版出现中文问题

soobin 2 anos atrás
pai
commit
ec1d5d3fac

+ 40 - 1
common/lang/en.js

@@ -147,7 +147,8 @@ export default {
 		updata:'update',
 	},
 	remoteList:{
-		dosugur:'remote sugar making',
+		title:'Remote operation list',
+		dosugur:'Remote sugar making',
 		flowers:'shielding/display pattern',
 		parameters:'parameter adjustment',
 		alarmClock:'alarm clock(time switch furnace head/machine sleep)',
@@ -260,5 +261,43 @@ export default {
 	bangdingMachine:{
 		clientId:'clientId',
 		equimentType:'equimentType'
+	},
+	generalParameters:{
+		headTemperature:'Head temperature',
+		headMediumSpeed:'Head medium speed',
+		pumpOpeningtime:'Pump opening time',
+		blowerBlowingTime:'Blower blowing time',
+		lowerSugarThickness:'Lower sugar thickness',
+		sugarTemperatureError:'Allow sugar temperature error',
+		returnAdjustment:'Return adjustment',
+		headLowSpeed:'Head low speed',
+		headHighSpeed:'Head high speed',
+		closingWaitTime:'Manual door closing wait time',
+		lowTemperatureEnvironment:'Low temperature environment setting (furnace head raising temperature)',
+		highTemperatureEnvironment:'High temperature environment setting (external circulation fan)',
+		headDuringHumidification:'temperature rise of furnace head during humidification',
+		humidificationMonitoringTime:'Humidification monitoring time',
+		humidificationOFFTime:'Humidification OFF time',
+		humidificationONTime:'Humidification ON time',
+		humidificationStartDelay:'Humidification start delay',
+		humidificationStopDelay:'Humidification stop delay',
+		manipulatorWaitingTime:'Manipulator waiting time',
+		referenceCoefficient:'Reference coefficient',
+		referenceHumidity:'Reference humidity',
+	},
+	advancedParameters:{
+		Xzerocompensation:'X zero compensation',
+		Yzerocompensation:'Y zero compensation',
+		Zzerocompensation:'Z zero compensation',
+		sugarPositionX:'Take the sugar position X',
+		sugarPositionY:'Take the sugar position Y',
+		sugarPositionZ:'Take the sugar position Z',
+		stickPositionX:'Take the stick position X',
+		stickPositionY:'Take the stick position Y',
+		stickPositionZ:'Take the stick position Z',
+		materialShortageMonitor:'Activate material shortage monitor',
+		outerLoopButton:'Outer loop button',
+		on:'ON',
+		off:'OFF',
 	}
 }

+ 40 - 0
common/lang/zh.js

@@ -145,6 +145,7 @@ export default {
 		updata:'更改',
 	},
 	remoteList:{
+		title:'远程操作列表',
 		dosugur:'远程做糖',
 		flowers:'屏蔽/显示售卖花型',
 		parameters:'参数调整',
@@ -258,5 +259,44 @@ export default {
 	bangdingMachine:{
 		clientId:'设备编号',
 		equimentType:'机型'
+	},
+	generalParameters:{
+		headTemperature:'炉头工作温度',
+		headMediumSpeed:'炉头中速',
+		pumpOpeningtime:'水泵开启时间',
+		blowerBlowingTime:'风机吹气时间',
+		lowerSugarThickness:'下糖粗细系数',
+		sugarTemperatureError:'柜内允许做糖温度误差',
+		returnAdjustment:'回差调节',
+		headLowSpeed:'炉头低速',
+		headHighSpeed:'炉头高速',
+		closingWaitTime:'手动门关闭等待时间',
+		lowTemperatureEnvironment:'低温环境设定(炉头升柜温)',
+		highTemperatureEnvironment:'高温环境设定(外循环风机)',
+		headDuringHumidification:'加湿时炉头升温N度',
+		humidificationMonitoringTime:'加湿监控时间',
+		humidificationOFFTime:'加湿OFF时间',
+		humidificationONTime:'加湿ON时间',
+		humidificationStartDelay:'加湿启动延时',
+		humidificationStopDelay:'加湿停止延时',
+		manipulatorWaitingTime:'出棍后机械手等待时间',
+		referenceCoefficient:'基准系数',
+		referenceHumidity:'基准湿度',
+	},
+	advancedParameters:{
+		Xzerocompensation:'X零点补偿',
+		Yzerocompensation:'Y零点补偿',
+		Zzerocompensation:'Z零点补偿',
+		sugarPositionX:'取糖位置X设置',
+		sugarPositionY:'取糖位置Y设置',
+		sugarPositionZ:'取糖位置Z设置',
+		stickPositionX:'取棍位置X设置',
+		stickPositionY:'取棍位置Y设置',
+		stickPositionZ:'取棍位置Z设置',
+		materialShortageMonitor:'启动缺物料监控',
+		outerLoopButton:'外循环按钮',
+		on:'启动',
+		off:'关闭',
+		
 	}
 }

+ 35 - 27
packageA/pages/remote/advancedParameters.vue

@@ -10,7 +10,7 @@
 				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
-				<button type="primary" class="" @click="search()">
+				<button type="primary" size="mini" class="" @click="search()">
 					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
@@ -31,7 +31,7 @@
 		</view>
 		<view v-show="show">
 			<view class="body">
-				<p class="p">X零点补偿:</p>
+				<p class="p">{{$t('advancedParameters.Xzerocompensation')}}:</p>
 				<input class="input" type="text" v-model="D436" />
 				<button type="primary" class="button" @click="update('D436',D436)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -39,7 +39,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">Y零点补偿:</p>
+				<p class="p">{{$t('advancedParameters.Yzerocompensation')}}:</p>
 				<input class="input" type="text" v-model="D438" />
 				<button type="primary" class="button" @click="update('D438',D438)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -47,7 +47,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">Z零点补偿:</p>
+				<p class="p">{{$t('advancedParameters.Zzerocompensation')}}:</p>
 				<input class="input" type="text" v-model="D440" />
 				<button type="primary" class="button" @click="update('D440',D440)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -55,7 +55,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">取糖位置X设置:</p>
+				<p class="p">{{$t('advancedParameters.sugarPositionX')}}:</p>
 				<input class="input" type="text" v-model="D218" />
 				<button type="primary" class="button" @click="update('D218',D218)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -63,7 +63,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">取糖位置Y设置:</p>
+				<p class="p">{{$t('advancedParameters.sugarPositionY')}}:</p>
 				<input class="input" type="text" v-model="D268" />
 				<button type="primary" class="button" @click="update('D268',D268)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -71,7 +71,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">取糖位置Z设置:</p>
+				<p class="p">{{$t('advancedParameters.sugarPositionZ')}}:</p>
 				<input class="input" type="text" v-model="D318" />
 				<button type="primary" class="button" @click="update('D318',D318)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -81,7 +81,7 @@
 			<view class="" v-show="equimentType=='MG301'">
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">取棍位置X设置:</p>
+					<p class="p">{{$t('advancedParameters.stickPositionX')}}:</p>
 					<input class="input" type="text" v-model="D226" />
 					<button type="primary" class="button" @click="update('D226',D226)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -89,7 +89,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">取棍位置Y设置:</p>
+					<p class="p">{{$t('advancedParameters.stickPositionY')}}:</p>
 					<input class="input" type="text" v-model="D276" />
 					<button type="primary" class="button" @click="update('D276',D276)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -97,7 +97,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">取棍位置Z设置:</p>
+					<p class="p">{{$t('advancedParameters.stickPositionZ')}}:</p>
 					<input class="input" type="text" v-model="D326" />
 					<button type="primary" class="button" @click="update('D326',D326)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -108,7 +108,7 @@
 			<view class="" v-show="equimentType=='MG320'">
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">取棍位置X设置:</p>
+					<p class="p">{{$t('advancedParameters.stickPositionX')}}:</p>
 					<input class="input" type="text" v-model="D228" />
 					<button type="primary" class="button" @click="update('D228',D228)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -116,7 +116,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">取棍位置Y设置:</p>
+					<p class="p">{{$t('advancedParameters.stickPositionY')}}:</p>
 					<input class="input" type="text" v-model="D278" />
 					<button type="primary" class="button" @click="update('D278',D278)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -124,7 +124,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">取棍位置Z设置:</p>
+					<p class="p">{{$t('advancedParameters.stickPositionZ')}}:</p>
 					<input class="input" type="text" v-model="D328" />
 					<button type="primary" class="button" @click="update('D328',D328)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -132,22 +132,22 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">启动缺物料监控</p>
+					<p class="p">{{$t('advancedParameters.materialShortageMonitor')}}</p>
 					<button type="primary" class="button" @click="update('M502','0')">
-						<p class="p2">启动</P>
+						<p class="p2">{{$t('advancedParameters.on')}}</P>
 					</button>
 					<button type="primary" class="button" @click="update('M502','1')">
-						<p class="p2">关闭</P>
+						<p class="p2">{{$t('advancedParameters.off')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">外循环按钮</p>
+					<p class="p">{{$t('advancedParameters.outerLoopButton')}}</p>
 					<button type="primary" class="button" @click="update('M506','0')">
-						<p class="p2">启动</P>
+						<p class="p2">{{$t('advancedParameters.on')}}</P>
 					</button>
 					<button type="primary" class="button" @click="update('M506','1')">
-						<p class="p2">关闭</P>
+						<p class="p2">{{$t('advancedParameters.off')}}</P>
 					</button>
 				</view>
 			</view>
@@ -191,6 +191,9 @@
 		onShow() {
 			var token = uni.getStorageSync("token");
 			this.globalUser = uni.getStorageSync("globalUser");
+			uni.setNavigationBarTitle({
+				title: this.$t('parameters.advanced')
+			});
 			if (token.length > 1) {
 				this.getEquipmentListData();
 				// this.getParam();
@@ -387,17 +390,21 @@
 		font-family: "PingFang-SC-Bold";
 	}
 	.search-input{
-		width: 45%;
+		width: 48%;
+		height: 25px;
 		text-align: center;
 		font-size: 26upx;
-		font-family: "PingFang-SC-Bold";
+		/* font-family: "PingFang-SC-Bold"; */
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
 	.search-button{
 		width: 20%;
-		padding-left: 7upx;
+		padding-left: 10px;
+		padding-bottom: 5px;
 		text-align: center;
+		height: 60upx;
+		text-align: left;
 	}
 	.line {
 		height: 50upx;
@@ -409,7 +416,7 @@
 
 	.body {
 		background-color: #FFFFFF;
-		width: 700upx;
+		width: 95%;
 		padding: 10upx 10upx 10upx 10upx;
 		display: flex;
 		flex-direction: row;
@@ -418,22 +425,23 @@
 	}
 
 	.p {
-		width: 350upx;
+		width: 60%;
 		text-align: right;
 	}
 
 	.input {
-		width: 200upx;
+		width: 20%;
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
+		padding-top: 5px;
 		text-align: center;
 	}
 
 	.button {
-		width: 120upx;
+		width: 17%;
 		height: 60upx;
 		text-align: left;
-		border-radius: 10upx;
+		/* border-radius: 10upx; */
 
 	}
 

+ 3 - 0
packageA/pages/remote/alarmClockList.vue

@@ -52,6 +52,9 @@
 		},
 		onShow() {
 			var token = uni.getStorageSync("token");
+			uni.setNavigationBarTitle({
+				title: this.$t('remoteList.alarmClock')
+			});
 			if (token.length > 1) {
 				this.getAlarmClockList();
 			} else {

+ 11 - 4
packageA/pages/remote/dosugar.vue

@@ -8,7 +8,7 @@
 				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
-				<button type="primary" class="" @click="search()">
+				<button type="primary" size="mini" class="" @click="search()">
 					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
@@ -79,6 +79,9 @@
 			// 	text: this.$t('tabs.tab4')
 			// });
 			var token = uni.getStorageSync("token");
+			uni.setNavigationBarTitle({
+				title: this.$t('remoteList.dosugur')
+			});
 			if (token.length > 1) {
 				this.getEquipmentListData();
 			} else {
@@ -293,17 +296,21 @@
 		font-family: "PingFang-SC-Bold";
 	}
 	.search-input{
-		width: 45%;
+		width: 48%;
+		height: 25px;
 		text-align: center;
 		font-size: 26upx;
-		font-family: "PingFang-SC-Bold";
+		/* font-family: "PingFang-SC-Bold"; */
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
 	.search-button{
 		width: 20%;
-		padding-left: 7upx;
+		padding-left: 10px;
+		padding-bottom: 5px;
 		text-align: center;
+		height: 60upx;
+		text-align: left;
 	}
 	.tr {
 		padding-top: 15upx;

+ 13 - 7
packageA/pages/remote/flowerShow.vue

@@ -8,7 +8,7 @@
 				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
-				<button type="primary" class="" @click="search()">
+				<button type="primary" size="mini" class="" @click="search()">
 					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
@@ -126,6 +126,9 @@
 			// 	text: this.$t('tabs.tab4')
 			// });
 			var token = uni.getStorageSync("token");
+			uni.setNavigationBarTitle({
+				title: this.$t('remoteList.flowers')
+			});
 			if (token.length > 1) {
 				this.getEquipmentListData();
 			} else {
@@ -396,19 +399,22 @@
 		font-family: "PingFang-SC-Bold";
 	}
 
-	.search-input {
-		width: 45%;
+	.search-input{
+		width: 48%;
+		height: 25px;
 		text-align: center;
 		font-size: 26upx;
-		font-family: "PingFang-SC-Bold";
+		/* font-family: "PingFang-SC-Bold"; */
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
-
-	.search-button {
+	.search-button{
 		width: 20%;
-		padding-left: 7upx;
+		padding-left: 10px;
+		padding-bottom: 5px;
 		text-align: center;
+		height: 60upx;
+		text-align: left;
 	}
 
 	.tr {

+ 41 - 32
packageA/pages/remote/generalParameters.vue

@@ -11,7 +11,7 @@
 				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
-				<button type="primary" class="" @click="search()">
+				<button type="primary" size="mini" class="" @click="search()">
 					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
@@ -32,7 +32,7 @@
 		</view>
 		<view >
 			<view class="body">
-				<p class="p">炉头工作温度:</p>
+				<p class="p">{{$t('generalParameters.headTemperature')}}:</p>
 				<input class="input" type="text" v-model="D418" />
 				<button type="primary" class="button" @click="update('D418',D418)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -40,7 +40,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">炉头中速:</p>
+				<p class="p">{{$t('generalParameters.headMediumSpeed')}}:</p>
 				<input class="input" type="text" v-model="D406" />
 				<button type="primary" class="button" @click="update('D406',D406)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -48,7 +48,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">水泵开启时间:</p>
+				<p class="p">{{$t('generalParameters.pumpOpeningtime')}}:</p>
 				<input class="input" type="text" v-model="D408" />
 				<button type="primary" class="button" @click="update('D408',D408)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -56,7 +56,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">风机吹气时间:</p>
+				<p class="p">{{$t('generalParameters.blowerBlowingTime')}}:</p>
 				<input class="input" type="text" v-model="D409" />
 				<button type="primary" class="button" @click="update('D409',D409)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -64,7 +64,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">下糖粗细系数:</p>
+				<p class="p">{{$t('generalParameters.lowerSugarThickness')}}:</p>
 				<input class="input" type="text" v-model="D416" />
 				<button type="primary" class="button" @click="update('D416',D416)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -72,7 +72,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">柜内允许做糖温度误差:</p>
+				<p class="p">{{$t('generalParameters.sugarTemperatureError')}}:</p>
 				<input class="input" type="text" v-model="D419" />
 				<button type="primary" class="button" @click="update('D419',D419)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -80,7 +80,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">回差调节:</p>
+				<p class="p">{{$t('generalParameters.returnAdjustment')}}:</p>
 				<input class="input" type="text" v-model="M504" />
 				<button type="primary" class="button" @click="update('M504',M504)">
 					<p class="p2">{{$t('parameters.update')}}</P>
@@ -91,7 +91,7 @@
 			<view class="" v-show="equimentType=='MG301'||equimentType=='MG320'">
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">炉头低速:</p>
+					<p class="p">{{$t('generalParameters.headLowSpeed')}}:</p>
 					<input class="input" type="text" v-model="D405" />
 					<button type="primary" class="button" @click="update('D405',D405)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -99,7 +99,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">炉头高速:</p>
+					<p class="p">{{$t('generalParameters.headHighSpeed')}}:</p>
 					<input class="input" type="text" v-model="D407" />
 					<button type="primary" class="button" @click="update('D407',D407)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -107,7 +107,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">手动门关闭等待时间:</p>
+					<p class="p">{{$t('generalParameters.closingWaitTime')}}:</p>
 					<input class="input" type="text" v-model="D412" />
 					<button type="primary" class="button" @click="update('D412',D412)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -115,7 +115,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">低温环境设定(炉头升柜温):</p>
+					<p class="p">{{$t('generalParameters.lowTemperatureEnvironment')}}:</p>
 					<input class="input" type="text" v-model="D460" />
 					<button type="primary" class="button" @click="update('D460',D460)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -123,7 +123,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">高温环境设定(外循环风机):</p>
+					<p class="p">{{$t('generalParameters.highTemperatureEnvironment')}}:</p>
 					<input class="input" type="text" v-model="D461" />
 					<button type="primary" class="button" @click="update('D461',D461)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -134,7 +134,7 @@
 			<view class="" v-show="equimentType=='MG320'">
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">加湿时炉头升温N度:</p>
+					<p class="p">{{$t('generalParameters.headDuringHumidification')}}:</p>
 					<input class="input" type="text" v-model="D467" />
 					<button type="primary" class="button" @click="update('D467',D467)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -142,7 +142,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">加湿时候监控时间:</p>
+					<p class="p">{{$t('generalParameters.humidificationMonitoringTime')}}:</p>
 					<input class="input" type="text" v-model="D468" />
 					<button type="primary" class="button" @click="update('D468',D468)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -150,7 +150,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">加湿OFF时间:</p>
+					<p class="p">{{$t('generalParameters.humidificationOFFTime')}}:</p>
 					<input class="input" type="text" v-model="D475" />
 					<button type="primary" class="button" @click="update('D475',D475)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -158,7 +158,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">加湿ON时间:</p>
+					<p class="p">{{$t('generalParameters.humidificationONTime')}}:</p>
 					<input class="input" type="text" v-model="D476" />
 					<button type="primary" class="button" @click="update('D476',D476)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -166,7 +166,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">加湿启动延时:</p>
+					<p class="p">{{$t('generalParameters.humidificationStartDelay')}}:</p>
 					<input class="input" type="text" v-model="D477" />
 					<button type="primary" class="button" @click="update('D477',D477)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -174,7 +174,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">加湿停止延时:</p>
+					<p class="p">{{$t('generalParameters.humidificationStopDelay')}}:</p>
 					<input class="input" type="text" v-model="D478" />
 					<button type="primary" class="button" @click="update('D478',D478)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -182,7 +182,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">出棍后机械手等待时间:</p>
+					<p class="p">{{$t('generalParameters.manipulatorWaitingTime')}}:</p>
 					<input class="input" type="text" v-model="D471" />
 					<button type="primary" class="button" @click="update('D471',D471)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -193,7 +193,7 @@
 			<view class="" v-show="equimentType=='MG301'||equimentType=='MG280'">
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">基准系数:</p>
+					<p class="p">{{$t('generalParameters.referenceCoefficient')}}:</p>
 					<input class="input" type="text" v-model="D444" />
 					<button type="primary" class="button" @click="update('D444',D444)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -201,7 +201,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">基准湿度:</p>
+					<p class="p">{{$t('generalParameters.referenceHumidity')}}:</p>
 					<input class="input" type="text" v-model="D445" />
 					<button type="primary" class="button" @click="update('D445',D445)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -212,7 +212,7 @@
 			<view class="" v-show="equimentType=='MG280'">
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">加湿OFF时间:</p>
+					<p class="p">{{$t('generalParameters.humidificationOFFTime')}}:</p>
 					<input class="input" type="text" v-model="D472" />
 					<button type="primary" class="button" @click="update('D472',D472)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -220,7 +220,7 @@
 				</view>
 				<view class="line2"></view>
 				<view class="body">
-					<p class="p">加湿ON时间:</p>
+					<p class="p">{{$t('generalParameters.humidificationONTime')}}:</p>
 					<input class="input" type="text" v-model="D473" />
 					<button type="primary" class="button" @click="update('D473',D473)">
 						<p class="p2">{{$t('parameters.update')}}</P>
@@ -277,6 +277,9 @@
 		onShow() {
 			var token = uni.getStorageSync("token");
 			this.globalUser = uni.getStorageSync("globalUser");
+			uni.setNavigationBarTitle({
+				title: this.$t('parameters.general')
+			});
 			if (token.length > 1) {
 				this.getEquipmentListData();
 				// this.getParam();
@@ -531,17 +534,21 @@
 		font-family: "PingFang-SC-Bold";
 	}
 	.search-input{
-		width: 45%;
+		width: 48%;
+		height: 25px;
 		text-align: center;
 		font-size: 26upx;
-		font-family: "PingFang-SC-Bold";
+		/* font-family: "PingFang-SC-Bold"; */
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
 	.search-button{
 		width: 20%;
-		padding-left: 7upx;
+		padding-left: 10px;
+		padding-bottom: 5px;
 		text-align: center;
+		height: 60upx;
+		text-align: left;
 	}
 	.line {
 		height: 50upx;
@@ -553,7 +560,7 @@
 
 	.body {
 		background-color: #FFFFFF;
-		width: 700upx;
+		width: 98%;
 		padding: 10upx 10upx 10upx 10upx;
 		display: flex;
 		flex-direction: row;
@@ -562,19 +569,21 @@
 	}
 
 	.p {
-		width: 350upx;
+		width: 50%;
 		text-align: right;
 	}
 
 	.input {
-		width: 200upx;
+		width: 20%;
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
+		margin-left: 10px;
+		padding-top: 5px;
 		text-align: center;
 	}
 
 	.button {
-		width: 120upx;
+		width: 15%;
 		height: 60upx;
 		text-align: left;
 		border-radius: 10upx;
@@ -582,7 +591,7 @@
 	}
 
 	.p2 {
-		font-size: 30upx;
+		font-size: 25upx;
 		/* #ifndef H5 */
 		padding-top: 3upx;
 		/* #endif */

+ 11 - 4
packageA/pages/remote/humidityParameters.vue

@@ -11,7 +11,7 @@
 				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
-				<button type="primary" class="" @click="search()">
+				<button type="primary" size="mini" class="" @click="search()">
 					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
@@ -102,6 +102,9 @@
 		onShow() {
 			var token = uni.getStorageSync("token");
 			this.globalUser = uni.getStorageSync("globalUser");
+			uni.setNavigationBarTitle({
+				title: this.$t('parameters.cabinet_hd')
+			});
 			if (token.length > 1) {
 				this.getEquipmentListData();
 				// this.getParam();
@@ -215,17 +218,21 @@
 		font-family: "PingFang-SC-Bold";
 	}
 	.search-input{
-		width: 45%;
+		width: 48%;
+		height: 25px;
 		text-align: center;
 		font-size: 26upx;
-		font-family: "PingFang-SC-Bold";
+		/* font-family: "PingFang-SC-Bold"; */
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
 	.search-button{
 		width: 20%;
-		padding-left: 7upx;
+		padding-left: 10px;
+		padding-bottom: 5px;
 		text-align: center;
+		height: 60upx;
+		text-align: left;
 	}
 	.line {
 		height: 50upx;

+ 6 - 0
packageA/pages/remote/parameters.vue

@@ -11,6 +11,12 @@
 
 <script>
 	export default {
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.$t('remoteList.parameters')
+			});
+		},
+		
 		methods: {
 			general(){
 				uni.navigateTo({

+ 3 - 0
packageA/pages/remote/remoteList.vue

@@ -62,6 +62,9 @@
 			if(gid == 1150){
 				this.show3 = true;
 			}
+			uni.setNavigationBarTitle({
+				title: this.$t('remoteList.title')
+			});
 			// if (gid != 1||gid != 236||name!="邱咪") {
 			// this.show = true;
 			// this.show2 = true;

+ 16 - 11
packageA/pages/remote/updatePassword.vue

@@ -9,7 +9,7 @@
 				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
-				<button type="primary" class="" @click="search()">
+				<button type="primary" size="mini" class="" @click="search()">
 					<p class="">{{$t('alarmClock.add')}}</P>
 				</button>
 			</view>
@@ -75,6 +75,9 @@
 		},
 		onShow() {
 			this.globalUser = uni.getStorageSync("globalUser");
+			uni.setNavigationBarTitle({
+				title: this.$t('remoteList.password')
+			});
 			var token = uni.getStorageSync("token");
 			if (token.length > 1) {
 				this.getEquipmentListData();
@@ -285,7 +288,6 @@
 	.search {
 		width: 100%;
 		padding-top: 15upx;
-		padding-bottom: 25upx;
 		display: flex;
 		flex-direction: row;
 		justify-content: flex-start;
@@ -298,14 +300,23 @@
 		font-family: "PingFang-SC-Bold";
 	}
 
-	.search-input {
-		width: 45%;
+	.search-input{
+		width: 48%;
+		height: 25px;
 		text-align: center;
 		font-size: 26upx;
-		font-family: "PingFang-SC-Bold";
+		/* font-family: "PingFang-SC-Bold"; */
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
+	.search-button{
+		width: 20%;
+		padding-left: 10px;
+		padding-bottom: 5px;
+		text-align: center;
+		height: 60upx;
+		text-align: left;
+	}
 	.search-input2 {
 		width: 65%;
 		text-align: center;
@@ -315,12 +326,6 @@
 		border-radius: 5upx;
 	}
 
-	.search-button {
-		width: 20%;
-		padding-left: 7upx;
-		text-align: center;
-	}
-
 	.select-item {
 		/* padding-top: 20upx; */
 	}

+ 13 - 7
packageA/pages/remote/volume.vue

@@ -8,7 +8,7 @@
 				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
-				<button type="primary" class="" @click="search()">
+				<button type="primary" size="mini" class="" @click="search()">
 					<p class="">{{$t('dosugar.search')}}</P>
 				</button>
 			</view>
@@ -62,6 +62,9 @@
 		onShow() {
 			var token = uni.getStorageSync("token");
 			this.globalUser = uni.getStorageSync("globalUser");
+			uni.setNavigationBarTitle({
+				title: this.$t('remoteList.volume')
+			});
 			if (token.length > 1) {
 				this.getEquipmentListData();
 				// this.getParam();
@@ -175,19 +178,22 @@
 		font-family: "PingFang-SC-Bold";
 	}
 
-	.search-input {
-		width: 45%;
+	.search-input{
+		width: 48%;
+		height: 25px;
 		text-align: center;
 		font-size: 26upx;
-		font-family: "PingFang-SC-Bold";
+		/* font-family: "PingFang-SC-Bold"; */
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
-
-	.search-button {
+	.search-button{
 		width: 20%;
-		padding-left: 7upx;
+		padding-left: 10px;
+		padding-bottom: 5px;
 		text-align: center;
+		height: 60upx;
+		text-align: left;
 	}
 
 	.line {

+ 5 - 0
packageB/pages/char/elseStatistics.vue

@@ -35,6 +35,11 @@
 				}
 			},
 		},
+		onShow() {
+			uni.setNavigationBarTitle({
+				title: this.$t('mainStatistics.title')
+			});	
+		},
 		onLoad(option){
 			this.equipmentId = option['equipmentId'];
 			this.adminId = option['adminId'];

+ 15 - 7
packageB/pages/remote/updatePrice.vue

@@ -9,7 +9,7 @@
 				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
 			</view>
 			<view class="search-button">
-				<button type="primary" class="" @click="search()">
+				<button type="primary" size="mini" class="" @click="search()">
 					<p class="">{{$t('alarmClock.add')}}</P>
 				</button>
 			</view>
@@ -416,6 +416,9 @@
 		},
 		onShow() {
 			this.globalUser = uni.getStorageSync("globalUser");
+			uni.setNavigationBarTitle({
+				title: this.$t('remoteList.price')
+			});
 			var token = uni.getStorageSync("token");
 			if (token.length > 1) {
 				this.getEquipmentListData();
@@ -1143,7 +1146,7 @@
 	.search {
 		width: 100%;
 		padding-top: 15upx;
-		padding-bottom: 25upx;
+		padding-bottom: 15upx;
 		display: flex;
 		flex-direction: row;
 		justify-content: flex-start;
@@ -1156,14 +1159,16 @@
 		font-family: "PingFang-SC-Bold";
 	}
 
-	.search-input {
-		width: 45%;
+	.search-input{
+		width: 48%;
+		height: 25px;
 		text-align: center;
 		font-size: 26upx;
-		font-family: "PingFang-SC-Bold";
+		/* font-family: "PingFang-SC-Bold"; */
 		box-shadow: 0upx 0upx 20upx #D3D3D3;
 		border-radius: 5upx;
 	}
+
 	.search-input2 {
 		width: 65%;
 		text-align: center;
@@ -1179,10 +1184,13 @@
 		font-family: "PingFang-SC-Bold";
 	}
 
-	.search-button {
+	.search-button{
 		width: 20%;
-		padding-left: 7upx;
+		padding-left: 10px;
+		padding-bottom: 5px;
 		text-align: center;
+		height: 60upx;
+		text-align: left;
 	}
 
 	.select-item {

+ 5 - 4
pages/Charts/mainStatistics.vue

@@ -301,14 +301,15 @@
 				msgType: 'success',
 				scrollHeight: uni.getSystemInfoSync().windowHeight - 130,
 				ifForeign:0,
-				langAbbrs:false
+				langAbbrs:false,
+				localPname: this.pname,
 			}
 		},
 		computed: {
 			...mapState(['loginUser']),
 			pnameData: {
 				get() {
-					return this.pname;
+					return this.localPname;
 				}
 			},
 		},
@@ -370,8 +371,8 @@
 			// },
 			...mapActions('chart', ['getStatistics', 'getMachineNum']),
 			async init() {
-				if (!this.pname) {
-					this.pname = this.loginUser.name;
+				if (!this.localPname) {
+					this.localPname = this.loginUser.name;
 				}
 				_self = this;
 				//图表中图

+ 2 - 2
pages/User/equipmentStatusList.vue

@@ -126,7 +126,7 @@
 							<view class="swichFont2">{{$t('equipmentStatusList.sleepDesc')}}:</view>
 							<input v-if="descShow" class="swichFont3" :value=equipment.sleepDesc @input="getValue" 
 							style="background: #fff" />
-							<span v-else class="swichFont4">{{equipment.sleepDesc==null?"暂停营业":equipment.sleepDesc}}</span>
+							<span v-else class="swichFont4">{{equipment.sleepDesc==null?$t('equipmentStatusList.confirm'):equipment.sleepDesc}}</span>
 							<view v-if="editBtn" class="switch3">
 								<button type="primary" @click="toggleReadOnly" class="button">
 									<p class="p">{{$t('equipmentStatusList.edit')}}</p>
@@ -823,7 +823,7 @@
 							},
 							success: (res) => {
 								uni.showModal({
-									title: '提示Tip',
+									title: this.$t('equipmentStatusList.tip'),
 									content: res.data.message,
 									success: function(res) {
 										that.getEquipmentListData();