fix(物联网): 调整首页报警、统计触发、设备详情解决分组切换问题和input默认值问题

components/iot-components/input/iots-input.vue

@@ -20,7 +20,7 @@
 		props:{
 			// 选择值
 			value: {
-				type: [String,null],
+				type: [String,Number],
 				default: ''
 			},
 			// 图标
@@ -51,12 +51,20 @@
 			}
 		},
 		created() {
+			if(this.value!=null){
+				this.inputValue = this.value+'';
+			}else{
 				this.inputValue = this.value;
+			}
 		},
 		watch: {
 		  value(newValue) {
+				if(newValue!=null){
+					this.inputValue = newValue+'';
+				}else{
 					this.inputValue = newValue;
 				}
+		  }
 		},
 		methods:{
 			// 输入值变化

pages/iots/device/device-detail.vue

@@ -170,7 +170,7 @@
 				 :disabled="true"
 				 :name="item.name"
 				 v-model="item.value"
-				 :unit="item.ioObj?item.ioObj.unit?item.ioObj.unit:'':''"
+         :unit="item.ioObj ? item.ioObj.unit ?item.ioObj.unit:'': ''"
 				 @change="downData($event,index)"
 				 @clickLog="clickLog(index)"
 				></iots-input>
@@ -480,6 +480,7 @@
 			},
 			// 选择分组
 			changeGroup(e){
+				this.dataIndex = e;
 				if(e != 0){
 					const identifierMap = new Map();
 					this.dataAllData.forEach(val => {
@@ -535,7 +536,6 @@
 							if(thingModel.contents.prop.length){
 								this.dataList = thingModel.contents.prop.map(item=>{
 									if(item.dataType=='int'){
-										
 										if(item.ioObj.IoDeployForm.min!=undefined){
 											item.value = parseFloat(item.ioObj.IoDeployForm.min);
 										}else{
@@ -824,7 +824,7 @@
 						// this.addLog('up',obj);
 						this.deviceTime = this.$u.timeFormat(obj.fg_device_ts, 'yyyy-mm-dd hh:MM:ss');
 						if (obj) {
-							let dataList = JSON.parse(JSON.stringify(this.dataList));
+							let dataList = JSON.parse(JSON.stringify(this.dataAllData));
 							// 这是连接的第一次获取，虽然进页面已经获取一次最新数据，但是可能存在断开之后的请求，所以需要遍历覆盖
 							for (let i = 0; i < dataList.length; i++) {
 								for (let key in obj) {
@@ -840,7 +840,8 @@
 								}
 							}
 							this.$nextTick(()=>{
-								this.$set(this,'dataList',dataList)
+								this.$set(this,'dataAllData',dataList)
+								this.changeGroup(this.dataIndex)
 								this.$forceUpdate()
 							})
 						}

pages/tabbar/module/iots2.vue

@@ -170,18 +170,22 @@
 			}
 		},
 		watch: {
-			// showToggle() {
+			showToggle() {
-			// 	console.log("show变化")
+				console.log("show变化")
 				// clearInterval(this.timer);
 				// this.timer = setInterval(() => {
 				// 	this.mescroll.resetUpScroll();
-			// 		console.log("当前起始项Index为", this.showStartIndex, this.showEndIndex);
+					this.getDeviceInfo();
+					console.log("当前起始项Index为", this.showStartIndex, this.showEndIndex);
 				// }, 5000)
-			// },
+			},
-			// hideToggle() {
+			hideToggle() {
-			// 	console.log("hide变化")
+				console.log("hide变化")
 				// clearInterval(this.timer);
-			// },
+			},
+		},
+		onShow() {
+			
 		},
 
 		created() {