fix:调整设备详情的命令记录

@@ -4,7 +4,7 @@
 		<view class="detail">
 			<view class="detail-item">
 				<view class="detail-label">设备类型</view>
-				<view class="detail-value">{{ commandDetail.deviceType }}</view>
+				<view class="detail-value">{{ deviceType }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
@@ -19,7 +19,7 @@
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item">
 				<view class="detail-label">命令下发时间</view>
-				<view class="detail-value">{{ commandDetail.createTime }}</view>
+				<view class="detail-value">{{ format(commandDetail.createTime) }}</view>
 			</view>
 			<u-line length="90%" margin="0 auto"></u-line>
 			<view class="detail-item" v-if="commandDetail.additionalInfo.cmdType">
@@ -29,31 +29,51 @@
 			<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"></view>
+				<view class="detail-value">{{commandDetail.request.oneway?'oneway':'towway'}}</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.status==='SUCCESSFUL'?'成功':'失败'}}</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.response?'成功':'失败'}}</view>
 			</view>
 		</view>
 		<view class="command">命令内容</view>
-		<u-textarea></u-textarea>
+		<u-textarea :value="formatValue(commandDetail.request.body)" disabled></u-textarea>
 	</view>
 </template>
 
 <script>
+import { formatToDate } from '@/plugins/utils.js';
 export default {
 	data() {
 		return {
 			commandDetail: {}
 		};
 	},
+	computed: {
+		deviceType() {
+			return this.commandDetail.deviceType === 'DIRECT_CONNECTION'
+				? '直连设备'
+				: this.commandDetail.deviceType === 'GATEWAY'
+				? '网关设备'
+				: this.commandDetail.deviceType === 'SENSOR'
+				? '网关子设备'
+				: '';
+		}
+	},
+	methods: {
+		format(date) {
+			return formatToDate(date, 'YYYY-MM-DD HH:mm:ss');
+		},
+		formatValue(value){
+			return JSON.stringify(value)
+		}
+	},
 	onLoad(options) {
 		const { data } = options;
 		this.commandDetail = JSON.parse(data);

@@ -16,7 +16,8 @@
 				<view class="item">
 					<view class="item-first">
 						<text>{{ item.deviceName }}</text>
-						<!-- 	<view class="item-right">响应成功</view> -->
+						<view class="item-right item-success" v-if="item.response">响应成功</view>
+						<view class="item-right item-fail" v-else>响应失败</view>
 					</view>
 					<view v-if="item.additionalInfo.cmdType">
 						命令类型:
@@ -35,7 +36,6 @@
 			<view class="filter">
 				<view class="filter-title"><text>筛选条件</text></view>
 				<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>
@@ -96,23 +96,6 @@ export default {
 					type: 'fail'
 				}
 			],
-			responseWay: [
-				{
-					checked: true,
-					name: '全部',
-					type: ''
-				},
-				{
-					checked: false,
-					name: 'OneWay',
-					type: 'OneWay'
-				},
-				{
-					checked: false,
-					name: 'TowWay',
-					type: 'TowWay'
-				}
-			],
 			downOption: {
 				auto: false //是否在初始化后,自动执行downCallback; 默认true
 			},
@@ -180,8 +163,8 @@ export default {
 			});
 		},
 		resetFilter() {
-			const { issueStatus, responseWay } = this;
-			[issueStatus, responseWay].forEach(item => item.map((item, index) => (item.checked = index === 0)));
+			const { issueStatus } = this;
+			issueStatus.forEach(item => item.map((item, index) => (item.checked = index === 0)));
 		},
 		close() {
 			this.show = false;
@@ -198,10 +181,8 @@ export default {
 		},
 		confirmFilter() {
 			const issueStatus = this.issueStatus.find(item => item.checked);
-			const responseWay = this.responseWay.find(item => item.checked);
 			this.loadData(1, {
 				status: issueStatus.type ? issueStatus.type : undefined,
-				responseWay: responseWay.type ? responseWay.type : undefined,
 				deviceId: this.deviceId
 			});
 			this.show = false;
@@ -273,13 +254,19 @@ export default {
 					display: flex;
 					justify-content: center;
 					align-items: center;
-					color: #00c9a7;
 					width: 104rpx;
 					height: 36rpx;
 					font-size: 20rpx;
-					background-color: #00c9a725;
 					border-radius: 20rpx;
 				}
+				.item-fail {
+					color: #848383;
+					background-color: #84838325;
+				}
+				.item.success {
+					color: #00c9a7;
+					background-color: #00c9a725;
+				}
 			}
 		}
 	}

@@ -127,7 +127,12 @@ export default {
 		},
 		async confirmCommand() {
 			try {
-				await issueCommand(this.commandType, this.deviceDetail.tbDeviceId, JSON.parse(this.commandValue));
+				const commandValue = JSON.parse(this.commandValue);
+				commandValue.persistent = true;
+				commandValue.additionalInfo = {
+					cmdType: 'API'
+				};
+				await issueCommand(this.commandType, this.deviceDetail.tbDeviceId,commandValue);
 				this.hiddenModal();
 			} catch (e) {
 				uni.$u.toast('下发失败~');

@@ -19,7 +19,7 @@ const GlobalOption = {
 		},
 		empty: {
 			use: true, // 是否显示空布局
-			icon: "../../../../../static/empty-data.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+			icon: "../../../../../static/empty.png" // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
 		}
 	},
 	// 国际化配置