Merge branch 'fix/device-hihstory-select-attr' into 'main_dev'

fix: 修复详情历史数据选择属性时是标识符的问题

See merge request yunteng/thingskit-app!144

@@ -62,7 +62,7 @@
 			@close="calendarClose"></u-calendar>
 			@close="calendarClose"></u-calendar>
 		<u-picker :show="showTimeGap" :columns="columns" keyName="label" closeOnClickOverlay @confirm="confirmTimeGap"
 		<u-picker :show="showTimeGap" :columns="columns" keyName="label" closeOnClickOverlay @confirm="confirmTimeGap"
 			@cancel="cancelTimeGap" @close="cancelTimeGap" :defaultIndex="[3]"></u-picker>
 			@cancel="cancelTimeGap" @close="cancelTimeGap" :defaultIndex="[3]"></u-picker>
-		<u-picker :show="showSelectType" :columns="keys" closeOnClickOverlay @confirm="confirmTypeGap"
+		<u-picker :show="showSelectType" :columns="[keys.map(item=>({label:item.name,value:item.identifier}))]" keyName="label" closeOnClickOverlay @confirm="confirmTypeGap"
 			@cancel="cancelTypeGap" @close="cancelTypeGap"></u-picker>
 			@cancel="cancelTypeGap" @close="cancelTypeGap"></u-picker>
 		<u-picker :show="showSelectAvg" :columns="avgColumns" keyName="label" closeOnClickOverlay
 		<u-picker :show="showSelectAvg" :columns="avgColumns" keyName="label" closeOnClickOverlay
 			@confirm="confirmAvgGap" @cancel="showSelectAvg=false" @close="showSelectAvg=false"></u-picker>
 			@confirm="confirmAvgGap" @cancel="showSelectAvg=false" @close="showSelectAvg=false"></u-picker>
@@ -163,7 +163,7 @@
 				chartData: {
 				chartData: {
 					categories: this.historyData.length && this.historyData.map(item => item.ts),
 					categories: this.historyData.length && this.historyData.map(item => item.ts),
 					series: [{
 					series: [{
-						name: this.keys[0][0],
+						name: this.keys[0].identifier,
 						data: this.historyData.length && this.historyData.map(item => Number(item.value))
 						data: this.historyData.length && this.historyData.map(item => Number(item.value))
 					}]
 					}]
 				},
 				},
@@ -199,7 +199,7 @@
 				timeData: {
 				timeData: {
 					selectTime: this.yesterday + ' 至 ' + this.today,
 					selectTime: this.yesterday + ' 至 ' + this.today,
 					getTimeGap: this.timeDiff,
 					getTimeGap: this.timeDiff,
-					getType: this.keys[0][0],
+					getType: this.keys[0].name,
 					limit: 7,
 					limit: 7,
 					agg: 'NONE'
 					agg: 'NONE'
 				},
 				},
@@ -214,7 +214,7 @@
 				} else {
 				} else {
 					this.chartData.categories = newValue.map(item => item.ts);
 					this.chartData.categories = newValue.map(item => item.ts);
 					this.chartData.series = [{
 					this.chartData.series = [{
-						name: this.keys[0][0],
+						name: this.keys[0].name,
 						data: newValue.map(item => Number(item.value))
 						data: newValue.map(item => Number(item.value))
 					}];
 					}];
 				}
 				}
@@ -363,18 +363,18 @@
 			},
 			},
 			async confirmTypeGap(time) {
 			async confirmTypeGap(time) {
 				this.showSelectType = false;
 				this.showSelectType = false;
-				this.timeData.getType = time.value[0];
+				this.timeData.getType = time.value[0].label;
 				const interval = this.columns[0].find(item => item.label === this.timeData.getTimeGap);
 				const interval = this.columns[0].find(item => item.label === this.timeData.getTimeGap);
 				const data = await getHistoryData({
 				const data = await getHistoryData({
 					startTs: this.startTs,
 					startTs: this.startTs,
 					endTs: this.endTs,
 					endTs: this.endTs,
-					keys: this.timeData.getType,
+					keys:time.value[0].value,
 					interval: this.limitFlag ? null : interval.value,
 					interval: this.limitFlag ? null : interval.value,
 					entityId: this.entityId,
 					entityId: this.entityId,
 					limit: this.timeData.limit,
 					limit: this.timeData.limit,
 					agg: this.timeData.agg
 					agg: this.timeData.agg
 				});
 				});
-				this.$emit('update', data[this.timeData.getType]);
+				this.$emit('update', data[time.value[0].value]);
 			},
 			},
 			cancelTypeGap() {
 			cancelTypeGap() {
 				this.showSelectType = false;
 				this.showSelectType = false;

@@ -2,8 +2,8 @@
 	<view class="realtime-page">
 	<view class="realtime-page">
 		<view class="item" v-for="(item, index) in recordList" :key="index">
 		<view class="item" v-for="(item, index) in recordList" :key="index">
 			<view class="item-top">
 			<view class="item-top">
-				<view>{{ item.key }}</view>
-				<view class="item-value">{{ item.value }}</view>
+				<view>{{ item.name }}</view>
+				<view class="item-value">{{ item.value || '' }}</view>
 			</view>
 			</view>
 			<view class="item-time">{{ item.time }}</view>
 			<view class="item-time">{{ item.time }}</view>
 		</view>
 		</view>
@@ -18,10 +18,10 @@
 				type: Array,
 				type: Array,
 				default: () => []
 				default: () => []
 			}
 			}
