fix：修改设备实时数据传keys和历史数据传参加上limit

 // 获取某个Key的历史数据
+const getUrlParams = (params) => {
+	return Object.keys(params).reduce((prev, next, currentIndex) => {
+		if (params[next]) {
+			return prev += `${!currentIndex ? '?' : '&'}${next}=${params[next]}`
+		}
+		return prev
+	}, '')
+}
+
 export function getHistoryData(params) {
-	const {
-		entityId,
-		keys,
-		startTs,
-		endTs,
-		interval
+	let {
+		entityId
 	} = params
+	params = getUrlParams(params)
 	return uni.$u.http.get(
-		`/plugins/telemetry/DEVICE/${entityId}/values/timeseries?keys=${keys}&startTs=${startTs}&endTs=${endTs}&interval=${interval}`
+		`/plugins/telemetry/DEVICE/${entityId}/values/timeseries${params}`
 	);
 }
 
+
+
 // 获取当前设备的key
 export function getDeviceKeys(id) {
 	return uni.$u.http.get(`/plugins/telemetry/DEVICE/${id}/keys/timeseries`);
 };
 
 export function issueCommand(type, tbDeviceId, data) {
-	console.log(type,tbDeviceId)
+	console.log(type, tbDeviceId)
 	return uni.$u.http.post(`/rpc/${type==='OneWay'?'oneway':'twoway'}/${tbDeviceId}`, data)
 }

 <template>
-  <view class="device-detail-page">
-    <!-- 公共组件-每个页面必须引入 -->
-    <public-module></public-module>
-    <u-sticky bgColor="#fff">
-      <u-tabs
-        :list="list"
-        :current="currentTab"
-        @click="handleTabClick"
-        :activeStyle="{
+	<view class="device-detail-page">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<u-sticky bgColor="#fff">
+			<u-tabs :list="list" :current="currentTab" @click="handleTabClick" :activeStyle="{
           fontWeight: 'bold',
           color: '#333',
-        }"
-        :inactiveStyle="{
+        }" :inactiveStyle="{
           color: '#999',
-        }"
-        :scrollable="isScrollable"
-      />
-    </u-sticky>
-    <view style="margin-top: 30rpx">
-      <basicInfo v-show="currentTab == 0" :deviceDetail="deviceDetail" />
-      <realTimeData v-show="currentTab === 1" :recordList="recordList" />
-      <historyData
-        v-if="currentTab === 2"
-        :keys="keys"
-        :yesterday="yesterday"
-        :today="today"
-        :timeDiff="timeDiff"
-        :historyData="historyData"
-        :entityId="entityId"
-        :start="startTs"
-        :end="endTs"
-        @update="handleUpdate"
-      />
-      <alarmHistory v-show="currentTab === 3" :deviceId="deviceId" />
-      <commondRecord v-if="currentTab === 4" :tbDeviceId="entityId" />
-    </view>
-  </view>
+        }" :scrollable="isScrollable" />
+		</u-sticky>
+		<view style="margin-top: 30rpx">
+			<basicInfo v-show="currentTab == 0" :deviceDetail="deviceDetail" />
+			<realTimeData v-show="currentTab === 1" :recordList="recordList" />
+			<historyData v-if="currentTab === 2" :keys="keys" :yesterday="yesterday" :today="today" :timeDiff="timeDiff"
+				:historyData="historyData" :entityId="entityId" :start="startTs" :end="endTs" @update="handleUpdate" />
+			<alarmHistory v-show="currentTab === 3" :deviceId="deviceId" />
+			<commondRecord v-if="currentTab === 4" :tbDeviceId="entityId" />
+		</view>
+	</view>
 </template>
 
 <script>
-import fTabbar from "@/components/module/f-tabbar/f-tabbar";
-import basicInfo from "./tabDetail/basicInfo.vue";
-import realTimeData from "./tabDetail/realtimeData.vue";
-import alarmHistory from "./tabDetail/alarmHistory.vue";
-import historyData from "./tabDetail/historyData.vue";
-import commondRecord from "./tabDetail/CommandRecord.vue";
-import { getDeviceKeys, getHistoryData } from "./api/index.js";
-import { formatToDate } from "@/plugins/utils.js";
-import MescrollCompMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mixins/mescroll-comp.js";
-import moment from "moment";
-import base from "@/config/baseUrl.js";
+	import fTabbar from "@/components/module/f-tabbar/f-tabbar";
+	import basicInfo from "./tabDetail/basicInfo.vue";
+	import realTimeData from "./tabDetail/realtimeData.vue";
+	import alarmHistory from "./tabDetail/alarmHistory.vue";
+	import historyData from "./tabDetail/historyData.vue";
+	import commondRecord from "./tabDetail/CommandRecord.vue";
+	import {
+		getDeviceKeys,
+		getHistoryData
+	} from "./api/index.js";
+	import {
+		formatToDate
+	} from "@/plugins/utils.js";
+	import MescrollCompMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mixins/mescroll-comp.js";
+	import moment from "moment";
+	import base from "@/config/baseUrl.js";
 
