更新

common/lang/en.js

@@ -22,13 +22,13 @@ export default {
 		monthImg:'../../static/img/yue1.png',
 		yearImg:'../../static/img/nian1.png',
 		allImg:'../../static/img/zong1.png',
-		dayTotalMoney:'todayMoney',
+		dayTotalMoney:'todayAmt',
 		dayTotalNum:'todayNumber',
-		weekTotalMoney:'weekMoney',
+		weekTotalMoney:'weekAmt',
 		weekTotalNum:'weekNumber',
-		monthTotalMoney:'monthMoney',
+		monthTotalMoney:'monthAmt',
 		monthTotalNum:'monthNumber',
-		yearTotalMoney:'yearMoney',
+		yearTotalMoney:'yearAmt',
 		yearTotalNum:'yearNumber',
 		machineTotalNum:'machineNumber',
 		machineUseNum:'workingMachine',
@@ -97,6 +97,13 @@ export default {
 		guanbi:'off',
 		refreshTime:'last refresh time',
 		volume:'volume',
+		whiteSugar:'whiteSugar',
+		redSugar:'redSugar',
+		yellowSugar:'yellowSugar',
+		blueSugar:'blueSugar',
+		stick:'stick',
+		water:'water',
+		wasteWater:'wasteWater',
 	},
 	equipmentStatics:{
 		title:'Machine Sales Ranking',
@@ -112,7 +119,8 @@ export default {
 		title:'me',
 		bindLogout:'exit',
 		equipmentname:'modify device name',
-		remote:'remote operation'
+		remote:'remote operation',
+		equipmentlist:'machine details'
 	},
 	equipmentname:{
 		title:'modify device name',
@@ -123,7 +131,9 @@ export default {
 		flowers:'shielding/display pattern',
 		parameters:'parameter adjustment',
 		alarmClock:'alarm clock(time switch furnace head/machine sleep)',
-		volume:'Machine volume adjustment'
+		volume:'Machine volume adjustment',
+		password:'Remote modification of machine password',
+		price:'Modify commodity price',
 	},
 	dosugar:{
 		equipmentClientID:'Enter the machine code',
@@ -137,7 +147,11 @@ export default {
 		flower:'flower',
 		show:'show',
 		unshow:'unshow',
-		submit:'submit'
+		submit:'submit',
+		yellowSugar:'All yellow sugar flower:',
+		buleSugar:'All bule sugar flower:',
+		redSugar:'All red sugar flower:',
+		whileSugar:'All while sugar flower:',
 	},
 	volume:{
 		volu:'Current volume'
@@ -145,7 +159,13 @@ export default {
 	parameters:{
 		general:'General parameters',
 		advanced:'Advanced parameters',
-		debug:'Debug page'
+		cabinet_hd:'cabinetHd Debug',
+		debug:'Debug page',
+		cabinetHd:'cabinetHd',
+		allUpdate:'one key increment and decrement',
+		winter:'winter parameters',
+		summer:'summer parameters',
+		update:'update'
 	},
 	alarmClock:{
 		title:'alarmClock',
@@ -171,5 +191,50 @@ export default {
 		status1:'closed',
 		status2:'enable',
 		zhou:''
+	},
+	updatePassword:{
+		adminPwd:'adminPwd',
+		guestPwd:'guestPwd',
+		update:'submit',
+		sure:'Are you sure?'
+	},
+	updatePrice:{
+		A01:'Rose elf',
+		A02:'Childlike innocence still',
+		A03:'Colorful',
+		A04:'Snow love dance',
+		A05:'Hibiscus in water',
+		A06:'Flame red lips',
+		A07:'Dream come true',
+		A08:'Fall in love at first sight',
+		A09:'Orchid love',
+		A10:'Guardian of the heart',
+		A11:'Summer love',
+		A12:'Ice beauty',
+		A13:'Celestial beauty',
+		A14:'Pure heart',
+		A15:'Heart of the Oceans',
+		A16:'Love of Crystal',
+		A17:'Color elf',
+		A18:'Warm jacket',
+		A19:'Fairy Butterfly Dream',
+		A20:'Summer Allure',
+		A21:'Let a hundred flowers blossom',
+		A22:'Bee wrapped around butterfly love',
+		A23:'Cardamom Years',
+		A24:'Star fantasy',
+		A25:'Falling into the stars',
+		A26:'Snow flies dancing',
+		A27:'Spring flowers bloom',
+		A28:'Flowers flying',
+		A29:'In the Mood for Love',
+		A30:'Hearts blooming',
+		A31:'Hibiscus in water-mini',
+		A32:'Flame red lips-mini',
+		A33:'Summer love-mini',
+		A34:'Ice beauty-mini',
+		A35:'Color elf-mini',
+		name:'productName',
+		price:'price'
 	}
 }

common/lang/zh.js

@@ -95,6 +95,13 @@ export default {
 		guanbi:'关闭',
 		refreshTime:'最近刷新时间',
 		volume:'音量',
+		whiteSugar:'白糖',
+		redSugar:'红糖',
+		yellowSugar:'黄糖',
+		blueSugar:'蓝糖',
+		stick:'棍子',
+		water:'清水',
+		wasteWater:'废水',
 	},
 	equipmentStatics:{
 		title:'机器销售排行',
@@ -110,7 +117,8 @@ export default {
 		title:'我的',
 		bindLogout:'退出',
 		equipmentname:'修改设备名称',
-		remote:'远程操作'
+		remote:'远程操作',
+		equipmentlist:'机器详情'
 	},
 	equipmentname:{
 		title:'修改设备名称',
@@ -121,7 +129,9 @@ export default {
 		flowers:'屏蔽/显示售卖花型',
 		parameters:'参数调整',
 		alarmClock:'闹钟(定时开关炉头/机器休眠)',
-		volume:'机器音量调节'
+		volume:'机器音量调节',
+		password:'远程修改机器密码',
+		price:'修改商品价格',
 	},
 	dosugar:{
 		equipmentClientID:'输入机器编码',
@@ -135,7 +145,11 @@ export default {
 		flower:'花型',
 		show:'显示',
 		unshow:'屏蔽',
-		submit:'提交'
+		submit:'提交',
+		yellowSugar:'所有黄糖花型：',
+		buleSugar:'所有蓝糖花型：',
+		redSugar:'所有红糖花型：',
+		whileSugar:'所有白糖花型：',
 	},
 	volume:{
 		volu:'当前音量'
@@ -143,7 +157,13 @@ export default {
 	parameters:{
 		general:'通用参数',
 		advanced:'进阶参数',
-		debug:'调试页参数'
+		cabinet_hd:'湿度调整',
+		debug:'调试页参数',
+		cabinetHd:'柜内湿度',
+		allUpdate:'一键递增递减',
+		winter:'冬季参数',
+		summer:'夏季参数',
+		update:'更新'
 	},
 	alarmClock:{
 		title:'时钟',
@@ -169,5 +189,50 @@ export default {
 		status1:'已关闭',
 		status2:'已启用',
 		zhou:'周'
+	},
+	updatePassword:{
+		adminPwd:'管理员密码',
+		guestPwd:'次级管理员密码',
+		update:'提交',
+		sure:'确定修改？'
+	},
+	updatePrice:{
+		A01:'玫瑰精灵',
+		A02:'童心未泯',
+		A03:'五彩缤纷',
+		A04:'天雪恋舞',
+		A05:'水中芙蓉',
+		A06:'烈焰红唇',
+		A07:'美梦成真',
+		A08:'一见钟情',
+		A09:'幽兰爱恋',
+		A10:'心之守护',
+		A11:'夏日爱恋',
+		A12:'冰美人',
+		A13:'国色天香',
+		A14:'赤子之心',
+		A15:'海洋之心',
+		A16:'水晶之恋',
+		A17:'彩色精灵',
+		A18:'小棉袄',
+		A19:'精灵蝶梦',
+		A20:'夏日倾城',
+		A21:'百花齐放',
+		A22:'蜂缠蝶恋',
+		A23:'豆蔻年华',
+		A24:'星空幻想',
+		A25:'坠入星空',
+		A26:'雪花飞舞',
+		A27:'春暖花开',
+		A28:'花飞蝶舞',
+		A29:'花样年华',
+		A30:'心花怒放',
+		A31:'水中芙蓉mini',
+		A32:'烈焰红唇mini',
+		A33:'夏日爱恋mini',
+		A34:'冰美人mini',
+		A35:'彩色精灵mini',
+		name:'商品',
+		price:'价格'
 	}
 }

configs/env.js

@@ -9,8 +9,8 @@ let configs = {
 if (process.env.NODE_ENV === 'development') {
 	// 测试环境
 	configs = Object.assign(configs, {
-		// baseUrl: 'https://app.sunzee.com.cn/ShenzeeServer',
-		baseUrl: 'http://127.0.0.1:8090',
+		baseUrl: 'https://app.sunzee.com.cn/ShenzeeServer',
+		// baseUrl: 'http://127.0.0.1:8090',
 	});
 }
 

main.js

@@ -47,8 +47,8 @@ Vue.use(VueI18n)
 // })
 Vue.config.productionTip = !!env.isProduction;
 const i18n = new VueI18n({  
-  locale: 'en-US',  // 默认选择的语言
-  // locale: 'zh-CN',
+  // locale: 'en-US',  // 默认选择的语言
+  locale: 'zh-CN',
    messages: {
          'zh-CN': zh,   // 中文语言包
          'en-US': en    // 英文语言包
@@ -56,7 +56,7 @@ const i18n = new VueI18n({
 });
 
 App.mpType = 'app'
-// Vue.prototype.serverurl="http://127.0.0.1:8090";
+// Vue.prototype.serverurl="http://127.0.0.1:8090";67.5
 Vue.prototype.serverurl="https://app.sunzee.com.cn/ShenzeeServer";
 Vue.prototype.$store = store;
 Vue.prototype._i18n = i18n;

packageA/pages/equipmentStatus/equipmentlist.vue

@@ -0,0 +1,393 @@
+<!-- 机器状态页面 -->
+<template>
+<!-- 	<view v-if="merchantList.length>1">
+		<uni-collapse :accordion="true">
+			<view class="titleFlag">
+				<image class="img" src="../../static/img/red.png"></image>
+				<font class="wenziT">红色代表机器报警</font>
+				<image class="img" src="../../static/img/green.png"></image>
+				<font class="wenziT">绿色代表机器正常</font>
+			</view>
+			<view class="titlelist" v-for="(merchant,index) in merchantList" :key="merchant.id">
+				<uni-collapse-item :title="getMerchantTitle(merchant)" :open="index===0">
+					<view style="padding: 20upx;background-color: aliceblue;">
+						<view v-if="merchant.equipmentList.length==0" style="text-align: center;">暂无数据</view>
+						<view v-if="merchant.equipmentList.length>0">
+							<uni-collapse :show-animation="true">
+								<view style="position: relative;" v-for="equipment in merchant.equipmentList" :key="equipment.id">
+									<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
+									<uni-collapse-item :title="getEquipmentTitle(equipment)">
+										<view style="padding: 20upx;background-color: antiquewhite;">
+											<view class="swithBox" v-if="equipment.isSleep">
+												<view class="swichFont">睡眠状态：机器已睡眠</view>
+												<view class="switch">
+													<switch style="transform:scale(0.65)" checked @change="change(equipment.id,0)" />
+												</view>
+											</view>
+											<view class="swithBox" v-else>
+												<view class="swichFont">睡眠状态：未睡眠</view>
+												<view class="switch">
+													<switch style="transform:scale(0.65)" :checked="sleepChecked" @change="change(equipment.id,1)" />
+												</view>
+											</view>
+											<view class="line1"></view>
+											<view class="swithBox" v-if="equipment.eqeStatus==0">
+												<view class="swichFont">关机：已关机</view>
+												<view class="switch">
+													<switch style="transform:scale(0.65)" checked @change="OnOff(equipment.id,1)" />
+												</view>
+											</view>
+											<view class="swithBox" v-else>
+												<view class="swichFont">关机：未关机</view>
+												<view class="switch">
+													<switch style="transform:scale(0.65)" :checked="onffChecked" @change="OnOff(equipment.id,0)" />
+												</view>
+											</view>
+											<view class="line1"></view>
+											<view><span>机器唯一码：</span><span>{{equipment.clientId}}</span></view>
+											<view><span>所在地：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
+											<view><span>炉头温度：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
+											<view><span>柜内湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
+											<view><span>柜内温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
+											<view v-if="equipment.hasTodayAlarm">
+												<view><span>报警内容：</span></view>
+												<view v-for="(alarm,index) in equipment.alarmList" :key="index">
+													<view><span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}} {{alarm.alarmContent}}
+															<button v-if="alarm.isEliminate==1" style="color:#BEBEBE;" @click="eliminate(alarm.id)" class="eliminateButton">
+																<p class="p">已消除</p>
+															</button>
+															<button v-if="alarm.isEliminate!=1" type="primary" @click="eliminate(alarm.id)" class="eliminateButton">
+																<p class="p">消除</p>
+															</button>
+														</span></view>
+												</view>
+											</view>
+											<view v-else>
+												<view><span>报警内容：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}
+														{{equipment.alarmContent}}</span></view>
+											</view>
+										</view>
+									</uni-collapse-item>
+								</view>
+							</uni-collapse>
+						</view>
+					</view>
+				</uni-collapse-item>
+			</view>
+		</uni-collapse>
+	</view> -->
+	<view >
+		<uni-collapse :show-animation="true">
+			<view class="titleFlag">
+				<image class="img" src="../../../static/img/red.png"></image>
+				<font class="wenziT">{{$t('equipmentStatusList.red')}}</font>
+				<image class="img" src="../../../static/img/green.png"></image>
+				<font class="wenziT">{{$t('equipmentStatusList.green')}}</font>
+			</view>
+			<view class="titlelist" style="position: relative;" v-for="equipment in merchantList[0].equipmentList" :key="equipment.id">
+				<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
+				<uni-collapse-item :title="getEquipmentTitle(equipment)" :open="true">
+					<!-- 睡眠 -->
+					<view style="padding: 20upx;background-color: antiquewhite;">
+						<view><span>{{$t('equipmentStatusList.equipmentNo')}}：</span><span>{{equipment.clientId}}</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>{{$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.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>
+							<view v-for="(alarm,index) in equipment.alarmList" :key="index">
+								<view>
+									<span class="baojing">{{alarm.occurrenceTime?alarm.occurrenceTime:''}} {{alarm.alarmContent}}
+										<button v-if="alarm.isEliminate==1" style="color:#BEBEBE;" @click="eliminate(alarm.id)" class="eliminateButton">
+											<p class="p">{{$t('equipmentStatusList.yixiaochu')}}</p>
+										</button>
+										<button v-if="alarm.isEliminate!=1" type="primary" @click="eliminate(alarm.id)" class="eliminateButton">
+											<p class="p">{{$t('equipmentStatusList.xiaochu')}}</p>
+										</button>
+									</span>
+								</view>
+							</view>
+						</view>
+						<view class="" v-else>
+							<view><span>{{$t('equipmentStatusList.alarm')}}：</span><span>{{equipment.occurrenceTime?equipment.occurrenceTime:''}}
+									{{equipment.alarmContent}}</span></view>
+						</view>
+					</view>
+				</uni-collapse-item>
+			</view>
+		</uni-collapse>
+	</view>
+
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'
+	import uniCollapse from '@/components/uni-collapse/uni-collapse.vue'
+	import uniCollapseItem from '@/components/uni-collapse-item/uni-collapse-item.vue'
+	import uniList from '@/components/uni-list/uni-list.vue'
+	import uniListItem from '@/components/uni-list-item/uni-list-item.vue'
+	import {
+		dateUtils
+	} from '@/common/util.js';
+	export default {
+		components: {
+			uniCollapse,
+			uniCollapseItem,
+			uniList,
+			uniListItem,
+		},
+		data() {
+			return {
+				globalUser: {},
+				merchantList: [{
+					equipmentList: []
+				}],
+				extraIcon: {
+					color: '#4cd964',
+					size: '22',
+					type: 'spinner'
+				},
+				statusNormal: 'status-normal',
+				statusError: 'status-error',
+				sleepChecked: null,
+				onffChecked: null,
+				time: null,
+				timeAll: {
+
+				},
+				input: 0,
+			}
+		},
+		computed: {
+			...mapState(['loginUser']),
+		},
+		onPullDownRefresh() {
+			this.getEquipmentListData();
+		},
+		onShow() {
+			// this.input = this.input + 1;
+			this.globalUser = uni.getStorageSync("globalUser");
+			// uni.setNavigationBarTitle({
+			// 	title: this.$t('equipmentStatusList.title')
+			// });
+			// uni.setTabBarItem({
+			// 	index: 3,
+			// 	text: this.$t('tabs.tab4')
+			// });
+			var token = uni.getStorageSync("token");
+			if (token.length > 1) {
+				this.getEquipmentListData();
+			} else {
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
+
+		},
+		methods: {
+			...mapActions('chart', ['getEquipmentListByUser']),
+			getMerchantTitle(merchant) {
+				return merchant.name ? merchant.name : merchant.username;
+			},
+			getEquipmentTitle(equipment) {
+				return equipment.name ? equipment.name : '暂无名称';
+			},
+			getEquipmentListData() {
+				this.getEquipmentListByUser(this.globalUser)
+					.then(data => {
+						this.merchantList = data;
+						var listName = data[0].equipmentList;
+						var times = new Map;
+						if (this.input == 1) {
+							for (var i = 0; i < listName.length; i++) {
+								var k = listName[i].id;
+								times.set(k, null);
+							}
+							this.timeAll = times;
+						}
+						var listId = data[0].id;
+						if (listId != null && listId != '1') {
+							uni.setStorageSync("listName", listName);
+						}
+						uni.stopPullDownRefresh();
+					}, _ => void uni.stopPullDownRefresh());
+			},
+			eliminate(id) {
+				var token = uni.getStorageSync("token");
+				uni.request({
+					url: this.serverurl + '/TEquipment/eliminate',
+					data: {
+						"id": id
+					},
+					method: "POST",
+					header: {
+						'token': token
+					},
+					success: (res) => {
+						uni.showToast({
+							title: "发送成功",
+							icon: 'none',
+							duration: 1000
+						});
+						this.getEquipmentListData();
+					}
+				});
+			},
+
+}
+	}
+</script>
+
+<style>
+	.status-css {
+		position: absolute;
+		width: 30upx;
+		height: 30upx;
+		right: 86upx;
+		top: 30upx;
+		border-radius: 30upx;
+		color: "#596D83";
+		font-size: 12upx;
+	}
+
+	.status-error {
+		background-color: #dd524d
+	}
+
+	.status-normal {
+		background-color: #4cd964
+	}
+
+	.baojing {
+		display: flex;
+		flex-direction: row;
+		padding-left: 20upx;
+	}
+
+	.titleFlag {
+		height: 56upx;
+		background-color: #F8F8F8;
+		color: #8C959F;
+		font-size: 22upx;
+		display: flex;
+		flex-direction: row;
+	}
+
+	.opendoor {
+		/* #ifdef H5 */
+
+		/* #endif */
+		padding-top: 10upx;
+		padding-bottom: 10upx;
+		/* text-align: center; */
+		display: flex;
+		flex-direction: row;
+	}
+
+	.button {
+		/* #ifdef H5 */
+		text-align: center;
+		height: 50upx;
+		weight: 20upx;
+		/* #endif */
+		padding-left: 15upx;
+		/* padding-top: 2upx; */
+	}
+
+	.eliminateButton {
+		/* #ifdef H5 */
+		text-align: center;
+		height: 50upx;
+		weight: 20upx;
+		/* #endif */
+		padding-left: 15upx;
+		/* padding-top: 2upx; */
+	}
+
+	.p {
+		/* #ifdef H5 */
+		font-size: 28upx;
+		height: 50upx;
+		weight: 20upx;
+		transform: translateY(-14upx);
+		/* text-align: center; */
+		/* #endif */
+		/* padding-bottom: 50upx; */
+		text-align: center;
+		padding-left: 13upx;
+	}
+
+	.img {
+		padding-top: 20upx;
+		padding-left: 30upx;
+		width: 15upx;
+		height: 15upx;
+	}
+
+	.wenziT {
+		padding-top: 10upx;
+		padding-left: 10upx;
+	}
+
+	.titlelist {
+		color: #363D44;
+		font-size: 16upx;
+		font-family: "PingFang-SC-Medium";
+	}
+
+	.swithBox {
+		display: flex;
+		flex-direction: row;
+		padding-bottom: 15upx;
+		padding-top: 5upx;
+	}
+
+	.switch {
+		width: 100upx;
+		height: 22upx;
+	}
+
+	.switch1 {
+		display: flex;
+		flex-direction: row;
+		width: 35%;
+		height: 42upx;
+		padding-top: 13upx;
+		padding-left: 72upx;
+	}
+
+	.swichFont {
+		width: 85%;
+		padding-top: 12upx;
+	}
+
+	.swichFont1 {
+		width: 55%;
+		padding-top: 12upx;
+	}
+
+	.line1 {
+		width: 100%;
+		height: 3upx;
+		background: #000000;
+	}
+</style>

packageA/pages/remote/advancedParameters.vue

@@ -34,7 +34,7 @@
 				<p class="p">X零点补偿：</p>
 				<input class="input" type="text" v-model="D436" />
 				<button type="primary" class="button" @click="update('D436',D436)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -42,7 +42,7 @@
 				<p class="p">Y零点补偿：</p>
 				<input class="input" type="text" v-model="D438" />
 				<button type="primary" class="button" @click="update('D438',D438)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -50,7 +50,7 @@
 				<p class="p">Z零点补偿：</p>
 				<input class="input" type="text" v-model="D440" />
 				<button type="primary" class="button" @click="update('D440',D440)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -58,7 +58,7 @@
 				<p class="p">取糖位置X设置：</p>
 				<input class="input" type="text" v-model="D218" />
 				<button type="primary" class="button" @click="update('D218',D218)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -66,7 +66,7 @@
 				<p class="p">取糖位置Y设置：</p>
 				<input class="input" type="text" v-model="D268" />
 				<button type="primary" class="button" @click="update('D268',D268)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -74,7 +74,7 @@
 				<p class="p">取糖位置Z设置：</p>
 				<input class="input" type="text" v-model="D318" />
 				<button type="primary" class="button" @click="update('D318',D318)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<!-- //301特有 -->
@@ -84,7 +84,7 @@
 					<p class="p">取棍位置X设置：</p>
 					<input class="input" type="text" v-model="D226" />
 					<button type="primary" class="button" @click="update('D226',D226)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -92,7 +92,7 @@
 					<p class="p">取棍位置Y设置：</p>
 					<input class="input" type="text" v-model="D276" />
 					<button type="primary" class="button" @click="update('D276',D276)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -100,7 +100,7 @@
 					<p class="p">取棍位置Z设置：</p>
 					<input class="input" type="text" v-model="D326" />
 					<button type="primary" class="button" @click="update('D326',D326)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 			</view>
@@ -111,7 +111,7 @@
 					<p class="p">取棍位置X设置：</p>
 					<input class="input" type="text" v-model="D228" />
 					<button type="primary" class="button" @click="update('D228',D228)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -119,7 +119,7 @@
 					<p class="p">取棍位置Y设置：</p>
 					<input class="input" type="text" v-model="D278" />
 					<button type="primary" class="button" @click="update('D278',D278)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -127,7 +127,7 @@
 					<p class="p">取棍位置Z设置：</p>
 					<input class="input" type="text" v-model="D328" />
 					<button type="primary" class="button" @click="update('D328',D328)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>

packageA/pages/remote/debugParameters.vue

@@ -31,7 +31,7 @@
 		</view>
 		<view v-show="show">
 			<view class="body">
-				<p class="p">门1开</p>
+				<p class="p">自动门开</p>
 				<button type="primary" class="button" @click="update('M300','0')">
 					<p class="p2">启动</P>
 				</button>
@@ -43,7 +43,7 @@
 			<!-- //320特有 -->
 			<view class="" v-show="equimentType=='MG320'">
 				<view class="body">
-					<p class="p">门2开</p>
+					<p class="p">取糖门开</p>
 					<button type="primary" class="button" @click="update('M301','0')">
 						<p class="p2">启动</P>
 					</button>
@@ -114,7 +114,7 @@
 			</view>
 			<view class="line2"></view>
 			<view class="body">
-				<p class="p">出棍推杆</p>
+				<p class="p">出棍模块</p>
 				<button type="primary" class="button" @click="update('M308','0')">
 					<p class="p2">启动</P>
 				</button>
@@ -142,7 +142,7 @@
 					<p class="p2">关闭</P>
 				</button>
 			</view>
-			<view class="line2"></view>
+<!-- 			<view class="line2"></view>
 			<view class="body">
 				<p class="p">炉头加热并启动</p>
 				<button type="primary" class="button" @click="update('M39','0')">
@@ -151,7 +151,7 @@
 				<button type="primary" class="button" @click="update('M39','1')">
 					<p class="p2">关闭</P>
 				</button>
-			</view>
+			</view> -->
 			<view class="line2"></view>
 			<view class="body">
 				<p class="p">炉头转动高速</p>

packageA/pages/remote/dosugar.vue

@@ -342,4 +342,4 @@
 		color: #007AFF;
 		padding-top: 30upx;
 	}
-</style>
+</style>

packageA/pages/remote/flowerShow.vue

@@ -27,16 +27,64 @@
 				</view>
 			</view>
 		</view>
+		<view class="product" v-if="productList.length>0">
+			<P style='color:#0A98D5;' class="productName">{{$t('flowers.buleSugar')}}</P>
+			<radio-group name="蓝">
+				<label>
+					<radio @click="changeShowList('blue-0')" value="0" /><text>{{$t('flowers.show')}}</text>
+				</label>
+				<label>
+					<radio @click="changeShowList('blue-1')" value="1" /><text>{{$t('flowers.unshow')}}</text>
+				</label>
+			</radio-group>
+		</view>
+		<view class="product" v-if="productList.length>0">
+			<P style='color:#F4AE1B;' class="productName">{{$t('flowers.yellowSugar')}}</P>
+			<radio-group name="黄">
+				<label>
+					<radio @click="changeShowList('yellow-0')" value="0" /><text>{{$t('flowers.show')}}</text>
+				</label>
+				<label>
+					<radio @click="changeShowList('yellow-1')" value="1" /><text>{{$t('flowers.unshow')}}</text>
+				</label>
+			</radio-group>
+		</view>
+		<view class="product" v-if="productList.length>0">
+			<P style='color:#FF3333;' class="productName">{{$t('flowers.redSugar')}}</P>
+			<radio-group name="红">
+				<label>
+					<radio @click="changeShowList('red-0')" value="0" /><text>{{$t('flowers.show')}}</text>
+				</label>
+				<label>
+					<radio @click="changeShowList('red-1')" value="1" /><text>{{$t('flowers.unshow')}}</text>
+				</label>
+			</radio-group>
+		</view>
+		<view class="product" v-if="productList.length>0">
+			<P class="productName">{{$t('flowers.whileSugar')}}</P>
+			<radio-group name="白">
+				<label>
+					<radio @click="changeShowList('white-0')" value="0" /><text>{{$t('flowers.show')}}</text>
+				</label>
+				<label>
+					<radio @click="changeShowList('white-1')" value="1" /><text>{{$t('flowers.unshow')}}</text>
+				</label>
+			</radio-group>
+		</view>
+		<view class="line"></view>
 		<view class="product" v-for="(item,index) in products" :key="index">
+
 			<P class="productName">{{$t('flowers.flower')}}：{{item.productName}} </P>
-				<radio-group :name="item.productName">
-					<label>
-						<radio @click="changeShow(item.productName+'-0')" value="0" :checked='item.showType==null || item.showType==0' /><text>{{$t('flowers.show')}}</text>
-					</label>
-					<label>
-						<radio @click="changeShow(item.productName+'-1')" value="1" :checked='item.showType==1' /><text>{{$t('flowers.unshow')}}</text>
-					</label>
-				</radio-group>
+			<radio-group :name="item.productName">
+				<label>
+					<radio @click="changeShow(item.productName+'-0')" value="0"
+						:checked='item.showType==null || item.showType==0' /><text>{{$t('flowers.show')}}</text>
+				</label>
+				<label>
+					<radio @click="changeShow(item.productName+'-1')" value="1" :checked='item.showType==1' />
+					<text>{{$t('flowers.unshow')}}</text>
+				</label>
+			</radio-group>
 		</view>
 		<view class="tr">
 			<button type="primary" formType="submit" @click="updateProducts()" class="button">
@@ -188,13 +236,52 @@
 				var productList = this.products;
 				for (var i = 0; i < productList.length; i++) {
 					var product = productList[i];
-					if (name==product.productName) {
+					if (name == product.productName) {
 						product.showType = num;
 					}
 					list.push(product);
 				}
 				this.products = list;
-				// console.log(name + '-' + num);
+			},
+			//按糖颜色去筛选花型的显示
+			changeShowList(nameNum) {
+				var arr = nameNum.split("-");
+				var name = arr[0];
+				var num = arr[1];
+				var list = [];
+				var productList = this.products;
+				var products = [];
+				//修改所有蓝色的花型
+				if (name == 'blue') {
+					products = ['精灵蝶梦', '夏日倾城', '百花齐放', '星空幻想', '坠入星空', '花飞蝶舞', '花样年华', '五彩缤纷', '幽兰爱恋', '冰美人', '海洋之心',
+						'彩色精灵'
+					];
+				}
+				if (name == 'yellow') {
+					products = ['精灵蝶梦', '夏日倾城', '百花齐放', '蜂缠蝶恋', '星空幻想', '坠入星空', '花飞蝶舞',
+						'花样年华', '心花怒放', '五彩缤纷', '美梦成真', '夏日爱恋', '国色天香', '彩色精灵',
+					];
+				}
+				if (name == 'red') {
+					products = ['精灵蝶梦', '夏日倾城', '百花齐放','星空幻想', '蜂缠蝶恋', '豆蔻年华', '花飞蝶舞', '花样年华', '心花怒放',
+						'玫瑰精灵', '童心未泯', '五彩缤纷', '烈焰红唇', '美梦成真', '一见钟情', '赤子之心', '彩色精灵'
+					];
+				}
+				if (name == 'white') {
+					products = ['蜂缠蝶恋', '雪花飞舞', '春暖花开', '天雪恋舞', '心花怒放','水中芙蓉', '幽兰爱恋', '心之守护', '水晶之恋', '小棉袄'];
+				}
+				for (var j = 0; j < products.length; j++) {
+					for (var i = 0; i < productList.length; i++) {
+						var product = productList[i];
+						if (products[j] == product.productName) {
+							product.showType = num;
+							// list.push(product);
+						}
+						
+					}
+				}
+
+				this.products = productList;
 			},
 			updateProducts() {
 				uni.showModal({
@@ -366,4 +453,9 @@
 		color: #007AFF;
 		padding-top: 30upx;
 	}
+
+	.line {
+		background: #ECECEC;
+		height: 20upx;
+	}
 </style>

packageA/pages/remote/generalParameters.vue

@@ -35,7 +35,7 @@
 				<p class="p">炉头工作温度：</p>
 				<input class="input" type="text" v-model="D418" />
 				<button type="primary" class="button" @click="update('D418',D418)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -43,7 +43,7 @@
 				<p class="p">炉头中速：</p>
 				<input class="input" type="text" v-model="D406" />
 				<button type="primary" class="button" @click="update('D406',D406)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -51,7 +51,7 @@
 				<p class="p">水泵开启时间：</p>
 				<input class="input" type="text" v-model="D408" />
 				<button type="primary" class="button" @click="update('D408',D408)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -59,7 +59,7 @@
 				<p class="p">风机吹气时间：</p>
 				<input class="input" type="text" v-model="D409" />
 				<button type="primary" class="button" @click="update('D409',D409)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -67,7 +67,7 @@
 				<p class="p">下糖粗细系数：</p>
 				<input class="input" type="text" v-model="D416" />
 				<button type="primary" class="button" @click="update('D416',D416)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -75,7 +75,7 @@
 				<p class="p">柜内允许做糖温度误差：</p>
 				<input class="input" type="text" v-model="D419" />
 				<button type="primary" class="button" @click="update('D419',D419)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -83,7 +83,7 @@
 				<p class="p">回差调节：</p>
 				<input class="input" type="text" v-model="M504" />
 				<button type="primary" class="button" @click="update('M504',M504)">
-					<p class="p2">更新</P>
+					<p class="p2">{{$t('parameters.update')}}</P>
 				</button>
 			</view>
 			<view class="line2"></view>
@@ -94,7 +94,7 @@
 					<p class="p">炉头低速：</p>
 					<input class="input" type="text" v-model="D405" />
 					<button type="primary" class="button" @click="update('D405',D405)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -102,7 +102,7 @@
 					<p class="p">炉头高速：</p>
 					<input class="input" type="text" v-model="D407" />
 					<button type="primary" class="button" @click="update('D407',D407)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -110,7 +110,7 @@
 					<p class="p">手动门关闭等待时间：</p>
 					<input class="input" type="text" v-model="D412" />
 					<button type="primary" class="button" @click="update('D412',D412)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -118,7 +118,7 @@
 					<p class="p">低温环境设定(炉头升柜温)：</p>
 					<input class="input" type="text" v-model="D460" />
 					<button type="primary" class="button" @click="update('D460',D460)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -126,7 +126,7 @@
 					<p class="p">高温环境设定(外循环风机)：</p>
 					<input class="input" type="text" v-model="D461" />
 					<button type="primary" class="button" @click="update('D461',D461)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 			</view>
@@ -137,7 +137,7 @@
 					<p class="p">加湿时炉头升温N度：</p>
 					<input class="input" type="text" v-model="D467" />
 					<button type="primary" class="button" @click="update('D467',D467)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -145,7 +145,7 @@
 					<p class="p">加湿时候监控时间：</p>
 					<input class="input" type="text" v-model="D468" />
 					<button type="primary" class="button" @click="update('D468',D468)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -153,7 +153,7 @@
 					<p class="p">加湿OFF时间：</p>
 					<input class="input" type="text" v-model="D475" />
 					<button type="primary" class="button" @click="update('D475',D475)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -161,7 +161,7 @@
 					<p class="p">加湿ON时间：</p>
 					<input class="input" type="text" v-model="D476" />
 					<button type="primary" class="button" @click="update('D476',D476)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -169,7 +169,7 @@
 					<p class="p">加湿启动延时：</p>
 					<input class="input" type="text" v-model="D477" />
 					<button type="primary" class="button" @click="update('D477',D477)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -177,7 +177,7 @@
 					<p class="p">加湿停止延时：</p>
 					<input class="input" type="text" v-model="D478" />
 					<button type="primary" class="button" @click="update('D478',D478)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -185,7 +185,7 @@
 					<p class="p">出棍后机械手等待时间：</p>
 					<input class="input" type="text" v-model="D471" />
 					<button type="primary" class="button" @click="update('D471',D471)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 			</view>
@@ -196,7 +196,7 @@
 					<p class="p">基准系数：</p>
 					<input class="input" type="text" v-model="D444" />
 					<button type="primary" class="button" @click="update('D444',D444)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -204,7 +204,7 @@
 					<p class="p">基准湿度：</p>
 					<input class="input" type="text" v-model="D445" />
 					<button type="primary" class="button" @click="update('D445',D445)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 			</view>
@@ -215,7 +215,7 @@
 					<p class="p">加湿OFF时间：</p>
 					<input class="input" type="text" v-model="D472" />
 					<button type="primary" class="button" @click="update('D472',D472)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 				<view class="line2"></view>
@@ -223,7 +223,7 @@
 					<p class="p">加湿ON时间：</p>
 					<input class="input" type="text" v-model="D473" />
 					<button type="primary" class="button" @click="update('D473',D473)">
-						<p class="p2">更新</P>
+						<p class="p2">{{$t('parameters.update')}}</P>
 					</button>
 				</view>
 			</view>

packageA/pages/remote/humidityParameters.vue

@@ -0,0 +1,279 @@
+<template>
+	<view class="">
+		<!-- <view class="line">
+		</view> -->
+		
+		<view class="search">
+			<view class="search-title">
+				{{$t('dosugar.equipmentClientID')}}
+			</view>
+			<view class="search-input">
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
+			</view>
+			<view class="search-button">
+				<button type="primary" class="" @click="search()">
+					<p class="">{{$t('dosugar.search')}}</P>
+				</button>
+			</view>
+		</view>
+		<view class="td-right">
+			<view class="uni-list">
+				<view class="uni-list-cell">
+					<view class="uni-list-cell-left">
+						{{$t('dosugar.chooseEquipment')}}
+					</view>
+					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
+						<picker @change="changeEquipment" :value="index" :range="equipmentNameList">
+							<view class="uni-input">{{equipmentNameList[index]}}</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view >
+			<view class="line2"></view>
+			<view class="body">
+				<p class="p">{{$t('parameters.cabinetHd')}}：</p>
+				<input class="input" type="text" v-model="cabinetHd" />
+			</view>
+			<!-- 320和330特有 -->
+			<view class="" v-show="equimentType=='MG330'||equimentType=='MG320'">
+				<view class="line2"></view>
+				<view class="body">
+					<p class="p">{{$t('parameters.allUpdate')}}：</p>
+					<input class="input" type="text" v-model="allUpdate" />
+					<button type="primary" class="button" @click="update('allUpdate',allUpdate)">
+						<p class="p2">{{$t('parameters.update')}}</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+			</view>
+			<!-- //320特有 -->
+			<view class="" v-show="equimentType=='MG320'">
+				<view class="line2"></view>
+				<view class="body">
+					<p class="p">{{$t('parameters.winter')}}：</p>
+					<button type="primary" class="button" @click="update('winter','winter')">
+						<p class="p2">{{$t('parameters.update')}}</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+				<view class="body">
+					<p class="p">{{$t('parameters.summer')}}：</p>
+					<button type="primary" class="button" @click="update('summer','summer')">
+						<p class="p2">{{$t('parameters.update')}}</P>
+					</button>
+				</view>
+				<view class="line2"></view>
+			</view>
+			<!-- 301和280特有 -->
+			<view class="" v-show="equimentType=='MG301'||equimentType=='MG280'">
+
+			</view>
+			<!-- 280特有 -->
+			<view class="" v-show="equimentType=='MG280'">
+				
+			</view>
+		</view>
+		<view class="line2"></view>
+	</view>
+</template>
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'
+	export default {
+		data() {
+			return {
+				index: null,
+				allUpdate:null,
+				equipmentName: null,
+				equimentType: null,
+				equipmentId:null,
+				cabinetHd:'',
+				equipmentNameList: [],
+				globalUser: null,
+				show: true,
+				searchClientId:null
+			}
+		},
+		onShow() {
+			var token = uni.getStorageSync("token");
+			this.globalUser = uni.getStorageSync("globalUser");
+			if (token.length > 1) {
+				this.getEquipmentListData();
+				// this.getParam();
+			} else {
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
+
+		},
+		methods: {
+			...mapActions('chart', ['getParameters', 'humidityParameters', 'getEquipmentListByUser']),
+			getEquipmentListData() {
+				this.getEquipmentListByUser(this.globalUser)
+					.then(data => {
+						// this.merchantList = data;
+						var listName = data[0].equipmentList;
+						var equipmentNameList = [];
+						for (var i = 0; i < listName.length; i++) {
+							equipmentNameList.push("名称:" + listName[i].name + " 编号:" + listName[i].clientId.substring(
+								listName[i].clientId.length - 6, listName[i].clientId.length));
+						}
+						this.equipmentNameList = equipmentNameList;
+						var listId = data[0].id;
+						if (listId != null && listId != '1') {
+							uni.setStorageSync("listName", listName);
+						}
+						uni.stopPullDownRefresh();
+					}, _ => void uni.stopPullDownRefresh());
+			},
+			search(){
+				var clientId = this.searchClientId;
+				var list = uni.getStorageSync("listName");
+				var n = 0;
+				for (var i = 0; i < list.length; i++) {
+					var code = list[i].clientId.substring(list[i].clientId.length - 6, list[i].clientId.length);
+					if(code==clientId){
+						n++;
+						this.index = i;
+						var id = list[i].id;
+						this.equipmentId =  id;
+						this.cabinetHd = list[i].cabinetHd;
+						this.equimentType = list[i].equimentType;
+						this.clientId = list[i].clientId;
+						this.show = true;
+						if (this.equimentType == 'MG280') {
+							this.show = false;
+						}
+						// this.getParam();
+						break;
+					}
+				}
+				if(n==0){
+					uni.showModal({
+						title: "提示",
+						content: "找不到该机器",
+						success: (res) => {
+					
+						}
+					})
+				}
+			},
+			//改变机器
+			changeEquipment: function(e) {
+				this.searchClientId = null;
+				this.index = e.target.value;
+				var list = uni.getStorageSync("listName");
+				// this.getProName(list[e.target.value].id);
+				this.equipmentId = list[e.target.value].id;
+				this.cabinetHd = list[e.target.value].cabinetHd;
+				this.equimentType = list[e.target.value].equimentType;
+				this.clientId = list[e.target.value].clientId;
+				this.show = true;
+				if (this.equimentType == 'MG280') {
+					this.show = false;
+				}
+				// console.log("eid==" + this.equipmentId);
+				// console.log("equimentType==" + this.equimentType);
+				// this.getParam();
+			},
+			update(name, val) {
+				const param = {};
+				param['id'] = this.equipmentId;
+				param['name'] = name;
+				param['val'] = val;
+				this.humidityParameters(param).then(res => {
+					if (res.data == 'SUCCESS') {
+						uni.showToast({
+							title: '发送成功success',
+							duration: 1000
+						});
+					}
+				}, _ => void uni.stopPullDownRefresh());
+			},
+		},
+	}
+</script>
+
+<style>
+	.search{
+		width: 100%;
+		padding-top: 10upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+	.search-title{
+		width: 28%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+	}
+	.search-input{
+		width: 45%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+	.search-button{
+		width: 20%;
+		padding-left: 7upx;
+		text-align: center;
+	}
+	.line {
+		height: 50upx;
+	}
+
+	.line2 {
+		height: 10upx;
+	}
+
+	.body {
+		background-color: #FFFFFF;
+		width: 700upx;
+		padding: 10upx 10upx 10upx 10upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 32upx;
+	}
+
+	.p {
+		width: 350upx;
+		text-align: right;
+	}
+
+	.input {
+		width: 200upx;
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+		text-align: center;
+	}
+
+	.button {
+		width: 120upx;
+		height: 60upx;
+		text-align: left;
+		border-radius: 10upx;
+
+	}
+
+	.p2 {
+		font-size: 30upx;
+		/* #ifndef H5 */
+		padding-top: 3upx;
+		/* #endif */
+		position: absolute;
+		/* 水平居中 */
+		left: 50%;
+		-webkit-transform: translateX(-50%);
+		transform: translateX(-50%);
+	}
+</style>

packageA/pages/remote/parameters.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="">
 		<uni-list>
-			<uni-list-item title="通用参数"  @click="general()"></uni-list-item>
-			<uni-list-item title="进阶参数"  @click="advanced()"></uni-list-item>
-			<uni-list-item title="调试页参数"  @click="debug()"></uni-list-item>
+			<uni-list-item :title="$t('parameters.general')"  @click="general()"></uni-list-item>
+			<uni-list-item :title="$t('parameters.advanced')"  @click="advanced()"></uni-list-item>
+			<uni-list-item :title="$t('parameters.cabinet_hd')"  @click="humidity()"></uni-list-item>
+			<!-- <uni-list-item title="调试页参数"  @click="debug()"></uni-list-item> -->
 		</uni-list>
 	</view>
 </template>
@@ -21,6 +22,11 @@
 					url: 'advancedParameters',
 				});
 			},
+			humidity(){
+				uni.navigateTo({
+					url: 'humidityParameters',
+				});
+			},
 			debug(){
 				uni.navigateTo({
 					url: 'debugParameters',

packageA/pages/remote/remoteList.vue

@@ -6,9 +6,9 @@
 					<view v-show="show">
 						<uni-list-item :title="$t('remoteList.dosugur')" @click="sugar()" />
 					</view>
-<!-- 					<view v-show="show">
+					<view v-show="show">
 						<uni-list-item :title="$t('remoteList.flowers')" @click="flowers()" />
-					</view> -->
+					</view>
 					<view v-show="show2">
 						<uni-list-item :title="$t('remoteList.parameters')" @click="parameters()" />
 					</view>
@@ -18,6 +18,12 @@
 					<view v-show="show">
 						<uni-list-item :title="$t('remoteList.volume')" @click="volume()" />
 					</view>
+					<view v-show="show">
+						<uni-list-item :title="$t('remoteList.password')" @click="password()" />
+					</view>
+					<view v-show="show">
+						<uni-list-item :title="$t('remoteList.price')" @click="price()" />
+					</view>
 					<view v-show="show3">
 						<uni-list-item title="解绑机器" @click="jiebang()" />
 					</view>
@@ -97,6 +103,16 @@
 					url: 'lianjie',
 				});
 			},
+			password() {
+				uni.navigateTo({
+					url: 'updatePassword',
+				});
+			},
+			price() {
+				uni.navigateTo({
+					url: '/packageB/pages/remote/updatePrice',
+				});
+			},
 		}
 	}
 	

packageA/pages/remote/updatePassword.vue

@@ -0,0 +1,349 @@
+<template>
+	<view>
+		<!-- //查找 -->
+		<view class="search">
+			<view class="search-title">
+				{{$t('dosugar.equipmentClientID')}}
+			</view>
+			<view class="search-input">
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
+			</view>
+			<view class="search-button">
+				<button type="primary" class="" @click="search()">
+					<p class="">{{$t('alarmClock.add')}}</P>
+				</button>
+			</view>
+		</view>
+		<!-- //多选下拉框 -->
+		<view class="select-item">
+			<ld-select :multiple="true" :list="equipmentNameList" label-key="label" value-key="value"
+				:placeholder="$t('alarmClock.placeholder')" clearable v-model="equipmentIds" @change="selectChange2"></ld-select>
+		</view>
+		<view class="search">
+			<view class="search-title">
+				{{$t('updatePassword.adminPwd')}}：
+			</view>
+			<view class="search-input2">
+				<input type="text"  v-model="adminPwd" />
+			</view>
+		</view>
+		<view class="search">
+			<view class="search-title">
+				{{$t('updatePassword.guestPwd')}}：
+			</view>
+			<view class="search-input2">
+				<input type="text"  v-model="guestPwd" />
+			</view>
+		</view>
+		<view class="line"></view>
+		<!-- //提交按钮 -->
+		<view class="tr">
+			<button  type="primary" formType="submit" @click="update()" class="button">
+				<p class="p1">{{$t('alarmClock.update')}}</p>
+			</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'
+	import MxDatePicker from "../../components/mx-datepicker/mx-datepicker.vue";
+	// import ldSelect from "../../components/ld-select/ld-select.vue";
+	import ldSelect from "../../components/ld-select/ld-select.vue"
+	import likeButton from "../../components/like-button/like-button.vue";
+	export default {
+		components: {
+			MxDatePicker,
+			ldSelect,
+			likeButton
+		},
+		data() {
+			return {
+				value: '',
+				searchClientId: null,
+				equipmentName: null,
+				equipmentNameList: [],
+				globalUser: {},
+				equipmentIds: [],
+				adminPwd:null,
+				guestPwd:null
+			}
+		},
+		onShow() {
+			this.globalUser = uni.getStorageSync("globalUser");
+			var token = uni.getStorageSync("token");
+			if (token.length > 1) {
+				this.getEquipmentListData();
+			} else {
+				uni.reLaunch({
+					url: '../../../pages/Login/Login',
+				});
+			}
+
+		},
+		onLoad() {
+
+		},
+		methods: {
+			...mapActions('chart', ['getEquipmentListByUser', 'addAlarmClock', 'addAlarmClockItem', 'updateAlarmClock']),
+			getEquipmentListData() {
+				this.getEquipmentListByUser(this.globalUser)
+					.then(data => {
+						// this.merchantList = data;
+						// console.log("1223");
+						var listName = data[0].equipmentList;
+						var equipmentNameList = this.equipmentNameList;
+						var co = {};
+						co["value"] = 'all';
+						co["label"] = '全部机器ALL machine';
+						equipmentNameList.push(co);
+						for (var i = 0; i < listName.length; i++) {
+							var cov = {};
+							cov["value"] = listName[i].id;
+							cov["label"] = "名称:" + listName[i].name + " 编号:" + listName[i].clientId.substring(
+								listName[i].clientId.length - 6, listName[i].clientId.length);
+							equipmentNameList.push(cov);
+						}
+						this.equipmentNameList = equipmentNameList;
+						var listId = data[0].id;
+						if (listId != null && listId != '1') {
+							uni.setStorageSync("listName", listName);
+						}
+
+						uni.stopPullDownRefresh();
+					}, _ => void uni.stopPullDownRefresh());
+			},
+
+			onSelected(e) { //选择
+				this.showPicker = false;
+				if (e) {
+					this[this.type] = e.value;
+					//选择的值
+					// console.log('value => ' + e.value);
+					//原始的Date对象
+					// console.log('date => ' + e.date);
+				}
+			},
+			// bindPickerChange: function(e) {
+			// 	this.indexType = e.target.value
+			// },
+			addEids(equipmentIds) {
+				// console.log('equipmentIds' + equipmentIds);
+				var eids = equipmentIds.split(",");
+				var idss = this.equipmentIds;
+				var is = this.equipmentNameList
+				for (var k = 0; k < eids.length; k++) {
+					var id = eids[k];
+					if (id != "" && id != '') {
+						this.equipmentIds.push(parseInt(id));
+					}
+				}
+			},
+			search() {
+				// console.log("search");
+				var clientId = this.searchClientId;
+				var list = uni.getStorageSync("listName");
+				var n = 0;
+				for (var i = 0; i < list.length; i++) {
+					var code = list[i].clientId.substring(list[i].clientId.length - 6, list[i].clientId.length);
+					if (code == clientId) {
+						n++;
+						var id = list[i].id;
+						this.equipmentIds.push(id);
+						break;
+					}
+				}
+				if (n == 0) {
+					uni.showModal({
+						title: "提示",
+						content: "找不到该机器",
+						success: (res) => {
+
+						}
+					})
+				}
+				if (n > 0) {
+					uni.showModal({
+						title: "提示",
+						content: "已添加该机器",
+						success: (res) => {
+
+						}
+					})
+				}
+			},
+			selectChange2(val) {
+				//有改动文件 import likeButton from "../../components/like-button/like-button.vue";
+				if (val == "all") {
+					this.equipmentIds = [];
+					var list = uni.getStorageSync("listName");
+					for (var i = 0; i < list.length; i++) {
+						this.equipmentIds.push(list[i].id);
+					}
+				} else {
+					this.equipmentIds = val
+				}
+				// console.log('this.equipmentIds => ' + this.equipmentIds);
+			},
+			switchChange: function(e) {
+				this.status = e.target.value;
+			},
+			update() {
+				var that = this;
+				uni.showModal({
+					title: that.$t('equipmentStatusList.tip'),
+					content:that.$t('updatePassword.sure') ,
+					success: (re) => {
+						if (re.confirm) {
+							var serverurl = that.serverurl;
+							var token = uni.getStorageSync("token");
+							uni.request({
+								url: serverurl + '/TEquipment/updatePassword?equipmentIds='+that.equipmentIds+'&guestPwd='+that.guestPwd+'&adminPwd='+that.adminPwd,
+								// data: {
+								// 	"equipmentIds": that.equipmentIds,
+								// 	"guestPwd": that.guestPwd,
+								// 	"adminPwd": that.adminPwd,
+								// },
+								method: "POST",
+								header: {
+									'token': token
+								},
+								success: (res) => {
+									if(res.data.code){
+										uni.showToast({
+											title: res.data.message,
+											duration: 1000
+										});
+									}
+								}
+							});
+						}
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.test {
+		text-align: center;
+		padding: 10px 0;
+	}
+
+	.time {
+		font-size: 78upx;
+	}
+
+	.btime {
+		margin: 20upx;
+		font-size: 28upx;
+	}
+
+	/* 	button {
+		margin: 20upx;
+		font-size: 28upx;
+	} */
+
+	/* #ifdef MP-ALIPAY */
+	.uni-badge {
+		margin-left: 20rpx;
+	}
+
+	/* #endif */
+	.uni-badge {
+		font-size: 40upx;
+	}
+
+	.example-body {
+		flex-direction: row;
+		justify-content: flex-start;
+		padding-bottom: 15upx;
+		font-size: 40upx;
+	}
+
+	.uni-badge-left-margin {
+		font-size: 40upx;
+		margin-left: 50upx;
+	}
+
+	.uni-list-cell {
+		padding-top: 20upx;
+		padding-bottom: 10upx;
+		font-size: 35upx;
+	}
+
+	.line {
+		height: 2upx;
+		background: #8C959F;
+	}
+
+	.search {
+		width: 100%;
+		padding-top: 15upx;
+		padding-bottom: 25upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	.search-title {
+		width: 28%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+	}
+
+	.search-input {
+		width: 45%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+	.search-input2 {
+		width: 65%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+
+	.search-button {
+		width: 20%;
+		padding-left: 7upx;
+		text-align: center;
+	}
+
+	.select-item {
+		/* padding-top: 20upx; */
+	}
+
+	.tr {
+		padding-top: 15upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 48upx;
+		font-family: "PingFang-SC-Bold";
+		position: fixed;
+		bottom: 100upx;
+		width: 100%;
+	}
+
+	.button {
+		margin: auto;
+		width: 60%;
+		height: 100upx;
+	}
+
+	.p1 {
+		font-size: 48upx;
+	}
+</style>

packageA/pages/user/buyPromo.vue

@@ -1,188 +0,0 @@
-<!-- <template>
-	<view class=" ">
-		<view class="font header">
-			优惠码价格:{{price}}元/个
-		</view>
-		<view class="font header">
-			<view class="font">
-				你要购买的数量:
-			</view>
-			<view class="input-two">
-				<input  type="text" class="input" v-model="num" />
-			</view>
-			<view class="font3">
-				个
-			</view>
-		</view>
-		<view class="font2 header">
-			<view class="font">
-				有效期:
-			</view>
-			<view class="input-two">
-				<input  type="text" class="input" v-model="day" />
-			</view>
-			<view class="font3">
-				天.(最长90天)
-			</view>
-		</view>
-		<view class="font2 header">
-			合计：{{num*price}}元
-		</view>
-		<view class="button">
-			<button type="primary" @click="buy()" class="button2">
-				<p class="p">购买</p>
-			</button>
-		</view>
-		<view class="" style="margin: auto;">
-			<font class="font1">{{title}}</font>
-			<image class="img"  :src=img mode=""></image>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				price:null,
-				num:'10',
-				day:'30',
-				title:'',
-				img:null
-			}
-		},
-		onLoad() {
-		},
-		onShow() {
-			this.findPrice();
-		},
-		methods: {
-			findPrice(){
-				var token = uni.getStorageSync("token");
-				uni.request({
-					url: this.serverurl + '/TPromoCode/findPrice',
-					method: "GET",
-					header:{
-						'token':token
-					},
-					success: (res) => {
-						
-						this.price = res.data.data;
-					}
-				})
-			},
-			buy(){
-				if(this.day>90){
-					uni.showModal({
-						content: '有效期不能超过90天',
-						showCancel: false
-					});
-					return null;
-				}
-				var p = this.price;
-				var n = this.num;
-				var pri = p*n;
-				if(pri==0){
-					uni.showModal({
-						content: '价格为0',
-						showCancel: false
-					});
-					return null;
-				}
-				var globalUser = uni.getStorageSync("globalUser");
-				var id = globalUser.id;
-				var token = uni.getStorageSync("token");
-				uni.request({
-					url: this.serverurl + '/TPromoCode/buy?pri='+pri+'&adminId='+id+'&day='+this.day,
-					method: "GET",
-					header:{
-						'token':token
-					},
-					success: (res) => {
-						var img = res.data.data;
-						this.title = "请用微信扫码支付";
-						this.img = img;
-					}
-				})
-			}
-		},
-
-	}
-</script>
-
-<style>
-	.header {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-		padding-left: 20upx;
-	}
-	.font{
-		padding-top: 20upx;
-		height: 70upx;
-		color: #363D44;
-		font-size: 36upx;
-		font-family: "PingFang-SC-Bold";
-	}
-	.font2{
-		padding-top: 40upx;
-		padding-bottom: 30upx;
-		height: 70upx;
-		color: #363D44;
-		font-size: 36upx;
-		font-family: "PingFang-SC-Bold";
-	}
-	.font3{
-		padding-left: 30upx;
-		padding-top: 23upx;
-		height: 70upx;
-		color: #363D44;
-		font-size: 36upx;
-		font-family: "PingFang-SC-Bold";
-	}
-	.input-two {
-		width: 80upx;
-		height: 30upx;
-		padding-top: 23upx;
-		padding-left: 30upx;
-	}
-	.input {
-		padding-left: 20upx;
-		
-		background-color: #FFFFFF;
-		width: 80upx;
-		height: 30upx;
-		box-shadow: 0upx 0upx 20upx #D3D3D3;
-		border-radius: 5upx;
-	}
-	.button{
-		padding-top: 70upx;
-		margin: auto;
-		width: 80%;
-		height: 100upx;
-	}
-	.button2{
-		margin: auto;
-		width: 80%;
-		height: 100upx;
-	}
-	.p{
-		padding-top: 2upx;
-		margin: 0 auto;
-		font-size: 45upx;
-		font-family: "PingFang-SC-Bold";
-	}
-	.font1{
-		color: #F4AE1B;
-		padding-left: 300upx;
-		padding-top: 100upx;
-		font-size: 25upx;
-		font-family: "PingFang-SC-Bold";
-	}
-	.img{
-		height: 650upx;
-		weight:650upx;
-		margin: auto;
-	}
-</style>
- -->

packageA/pages/user/promoCode.vue

@@ -1,172 +0,0 @@
-<!-- <template>
-	<view class="warp">
-		<view class="font">
-				<uni-list class="font">
-					<uni-list-item title="购买优惠码" @click="buy()" />
-				</uni-list>
-		</view>
-		<view class="box">
-			<view class="font">优惠码列表</view>
-			<view class="header">
-				<view class="nickname">
-					筛选条件:
-				</view>
-				<view class="nickname">
-					状态：
-				</view>
-				<view style="width: 20%; margin-bottom: 2px;padding-top: 2upx; ">
-					<xfl-select :list="list" :clearable="false" :showItemNum="4" :focusShowList="true" :isCanInput="false"
-					 :style_Container="'height: 18px;font-size: 13px;'" :placeholder="''" :initValue="'全部'" :selectHideType="'hideAll'"
-					 @change="change">
-					</xfl-select>
-				</view>
-			</view>
-
-			<t-table @change="change">
-				<t-tr>
-					<t-th>优惠码</t-th>
-					<t-th>到期时间</t-th>
-					<t-th>状态</t-th>
-					<t-th>使用时间</t-th>
-					<t-th>使用机器</t-th>
-				</t-tr>
-				<t-tr v-for="item in tableList" :key="item.id">
-					<t-td>{{ item.code}}</t-td>
-					<t-td>{{ item.lastUseDate}}</t-td>
-					<t-td>{{ item.isUse=='0'?'未使用':item.isUse=='1'?'已使用':item.isUse=='2'?'已过期':''}}</t-td>
-					<t-td>{{ item.useDate}}</t-td>
-					<t-td>{{ item.useBy}}</t-td>
-				</t-tr>
-			</t-table>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import tTable from '@/components/t-table/t-table.vue';
-	import tTh from '@/components/t-table/t-th.vue';
-	import tTr from '@/components/t-table/t-tr.vue';
-	import tTd from '@/components/t-table/t-td.vue';
-	import xflSelect from '@/components/xfl-select/xfl-select.vue';
-	import uniList from '@/components/uni-list/uni-list.vue';
-	import uniListItem from '@/components/uni-list-item/uni-list-item.vue';
-	export default {
-		components: {
-			uniList,
-			uniListItem,
-			tTable,
-			tTh,
-			tTr,
-			tTd,
-			xflSelect
-		},
-		data() {
-			return {
-				tableList: [],
-				list: [ //要展示的数据
-					'全部',
-					'未使用',
-					'使用',
-					'已过期',
-				],
-			};
-		},
-		onShow() {
-			var token = uni.getStorageSync("token");
-			if (token.length>1) {
-				this.init();
-			}else{
-				uni.reLaunch({
-					url: '../Login/Login',
-				});
-			}
-		},
-		methods: {
-			buy() {
-				uni.navigateTo({
-					url: 'buyPromo',
-				});
-			},
-			init() {
-				var globalUser = uni.getStorageSync("globalUser");
-				var id = globalUser.id;
-				var token = uni.getStorageSync("token");
-				uni.request({
-					url: this.serverurl + '/TPromoCode/findList',
-					data: {
-						"adminId": id,
-					},
-					header:{
-						'token':token
-					},
-					method: "POST",
-					success: (res) => {
-						this.tableList = res.data.data;
-					}
-				})
-			},
-			change({
-				newVal,
-				oldVal,
-				index,
-				orignItem
-			}) {
-				this.tableList=null;
-				if(index==0){
-					var isUse = null;
-				}
-				if(index==1){
-					var isUse = 0;
-				}
-				if(index==2){
-					var isUse = 1;
-				}
-				if(index==3){
-					var isUse = 2;
-				}
-				var globalUser = uni.getStorageSync("globalUser");
-				var id = globalUser.id;
-				var token = uni.getStorageSync("token");
-				uni.request({
-					url: this.serverurl + '/TPromoCode/findList',
-					data: {
-						"adminId": id,
-						"isUse":isUse
-					},
-					method: "POST",
-					header:{
-						'token':token
-					},
-					success: (res) => {
-						this.tableList = res.data.data;
-					}
-				})
-			}
-
-		}
-	};
-</script>
-
-<style>
-	.header {
-		display: flex;
-		flex-direction: row;
-		justify-content: flex-start;
-		padding-left: 10upx;
-	}
-
-	.nickname {
-		padding-left: 10upx;
-		height: 32upx;
-		color: #363D44;
-		font-size: 32upx;
-		font-family: "PingFang-SC-Bold";
-	}
-	.font{
-		color: #363D44;
-		font-size: 36upx;
-		font-family: "PingFang-SC-Bold";
-	}
-</style>
- -->

pages.json

@@ -54,12 +54,12 @@
 			}
 		},
 
-		{
-			"path": "pages/Charts/elseStatistics",
-			"style": {
-				"navigationBarTitleText": "统计图表"
-			}
-		},
+		// {
+		// 	"path": "pages/Charts/elseStatistics",
+		// 	"style": {
+		// 		"navigationBarTitleText": "统计图表"
+		// 	}
+		// },
 		{
 			"path": "pages/Charts/equipmentStatistics",
 			"style": {
@@ -123,203 +123,243 @@
 		]
 	},
 	"subPackages": [{
-		"root": "packageA",
-		"name": "pack1",
-		"pages": [{
-				"path": "pages/equipmentStatus/map",
-				"style": {
-					"navigationBarTitleText": "MAP",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "pages/equipmentStatus/GoogleMap",
-				"style": {
-					"navigationBarTitleText": "GoogleMap",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "pages/remote/dosugar",
-				"style": {
-					"navigationBarTitleText": "远程做糖",
-					"enablePullDownRefresh": false
-				}
+			"root": "packageA",
+			"name": "pack1",
+			"pages": [{
+					"path": "pages/equipmentStatus/map",
+					"style": {
+						"navigationBarTitleText": "MAP",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/equipmentStatus/GoogleMap",
+					"style": {
+						"navigationBarTitleText": "GoogleMap",
+						"enablePullDownRefresh": false
+					}
+				}, {
+					"path": "pages/remote/dosugar",
+					"style": {
+						"navigationBarTitleText": "远程做糖",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/sugarList",
-				"style": {
-					"navigationBarTitleText": "今日做糖列表",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/sugarList",
+					"style": {
+						"navigationBarTitleText": "今日做糖列表",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/remoteList",
-				"style": {
-					"navigationBarTitleText": "远程操作列表",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/remoteList",
+					"style": {
+						"navigationBarTitleText": "远程操作列表",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/parameters",
-				"style": {
-					"navigationBarTitleText": "参数列表",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/parameters",
+					"style": {
+						"navigationBarTitleText": "参数列表",
+						"enablePullDownRefresh": false
+					}
 
-			},
-			{
-				"path": "pages/remote/advancedParameters",
-				"style": {
-					"navigationBarTitleText": "进阶参数",
-					"enablePullDownRefresh": false
-				}
+				},
+				{
+					"path": "pages/remote/advancedParameters",
+					"style": {
+						"navigationBarTitleText": "进阶参数",
+						"enablePullDownRefresh": false
+					}
 
-			},
-			{
-				"path": "pages/remote/generalParameters",
-				"style": {
-					"navigationBarTitleText": "通用参数",
-					"enablePullDownRefresh": false
-				}
+				},
+				{
+					"path": "pages/remote/generalParameters",
+					"style": {
+						"navigationBarTitleText": "通用参数",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/alarmClockList",
-				"style": {
-					"navigationBarTitleText": "闹钟",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/alarmClockList",
+					"style": {
+						"navigationBarTitleText": "闹钟",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/alarmClockItem",
-				"style": {
-					"navigationBarTitleText": "设置闹钟",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/alarmClockItem",
+					"style": {
+						"navigationBarTitleText": "设置闹钟",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/user/equipmentName",
-				"style": {
-					"navigationBarTitleText": "修改设备名称"
-				}
-			},
-			{
-				"path": "pages/user/timeRule",
-				"style": {
-					"navigationBarTitleText": "定时开关机"
-				}
-			},
-			{
-				"path": "pages/user/timeSet",
-				"style": {
-					"navigationBarTitleText": "定时开关机"
-				}
-			},
-			{
-				"path": "pages/user/timeSelect",
-				"style": {}
-			}, {
-				"path": "pages/remote/volume",
-				"style": {
-					"navigationBarTitleText": "音量调节",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/user/equipmentName",
+					"style": {
+						"navigationBarTitleText": "修改设备名称"
+					}
+				},
+				{
+					"path": "pages/user/timeRule",
+					"style": {
+						"navigationBarTitleText": "定时开关机"
+					}
+				},
+				{
+					"path": "pages/user/timeSet",
+					"style": {
+						"navigationBarTitleText": "定时开关机"
+					}
+				},
+				{
+					"path": "pages/user/timeSelect",
+					"style": {}
+				}, {
+					"path": "pages/remote/volume",
+					"style": {
+						"navigationBarTitleText": "音量调节",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/user/refuse",
-				"style": {
-					"navigationBarTitleText": "退款",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/user/refuse",
+					"style": {
+						"navigationBarTitleText": "退款",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/user/editor/editor",
-				"style": {
-					"navigationBarTitleText": "编辑公告",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "pages/user/examine",
-				"style": {
-					"navigationBarTitleText": "审核",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/user/editor/editor",
+					"style": {
+						"navigationBarTitleText": "编辑公告",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/user/examine",
+					"style": {
+						"navigationBarTitleText": "审核",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/user/orderEit",
-				"style": {
-					"navigationBarTitleText": "详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "pages/user/modify/proportionCheck",
-				"style": {
-					"navigationBarTitleText": "分销修改",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "pages/user/modify/joinpayMchCheck",
-				"style": {
-					"navigationBarTitleText": "收款信息修改",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "pages/user/modify/proportionCheckList",
-				"style": {
-					"navigationBarTitleText": "分销修改列表",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/user/orderEit",
+					"style": {
+						"navigationBarTitleText": "详情",
+						"enablePullDownRefresh": false
+					}
+				}, {
+					"path": "pages/user/modify/proportionCheck",
+					"style": {
+						"navigationBarTitleText": "分销修改",
+						"enablePullDownRefresh": false
+					}
+				}, {
+					"path": "pages/user/modify/joinpayMchCheck",
+					"style": {
+						"navigationBarTitleText": "收款信息修改",
+						"enablePullDownRefresh": false
+					}
+				}, {
+					"path": "pages/user/modify/proportionCheckList",
+					"style": {
+						"navigationBarTitleText": "分销修改列表",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/user/modify/joinpayMchCheckList",
-				"style": {
-					"navigationBarTitleText": "收款信息修改列表",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/user/modify/joinpayMchCheckList",
+					"style": {
+						"navigationBarTitleText": "收款信息修改列表",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/flowerShow",
-				"style": {
-					"navigationBarTitleText": "售卖花型控制",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/flowerShow",
+					"style": {
+						"navigationBarTitleText": "售卖花型控制",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/debugParameters",
-				"style": {
-					"navigationBarTitleText": "调试页",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/debugParameters",
+					"style": {
+						"navigationBarTitleText": "调试页",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/jiebang",
-				"style": {
-					"navigationBarTitleText": "机器解绑",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/jiebang",
+					"style": {
+						"navigationBarTitleText": "机器解绑",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/lianjie",
-				"style": {
-					"navigationBarTitleText": "连接服务器",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/lianjie",
+					"style": {
+						"navigationBarTitleText": "连接服务器",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/jiebangDesc",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/jiebangDesc",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
 
-			}, {
-				"path": "pages/remote/lianjieDesc",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
+				}, {
+					"path": "pages/remote/lianjieDesc",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
 
-			}
-		]
-	}]
+				}, {
+					"path": "pages/remote/updatePassword",
+					"style": {
+						"navigationBarTitleText": "修改密码",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "pages/equipmentStatus/equipmentlist",
+					"style": {
+						"navigationBarTitleText": "机器详情列表",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "pages/remote/humidityParameters",
+					"style": {
+						"navigationBarTitleText": "湿度调整",
+						"enablePullDownRefresh": false
+					}
+
+				}
+			]
+		},
+		{
+			"root": "packageB",
+			"name": "pack2",
+			"pages": [{
+					"path": "pages/remote/updatePrice",
+					"style": {
+						"navigationBarTitleText": "修改价格",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/char/elseStatistics",
+					"style": {
+						"navigationBarTitleText": "统计图表"
+					}
+				}
+			]
+		}
+	]
 }

pages/Charts/equipmentStatistics.vue

@@ -12,7 +12,7 @@
 					{{$t('equipmentStatics.changeType')}}：
 				</view>
 				<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
-					<picker @change="changeType"  :value="index" :range="changeTypeList">
+					<picker @change="changeType" :value="index" :range="changeTypeList">
 						<view class="uni-input">{{changeTypeList[index]}}</view>
 					</picker>
 				</view>
@@ -278,9 +278,9 @@
 				cHeight: '',
 				pixelRatio: 1,
 				tese: 0,
-				type:0,
-				index:0,
-				changeTypeList:[this.$t('equipmentStatics.sales'),this.$t('equipmentStatics.flowers')],
+				type: 0,
+				index: 0,
+				changeTypeList: [this.$t('equipmentStatics.sales'), this.$t('equipmentStatics.flowers')],
 				startDate1: '',
 				endDate1: '',
 				startDate2: '',
@@ -406,9 +406,9 @@
 
 				}
 			},
-		 changeType: function(e){
-			 this.index = e.target.value;
-				this.type = e.target.value;
+			changeType: function(e) {
+				this.index = e.target.value;
+				// this.type = e.target.value;
 				this.tese = 1;
 				this.init();
 			},
@@ -631,26 +631,26 @@
 				if (this.equipmentId) {
 					param['equipmentId'] = this.equipmentId;
 				}
-				if(this.type=!''){
-					param['changeType'] = this.type;
-				}
-
+				param['changeType'] = this.index;
 				return this.getEquipmentStatistics(param)
 					.then(data => {
 						uni.stopPullDownRefresh();
-						if (param['chartType'] == 'day') {
-							canvaColumn1 = this.initChart('canvaColumn1', data);
-						}
-						if (param['chartType'] == 'week') {
-							canvaColumn2 = this.initChart('canvaColumn2', data);
-						}
-						if (param['chartType'] == 'month') {
-							canvaColumn3 = this.initChart('canvaColumn3', data);
-						}
-						if (param['chartType'] == 'year') {
-							canvaColumn4 = this.initChart('canvaColumn4', data);
+						if (data.categories != null&&data.series != null) {
+							if (param['chartType'] == 'day') {
+								canvaColumn1 = this.initChart('canvaColumn1', data);
+							}
+							if (param['chartType'] == 'week') {
+								canvaColumn2 = this.initChart('canvaColumn2', data);
+							}
+							if (param['chartType'] == 'month') {
+								canvaColumn3 = this.initChart('canvaColumn3', data);
+							}
+							if (param['chartType'] == 'year') {
+								canvaColumn4 = this.initChart('canvaColumn4', data);
+							}
 						}
 
+
 					}, _ => {
 						uni.stopPullDownRefresh();
 						if (param['chartType'] == 'day') {
@@ -1374,7 +1374,7 @@
 	.shijian {
 		padding-top: 30upx;
 		height: 80upx;
-		width: 690upx;
+		width: 680upx;
 		margin: auto;
 		box-shadow: 0upx 0upx 10upx #D3D3D3;
 	}
@@ -1419,6 +1419,7 @@
 		right: 30upx;
 		width: 71upx;
 		height: 57upx;
+		padding-right: 80%;
 	}
 
 	.nextImg {
@@ -1427,6 +1428,7 @@
 		width: 71upx;
 		height: 57upx;
 	}
+
 	.tr {
 		padding-top: 15upx;
 		display: flex;
@@ -1435,7 +1437,7 @@
 		font-size: 26upx;
 		font-family: "PingFang-SC-Bold";
 	}
-	
+
 	.td-left {
 		font-family: "PingFang-SC-Bold";
 		margin: auto;
@@ -1443,7 +1445,7 @@
 		width: 30%;
 		text-align: right;
 	}
-	
+
 	.td-right {
 		font-family: "PingFang-SC-Bold";
 		/* font-weight: bold; */

pages/Charts/mainStatistics.vue

@@ -143,7 +143,7 @@
 			</view>
 			<!-- 刷新按钮 -->
 			<view class="search-button">
-				<button type="primary" class="" @click="refresh()">
+				<button type="primary" class=""  :disabled="langAbbrs" @click="refresh()">
 					<p class="">{{$t('mainStatistics.refresh')}}</P>
 				</button>
 			</view>
@@ -301,6 +301,7 @@
 				msgType: 'success',
 				scrollHeight: uni.getSystemInfoSync().windowHeight - 130,
 				ifForeign:0,
+				langAbbrs:false
 			}
 		},
 		computed: {
@@ -377,7 +378,7 @@
 				this.cWidth = uni.upx2px(690);
 				this.cHeight = uni.upx2px(370);
 
-				await this.getMainStatisticsData();
+				this.getMainStatisticsData();
 				var test = uni.getStorageSync('test');
 				await this.initDateRang(new Date(), 'day', 0);
 				if (test == null || test < 2) {
@@ -517,6 +518,11 @@
 			refresh(){
 				uni.setStorageSync('test', 1);
 				this.init();
+				this.langAbbrs = true;
+					setTimeout(() => {
+						// 方法区
+						this.langAbbrs = false;
+					}, 5000);
 			},
 			equipmentStatus() {
 				var that = this;
@@ -691,8 +697,8 @@
 									dayTotalMoney = dayTotalMoney + series[1].data[i];
 									dayTotalNum = dayTotalNum + series[0].data[i]
 								}
-								this.dayTotalNum = dayTotalNum;
-								this.dayTotalMoney = dayTotalMoney;
+								this.dayTotalNum = dayTotalNum.toFixed(0);
+								this.dayTotalMoney = dayTotalMoney.toFixed(2);
 							}
 
 						}
@@ -705,8 +711,8 @@
 									weekTotalMoney = weekTotalMoney + series[1].data[i];
 									weekTotalNum = weekTotalNum + series[0].data[i]
 								}
-								this.weekTotalMoney = weekTotalMoney;
-								this.weekTotalNum = weekTotalNum;
+								this.weekTotalMoney = weekTotalMoney.toFixed(2);
+								this.weekTotalNum = weekTotalNum.toFixed(0);
 							}
 
 						}
@@ -719,8 +725,8 @@
 									monthTotalMoney = monthTotalMoney + series[1].data[i];
 									monthTotalNum = monthTotalNum + series[0].data[i]
 								}
-								this.monthTotalMoney = monthTotalMoney;
-								this.monthTotalNum = monthTotalNum;
+								this.monthTotalMoney = monthTotalMoney.toFixed(2);
+								this.monthTotalNum = monthTotalNum.toFixed(0);
 							}
 
 						}
@@ -733,8 +739,8 @@
 									yearTotalMoney = yearTotalMoney + series[1].data[i];
 									yearTotalNum = yearTotalNum + series[0].data[i]
 								}
-								this.yearTotalMoney = yearTotalMoney;
-								this.yearTotalNum = yearTotalNum;
+								this.yearTotalMoney = yearTotalMoney.toFixed(2);
+								this.yearTotalNum = yearTotalNum.toFixed(0);
 							}
 
 						}

pages/User/equipmentStatusList.vue

@@ -172,6 +172,18 @@
 						<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 v-show="equipment.isMaterialUse==1">
+							<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 v-show="equipment.isMaterialUse==1"><span>{{$t('equipmentStatusList.stick')}}:</span><span>{{equipment.stick?equipment.stick:''}}% </span></view>
+						<view v-show="equipment.isMaterialUse==1">
+							<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">
@@ -303,12 +315,24 @@
 				item["id"] = id;
 				item["longitude"] = longitude;
 				item["latitude"] = latitude;
-				uni.navigateTo({
-					// url:'map?item='+ encodeURIComponent(JSON.stringify(item))
-					// url:'../../packageA/pages/equipmentStatus/map?item='+ encodeURIComponent(JSON.stringify(item))
-					url:'../../packageA/pages/equipmentStatus/GoogleMap?item='+ encodeURIComponent(JSON.stringify(item))
-				    // url: '/pages/user/map?item='+ encodeURIComponent(JSON.stringify(item))
-				});
+				var globalUser = uni.getStorageSync("globalUser");
+				var ifForeign = globalUser.ifForeign;
+				if(ifForeign==0){
+					uni.navigateTo({
+						url:'../../packageA/pages/equipmentStatus/map?item='+ encodeURIComponent(JSON.stringify(item))
+					});
+				}
+				if(ifForeign==1){
+					uni.navigateTo({
+						url:'../../packageA/pages/equipmentStatus/GoogleMap?item='+ encodeURIComponent(JSON.stringify(item))
+					});
+				}
+				// uni.navigateTo({
+				// 	// url:'map?item='+ encodeURIComponent(JSON.stringify(item))
+				// 	url:'../../packageA/pages/equipmentStatus/map?item='+ encodeURIComponent(JSON.stringify(item))
+				// 	// url:'../../packageA/pages/equipmentStatus/GoogleMap?item='+ encodeURIComponent(JSON.stringify(item))
+				//     // url: '/pages/user/map?item='+ encodeURIComponent(JSON.stringify(item))
+				// });
 			},
 			//一键重启
 			reboot(id){

pages/User/merchantList.vue

@@ -79,12 +79,12 @@
 			...mapActions('chart', ['getEquipmentListByUser', 'getEquipmentListByProvince']),
 			openByAdmin(pname, adminId) {
 				uni.navigateTo({
-					url: '/pages/Charts/elseStatistics?adminId=' + adminId + '&pname=' + pname,
+					url: '../../packageB/pages/char/elseStatistics?adminId=' + adminId + '&pname=' + pname,
 				});
 			},
 			openByEquipment(pname, equipmentId) {
 				uni.navigateTo({
-					url: '/pages/Charts/elseStatistics?equipmentId=' + equipmentId + '&pname=' + pname,
+					url: '../../packageB/pages/char/elseStatistics?equipmentId=' + equipmentId + '&pname=' + pname,
 				});
 			},
 			//点击最后一级时触发该事件
@@ -108,7 +108,7 @@
 						success: (res) => {
 							this.pname = res.data.data.name;
 							uni.navigateTo({
-								url: '/pages/Charts/elseStatistics?adminId=' + id + '&pname=' + this.pname,
+								url: '../../packageB/pages/char/elseStatistics?adminId=' + id + '&pname=' + this.pname,
 							});
 						}
 					})
@@ -126,7 +126,7 @@
 						success: (res) => {
 							this.pname = res.data.data.name;
 							uni.navigateTo({
-								url: '/pages/Charts/elseStatistics?equipmentId=' + id + '&pname=' + this.pname,
+								url: '../../packageB/pages/char/elseStatistics?equipmentId=' + id + '&pname=' + this.pname,
 							});
 						}
 					})

pages/User/user.vue

@@ -39,6 +39,9 @@
 				<view v-if="show">
 					<uni-list-item :title="$t('user.equipmentname')" @click="updataName()" />
 				</view>
+				<view v-if="show">
+					<uni-list-item :title="$t('user.equipmentlist')" @click="equipmentlist()" />
+				</view>
 				<view v-if="ifForeign">
 					<uni-list-item title="退款" @click="refuse()" />
 				</view>
@@ -175,6 +178,11 @@
 					url: '../../packageA/pages/user/equipmentName',
 				});
 			},
+			equipmentlist() {
+				uni.navigateTo({
+					url: '../../packageA/pages/equipmentStatus/equipmentlist',
+				});
+			},
 			refuse(){
 				uni.navigateTo({
 					url: '../../packageA/pages/user/refuse',

store/modules/chart.js

@@ -91,6 +91,14 @@ export default {
 					return res;
 				});
 		},
+		//修改湿度参数
+		humidityParameters({ commit },param) {
+			return apis.sz.post('/TEquipment/humidityParameters',param)
+				.then(res => {
+					// const { data } = res;
+					return res;
+				});
+		},
 		//添加闹钟list
 		addAlarmClock({ commit },param) {
 			return apis.sz.post('/TAlarmClock/add',param)