Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-app!153

 //获取首页统计数据API
 const getHomeStatisticsApi = () => {
-	return uni.$u.http.get("/yt/homepage/app?login=false")
-};
+  return uni.$u.http.get('/yt/homepage/app?login=false')
+}
 
 //获取视频分页API
 const getCameraApi = (params = {}) => {
-	return uni.$u.http
-		.get('/yt/video', params)
-};
+  return uni.$u.http.get('/yt/video', params)
+}
 
 //获取视频详情API
 const byCameraIdGetDetailApi = (id) => {
-	return uni.$u.http.get(`/yt/video/url/${id}`)
-};
+  return uni.$u.http.get(`/yt/video/url/${id}`)
+}
+
+const getCameraGBTUrl = (deviceId, channelId) => {
+  return uni.$u.http.get(`/yt/video/control/start/${deviceId}/${channelId}`)
+}
 
 //获取组态分页API
 const getConfigurationApi = (params = {}) => {
-	return uni.$u.http
-		.get('/yt/configuration/center', params)
+  return uni.$u.http.get('/yt/configuration/center', params)
 }
 
 // 获取看板分页API
 const getVisualBoardApi = (params) => {
-	return uni.$u.http.get('yt/data_board',params)
+  return uni.$u.http.get('yt/data_board', params)
 }
 
 //获取组织列表
 const getMeOrgListApi = () => {
-	return uni.$u.http
-		.get('/yt/organization/me/list')
+  return uni.$u.http.get('/yt/organization/me/list')
 }
 
 export default {
-	getHomeStatisticsApi,
-	getCameraApi,
-	byCameraIdGetDetailApi,
-	getConfigurationApi,
-	getMeOrgListApi,
-	getVisualBoardApi
+  getHomeStatisticsApi,
+  getCameraApi,
+  byCameraIdGetDetailApi,
+  getConfigurationApi,
+  getMeOrgListApi,
+  getVisualBoardApi,
+  getCameraGBTUrl,
 }

@@ -17,7 +17,7 @@
 				</view>
 			</view>
 			<!-- 命令下发 设备在线并且不是网关子设备 -->
-			<view class="mr-2" v-if="deviceDetail.deviceState === 'ONLINE' && deviceDetail.deviceType !== 'SENSOR'">
+			<view class="mr-2" v-if="deviceDetail.deviceState === 'ONLINE' && deviceDetail.transportType!==deviceTypeNum.GBT">
 				<!-- #ifdef MP -->
 				<u-button type="primary" shape="circle" size="mini" text="下发命令" @click="handleMpShowModal" />
 				<!-- #endif -->
@@ -112,11 +112,11 @@
 
 <script>
 	import {formatToDate} from '@/plugins/utils.js';
-	import {issueCommand} from '../api/index.js';
 	import api from '@/api/index.js';
 	import mpCommandIssuance from './mp-command-issuance.vue';
 	import {commandTypeList} from '../config/data.js'
 	import {useShowModal} from '@/plugins/utils.js'
+	import {deviceTypeNum} from '../config/data'
 	
 	export default {
 		components: {
@@ -133,6 +133,7 @@
 				showNativeModal: false,
 				current: 0,
 				commandTypeList,
+				deviceTypeNum:deviceTypeNum,
 				commandTypeStr: 'OneWay',
 				inputCommandContent: '',
 				mpShowModal: false,
@@ -414,4 +415,4 @@
 	/deep/ .u-modal__content {
 		padding: 30rpx 0 !important;
 	}
-</style>
\ No newline at end of file
+</style>

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

@@ -2,8 +2,8 @@
 	<view class="realtime-page">
 		<view class="item" v-for="(item, index) in recordList" :key="index">
 			<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 class="item-time">{{ item.time }}</view>
 		</view>
@@ -18,10 +18,10 @@
 				type: Array,
 				default: () => []
 			}
-		}
+		},
 	};
 </script>
 
 <style lang="scss" scoped>
 	@import "../static/realtime-data.scss";
-</style>
\ No newline at end of file
+</style>