-export default {
-  mixins: [MescrollCompMixin],
-  components: {
-    fTabbar,
-    basicInfo,
-    realTimeData,
-    alarmHistory,
-    historyData,
-    commondRecord,
-  },
-  data() {
-    return {
-      list: [
-        {
-          name: "基础信息",
-        },
-        {
-          name: "实时数据",
-        },
-        {
-          name: "历史数据",
-        },
-        {
-          name: "告警记录",
-        },
-      ],
-      currentTab: 0,
-      deviceId: "",
-      deviceDetail: {},
-      keys: [],
-      yesterday: "",
-      today: "",
-      timeDiff: "",
-      historyData: [],
-      entityId: "",
-      startTs: "",
-      endTs: "",
-      recordList: [],
-      isScrollable: false,
-    };
-  },
-  onUnload() {
-    // 页面关闭时,销毁webSocket连接,否则第二次会存在连接不到的情况
-    uni.closeSocket();
-  },
-  async onLoad(options) {
-    const { id, alarmStatus, lastOnlineTime, tbDeviceId } = options;
-    this.deviceId = id;
-    const res = await uni.$u.http.get(`/yt/device/${id}`);
-    this.deviceDetail = {
-      ...res,
-      alarmStatus,
-      lastOnlineTime,
-    };
+	export default {
+		mixins: [MescrollCompMixin],
+		components: {
+			fTabbar,
+			basicInfo,
+			realTimeData,
+			alarmHistory,
+			historyData,
+			commondRecord,
+		},
+		data() {
+			return {
+				list: [{
+						name: "基础信息",
+					},
+					{
+						name: "实时数据",
+					},
+					{
+						name: "历史数据",
+					},
+					{
+						name: "告警记录",
+					},
+				],
+				currentTab: 0,
+				deviceId: "",
+				deviceDetail: {},
+				keys: [],
+				yesterday: "",
+				today: "",
+				timeDiff: "",
+				historyData: [],
+				entityId: "",
+				startTs: "",
+				endTs: "",
+				recordList: [],
+				isScrollable: false,
+				attrList: []
+			};
+		},
+		onUnload() {
+			// 页面关闭时,销毁webSocket连接,否则第二次会存在连接不到的情况
+			uni.closeSocket();
+		},
+		async onLoad(options) {
+			const {
+				id,
+				alarmStatus,
+				lastOnlineTime,
+				tbDeviceId,
+				deviceProfileId
+			} =
+			options;
+			this.deviceId = id;
+			const res = await uni.$u.http.get(`/yt/device/${id}`);
+			this.deviceDetail = {
+				...res,
+				alarmStatus,
+				lastOnlineTime,
+			};
 
-    // 设备类型不是网关子设备的添加一个命令记录的选项卡
-    if (this.deviceDetail.deviceType !== "SENSOR") {
-      this.list.push({
-        name: "命令记录",
-      });
-    }
-    this.isScrollable = this.list.length > 4;
-    // 连接webSockte
-    const socketTask = uni.connectSocket({
-      url:
-        `${base.socketPrefix}://${base.baseWebSocketUrl}/api/ws/plugins/telemetry?token=` +
-        uni.getStorageSync("userInfo").isToken, //仅为示例，并非真实接口地址。
-      complete: () => {},
-    });
-    uni.onSocketOpen((header) => {
-      socketTask.send({
-        data: JSON.stringify({
-          attrSubCmds: [],
-          tsSubCmds: [
-            {
-              entityType: "DEVICE",
-              entityId: tbDeviceId,
-              scope: "LATEST_TELEMETRY",
-              cmdId: 1,
-            },
-          ],
-          historyCmds: [],
-          entityDataCmds: [],
-          entityDataUnsubscribeCmds: [],
-          alarmDataCmds: [],
-          alarmDataUnsubscribeCmds: [],
-          entityCountCmds: [],
-          entityCountUnsubscribeCmds: [],
-        }),
-        success() {},
-      });
-    });
-    socketTask.onMessage((msg) => {
-      const { data } = JSON.parse(msg.data);
-      const newArray = [];
-      for (const key in data) {
-        const [time, value] = data[key].flat(1);
-        let obj = {
-          key,
-          time,
-          value,
-        };
-        if (this.recordList.length === 0) {
-          this.recordList.unshift(obj);
-        } else {
-          newArray.push(obj);
-        }
-      }
-      newArray.forEach((item) => {
-        let flag = false;
-        this.recordList.forEach((item1) => {
-          if (item1.key === item.key) {
-            item1.value = item.value;
-            item1.time = item.time;
-            flag = true;
-          }
-        });
-        if (!flag) {
-          this.recordList.unshift(item);
-        }
-      });
-      this.recordList = this.recordList.map((item) => {
-        return {
-          ...item,
-          time: formatToDate(item.time, "YYYY-MM-DD HH:mm:ss"),
-        };
-      });
-    });
+			// 设备类型不是网关子设备的添加一个命令记录的选项卡
+			if (this.deviceDetail.deviceType !== "SENSOR") {
+				this.list.push({
+					name: "命令记录",
+				});
+			}
+			this.isScrollable = this.list.length > 4;
+			if (res.deviceProfileId) {
+				const getAttrList = await uni.$u.http.get(
+					`/yt/device/attributes/${res.deviceProfileId}`
+				);
+				if (Array.isArray(getAttrList)) {
+					this.attrList = getAttrList.map(m => {
+						return m.identifier
+					})
+				}
+			}
+			// 连接webSockte
+			const socketTask = uni.connectSocket({
+				url: `${base.socketPrefix}://${base.baseWebSocketUrl}/api/ws/plugins/telemetry?token=` +
+					uni.getStorageSync("userInfo").isToken, //仅为示例，并非真实接口地址。
+				complete: () => {},
+			});
+			uni.onSocketOpen((header) => {
+				socketTask.send({
+					data: JSON.stringify({
+						attrSubCmds: [],
+						tsSubCmds: [{
+							entityType: "DEVICE",
+							entityId: tbDeviceId,
+							scope: "LATEST_TELEMETRY",
+							cmdId: 1,
+							keys: this.attrList.join(','),
+						}, ],
+						historyCmds: [],
+						entityDataCmds: [],
+						entityDataUnsubscribeCmds: [],
+						alarmDataCmds: [],
+						alarmDataUnsubscribeCmds: [],
+						entityCountCmds: [],
+						entityCountUnsubscribeCmds: [],
+					}),
+					success() {},
+				});
+			});
+			socketTask.onMessage((msg) => {
+				const {
+					data
+				} = JSON.parse(msg.data);
+				const newArray = [];
+				for (const key in data) {
+					const [time, value] = data[key].flat(1);
+					let obj = {
+						key,
+						time,
+						value,
+					};
+					if (this.recordList.length === 0) {
+						this.recordList.unshift(obj);
+					} else {
+						newArray.push(obj);
+					}
+				}
+				newArray.forEach((item) => {
+					let flag = false;
+					this.recordList.forEach((item1) => {
+						if (item1.key === item.key) {
+							item1.value = item.value;
+							item1.time = item.time;
+							flag = true;
+						}
+					});
+					if (!flag) {
+						this.recordList.unshift(item);
+					}
+				});
+				this.recordList = this.recordList.map((item) => {
+					return {
+						...item,
+						time: formatToDate(item.time, "YYYY-MM-DD HH:mm:ss"),
+					};
+				});
+			});
 
-    const keys = await getDeviceKeys(tbDeviceId);
-    this.keys = [keys];
-    // 昨天
-    this.yesterday = moment().subtract(1, "days").format("YYYY-MM-DD");
-    // 今天
-    this.today = moment().format("YYYY-MM-DD");
-    // 开始时间
-    this.startTs = moment().subtract(1, "days").format("x");
-    // 结束时间
-    this.endTs = moment().format("x");
-    this.entityId = tbDeviceId;
+			const keys = await getDeviceKeys(tbDeviceId);
+			this.keys = [keys];
+			// 昨天
+			this.yesterday = moment().subtract(1, "days").format("YYYY-MM-DD");
+			// 今天
+			this.today = moment().format("YYYY-MM-DD");
+			// 开始时间
+			this.startTs = moment().subtract(1, "days").format("x");
+			// 结束时间
+			this.endTs = moment().format("x");
+			this.entityId = tbDeviceId;
 
-    const data = await getHistoryData({
-      entityId: tbDeviceId,
-      startTs: this.startTs,
-      endTs: this.endTs,
-      keys: keys[0],
-      interval: 1800000,
-    });
-    this.timeDiff = "30分钟";
-    if (!Object.keys(data).length) return;
+			const data = await getHistoryData({
+				entityId: tbDeviceId,
+				startTs: this.startTs,
+				endTs: this.endTs,
+				keys: keys[0],
+				// interval: 1800000,
+				limit: 7,
+				agg: 'NONE'
+			});
+			this.timeDiff = "30分钟";
+			if (!Object.keys(data).length) return;
 
-    this.historyData = data[keys[0]].map((item) => {
-      return {
-        value: item.value,
-        ts: formatToDate(item.ts, "YYYY-MM-DD HH:mm:ss"),
-      };
-    });
-  },
-  methods: {
-    handleTabClick({ index }) {
-      this.currentTab = index;
-    },
-    handleUpdate(data) {
-      if (!Array.isArray(data)) {
-        this.historyData = [];
-        return;
-      }
-      this.historyData = data.map((item) => {
-        return {
-          value: item.value,
-          ts: formatToDate(item.ts, "YYYY-MM-DD HH:mm:ss"),
-        };
-      });
-    },
-  },
-};
+			this.historyData = data[keys[0]].map((item) => {
+				return {
+					value: item.value,
+					ts: formatToDate(item.ts, "YYYY-MM-DD HH:mm:ss"),
+				};
+			});
+		},
+		methods: {
+			handleTabClick({
+				index
+			}) {
+				this.currentTab = index;
+			},
+			handleUpdate(data, e) {
+				if (!Array.isArray(data)) {
+					this.historyData = [];
+					return;
+				}
+				this.historyData = data.map((item) => {
+					return {
+						value: item.value,
+						ts: formatToDate(item.ts, "YYYY-MM-DD HH:mm:ss"),
+					};
+				});
+			},
+		},
+	};
 </script>
 
 <style lang="scss" scoped>
