Merge remote-tracking branch 'origin/master'

App.vue

@@ -2,7 +2,10 @@
 	export default {
 		onLaunch: function() {
 			console.log('App Launch');
+			//默认语言
 			var lan = 'en'
+			
+			// var lan = 'zh'
 			 try {
 				const res = uni.getSystemInfoSync();
 				lan = res.language

common/lang/en.js

@@ -55,14 +55,19 @@ export default {
 		title:'equipment status',
 		red:'Red means machine alarm',
 		green:'Green means the machine is normal',
-		sleep:'sleep state：Machine sleep',
-		unsleep:'sleep state：Did not sleep',
+		sleep:'sleep state：machine sleep',
+		unsleep:'sleep state：did not sleep',
+		on:'switch：the machine is turning on',
+		off:'switch：machine shut down',
 		equipmentNo:'equipmentNo',
 		area:'area',
 		temperature :'Temperature of the furnace head',
 		equipmentTemperature:'equipmentTemperature',
 		humidity:'equipmentHumidity',
-		alarm:'alarm content'
+		alarm:'alarm content',
+		tip:'prompt',
+		sleepTip:'whether or not to sleep?',
+		onoffTip:'whether to turn it off?'
 	},
 	equipmentStatics:{
 		title:'Machine Sales Ranking',

common/lang/zh.js

@@ -55,12 +55,17 @@ export default {
 		green:'绿色代表机器正常',
 		sleep:'睡眠状态：机器已睡眠',
 		unsleep:'睡眠状态：未睡眠',
+		on:'关机：未关机',
+		off:'关机：已关机',
 		equipmentNo:'机器唯一码',
 		area:'所在地',
 		temperature :'炉头温度',
 		equipmentTemperature:'柜内温度',
 		humidity:'柜内湿度',
-		alarm:'报警内容'
+		alarm:'报警内容',
+		tip:'提示',
+		sleepTip:'是否休眠？',
+		onoffTip:'是否关机？'
 	},
 	equipmentStatics:{
 		title:'机器销售排行',

main.js

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

pages/Login/Login.vue

@@ -24,7 +24,7 @@
 					<view class="line"></view>
 				</view>
 
-				<view class="third-words">第三方账号登录</view>
+				<view class="third-words">绑定微信一键登录</view>
 
 				<view class="single-line">
 					<view class="line"></view>

pages/User/equipmentStatusList.vue

@@ -25,7 +25,20 @@
 											<view class="swithBox" v-else>
 												<view class="swichFont">睡眠状态：未睡眠</view>
 												<view class="switch">
-													<switch style="transform:scale(0.65)" @change="change(equipment.id,1)" />
+													<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>
@@ -66,13 +79,26 @@
 						<view class="swithBox" v-if="equipment.isSleep">
 							<view class="swichFont">{{$t('equipmentStatusList.sleep')}}</view>
 							<view class="switch">
-								<switch style="transform:scale(0.65)"  checked @change="change(equipment.id,0)" />
+								<switch style="transform:scale(0.65)" checked  @change="change(equipment.id,0)" />
 							</view>
 						</view>
 						<view class="swithBox" v-else>
 							<view class="swichFont">{{$t('equipmentStatusList.unsleep')}}</view>
 							<view class="switch">
-								<switch style="transform:scale(0.65)" @change="change(equipment.id,1)" />
+								<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">{{$t('equipmentStatusList.off')}}</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">{{$t('equipmentStatusList.on')}}</view>
+							<view class="switch">
+								<switch style="transform:scale(0.65)" :checked="onffChecked" @change="OnOff(equipment.id,0)" />
 							</view>
 						</view>
 						<view class="line1"></view>
@@ -123,6 +149,8 @@
 				},
 				statusNormal:'status-normal',
 				statusError:'status-error',
+				sleepChecked:null,
+				onffChecked:null,
 			}
 		},
 		computed: {
@@ -160,22 +188,117 @@
 				}
 				, _ => void uni.stopPullDownRefresh());
 			},
+			OnOff(id,code){
+				var that = this;
+				var code1 = code;
+				if(code1==0){
+					uni.showModal({
+					    title: that.$t('equipmentStatusList.tip'),
+					    content: that.$t('equipmentStatusList.onoffTip'),
+					    success: function (res)  {
+					        if (res.confirm) {
+								var serverurl = that.serverurl;
+								var code2 = code1;
+								var equipmentId = id;
+								uni.request({
+									url: serverurl + '/TEquipment/onOff',
+									data: {
+										"adminId": code2,
+										"equipmentId": equipmentId
+									},
+									method: "POST",
+									success: (res) => {
+										var list = res.data.data;
+										that.getEquipmentListData();
+									}
+								});
+					        } else if (res.cancel) {
+								that.onffChecked = false;
+								that.getEquipmentListData();
+					        }
+					    }
+					});
+				}else{
+					var serverurl = that.serverurl;
+					var code = code;
+					var equipmentId = id;
+					uni.request({
+						url: serverurl + '/TEquipment/onOff',
+						data: {
+							"adminId": code,
+							"equipmentId": equipmentId
+						},
+						method: "POST",
+						success: (res) => {
+							var list = res.data.data;
+							that.getEquipmentListData();
+						}
+					});
+				}
+			},
 			change(id,code){
-				var serverurl = this.serverurl;
-				var code = code;
-				var equipmentId = id;
-				uni.request({
-					url: serverurl + '/TEquipment/sleep',
-					data: {
-						"adminId": code,
-						"equipmentId": equipmentId
-					},
-					method: "POST",
-					success: (res) => {
-						var list = res.data.data;
-						this.getEquipmentListData();
-					}
-				});
+				var that = this;
+				var code1 = code;
+				if(code1==1){
+					uni.showModal({
+					    title: that.$t('equipmentStatusList.tip'),
+					    content: that.$t('equipmentStatusList.sleepTip'),
+					    success: function (res)  {
+					        if (res.confirm) {
+								var serverurl = that.serverurl;
+								var code2 = code1;
+								var equipmentId = id;
+								uni.request({
+									url: serverurl + '/TEquipment/sleep',
+									data: {
+										"adminId": code2,
+										"equipmentId": equipmentId
+									},
+									method: "POST",
+									success: (res) => {
+										var list = res.data.data;
+										that.getEquipmentListData();
+									}
+								});
+					        } else if (res.cancel) {
+								that.sleepChecked = false;
+								that.getEquipmentListData();
+					        }
+					    }
+					});
+				}else{
+					var serverurl = that.serverurl;
+					var code = code;
+					var equipmentId = id;
+					uni.request({
+						url: serverurl + '/TEquipment/sleep',
+						data: {
+							"adminId": code,
+							"equipmentId": equipmentId
+						},
+						method: "POST",
+						success: (res) => {
+							var list = res.data.data;
+							that.getEquipmentListData();
+						}
+					});
+				}
+				
+				// var serverurl = this.serverurl;
+				// var code = code;
+				// var equipmentId = id;
+				// uni.request({
+				// 	url: serverurl + '/TEquipment/sleep',
+				// 	data: {
+				// 		"adminId": code,
+				// 		"equipmentId": equipmentId
+				// 	},
+				// 	method: "POST",
+				// 	success: (res) => {
+				// 		var list = res.data.data;
+				// 		this.getEquipmentListData();
+				// 	}
+				// });
 			},
 		}
     }