-const list = [{
-		name: "基础信息",
-	},
-	{
-		name: "实时数据",
-	},
-	{
-		name: "历史数据",
-	},
-	{
-		name: "告警记录",
-	},
+const list = [
+  {
+    name: '基础信息',
+  },
+  {
+    name: '实时数据',
+  },
+  {
+    name: '历史数据',
+  },
+  {
+    name: '告警记录',
+  },
 ]
 
-const issueStatus = [{
-		checked: true,
-		name: '全部',
-		type: ''
-	},
-	{
-		checked: false,
-		name: '队列中',
-		type: 'QUEUED'
-	},
-	{
-		checked: false,
-		name: '已发送',
-		type: 'SENT'
-	},
-	{
-		checked: false,
-		name: '发送成功',
-		type: 'DELIVERED'
-	},
-	{
-		checked: false,
-		name: '响应成功',
-		type: 'SUCCESSFUL'
-	},
-	{
-		checked: false,
-		name: '超时',
-		type: 'TIMEOUT'
-	},
-	{
-		checked: false,
-		name: '已过期',
-		type: 'EXPIRED'
-	},
-	{
-		checked: false,
-		name: '响应失败',
-		type: 'FAILED'
-	},
-	{
-		checked: false,
-		name: '已删除',
-		type: 'DELETED'
-	}
+const issueStatus = [
+  {
+    checked: true,
+    name: '全部',
+    type: '',
+  },
+  {
+    checked: false,
+    name: '队列中',
+    type: 'QUEUED',
+  },
+  {
+    checked: false,
+    name: '已发送',
+    type: 'SENT',
+  },
+  {
+    checked: false,
+    name: '发送成功',
+    type: 'DELIVERED',
+  },
+  {
+    checked: false,
+    name: '响应成功',
+    type: 'SUCCESSFUL',
+  },
+  {
+    checked: false,
+    name: '超时',
+    type: 'TIMEOUT',
+  },
+  {
+    checked: false,
+    name: '已过期',
+    type: 'EXPIRED',
+  },
+  {
+    checked: false,
+    name: '响应失败',
+    type: 'FAILED',
+  },
+  {
+    checked: false,
+    name: '已删除',
+    type: 'DELETED',
+  },
 ]
 
-const commandTypeList = [{
-		value: 'OneWay',
-		name: '单向',
-	},
-	{
-		value: 'TwoWay',
-		name: '双向'
-	},
+const commandTypeList = [
+  {
+    value: 'OneWay',
+    name: '单向',
+  },
+  {
+    value: 'TwoWay',
+    name: '双向',
+  },
 ]
 
+const deviceTypeNum = {
+  GBT: 'GBT28181',
+}
 
-export {
-	list,
-	issueStatus,
-	commandTypeList
-}
\ No newline at end of file
+export { list, issueStatus, commandTypeList, deviceTypeNum }

@@ -3,220 +3,236 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<u-sticky :bgColor="bgColor">
-			<u-tabs :list="list" :current="currentTab" @click="handleTabClick" :activeStyle="activeColor"
-				:inactiveStyle="inActiveColor" :scrollable="isScrollable" />
+			<u-tabs :list="list" :current="currentTab" :lineWidth="transportType == deviceTypeNum.GBT?0:30" @click=" handleTabClick " :activeStyle="{activeColor}"
+				:inactiveStyle="inActiveColor" :scrollable="isScrollable" itemStyle="padding: 0 11px;display:flex;flex-direction:row;align-items:center;justify-content:start;height:44px" />
 		</u-sticky>
 		<view class="mt-3">
-			<basic-info v-show="currentTab == 0" :deviceDetail="deviceDetail" />
-			<realtime-data v-show="currentTab === 1" :recordList="recordList" />
-			<history-data v-if="currentTab === 2" :keys="keys" :yesterday="yesterday" :today="today"
-				:timeDiff="timeDiff" :historyData="historyData" :entityId="entityId" :start="startTs" :end="endTs"
-				@update="handleUpdate" />
-			<alarm-history v-show="currentTab === 3" :deviceId="deviceId" />
-			<commond-record v-if="currentTab === 4" :tbDeviceId="entityId" />
+			<basic-info v-show=" currentTab == 0 " :deviceDetail=" deviceDetail " />
+			<realtime-data v-show=" currentTab === 1 " :recordList=" recordList " />
+			<history-data v-if=" currentTab === 2 " :keys=" keys " :yesterday=" yesterday " :today=" today " :timeDiff=" timeDiff "
+				:historyData=" historyData " :entityId=" entityId " :start=" startTs " :end=" endTs " @update=" handleUpdate " />
+			<alarm-history v-show=" currentTab === 3 " :deviceId=" deviceId " />
+			<commond-record v-if=" currentTab === 4 " :tbDeviceId=" entityId " />
 		</view>
 	</view>
 </template>
 
 <script>
-	import fTabbar from "@/components/module/f-tabbar/f-tabbar";
-	import basicInfo from "./components/basic-info.vue";
-	import realtimeData from "./components/realtime-data.vue";
-	import alarmHistory from "./components/alarm-history.vue";
-	import historyData from "./components/history-data.vue";
-	import commondRecord from "./components/command-record.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 { list } from './config/data.js'
-	import api from '@/api'
+import fTabbar from "@/components/module/f-tabbar/f-tabbar";
+import basicInfo from "./components/basic-info.vue";
+import realtimeData from "./components/realtime-data.vue";
+import alarmHistory from "./components/alarm-history.vue";
+import historyData from "./components/history-data.vue";
+import commondRecord from "./components/command-record.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 { list } from './config/data.js'
+import api from '@/api'
+import { deviceTypeNum } from './config/data'
 
-	export default {
-		mixins: [MescrollCompMixin],
-		components: {
-			fTabbar,
-			basicInfo,
-			realtimeData,
-			alarmHistory,
-			historyData,
-			commondRecord,
-		},
-		data() {
-			return {
-				bgColor: '#fff',
-				activeColor: {
-					fontWeight: 'bold',
-					color: '#333',
-				},
-				inActiveColor: {
-					color: '#999',
-				},
-				list,
-				currentTab: 0,
-				deviceId: "",
-				deviceDetail: {},
-				keys: [],
-				yesterday: "",
-				today: "",
-				timeDiff: "",
-				historyData: [],
-				entityId: "",
-				startTs: "",
-				endTs: "",
-				recordList: [], //实时数据
-				isScrollable: false,
-				attrList: [],
-				getAttrList:[]
-			};
-		},
-		onUnload() {
-			// 页面关闭时,销毁webSocket连接,否则第二次会存在连接不到的情况
-			uni.closeSocket();
-		},
-		async onLoad(options) {
-			const {id,alarmStatus,lastOnlineTime,tbDeviceId,deviceProfileId} = options;
-			this.deviceId = id;
-			const res = await api.deviceApi.getDeviceDetail(this.deviceId)
-			if(!res) return
-			this.deviceDetail = {
-				...res,
-				alarmStatus,
-				lastOnlineTime,
-			};
-			// 设备类型不是网关子设备的添加一个命令记录的选项卡
-			if (this.deviceDetail.deviceType !== "SENSOR") {
-				this.list.push({
-					name: "命令记录",
-				});
-				const res = new Map()
-				this.list = this.list.filter((item) => !res.has(item.name) && res.set(item.name, 1))
-			} else {
-				this.list = this.list.filter(item => item.name !=='命令记录')
-			}
-			this.isScrollable = this.list.length > 4;
-			if (res.deviceProfileId) {
-				this.getAttrList = await api.deviceApi.getAttribute(res.deviceProfileId)
-				if (Array.isArray(this.getAttrList)) {
-					this.attrList = this.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: () => {},
+export default {
+	mixins: [MescrollCompMixin],
+	components: {
+		fTabbar,
+		basicInfo,
+		realtimeData,
+		alarmHistory,
+		historyData,
+		commondRecord,
+	},
+	data() {
+		return {
+			bgColor: '#fff',
+			activeColor: {
+				fontWeight: 'bold',
+				color: '#333',
+			},
+			inActiveColor: {
+				color: '#999',
+			},
+			list,
+			currentTab: 0,
+			deviceId: "",
+			deviceDetail: {},
+			keys: [],
+			yesterday: "",
+			today: "",
+			timeDiff: "",
+			historyData: [],
+			entityId: "",
+			startTs: "",
+			endTs: "",
+			recordList: [], //实时数据
+			isScrollable: false,
+			attrList: [],
+			getAttrList: [],
+			transportType:"",
+			deviceTypeNum,
+		};
+	},
+	onUnload() {
+		// 页面关闭时,销毁webSocket连接,否则第二次会存在连接不到的情况
+		uni.closeSocket();
+	},
+	async onLoad(options) {
+		const { id, alarmStatus, lastOnlineTime, tbDeviceId, deviceProfileId, transportType } = options;
+		this.deviceId = id;
+		this.transportType = transportType
+		const res = await api.deviceApi.getDeviceDetail(this.deviceId)
+		if (!res) return
+		this.deviceDetail = {
+			...res,
+			alarmStatus,
+			lastOnlineTime,
+			transportType
+		};
+		// 设备类型不是网关子设备的添加一个命令记录的选项卡
+		if (this.deviceDetail.deviceType !== "SENSOR") {
+			this.list.push({
+				name: "命令记录",
 			});
-			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() {},
-				});
+			const res = new Map()
+			this.list = this.list.filter((item) => !res.has(item.name) && res.set(item.name, 1))
+		} else {
+			this.list = this.list.filter(item => item.name !== '命令记录')
+		}
+		if (transportType === deviceTypeNum.GBT) {
+			this.list = this.list.filter(item => item.name == '基础信息')
+		}
+		this.isScrollable = this.list.length > 4;
+		if (res.deviceProfileId) {
+			this.getAttrList = await api.deviceApi.getAttribute(res.deviceProfileId)
+			if (Array.isArray(this.getAttrList)) {
+				this.attrList = this.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);
-					}
+		});
+		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);
+			}
+			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;
 					}
 				});