-.device-detail-page {
-  height: 100vh;
-  background-color: #f8f9fa;
-}
-</style>
+	.device-detail-page {
+		height: 100vh;
+		background-color: #f8f9fa;
+	}
+</style>

@@ -5,33 +5,42 @@
 		<view class="historyData-top">
 			<u-form :label-style="{ 'font-size': '0rpx' }">
 				<u-form-item @click="openCalendar">
-					<u-input v-model="timeData.selectTime" disabled disabledColor="#fff" placeholder="请选择日期" border="none" suffixIcon="arrow-down">
+					<u-input v-model="timeData.selectTime" disabled disabledColor="#fff" placeholder="请选择日期"
+						border="none" suffixIcon="arrow-down">
 						<template slot="prefix">
 							<image class="icon" src="../../../static/can-der.png"></image>
 						</template>
 					</u-input>
 				</u-form-item>
 				<u-form-item @click="openTimeGap">
-					<u-input v-model="timeData.getTimeGap" disabled disabledColor="#fff" placeholder="请选择时间区间" border="none" suffixIcon="arrow-down">
+					<u-input v-model="timeData.getTimeGap" disabled disabledColor="#fff" placeholder="请选择时间区间"
+						border="none" suffixIcon="arrow-down">
 						<template slot="prefix">
 							<image class="icon" src="../../../static/time.png"></image>
 						</template>
 					</u-input>
 				</u-form-item>
+				<u-form-item @click="openAvg">
+					<u-input shape="circle" v-model="aggText" placeholder="请选择数据聚合功能" disabled disabledColor="#377DFF0D"
+						suffixIcon="arrow-down" />
+				</u-form-item>
+				<u-form-item @click="openTimeGap" v-if="limitFlag">
+					<view class="u-flex">
+						<text>最大条数</text>
+						<u-number-box style="margin-left:30rpx" class="ml-10" v-model="timeData.limit" :min="7"
+							:max="50000"></u-number-box>
+					</view>
+				</u-form-item>
 				<u-form-item @click="openType">
-					<u-input shape="circle" v-model="timeData.getType" placeholder="请选择属性" disabled disabledColor="#377DFF0D" suffixIcon="arrow-down" />
+					<u-input shape="circle" v-model="timeData.getType" placeholder="请选择属性" disabled
+						disabledColor="#377DFF0D" suffixIcon="arrow-down" />
 				</u-form-item>
 			</u-form>
 
 			<view class="charts-box" v-show="historyData.length">
-				<qiun-data-charts
-					type="area"
-					canvas2d
-					canvasId="daskujdhasljkdcnzjkdfhuoqwlqwjhkdsamjczxnmdasd123321"
-					:chartData="chartData"
-					:ontouch="true"
-					:opts="{ xAxis: { disabled: true, itemCount: 6, scrollShow: true }, legend: { show: false }, enableScroll: true }"
-				/>
+				<qiun-data-charts type="area" canvas2d canvasId="daskujdhasljkdcnzjkdfhuoqwlqwjhkdsamjczxnmdasd123321"
+					:chartData="chartData" :ontouch="true"
+					:opts="{ xAxis: { disabled: true, itemCount: 6, scrollShow: true }, legend: { show: false }, enableScroll: true }" />
 			</view>
 			<mescroll-empty v-if="!historyData.length" />
 		</view>
@@ -41,166 +50,125 @@
 					<view class="th">变量值</view>
 					<view class="th">更新时间</view>
 				</view>
-				<view class="tr bg-g" :class="{ odd: index % 2 === 0 }" v-for="(item, index) in historyData" :key="index">
+				<view class="tr bg-g" :class="{ odd: index % 2 === 0 }" v-for="(item, index) in historyData"
+					:key="index">
 					<view class="td">{{ item.value }}</view>
 					<view class="td">{{ item.ts }}</view>
 				</view>
 			</view>
 		</view>