-		}
+		},
 	};
 	};
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 	@import "../static/realtime-data.scss";
 	@import "../static/realtime-data.scss";
-</style>
+</style>

@@ -99,7 +99,7 @@
 			if (res.deviceProfileId) {
 			if (res.deviceProfileId) {
 				this.getAttrList = await api.deviceApi.getAttribute(res.deviceProfileId)
 				this.getAttrList = await api.deviceApi.getAttribute(res.deviceProfileId)
 				if (Array.isArray(this.getAttrList)) {
 				if (Array.isArray(this.getAttrList)) {
-					this.attrList = this.getAttrList.map(m => {
+					this.attrList = this.getAttrList?.map(m => {
 						return m.identifier
 						return m.identifier
 					})
 					})
 				}
 				}
@@ -156,15 +156,24 @@
 						this.recordList.unshift(item);
 						this.recordList.unshift(item);
 					}
 					}
 				});
 				});
-				this.recordList = this.recordList.map((item) => {
+				this.recordList = this.recordList?.map((item) => {
 					return {
 					return {
 						...item,
 						...item,
 						time: formatToDate(item.time, "YYYY-MM-DD HH:mm:ss"),
 						time: formatToDate(item.time, "YYYY-MM-DD HH:mm:ss"),
 					};
 					};
 				});
 				});
+				if(this.getAttrList){
+					this.getAttrList.forEach(item=>{
+						this.recordList?.forEach(item1=>{
+							if(item.identifier===item1.key){
+								item1.name=item.name
+							}
+						})
+					})
+				}
 			});
 			});
 			const keys = await getDeviceKeys(tbDeviceId);
 			const keys = await getDeviceKeys(tbDeviceId);
-			this.keys = [this.getAttrList.map(item=>item.identifier)];
+			this.keys=this.getAttrList || []
 			// 昨天
 			// 昨天
 			this.yesterday = moment().subtract(1, "days").format("YYYY-MM-DD");
 			this.yesterday = moment().subtract(1, "days").format("YYYY-MM-DD");
 			// 今天
 			// 今天

@@ -15,6 +15,11 @@
 			font-weight: bold;
 			font-weight: bold;
 			.item-value {
 			.item-value {
 				font-weight: bold;
 				font-weight: bold;
+				width:200rpx;
+				text-align: right;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
 			}
 			}
 		}
 		}
 		.item-time {
 		.item-time {
@@ -23,4 +28,4 @@
 			color: #999;
 			color: #999;
 		}
 		}
 	}
 	}
-}
+}

@@ -122,16 +122,16 @@
 							message: '请输入正确的手机号码'
 							message: '请输入正确的手机号码'
 						}
 						}
 					],
 					],
-					email: [{
-							required: true,
-							message: '请输入正确的邮箱号',
-							trigger: 'change'
-						},
-						{
-							pattern: /^[0-9a-zA-Z]+@(([0-9a-zA-Z]+)[.])+[a-z]{3}$/,
-							message: '请输入正确的邮箱号'
-						}
-					]
+					// email: [{
+					// 		required: true,
+					// 		message: '请输入正确的邮箱号',
+					// 		trigger: 'change'
+					// 	},
+					// 	{
+					// 		pattern: /^[0-9a-zA-Z]+@(([0-9a-zA-Z]+)[.])+[a-z]{3}$/,
+					// 		message: '请输入正确的邮箱号'
+					// 	}
+					// ]
 				},
 				},
 				showDate: false,
 				showDate: false,
 				dateTime: Number(new Date()),
 				dateTime: Number(new Date()),