Merge branch 'main' into dev-ft

@@ -87,7 +87,7 @@ export default {
 				{
 					name: '首页',
 					url: 'pages/index/index',
-					icon: '../../../static/homw-un.png',
+					icon: '../../../static/home-un.png',
 					iconFill: '../../../static/home-yes.png'
 				},
 				{

@@ -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('下发失败~');

@@ -25,7 +25,7 @@
 				</view>
 			</view>
 		</u-sticky>
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :upOption="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
@@ -101,7 +101,6 @@
 
 <script>
 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';
@@ -109,7 +108,6 @@ export default {
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 	components: {
 		fTabbar,
-		fNavbar,
 		FilterItem
 	},
 	data() {
@@ -188,19 +186,27 @@ export default {
 			page: {
 				num: 0,
 				size: 10
-			}
+			},
+			deviceState: ''
 		};
 	},
-	onLoad(e) {
+	async onLoad(options) {
 		// 隐藏原生的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
+		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() {
@@ -217,6 +223,7 @@ export default {
 			this.list = [];
 			this.page.num = 1;
 			//联网加载数据
+			this.resetFilter();
 			this.loadData(this.page.num);
 		},
 
@@ -224,39 +231,41 @@ export default {
 		upCallback() {
 			//联网加载数据
 			this.page.num += 1;
-			this.loadData(this.page.num);
+			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
+			});
 		},
 
 		//获取设备
-		loadData(pageNo, params = {}) {
-			let httpData = {
-				page: pageNo,
-				pageSize: 10,
-				...params
-			};
-			uni.$u.http
-				.get('/yt/device', {
+		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
 					}
-				})
-				.then(res => {
-					this.total = res.total;
-					uni.stopPullDownRefresh();
-					console.log('获取后端数据', res);
-					//方法一(推荐): 后台接口有返回列表的总页数 totalPage
-					this.mescroll.endByPage(res.items.length, res.total); //必传参数(当前页的数据个数, 总页数)
-					if (pageNo == 1) {
-						this.list = res.items;
-					} else {
-						this.list = this.list.concat(res.items);
-					}
-				})
-				.catch(() => {
-					//联网失败, 结束加载
-					this.mescroll.endErr();
 				});
+				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();
+			}
 		},
 		openOrg() {
 			uni.navigateTo({
@@ -264,7 +273,6 @@ export default {
 			});
 		},
 		close() {
-			this.resetFilter();
 			this.show = false;
 		},
 		openSearchDialog() {
@@ -371,4 +379,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

@@ -10,7 +10,7 @@
 					<text class="device-text">设备数：{{ deviceTotal }}</text>
 				</view>
 			</view>
-			<view class="org-item"><image class="image" src="../../../static/right-arrow.png"></image></view>
+			<view class="org-item"><image class="image" src="../../../static/arrow-right.png"></image></view>
 		</view>
 		<view style="height: 150rpx;"></view>
 		<!-- 自带分页组件 -->

@@ -157,7 +157,7 @@ export default {
 		//设备状态查询
 		navigatorDeviceStatus(e) {
 			uni.reLaunch({
-				url: '../device/device?type=' + JSON.stringify(e)
+				url: `../device/device?deviceState=${e}`
 			});
 		}
 	}

@@ -8,7 +8,7 @@
 			<view class="u-flex u-p-l-30 u-p-r-20 u-p-t-75 u-p-b-30">
 				<block v-if="userInfo.isToken || userInfo.isThirdLogin">
 					<view @click="openPersonalInfo" class="u-m-r-20">
-						<image class="avatar" mode="aspectFill" :src="userInfo.avatar == '' ? '/static/default.png' : userInfo.avatar"></image>
+						<image class="avatar" mode="aspectFill" :src="userInfo.avatar == '' ? '/static/logo.png' : userInfo.avatar"></image>
 					</view>
 					<view class="u-flex-1">
 						<view class="nickName u-flex">
@@ -22,7 +22,7 @@
 				</block>
 				<block v-else>
 					<view class="u-m-r-20" @click="openLoginFunc">
-						<view class="avatar u-flex"><image class="avatar" mode="aspectFill" src="../../static/default.png"></image></view>
+						<view class="avatar u-flex"><image class="avatar" mode="aspectFill" src="../../static/logo.png"></image></view>
 					</view>
 					<view class="u-flex-1"><view @click="openLoginFunc" class="u-font-lg click-login login-btn ">请点击登录</view></view>
 				</block>

@@ -3,7 +3,7 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view @click="upAvatar" class="u-flex set-main">
-			<view class="main-image"><image class="image" :src="avatar || '/static/default.png'"></image></view>
+			<view class="main-image"><image class="image" :src="avatar || '/static/logo.png'"></image></view>
 			<view class="main-right-image"><image class="image" src="../../static/arrow-right.png"></image></view>
 		</view>
 		<view class="u-m-t-20 basic-text"><text class="text">基本资料</text></view>

@@ -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 )
 		}
 	},
 	// 国际化配置