-		<u-calendar
-			:show="showCalendar"
-			:defaultDate="defaultDate"
-			closeOnClickOverlay
-			mode="range"
-			startText="开始时间"
-			endText="结束时间"
-			confirmDisabledText="请选择日期"
-			:minDate="minDate"
-			:maxDate="maxDate"
-			@confirm="calendarConfirm"
-			@close="calendarClose"
-		></u-calendar>
-		<u-picker
-			:show="showTimeGap"
-			:columns="columns"
-			keyName="label"
-			closeOnClickOverlay
-			@confirm="confirmTimeGap"
-			@cancel="cancelTimeGap"
-			@close="cancelTimeGap"
-			:defaultIndex="[3]"
-		></u-picker>
-		<u-picker :show="showSelectType" :columns="keys" closeOnClickOverlay @confirm="confirmTypeGap" @cancel="cancelTypeGap" @close="cancelTypeGap"></u-picker>
+		<u-calendar :show="showCalendar" :defaultDate="defaultDate" closeOnClickOverlay mode="range" startText="开始时间"
+			endText="结束时间" confirmDisabledText="请选择日期" :minDate="minDate" :maxDate="maxDate" @confirm="calendarConfirm"
+			@close="calendarClose"></u-calendar>
+		<u-picker :show="showTimeGap" :columns="columns" keyName="label" closeOnClickOverlay @confirm="confirmTimeGap"
+			@cancel="cancelTimeGap" @close="cancelTimeGap" :defaultIndex="[3]"></u-picker>
+		<u-picker :show="showSelectType" :columns="keys" closeOnClickOverlay @confirm="confirmTypeGap"
+			@cancel="cancelTypeGap" @close="cancelTypeGap"></u-picker>
+		<u-picker :show="showSelectAvg" :columns="avgColumns" keyName="label" closeOnClickOverlay
+			@confirm="confirmAvgGap" @cancel="showSelectAvg=false" @close="showSelectAvg=false"></u-picker>
 	</view>
 </template>
 
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue';
-import { getHistoryData } from '../api/index.js';
-import { formatToDate } from '@/plugins/utils.js';
-const d = new Date();
-const year = d.getFullYear();
-let month = d.getMonth() + 1;
-month = month < 10 ? `0${month}` : month;
-const date = d.getDate();
-export default {
-	components: {
-		fTabbar,
-		qiunDataCharts
-	},
-	props: {
-		keys: {
-			type: Array,
-			default: () => []
-		},
-		yesterday: {
-			type: String,
-			default: ''
-		},
-		today: {
-			type: String,
-			default: ''
-		},
-		timeDiff: {
-			type: String,
-			default: ''
-		},
-		historyData: {
-			type: Array,
-			default: () => []
-		},
-		entityId: {
-			type: String,
-			required: true
-		},
-		start: {
-			type: String,
-			required: true
+	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+	import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue';
+	import {
+		getHistoryData
+	} from '../api/index.js';
+	import {
+		formatToDate
+	} from '@/plugins/utils.js';
+	const d = new Date();
+	const year = d.getFullYear();
+	let month = d.getMonth() + 1;
+	month = month < 10 ? `0${month}` : month;
+	const date = d.getDate();
+	export default {
+		components: {
+			fTabbar,
+			qiunDataCharts
 		},
-		end: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			startTs: this.start,
-			endTs: this.end,
-			showCalendar: false,
-			showTimeGap: false,
-			showSelectType: false,
-			minDate: `${year}-${month - 1}-${date}`,
-			maxDate: `${year}-${month}-${date + 1}`,
-			defaultDate: [this.yesterday, this.today],
-			chartData: {
-				categories: this.historyData.length && this.historyData.map(item => item.ts),
-				series: [
-					{
-						name: this.keys[0][0],
-						data: this.historyData.length && this.historyData.map(item => Number(item.value))
-					}
-				]
+		props: {
+			keys: {
+				type: Array,
+				default: () => []
 			},
-			columns: [
-				[
-					{
-						label: '5分钟',
-						value: 300000
-					},
-					{
-						label: '10分钟',
-						value: 600000
-					},
-					{
-						label: '15分钟',
-						value: 900000
-					},
-					{
-						label: '30分钟',
-						value: 1800000
-					},
-					{
-						label: '1小时',
-						value: 3600000
-					},
-					{
-						label: '2小时',
-						value: 7200000
-					}
-				]
-			],
-			timeData: {
-				selectTime: this.yesterday + ' 至 ' + this.today,
-				getTimeGap: this.timeDiff,
-				getType: this.keys[0][0]
-			}
-		};
-	},
-	watch: {
-		historyData(newValue) {
-			if (!newValue.length) {
-				this.chartData.categories = [];
-				this.chartData.series = [];
-			} else {
-				this.chartData.categories = newValue.map(item => item.ts);
-				this.chartData.series = [
-					{
-						name: this.keys[0][0],
-						data: newValue.map(item => Number(item.value))
-					}
-				];
+			yesterday: {
+				type: String,
+				default: ''
+			},
+			today: {
+				type: String,
+				default: ''
+			},
+			timeDiff: {
+				type: String,
+				default: ''
+			},
+			historyData: {
+				type: Array,
+				default: () => []
+			},
+			entityId: {
+				type: String,
+				required: true
+			},
+			start: {
+				type: String,
+				required: true
+			},
+			end: {
+				type: String,
+				required: true
 			}
-		}
-	},
-	methods: {
-		// 动态生成Columns
-		generateColumns(value) {
-			if (value < 604800000) {
-				// 小于7天
-				return [
-					[
+		},
+		data() {
+			return {
+				limitFlag: true,
+				avgColumns: [
+					[{
+							label: '最小值',
+							value: 'MIN'
+						}, {
+							label: '最大值',
+							value: 'MAX'
+						},
+						{
+							label: '平均值',
+							value: 'AVG'
+						},
+						{
+							label: '求和',
+							value: 'SUM'
+						},
+						{
+							label: '计数',
+							value: 'COUNT'
+						},
 						{
+							label: '空',
+							value: 'NONE'
+						},
+					]
+				],
+				startTs: this.start,
+				endTs: this.end,
+				showCalendar: false,
+				showTimeGap: false,
+				showSelectType: false,
+				showSelectAvg: false,
+				minDate: `${year}-${month - 1}-${date}`,
+				maxDate: `${year}-${month}-${date + 1}`,
+				defaultDate: [this.yesterday, this.today],
+				chartData: {
+					categories: this.historyData.length && this.historyData.map(item => item.ts),
+					series: [{
+						name: this.keys[0][0],
+						data: this.historyData.length && this.historyData.map(item => Number(item.value))
+					}]
+				},
+				columns: [
+					[{
 							label: '5分钟',
 							value: 300000
 						},
@@ -225,173 +193,253 @@ export default {
 							value: 7200000
 						}
 					]
-				];
-			} else if (value < 2592000000) {
-				// 小于30天
-				return [
-					[
-						{
-							label: '30分钟',
-							value: 1800000
-						},
-						{
-							label: '1小时',
-							value: 3600000
-						},
-						{
-							label: '2小时',
-							value: 7200000
-						},
-						{
-							label: '5小时',
-							value: 18000000
-						},
-						{
-							label: '10小时',
-							value: 36000000
-						},
-						{
-							label: '12小时',
-							value: 43200000
-						},
-						{
-							label: '1天',
-							value: 86400000
-						}
-					]
-				];
-			} else if (value >= 2592000000) {
-				// 大于30天
-				return [
-					[
-						{
-							label: '2小时',
-							value: 7200000
-						},
-						{
-							label: '5小时',
-							value: 18000000
-						},
-						{
-							label: '10小时',
-							value: 36000000
-						},
-						{
-							label: '12小时',
-							value: 43200000
-						},
-						{
-							label: '1天',
-							value: 86400000
-						}
-					]
-				];
-			}
-		},
-		openCalendar() {
-			this.showCalendar = true;
-		},
-		openTimeGap() {
-			this.showTimeGap = true;
+				],
+				timeData: {
+					selectTime: this.yesterday + ' 至 ' + this.today,
+					getTimeGap: this.timeDiff,
+					getType: this.keys[0][0],
+					limit: 7,
+					agg: 'NONE'
+				},
+				aggText: '空'
+			};
 		},
-		openType() {
-			this.showSelectType = true;
-		},
-		calendarConfirm(date) {
-			this.showCalendar = false;
-			this.timeData.selectTime = `${date[0]} 至 ${date[date.length - 1]}`;
-			// 选择的日期时间差(时间戳)
-			const timeDiff = formatToDate(date[date.length - 1], 'x') - formatToDate(date[0], 'x');
-			const genColumns = this.generateColumns(timeDiff);
-			this.columns = genColumns;
-			this.timeData.getTimeGap = '';
-			this.timeData.getType = '';
-			this.startTs = formatToDate(date[0], 'x');
-			// 最后时间的最后一秒
-			this.endTs = formatToDate(`${date[date.length - 1]} 23:59:59`, 'x');
-		},
-		calendarClose() {
-			this.showCalendar = false;
-		},
-		confirmTimeGap(time) {
-			this.showTimeGap = false;
-			this.timeData.getTimeGap = time.value[0].label;
-			this.timeData.getType = '';
+		watch: {
+			historyData(newValue) {
+				if (!newValue.length) {
+					this.chartData.categories = [];
+					this.chartData.series = [];
+				} else {
+					this.chartData.categories = newValue.map(item => item.ts);
+					this.chartData.series = [{
+						name: this.keys[0][0],
+						data: newValue.map(item => Number(item.value))
+					}];
+				}
+			}
 		},
+		methods: {
+			// 动态生成Columns
+			generateColumns(value) {
+				if (value < 604800000) {
+					// 小于7天
+					return [
+						[{
+								label: '5分钟',
+								value: 300000
+							},
+							{
+								label: '10分钟',
+								value: 600000
+							},
+							{
+								label: '15分钟',
+								value: 900000
+							},
+							{
+								label: '30分钟',
+								value: 1800000
+							},
+							{
+								label: '1小时',
+								value: 3600000
+							},
+							{
+								label: '2小时',
+								value: 7200000
+							}
+						]
+					];
+				} else if (value < 2592000000) {
+					// 小于30天
+					return [
+						[{
+								label: '30分钟',
+								value: 1800000
+							},
+							{
+								label: '1小时',
+								value: 3600000
+							},
+							{
+								label: '2小时',
+								value: 7200000
+							},
+							{
+								label: '5小时',
+								value: 18000000
+							},
+							{
+								label: '10小时',
+								value: 36000000
+							},
+							{
+								label: '12小时',
+								value: 43200000
+							},
+							{
+								label: '1天',
+								value: 86400000
+							}
+						]
+					];
+				} else if (value >= 2592000000) {
+					// 大于30天
+					return [
+						[{
+								label: '2小时',
+								value: 7200000
+							},
+							{
+								label: '5小时',
+								value: 18000000
+							},
+							{
+								label: '10小时',
+								value: 36000000
+							},
+							{
+								label: '12小时',
+								value: 43200000
+							},
+							{
+								label: '1天',
+								value: 86400000
+							}
+						]
+					];
+				}
+			},
+			openCalendar() {
+				this.showCalendar = true;
+			},
+			openTimeGap() {
+				this.showTimeGap = true;
+			},
+			openType() {
+				this.showSelectType = true;
+			},
+			openAvg() {
+				this.showSelectAvg = true
+			},
+			calendarConfirm(date) {
+				this.showCalendar = false;
+				this.timeData.selectTime = `${date[0]} 至 ${date[date.length - 1]}`;
+				// 选择的日期时间差(时间戳)
+				const timeDiff = formatToDate(date[date.length - 1], 'x') - formatToDate(date[0], 'x');
+				const genColumns = this.generateColumns(timeDiff);
+				this.columns = genColumns;
+				this.timeData.getTimeGap = '';
+				this.timeData.getType = '';
+				this.startTs = formatToDate(date[0], 'x');
+				// 最后时间的最后一秒
+				this.endTs = formatToDate(`${date[date.length - 1]} 23:59:59`, 'x');
+			},
+			calendarClose() {
+				this.showCalendar = false;
+			},
+			confirmTimeGap(time) {
+				this.showTimeGap = false;
+				this.timeData.getTimeGap = time.value[0].label;
+				this.timeData.getType = '';
+			},
 
-		cancelTimeGap() {
-			this.showTimeGap = false;
-		},
-		async confirmTypeGap(time) {
-			this.showSelectType = false;
-			this.timeData.getType = time.value[0];
-			const interval = this.columns[0].find(item => item.label === this.timeData.getTimeGap);
-			const data = await getHistoryData({
-				startTs: this.startTs,
-				endTs: this.endTs,
-				keys: this.timeData.getType,
-				interval: interval.value,
-				entityId: this.entityId
-			});
-			this.$emit('update', data[this.timeData.getType]);
-		},
-		cancelTypeGap() {
-			this.showSelectType = false;
+			cancelTimeGap() {
+				this.showTimeGap = false;
+			},
+			confirmAvgGap(e) {
+				this.timeData.agg = e.value[0].value
+				this.aggText = e.value[0].label
+				if (e.value[0].value === 'NONE') {
+					this.limitFlag = true
+					this.timeData.limit = 7
+				} else {
+					this.timeData.limit = null
+					this.limitFlag = false
+				}
+				this.showSelectAvg = false
+			},
+			async confirmTypeGap(time) {
+				this.showSelectType = false;
+				this.timeData.getType = time.value[0];
+				const interval = this.columns[0].find(item => item.label === this.timeData.getTimeGap);
+				const data = await getHistoryData({
+					startTs: this.startTs,
+					endTs: this.endTs,
+					keys: this.timeData.getType,
+					interval: this.limitFlag ? null : interval.value,
+					entityId: this.entityId,
+					limit: this.timeData.limit,
+					agg: this.timeData.agg
+				});
+				this.$emit('update', data[this.timeData.getType]);
+			},
+			cancelTypeGap() {
+				this.showSelectType = false;
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.charts-box {
-	width: 100%;
-	height: 550rpx;
-}
-.historyData {
-	margin: 30rpx;
-	.historyData-top {
-		padding: 30rpx;
-		background-color: #fff;
-		// height: 870rpx;
-		border-radius: 20rpx;
-		.icon {
-			width: 28rpx;
-			height: 28rpx;
-			margin-right: 15rpx;
-		}
+	.charts-box {
+		width: 100%;
+		height: 550rpx;
 	}
-	.historyData-bottom {
-		margin-top: 30rpx;
-		background-color: #fff;
-		border-radius: 20rpx;
-		.table {
-			border: 0px solid darkgray;
-			.tr {
-				display: flex;
-				width: 100%;
-				justify-content: center;
-				height: 3rem;
-				align-items: center;
-				.th {
+
+	.historyData {
+		margin: 30rpx;
+
+		.historyData-top {
+			padding: 30rpx;
+			background-color: #fff;
+			// height: 870rpx;
+			border-radius: 20rpx;
+
+			.icon {
+				width: 28rpx;
+				height: 28rpx;
+				margin-right: 15rpx;
+			}
+		}
+
+		.historyData-bottom {
+			margin-top: 30rpx;
+			background-color: #fff;
+			border-radius: 20rpx;
+
+			.table {
+				border: 0px solid darkgray;
+
+				.tr {
 					display: flex;
+					width: 100%;
 					justify-content: center;
+					height: 3rem;
 					align-items: center;
-					width: 50%;
-					color: #333;
-					font-weight: 500;
-				}
-				.td {
-					color: #999;
-					width: 50%;
-					display: flex;
-					justify-content: center;
-					text-align: center;
+
+					.th {
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						width: 50%;
+						color: #333;
+						font-weight: 500;
+					}
+
+					.td {
+						color: #999;
+						width: 50%;
+						display: flex;
+						justify-content: center;
+						text-align: center;
+					}
 				}
 			}
 		}
 	}
-}
-.odd {
-	background-color: #f9fcff;
-}
+
+	.odd {
+		background-color: #f9fcff;
+	}
 </style>

@@ -4,7 +4,10 @@
 			<view class="device-top">
 				<view class="search">
 					<view>
-						<view class="search-left"><u--input prefixIcon="search" placeholder="输入设备SN或名称搜索" shape="circle" @change="inputChanged"></u--input></view>
+						<view class="search-left">
+							<u--input prefixIcon="search" placeholder="输入设备SN或名称搜索" shape="circle"
+								@change="inputChanged"></u--input>
+						</view>
 					</view>
 					<view @click="openSearchDialog" class="search-right">
 						<text>筛选</text>
@@ -25,19 +28,19 @@
 				</view>
 			</view>
 		</u-sticky>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback"
+			@up="upCallback">
 			<view class="device-list">
-				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)" class="list-item" v-for="item in list" :key="item.id">
-					<view
-						class="u-flex item"
-						style="
+				<view @click="openDeviceDetail(item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)"
+					class="list-item" v-for="item in list" :key="item.id">
+					<view class="u-flex item" style="
 			          justify-content: flex-start;
 			          flex-direction: column;
 			          align-items: center;
-			        "
-					>
+			        ">
 						<view style="width: 450rpx; text-align: left">
-							<text style="color: #333; font-size: 15px;font-weight: bold;">{{ item.name }}</text>
+							<text
+								style="color: #333; font-size: 15px;font-weight: bold;">{{ item.alias?item.alias:item.name }}</text>
 						</view>
 						<view style="width: 450rpx; text-align: left; margin-top: 10rpx">
 							<view style="color: #666; font-size: 14px;display: flex;">
@@ -54,32 +57,26 @@
 					</view>
 					<view class="item">
 						<view class="u-flex" style="margin-top: -6rpx">
-							<image
-								style="
+							<image style="
 			              width: 30rpx;
 			              height: 30rpx;
 			              margin-top: 5rpx;
 			              margin-right: 5rpx;
-			            "
-								:src="
+			            " :src="
 									item.deviceState === 'ONLINE'
 										? '../../static/online.png'
 										: item.deviceState === 'INACTIVE'
 										? '../../static/unonline.png'
 										: '../../static/baojing.png'
-								"
-							/>
+								" />
 
 							<view>
-								<text
-									style="
+								<text style="
 			                color: #377dff;
 			                font-size: 13px;
 			                margin-left: 5rpx;
 			                margin-top: 20rpx;
-			              "
-									:style="{ color: item.deviceState === 'ONLINE' ? '#377DFF' : item.deviceState === 'INACTIVE' ? '#666666' : '#DE4437' }"
-								>
+			              " :style="{ color: item.deviceState === 'ONLINE' ? '#377DFF' : item.deviceState === 'INACTIVE' ? '#666666' : '#DE4437' }">
 									{{ item.deviceState === 'ONLINE' ? '在线' : item.deviceState === 'INACTIVE' ? '待激活' : '离线' }}
 								</text>
 							</view>
@@ -89,15 +86,24 @@
 			</view>
 		</mescroll-body>
 		<!-- 设备筛选 -->
-		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20" @touchmove.stop.prevent="disabledScroll">
+		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20"
+			@touchmove.stop.prevent="disabledScroll">
 			<view class="filter" @touchmove.stop.prevent="disabledScroll">
 				<view class="filter-title"><text>筛选条件</text></view>
-				<FilterItem :filterList="deviceStatus" title="设备状态" @clickTag="currentIndex => handleClickTag(currentIndex, deviceStatus)"></FilterItem>
-				<FilterItem :filterList="alarmStatus" title="告警状态" @clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem>
-				<FilterItem :filterList="typeStatus" title="设备类型" @clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem>
+				<FilterItem :filterList="deviceStatus" title="设备状态"
+					@clickTag="currentIndex => handleClickTag(currentIndex, deviceStatus)"></FilterItem>
+				<FilterItem :filterList="alarmStatus" title="告警状态"
+					@clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem>
+				<FilterItem :filterList="typeStatus" title="设备类型"
+					@clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem>
 				<view class="button-group">
-					<view><u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="重置" @click="resetFilter"></u-button></view>
-					<view><u-button color="#3388ff" shape="circle" text="确认" @click="confirmFilter"></u-button></view>
+					<view>
+						<u-button :customStyle="{ color: '#333' }" color="#e3e3e5" shape="circle" text="重置"
+							@click="resetFilter"></u-button>
+					</view>
+					<view>
+						<u-button color="#3388ff" shape="circle" text="确认" @click="confirmFilter"></u-button>
+					</view>
 				</view>
 			</view>
 		</u-popup>
@@ -106,295 +112,317 @@
 </template>
 
 <script>
-import fTabbar from '@/components/module/f-tabbar/f-tabbar';
-import FilterItem from './FilterItem.vue';
-import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
-import { debounce } from '@/plugins/throttle.js';
-export default {
-	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
-	components: {
-		fTabbar,
-		FilterItem
-	},
-	data() {
-		return {
-			downOption: {
-				auto: false //是否在初始化后,自动执行downCallback; 默认true
-			},
-			upOption: {
-				isBounce: false,
-				auto: false // 不自动加载
-			},
-			show: false,
-			deviceStatus: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
-				},
-				{
-					checked: false,
-					name: '在线',
-					type: 'ONLINE'
-				},
-				{
-					checked: false,
-					name: '离线',
-					type: 'OFFLINE'
-				},
-				{
-					checked: false,
-					name: '待激活',
-					type: 'INACTIVE'
-				}
-			],
-			alarmStatus: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
-				},
-				{
-					checked: false,
-					name: '告警',
-					type: '1'
+	import fTabbar from '@/components/module/f-tabbar/f-tabbar';
+	import FilterItem from './FilterItem.vue';
+	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+	import {
+		debounce
+	} from '@/plugins/throttle.js';
+	export default {
+		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+		components: {
+			fTabbar,
+			FilterItem
+		},
+		data() {
+			return {
+				downOption: {
+					auto: false //是否在初始化后,自动执行downCallback; 默认true
 				},
-				{
-					checked: false,
-					name: '正常',
-					type: '0'
-				}
-			],
-			typeStatus: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
+				upOption: {
+					isBounce: false,
+					auto: false // 不自动加载
 				},
+				show: false,
+				deviceStatus: [{
+						checked: true,
+						name: '全部',
+						type: ''
+					},
+					{
+						checked: false,
+						name: '在线',
+						type: 'ONLINE'
+					},
+					{
+						checked: false,
+						name: '离线',
+						type: 'OFFLINE'
+					},
+					{
+						checked: false,
+						name: '待激活',
+						type: 'INACTIVE'
+					}
+				],
+				alarmStatus: [{
+						checked: true,
+						name: '全部',
+						type: ''
+					},
+					{
+						checked: false,
+						name: '告警',
+						type: '1'
+					},
+					{
+						checked: false,
+						name: '正常',
+						type: '0'
+					}
+				],
+				typeStatus: [{
+						checked: true,
+						name: '全部',
+						type: ''
+					},
 
-				{
-					checked: false,
-					name: '直连设备',
-					type: 'DIRECT_CONNECTION'
-				},
-				{
-					checked: false,
-					name: '网关设备',
-					type: 'GATEWAY'
+					{
+						checked: false,
+						name: '直连设备',
+						type: 'DIRECT_CONNECTION'
+					},
+					{
+						checked: false,
+						name: '网关设备',
+						type: 'GATEWAY'
+					},
+					{
+						checked: false,
+						name: '网关子设备',
+						type: 'SENSOR'
+					}
+				],
+				total: 0,
+				list: [],
+				page: {
+					num: 0,
+					size: 10
 				},
-				{
-					checked: false,
-					name: '网关子设备',
-					type: 'SENSOR'
-				}
-			],
-			total: 0,
-			list: [],
-			page: {
-				num: 0,
-				size: 10
-			},
-			deviceState: '',
-			deviceName: ''
-		};
-	},
-	async onLoad(options) {
-		// 隐藏原生的tabbar
-		uni.hideTabBar();
-		this.page.num = 1;
-		const { deviceState } = options;
-		this.deviceState = deviceState;
-		if (deviceState) {
-			this.deviceStatus.forEach(item => {
-				item.type === deviceState ? (item.checked = true) : (item.checked = false);
-			});
-			await this.loadData(1, {
-				deviceState
-			});
-		} else {
-			await this.loadData(1);
-		}
-		if (!this.list.length) {
-			this.mescroll.showEmpty();
-		}
-	},
-	onShow() {
-		if (this.orgId) {
-			this.loadData(1, {
-				organizationId: this.orgId
-			});
-		}
-	},
-	methods: {
-		disabledScroll() {
-			return;
+				deviceState: '',
+				deviceName: ''
+			};
 		},
-		/*下拉刷新的回调 */
-		downCallback() {
-			this.deviceName = '';
-			this.orgId = '';
-			//联网加载数据
-			this.list = [];
+		async onLoad(options) {
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
 			this.page.num = 1;
-			//联网加载数据
-			this.resetFilter();
-			this.loadData(this.page.num);
+			const {
+				deviceState
+			} = options;
+			this.deviceState = deviceState;
+			if (deviceState) {
+				this.deviceStatus.forEach(item => {
+					item.type === deviceState ? (item.checked = true) : (item.checked = false);
+				});
+				await this.loadData(1, {
+					deviceState
+				});
+			} else {
+				await this.loadData(1);
+			}
+			if (!this.list.length) {
+				this.mescroll.showEmpty();
+			}
 		},
-
-		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-		upCallback() {
-			//联网加载数据
-			this.page.num += 1;
-			const deviceState = this.deviceStatus.find(item => item.checked);
-			const alarmStatus = this.alarmStatus.find(item => item.checked);
-			const deviceType = this.typeStatus.find(item => item.checked);
-			this.loadData(this.page.num, {
-				deviceState: deviceState.type ? deviceState.type : undefined,
-				deviceType: deviceType.type ? deviceType.type : undefined,
-				alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type : undefined,
-				name: this.deviceName == null ? null : this.deviceName,
-				organizationId: this.orgId == null ? null : this.orgId
-			});
+		onShow() {
+			if (this.orgId) {
+				this.loadData(1, {
+					organizationId: this.orgId
+				});
+			}
 		},
+		methods: {
+			disabledScroll() {
+				return;
+			},
+			/*下拉刷新的回调 */
+			downCallback() {
+				this.deviceName = '';
+				this.orgId = '';
+				//联网加载数据
+				this.list = [];
+				this.page.num = 1;
+				//联网加载数据
+				this.resetFilter();
+				this.loadData(this.page.num);
+			},
 
-		//获取设备
-		async loadData(pageNo, params = {}) {
-			try {
-				let httpData = {
-					page: pageNo,
-					pageSize: 10,
-					...params
-				};
-				const { total, items } = await uni.$u.http.get('/yt/device', {
-					params: httpData,
-					custom: {
-						load: false
-					}
+			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+			upCallback() {
+				//联网加载数据
+				this.page.num += 1;
+				const deviceState = this.deviceStatus.find(item => item.checked);
+				const alarmStatus = this.alarmStatus.find(item => item.checked);
+				const deviceType = this.typeStatus.find(item => item.checked);
+				this.loadData(this.page.num, {
+					deviceState: deviceState.type ? deviceState.type : undefined,
+					deviceType: deviceType.type ? deviceType.type : undefined,
+					alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type :
+						undefined,
+					name: this.deviceName == null ? null : this.deviceName,
+					organizationId: this.orgId == null ? null : this.orgId
 				});
-				this.total = total;
-				uni.stopPullDownRefresh();
-				this.mescroll.endByPage(items.length, total); //必传参数(当前页的数据个数, 总页数)
-				if (pageNo == 1) {
-					this.list = items;
-				} else {
-					this.list = this.list.concat(items);
+			},
+
+			//获取设备
+			async loadData(pageNo, params = {}) {
+				try {
+					let httpData = {
+						page: pageNo,
+						pageSize: 10,
+						...params
+					};
+					const {
+						total,
+						items
+					} = await uni.$u.http.get('/yt/device', {
+						params: httpData,
+						custom: {
+							load: false
+						}
+					});
+					this.total = total;
+					uni.stopPullDownRefresh();
+					this.mescroll.endByPage(items.length, total); //必传参数(当前页的数据个数, 总页数)
+					if (pageNo == 1) {
+						this.list = items;
+					} else {
+						this.list = this.list.concat(items);
+					}
+				} catch {
+					this.mescroll.endErr();
 				}
-			} catch {
-				this.mescroll.endErr();
+			},
+			openOrg() {
+				uni.navigateTo({
+					url: './org/org'
+				});
+			},
+			close() {
+				this.show = false;
+			},
+			openSearchDialog() {
+				this.show = true;
+			},
+			openDeviceDetail(id, alarmStatus, lastOnlineTime, tbDeviceId) {
+				uni.navigateTo({
+					url: `/deviceSubPage/deviceDetailPage/deviceDetail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}`
+				});
+			},
+			handleClickTag(currentIndex, list) {
+				list.map((item, index) => {
+					item.checked = index === currentIndex;
+				});
+			},
+			resetFilter() {
+				const {
+					deviceStatus,
+					alarmStatus,
+					typeStatus
+				} = this;
+				[deviceStatus, alarmStatus, typeStatus].forEach(item => item.map((item, index) => (item.checked = index ===
+					0)));
+			},
+			confirmFilter() {
+				const deviceState = this.deviceStatus.find(item => item.checked);
+				const alarmStatus = this.alarmStatus.find(item => item.checked);
+				const deviceType = this.typeStatus.find(item => item.checked);
+				this.loadData(1, {
+					deviceState: deviceState.type ? deviceState.type : undefined,
+					deviceType: deviceType.type ? deviceType.type : undefined,
+					alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type :
+						undefined
+				});
+				this.show = false;
+			},
+			inputChanged(e) {
+				this.page.num = 1;
+				this.deviceName = e;
+				this.loadData(1, {
+					name: this.deviceName
+				});
 			}
-		},
-		openOrg() {
-			uni.navigateTo({
-				url: './org/org'
-			});
-		},
-		close() {
-			this.show = false;
-		},
-		openSearchDialog() {
-			this.show = true;
-		},
-		openDeviceDetail(id, alarmStatus, lastOnlineTime, tbDeviceId) {
-			uni.navigateTo({
-				url: `/deviceSubPage/deviceDetailPage/deviceDetail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}`
-			});
-		},
-		handleClickTag(currentIndex, list) {
-			list.map((item, index) => {
-				item.checked = index === currentIndex;
-			});
-		},
-		resetFilter() {
-			const { deviceStatus, alarmStatus, typeStatus } = this;
-			[deviceStatus, alarmStatus, typeStatus].forEach(item => item.map((item, index) => (item.checked = index === 0)));
-		},
-		confirmFilter() {
-			const deviceState = this.deviceStatus.find(item => item.checked);
-			const alarmStatus = this.alarmStatus.find(item => item.checked);
-			const deviceType = this.typeStatus.find(item => item.checked);
-			this.loadData(1, {
-				deviceState: deviceState.type ? deviceState.type : undefined,
-				deviceType: deviceType.type ? deviceType.type : undefined,
-				alarmStatus: alarmStatus.type === '0' || alarmStatus.type === '1' ? alarmStatus.type : undefined
-			});
-			this.show = false;
-		},
-		inputChanged(e) {
-			this.page.num = 1;
-			this.deviceName = e;
-			this.loadData(1, {
-				name: this.deviceName
-			});
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.device-page {
-	min-height: 100vh;
-	background-color: #f8f9fa;
-}
-.device-top {
-	padding: 10rpx 30rpx;
-	background-color: #fff;
-	.search {
-		display: flex;
-		justify-content: space-between;
-		padding-bottom: 10rpx;
-		.search-left {
-			width: 580rpx;
-			background-color: #f8f9fa;
-			border-radius: 200rpx;
-		}
-		.search-right {
+	.device-page {
+		min-height: 100vh;
+		background-color: #f8f9fa;
+	}
+
+	.device-top {
+		padding: 10rpx 30rpx;
+		background-color: #fff;
+
+		.search {
 			display: flex;
-			align-items: center;
-			text {
-				color: #333;
-				font-size: 14px;
+			justify-content: space-between;
+			padding-bottom: 10rpx;
+
+			.search-left {
+				width: 580rpx;
+				background-color: #f8f9fa;
+				border-radius: 200rpx;
 			}
-			image {
-				width: 40rpx;
-				height: 40rpx;
+
+			.search-right {
+				display: flex;
+				align-items: center;
+
+				text {
+					color: #333;
+					font-size: 14px;
+				}
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
 			}
 		}
 	}
-}
 
-.device-list {
-	display: flex;
-	flex-direction: column;
-	padding-left: 20rpx;
-	.list-item {
-		width: 713rpx;
-		height: 200rpx;
-		background-color: #fff;
-		margin-top: 24rpx;
+	.device-list {
 		display: flex;
-		border-radius: 10px;
-		justify-content: space-between;
-		.item {
-			margin: 30rpx;
+		flex-direction: column;
+		padding-left: 20rpx;
+
+		.list-item {
+			width: 713rpx;
+			height: 200rpx;
+			background-color: #fff;
+			margin-top: 24rpx;
+			display: flex;
+			border-radius: 10px;
+			justify-content: space-between;
+
+			.item {
+				margin: 30rpx;
+			}
 		}
 	}
-}
 
-.filter {
-	padding: 0 30rpx;
-	.filter-title {
-		text-align: center;
-		margin-top: 14px;
-		font-size: 16px;
-		font-weight: 700;
-	}
-	.button-group {
-		display: flex;
-		margin-top: 40rpx;
-		justify-content: space-between;
-		view {
-			width: 330rpx;
+	.filter {
+		padding: 0 30rpx;
+
+		.filter-title {
+			text-align: center;
+			margin-top: 14px;
+			font-size: 16px;
+			font-weight: 700;
+		}
+
+		.button-group {
+			display: flex;
+			margin-top: 40rpx;
+			justify-content: space-between;
+
+			view {
+				width: 330rpx;
+			}
 		}
 	}
-}
 </style>

@@ -48,6 +48,9 @@ button {
 }
 ///////////////////////////////////////////////////////////////小程序、app抽取公共样式/////////////////////////////////////////////////////////////////////
 //通用（设备、告警、摄像头分页头部组织和设备数和设备、告警里面的详情（左边的文本）
+.ml-10{
+	margin-left: 10rpx;
+}
 .text-org-bold {
 	width:200rpx;
 	color: #333333;