Merge branch 'sqy_dev' into 'main'

fix:调整设备的命令记录和修复bug

See merge request huang/thingskit-app!36

@@ -4,8 +4,8 @@ import {
 let baseUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	baseUrl = 'http://192.168.10.115:8080/api'
-	// baseUrl = 'https://dev.thingskit.com/api'
+	// baseUrl = 'http://192.168.10.115:8080/api'
+	baseUrl = 'https://dev.thingskit.com/api'
 
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境

@@ -14,6 +14,7 @@
 				:inactiveStyle="{
 					color: '#999'
 				}"
+				:scrollable="isScrollable"
 			/>
 		</u-sticky>
 		<view style="margin-top:30rpx;">
@@ -46,6 +47,7 @@ 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 moment from 'moment';
 export default {
 	components: {
 		fTabbar,
@@ -57,7 +59,7 @@ export default {
 	},
 	data() {
 		return {
-			list: [{ name: '基础信息' }, { name: '实时数据' }, { name: '历史数据' }, { name: '告警记录' }, { name: '命令记录' }],
+			list: [{ name: '基础信息' }, { name: '实时数据' }, { name: '历史数据' }, { name: '告警记录' }],
 			currentTab: 0,
 			deviceId: '',
 			deviceDetail: {},
@@ -69,10 +71,11 @@ export default {
 			entityId: '',
 			startTs: '',
 			endTs: '',
-			recordList: []
+			recordList: [],
+			isScrollable: false
 		};
 	},
-	onUnload(){
+	onUnload() {
 		// 页面关闭时,销毁webSocket连接,否则第二次会存在连接不到的情况
 		uni.closeSocket();
 	},
@@ -81,6 +84,14 @@ export default {
 		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: 'wss://dev.thingskit.com/api/ws/plugins/telemetry?token=' + uni.getStorageSync('userInfo').isToken, //仅为示例，并非真实接口地址。
@@ -144,22 +155,24 @@ export default {
 
 		const keys = await getDeviceKeys(tbDeviceId);
 		this.keys = [keys];
-		const date = new Date();
-		const year = date.getFullYear(); //获取完整的年份(4位)
-		const month = date.getMonth() + 1; //获取当前月份(0-11,0代表1月)
-		const day = date.getDate(); //获取当前日(1-31)
-		const yesterday = `${year}-${month}-${day - 1}`;
-		const today = `${year}-${month}-${day}`;
-		this.yesterday = yesterday;
-		this.today = today;
-		this.startTs = formatToDate(yesterday, 'x');
-		this.endTs = formatToDate(today, 'x');
+		// 昨天
+		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;
-		console.log(this.entityId)
+
 		const data = await getHistoryData({
 			entityId: tbDeviceId,
-			startTs: formatToDate(yesterday, 'x'),
-			endTs: formatToDate(today, 'x'),
+			startTs: this.startTs,
+			endTs: this.endTs,
 			keys: keys[0],
 			interval: 1800000
 		});

 <template>
 	<view class="command-detail">
-		<view class="detail-top">网关设备1</view>
+		<view class="detail-top">{{ commandDetail.deviceName }}</view>
 		<view class="detail">
 			<view class="detail-item">
 				<view class="detail-label">设备类型</view>
-				<view class="detail-value">网关子设备</view>
+				<view class="detail-value">{{ commandDetail.deviceType }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
 				<view class="detail-label">设备编号</view>
-				<view class="detail-value">SN98489123471829</view>
+				<view class="detail-value">{{ commandDetail.deviceSn }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
 				<view class="detail-label">所属组织</view>
-				<view class="detail-value">云腾汽车</view>
+				<view class="detail-value">{{ commandDetail.organizationName }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
 				<view class="detail-label">命令下发时间</view>
-				<view class="detail-value">2022-01-25 12:44:22</view>
+				<view class="detail-value">{{ commandDetail.createTime }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
-			<view class="detail-item">
+			<view class="detail-item" v-if="commandDetail.additionalInfo.cmdType">
 				<view class="detail-label">命令类型</view>
-				<view class="detail-value">Mqtt命令</view>
+				<view class="detail-value">{{ commandDetail.additionalInfo.cmdType }}</view>
 			</view>
-			<u-line length="90%" margin="0 auto"></u-line>
+			<u-line length="90%" margin="0 auto" v-if="commandDetail.additionalInfo.cmdType"></u-line>
 			<view class="detail-item">
 				<view class="detail-label">响应类型</view>
-				<view class="detail-value">OneWay</view>
+				<view class="detail-value"></view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
@@ -47,7 +47,20 @@
 	</view>
 </template>
 
-<script></script>
+<script>
+export default {
+	data() {
+		return {
+			commandDetail: {}
+		};
+	},
+	onLoad(options) {
+		const { data } = options;
+		this.commandDetail = JSON.parse(data);
+		console.log(this.commandDetail, '---------');
+	}
+};
+</script>
 
 <style lang="scss" scoped>
 .command-detail {
@@ -84,7 +97,7 @@
 			}
 		}
 	}
-	.command{
+	.command {
 		margin: 30rpx 0;
 	}
 }

@@ -12,21 +12,21 @@
 			</view>
 		</view>
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-			<view @click="openDeviceDetail(item)" class="list-item" v-for="(item, index) in list" :key="index">
+			<view @click="openCommandDetail(item)" class="list-item" v-for="(item, index) in list" :key="index">
 				<view class="item">
 					<view class="item-first">
 						<text>{{ item.deviceName }}</text>
-						<view class="item-right">响应成功</view>
+						<!-- 	<view class="item-right">响应成功</view> -->
 					</view>
-					<view>
+					<view v-if="item.additionalInfo.cmdType">
 						命令类型:
-						<text style="margin-left: 16rpx;">MQTT命令</text>
+						<text style="margin-left: 16rpx;">{{ item.additionalInfo.cmdType }}</text>
 					</view>
-					<view>
+					<view v-if="item.statusName">
 						命令状态:
-						<text style="margin-left: 16rpx;">下发成功</text>
+						<text style="margin-left: 16rpx;">{{ item.statusName }}</text>
 					</view>
-					<view class="time">{{ item.createdTime }}</view>
+					<view class="time">{{ format(item.createTime) }}</view>
 				</view>
 			</view>
 		</mescroll-body>
@@ -34,10 +34,8 @@
 		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20">
 			<view class="filter">
 				<view class="filter-title"><text>筛选条件</text></view>
-				<FilterItem :filterList="alarmStatus" title="告警状态" @clickTag="currentIndex => handleClickTag(currentIndex, alarmStatus)"></FilterItem>
-				<FilterItem :filterList="typeStatus" title="设备类型" @clickTag="currentIndex => handleClickTag(currentIndex, typeStatus)"></FilterItem>
-				<FilterItem :filterList="alarmLevelStatus" title="告警等级" @clickTag="currentIndex => handleClickTag(currentIndex, alarmLevelStatus)"></FilterItem>
-				<FilterItem :filterList="timeStatus" title="选择时间" @clickTag="currentIndex => handleClickTag(currentIndex, timeStatus)"></FilterItem>
+				<FilterItem :filterList="issueStatus" title="下发状态" @clickTag="currentIndex => handleClickTag(currentIndex, issueStatus)"></FilterItem>
+				<FilterItem :filterList="responseWay" title="响应方式" @clickTag="currentIndex => handleClickTag(currentIndex, responseWay)"></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>
@@ -59,6 +57,7 @@
 <script>
 import FilterItem from '@/pages/device/FilterItem.vue';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
+import { formatToDate } from '@/plugins/utils.js';
 export default {
 	mixins: [MescrollMixin],
 	components: {
@@ -70,11 +69,6 @@ export default {
 			default: ''
 		}
 	},
-	// mounted() {
-	// 	this.loadData(1, {
-	// 		tbDeviceId: this.tbDeviceId
-	// 	});
-	// },
 	data() {
 		return {
 			show: false,
@@ -85,7 +79,7 @@ export default {
 				getTimeGap: ''
 			},
 			showCalendar: false,
-			alarmStatus: [
+			issueStatus: [
 				{
 					checked: true,
 					name: '全部',
@@ -93,80 +87,16 @@ export default {
 				},
 				{
 					checked: false,
-					name: '激活未确认',
-					type: 'ACTIVE_UNACK'
+					name: '成功',
+					type: 'success'
 				},
 				{
 					checked: false,
-					name: '激活已确认',
-					type: 'ACTIVE_ACK'
-				},
-				{
-					checked: false,
-					name: '清除未确认',
-					type: 'CLEARED_UNACK'
-				},
-				{
-					checked: false,
-					name: '清除已确认',
-					type: 'CLEARED_ACK'
-				}
-			],
-			typeStatus: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
-				},
-				{
-					checked: false,
-					name: '网关设备',
-					type: 'GATEWAY'
-				},
-				{
-					checked: false,
-					name: '网关子设备',
-					type: 'SENSOR'
-				},
-				{
-					checked: false,
-					name: '直连设备',
-					type: 'DIRECT_CONNECTION'
-				}
-			],
-			alarmLevelStatus: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
-				},
-				{
-					checked: false,
-					name: '危险',
-					type: 'CRITICAL'
-				},
-				{
-					checked: false,
-					name: '重要',
-					type: 'MAJOR'
-				},
-				{
-					checked: false,
-					name: '次要',
-					type: 'MINOR'
-				},
-				{
-					checked: false,
-					name: '警告',
-					type: 'WARNING'
-				},
-				{
-					checked: false,
-					name: '不确定',
-					type: 'INDETERMINATE'
+					name: '失败',
+					type: 'fail'
 				}
 			],
-			timeStatus: [
+			responseWay: [
 				{
 					checked: true,
 					name: '全部',
@@ -174,23 +104,13 @@ export default {
 				},
 				{
 					checked: false,
-					name: '30分钟',
-					type: '1800000'
-				},
-				{
-					checked: false,
-					name: '一小时',
-					type: '3600000'
-				},
-				{
-					checked: false,
-					name: '2小时',
-					type: '7200000'
+					name: 'OneWay',
+					type: 'OneWay'
 				},
 				{
 					checked: false,
-					name: '近一天',
-					type: '1440000'
+					name: 'TowWay',
+					type: 'TowWay'
 				}
 			],
 			downOption: {
@@ -212,6 +132,9 @@ export default {
 				tbDeviceId: this.tbDeviceId
 			});
 		},
+		format(date) {
+			return formatToDate(date, 'YYYY-MM-DD HH:mm:ss');
+		},
 		/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 		upCallback() {
 			//联网加载数据
@@ -257,8 +180,8 @@ export default {
 			});
 		},
 		resetFilter() {
-			const { alarmStatus, typeStatus, alarmLevelStatus, timeStatus } = this;
-			[alarmStatus, typeStatus, alarmLevelStatus, timeStatus].forEach(item => item.map((item, index) => (item.checked = index === 0)));
+			const { issueStatus, responseWay } = this;
+			[issueStatus, responseWay].forEach(item => item.map((item, index) => (item.checked = index === 0)));
 		},
 		close() {
 			this.show = false;
@@ -274,18 +197,11 @@ export default {
 			this.timeData.selectTime = `${e[0]} / ${e[e.length - 1]}`;
 		},
 		confirmFilter() {
-			const alarmState = this.alarmStatus.find(item => item.checked);
-			const typeState = this.typeStatus.find(item => item.checked);
-			const alarmLevelState = this.alarmLevelStatus.find(item => item.checked);
-			const timeState = this.timeStatus.find(item => item.checked);
-			const endTs = Date.now();
-			const startTs = endTs - timeState.type;
+			const issueStatus = this.issueStatus.find(item => item.checked);
+			const responseWay = this.responseWay.find(item => item.checked);
 			this.loadData(1, {
-				status: alarmState.type ? alarmState.type : undefined,
-				deviceType: typeState.type ? typeState.type : undefined,
-				alarmType: alarmLevelState.type ? alarmLevelState.type : undefined,
-				startTime: timeState.type ? startTs : undefined,
-				endTime: timeState.type ? endTs : undefined,
+				status: issueStatus.type ? issueStatus.type : undefined,
+				responseWay: responseWay.type ? responseWay.type : undefined,
 				deviceId: this.deviceId
 			});
 			this.show = false;
@@ -293,19 +209,9 @@ export default {
 		calendarClose() {
 			this.showCalendar = false;
 		},
-		openDeviceDetail(item) {
-			const { id, deviceName, severity, originatorType, details, createdTime, status } = item;
-			let obj = {
-				id,
-				deviceName,
-				severity,
-				originatorType,
-				details,
-				createdTime,
-				status
-			};
+		openCommandDetail(item) {
 			uni.navigateTo({
-				url: '/deviceSubPage/deviceDetailPage/tabDetail/CommandDetail'
+				url: '/deviceSubPage/deviceDetailPage/tabDetail/CommandDetail?data=' + JSON.stringify(item)
 			});
 		}
 	}

@@ -301,7 +301,7 @@ export default {
 			this.loadData(1, {
 				status: alarmState.type ? alarmState.type : undefined,
 				deviceType: typeState.type ? typeState.type : undefined,
-				alarmType: alarmLevelState.type ? alarmLevelState.type : undefined,
+				severity: alarmLevelState.type ? alarmLevelState.type : undefined,
 				startTime: timeState.type ? startTs : undefined,
 				endTime: timeState.type ? endTs : undefined,
 				deviceId: this.deviceId

@@ -12,7 +12,9 @@
 					{{ deviceDetail.deviceState === 'INACTIVE' ? '待激活' : deviceDetail.deviceState === 'ONLINE' ? '在线' : '离线' }}
 				</view>
 			</view>
-			<view style="margin-right: 20rpx;" v-if="deviceDetail.deviceState==='ONLINE'"><u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal" /></view>
+			<view style="margin-right: 20rpx;" v-if="deviceDetail.deviceState === 'ONLINE' && deviceDetail.deviceType !== 'SENSOR'">
+				<u-button type="primary" shape="circle" size="mini" text="下发命令" @click="showModal" />
+			</view>
 		</view>
 		<view class="detail">
 			<view class="detail-item">
@@ -126,7 +128,7 @@ export default {
 		async confirmCommand() {
 			try {
 				await issueCommand(this.commandType, this.deviceDetail.tbDeviceId, JSON.parse(this.commandValue));
-				this.hiddenModal()
+				this.hiddenModal();
 			} catch (e) {
 				uni.$u.toast('下发失败~');
 			}

@@ -34,7 +34,7 @@
 			</view>
 			<mescroll-empty v-if="!historyData.length"/>
 		</view>
-		<view class="historyData-bottom">
+		<view class="historyData-bottom" v-show="historyData.length">
 			<view class="table">
 				<view class="tr bg-w" v-if="historyData.length">
 					<view class="th">变量值</view>
@@ -44,7 +44,6 @@
 					<view class="td">{{ item.value }}</view>
 					<view class="td">{{ item.ts }}</view>
 				</view>
-				<mescroll-empty v-if="!historyData.length"/>
 			</view>
 		</view>
 		<u-calendar
@@ -134,11 +133,11 @@ export default {
 			maxDate: `${year}-${month}-${date + 1}`,
 			defaultDate: [this.yesterday, this.today],
 			chartData: {
-				categories: this.historyData.map(item => item.ts),
+				categories: this.historyData.length && this.historyData.map(item => item.ts),
 				series: [
 					{
 						name: this.keys[0][0],
-						data: this.historyData.map(item => Number(item.value))
+						data: this.historyData.length && this.historyData.map(item => Number(item.value))
 					}
 				]
 			},
@@ -187,7 +186,7 @@ export default {
 				this.chartData.series = [
 					{
 						name: this.keys[0][0],
-						data: this.getHistoryData.map(item => Number(item.value))
+						data: newValue.map(item => Number(item.value))
 					}
 				];
 			}

 <template>
 	<view class="device-page">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
 		<u-sticky>
 			<view class="device-top">
 				<view class="search">
@@ -27,7 +25,7 @@
 				</view>
 			</view>
 		</u-sticky>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :upOption="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
@@ -106,7 +104,6 @@ import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import fNavbar from '@/components/module/f-navbar/f-navbar';
 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注册全局组件)
@@ -197,7 +194,9 @@ export default {
 	onLoad(e) {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
+		console.log('e', e);
 		if (e.type !== undefined) {
+			console.log(123)
 			const statusT = JSON.parse(e.type);
 			this.loadData(1, {
 				deviceState: statusT