-				this.recordList = this.recordList.map((item) => {
-					return {
-						...item,
-						time: formatToDate(item.time, "YYYY-MM-DD HH:mm:ss"),
-					};
-				});
+				if (!flag) {
+					this.recordList.unshift(item);
+				}
 			});
-			const keys = await getDeviceKeys(tbDeviceId);
-			this.keys = [this.getAttrList.map(item=>item.identifier)];
-			// 昨天
-			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,
-				limit: 7,
-				agg: 'NONE'
+			this.recordList = this.recordList?.map((item) => {
+				return {
+					...item,
+					time: formatToDate(item.time, "YYYY-MM-DD HH:mm:ss"),
+				};
 			});
-			this.timeDiff = "30分钟";
-			if (!Object.keys(data).length) return;
-			this.historyData = data[keys[0]].map((item) => {
+			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);
+		this.keys = this.getAttrList || []
+		// 昨天
+		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,
+			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, 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"),
 				};
 			});
 		},
-		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;
-	}
+.device-detail-page {
+	height: 100vh;
+	background-color: #f8f9fa;
+}
 </style>

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

@@ -67,7 +67,8 @@
 			async getVerifyCode() {
 				const phoneRegular = /^1\d{10}$/;
 				if (this.readonly) {
-					useShowToast('验证码已发送~')
+					// useShowToast('验证码已发送~')
+					return
 				}
 				if (!this.loginForm.phoneNumber) {
 					return useShowToast('请输入手机号~')
@@ -130,4 +131,4 @@
 
 <style lang="scss" scoped>
 	@import './static/code.scss';
-</style>
\ No newline at end of file
+</style>

@@ -122,16 +122,16 @@
 							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,
 				dateTime: Number(new Date()),

@@ -85,6 +85,7 @@ import {mapActions } from 'vuex'
 		},
 		onHide() {
 			this.ordId = ''
+			this.paramsStaus = ''
 		},
 		onLoad(e) {
 			if (getApp().getBindNot()) {
@@ -107,9 +108,6 @@ import {mapActions } from 'vuex'
 			}
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-			if (getApp().getBindNot()) {
-				return
-			}
 		},
 		computed: {
 			pageDisableScroll() {

 <template>
 	<view class="device-list">
-		<view @click="$emit('openDeviceDetail',item.id, item.alarmStatus, item.lastOnlineTime, item.tbDeviceId)"
+		<view @click="$emit('openDeviceDetail',item)"
 			class="list-item" v-for="item in list" :key="item.id">
 			<view class="u-flex item">
 				<view class="item-text text-clip">
@@ -122,4 +122,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>

@@ -58,8 +58,8 @@
 				});
 			},
 			resetFilter() {
-				const {deviceStatus,alarmStatus,typeStatus} = this;
-				[deviceStatus, alarmStatus, typeStatus].forEach(item => item.map((item, index) => (item.checked = index ===0)));
+				const {deviceStatus,alarmStatus,typeStatus,collectStatus} = this;
+				[deviceStatus, alarmStatus, typeStatus,collectStatus].forEach(item => item.map((item, index) => (item.checked = index ===0)));
 			},
 			confirmFilter() {
 				const deviceState = this.deviceStatus.find(item => item.checked);

@@ -64,9 +64,7 @@
 			if (getApp().getBindNot()) {
 				return
 			}
-			if (!e.deviceState) {
-				this.loadData(1);
-			} else {
+			if (e.deviceState) {
 				let params = JSON.parse(e.deviceState);
 				this.conditions = {
 					deviceState: params
@@ -87,7 +85,9 @@
 				this.conditions = {
 					organizationId: this.ordId
 				}
+				return
 			}
+			this.loadData(1);
 		},
 		methods: {
 			inputChanged(e) {
@@ -197,9 +197,10 @@
 					this.resetQuery();
 				})
 			},
-			openDeviceDetail(id, alarmStatus, lastOnlineTime, tbDeviceId) {
+			openDeviceDetail(values) {
+				const {id, alarmStatus, lastOnlineTime, tbDeviceId,transportType} = values || {}
 				uni.navigateTo({
-					url: `/device-subpackage/device-detail/device-detail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}`
+					url: `/device-subpackage/device-detail/device-detail?id=${id}&alarmStatus=${alarmStatus}&lastOnlineTime=${lastOnlineTime}&tbDeviceId=${tbDeviceId}&transportType=${transportType}`
 				});
 			},
 		}

@@ -3,30 +3,30 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<header-org @openOrg="openOrg" :total="cameraTotal" title="摄像头数：" :imageSrc="imageSrc"></header-org>
-		<view style="height: 150rpx;"></view>
+		<view style="height: 150rpx"></view>
 		<!-- 自带分页组件 -->
-		<mescroll-body height="80%" ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback"
-			@up="upCallback">
+		<mescroll-body height="80%" ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption"
+			@down="downCallback" @up="upCallback">
 			<view class="camera-container">
 				<view class="container-item">
 					<!-- #ifdef MP-WEIXIN -->
-					<view v-for="(item, index) in list" :key="item.id" class="item" >
+					<view v-for="(item, index) in list" :key="item.id" class="item">
 						<video :data-id="item.id" :data-accessMode="item.accessMode" :key="item.id" preload="none"
 							:id="'video' + item.id" class="video" :src="item.videoUrl" controls :title="item.name"
-							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn
-							:poster="item.avatar" @play="playVideo"></video>
-						<view  class="bottom-text text-clip w-300">
+							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn :poster="item.avatar"
+							@play="playVideo"></video>
+						<view class="bottom-text text-clip w-300">
 							<text class="text">{{ item.name }}</text>
 						</view>
 					</view>
 					<!-- #endif -->
 					<!-- #ifdef APP-PLUS -->
-					<cover-view v-for="(item, index) in list" :key="item.id" class="item" style="overflow: hidden;">
+					<cover-view v-for="(item, index) in list" :key="item.id" class="item" style="overflow: hidden">
 						<video :data-id="item.id" :data-accessMode="item.accessMode" :key="item.id" preload="none"
 							:id="'video' + item.id" class="video" :src="item.videoUrl" controls :title="item.name"
-							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn
-							:poster="item.avatar" @play="playVideo"></video>
-						<cover-view  class="bottom-text text-clip w-300">
+							x5-video-player-type="h5" x5-video-orientation="portraint" show-mute-btn :poster="item.avatar"
+							@play="playVideo"></video>
+						<cover-view class="bottom-text text-clip w-300">
 							<cover-view class="text">{{ item.name }}</cover-view>
 						</cover-view>
 					</cover-view>
@@ -36,133 +36,170 @@
 			<!-- <mescroll-empty v-if="!list.length" /> -->
 		</mescroll-body>
 		<!-- 自带分页组件 -->
-		<view style="height: 60rpx;"></view>
+		<view style="height: 60rpx"></view>
 	</view>
 </template>
 
 <script>
-	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
-	import api from '@/api/index.js'
-	import {
-		useNavigateTo
-	} from '@/plugins/utils.js'
-	import headerOrg from '@/components/common/header-org.vue'
+import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js'
+import api from '@/api/index.js'
+import { useNavigateTo } from '@/plugins/utils.js'
+import headerOrg from '@/components/common/header-org.vue'
+import store from '@/store'
 
-	export default {
-		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
-		components:{
-			headerOrg
+export default {
+	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
+	components: {
+		headerOrg,
+	},
+	data() {
+		return {
+			imageSrc: '/static/camer.png',
+			page: {
+				num: 0,
+				size: 10,
+			},
+			downOption: {
+				auto: true, //是否在初始化后,自动执行downCallback; 默认true
+			},
+			upOption: {
+				auto: false, // 不自动加载
+			},
+			current: 0,
+			cameraTotal: 0,
+			list: [],
+			ordId: '',
+		}
+	},
+	onShow() {
+		if (this.ordId) {
+			this.loadData(1, this.ordId)
+		}
+	},
+	onHide() {
+		this.ordId = ''
+	},
+	onUnload(){
+		store.commit('setLoadingShow', false)
+	},
+	onLoad() {
+		// 隐藏原生的tabbar
+		uni.hideTabBar()
+	},
+	methods: {
+		/*下拉刷新的回调 */
+		downCallback() {
+			//联网加载数据
+			this.page.num = 1
+			this.loadData(1)
 		},
-		data() {
-			return {
-				imageSrc:'/static/camer.png',
-				page: {
-					num: 0,
-					size: 10
-				},
-				downOption: {
-					auto: true //是否在初始化后,自动执行downCallback; 默认true
-				},
-				upOption: {
-					auto: false // 不自动加载
-				},
-				current: 0,
-				cameraTotal: 0,
-				list: [],
-				ordId: '',
-			};
+		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+		upCallback() {
+			//联网加载数据
+			this.page.num += 1
+			this.loadData(this.page.num)
 		},
-		onShow() {
-			if (this.ordId) {
-				this.loadData(1, this.ordId);
+		async loadData(pageNo, organizationId) {
+			let httpData = {
+				page: pageNo,
+				pageSize: 10,
+				organizationId,
+			}
+			const res = await api.homeApi.getCameraApi({
+				params: httpData,
+				custom: {
+					load: false,
+				},
+			})
+			if (res) {
+				uni.stopPullDownRefresh()
+				this.mescroll.endBySize(res.items.length, res.total)
+				this.cameraTotal = res.total
+				if (!res.items.length && res.total == 0) {
+					this.mescroll.showEmpty()
+				} else {
+					this.mescroll.removeEmpty()
+				}
+				// this.list = res.items
+				this.getPlaySource(res.items)
+				// this.$nextTick(()=>{
+				// 	for(let item of res.items){
+				// 	if(item.accessMode===1){
+				// 		item.videoUrl = ( api.homeApi.byCameraIdGetDetailApi(item.id)).data.url
+				// 	}
+				// 	if(item.accessMode === 2){
+				// 		const {deviceId,channelNo} = item.params || {}
+				// 		try{
+				// 			const result =  api.homeApi.getCameraGBTUrl(deviceId,channelNo)
+				// 			const {data:{flv}} = result || {}
+				// 			item.videoUrl = flv
+				// 		}catch(err){
+				// 			console.log(err,'error')
+				// 		}
+				// 	}
+				// }
+				// })
+
+				if (pageNo == 1) {
+					this.list = res.items
+				} else {
+					this.list = this.list.concat(res.items)
+				}
 			}
 		},
-		onHide() {
-			this.ordId = '';
-		},
-		onLoad() {
-			// 隐藏原生的tabbar
-			uni.hideTabBar();
-		},
-		methods: {
-			/*下拉刷新的回调 */
-			downCallback() {
-				//联网加载数据
-				this.page.num = 1;
-				this.loadData(1);
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback() {
-				//联网加载数据
-				this.page.num += 1;
-				this.loadData(this.page.num);
-			},
-			async loadData(pageNo, organizationId) {
-				let httpData = {
-					page: pageNo,
-					pageSize: 10,
-					organizationId
-				};
-				const res = await api.homeApi.getCameraApi({
-					params: httpData,
-					custom: {
-						load: false
-					}
-				})
-				if (res) {
-					uni.stopPullDownRefresh();
-					this.mescroll.endBySize(res.items.length, res.total);
-					this.cameraTotal = res.total;
-					if(!res.items.length && res.total==0){
-						this.mescroll.showEmpty()
-					}else{
-						this.mescroll.removeEmpty()
-					}
+		 getPlaySource(items) {
+			for (let item of items) {
+				if (item.accessMode === 1) {
+					api.homeApi.byCameraIdGetDetailApi(item.id).then(res => {
+						item.videoUrl = res.data.url
+					})
+				}
+				if (item.accessMode === 2) {
+					const { deviceId, channelNo } = item.params || {}
+					try {
+						api.homeApi.getCameraGBTUrl(deviceId, channelNo).then(res => {
+							const { data: { flv,fmp4,hls } } = res || {}
+							item.videoUrl = hls
+						})
 
-					for(let item of res.items){
-						if(item.accessMode===1){
-							item.videoUrl = (await api.homeApi.byCameraIdGetDetailApi(item.id)).data.url
-						}
-					}
 
-					if (pageNo == 1) {
-						this.list = res.items;
-					} else {
-						this.list = this.list.concat(res.items);
+					} catch (err) {
+						console.log(err, 'error')
 					}
 				}
-			},
-			//播放视频
-			async playVideo(e) {
-				const {currentTarget: {dataset: {accessmode,id}} = {}} = e
-				// let currentId = 'video' + id;
-				// const videoContext = uni.createVideoContext(currentId, this);
-				// videoContext.play()
-				/**
-				 * 点击全屏播放当前视频，暂停其余视频
-				 * 兼容APP和MP端
-				 */
-				this.videoContent = uni.createVideoContext(currentId, this);
-				this.videoContent.requestFullScreen();
-				// 获取视频列表
-				let trailer = this.list;
-				trailer.forEach((item, index) => {
-					if (item.videoUrl != null && item.videoUrl != '') {
-						let temp = 'video' + item.id;
-						if (temp != currentId) {
-							//暂停不是当前的视频
-							uni.createVideoContext(temp, this).pause();
-						}
-					}
-				});
-			},
-			openOrg() {
-				useNavigateTo('/pages/organization/organization')
 			}
-		}
-	};
+		},
+		//播放视频
+		async playVideo(e) {
+			const { currentTarget: { dataset: { accessmode, id } } = {} } = e
+			let currentId = 'video' + id;
+			// const videoContext = uni.createVideoContext(currentId, this);
+			// videoContext.play()
+			/**
+			 * 点击全屏播放当前视频，暂停其余视频
+			 * 兼容APP和MP端
+			 */
+			// this.videoContent = uni.createVideoContext(currentId, this)
+			// this.videoContent.requestFullScreen()
+			// 获取视频列表
+			let trailer = this.list
+			trailer.forEach((item, index) => {
+				if (item.videoUrl != null && item.videoUrl != '') {
+					let temp = 'video' + item.id
+					if (temp != currentId) {
+						//暂停不是当前的视频
+						uni.createVideoContext(temp, this).pause()
+					}
+				}
+			})
+		},
+		openOrg() {
+			useNavigateTo('/pages/organization/organization')
+		},
+	},
+}
 </script>
 
 <style lang="scss" scoped>
-	@import '../../static/camera.scss';
+@import '../../static/camera.scss';
 </style>

@@ -82,6 +82,8 @@
 		onLoad() {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
+		},
+		onShow(){	
 			if (getApp().getBindNot()) {
 				this.basicStatistics.map(item=>{
 						const { key, value } = item