From b58ef47b9f5dcce5db6f8dba1209e5acd5dd7bac Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Thu, 11 Aug 2022 14:54:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue   | 11 +++++++++--
 pages/mine/details2.vue |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7c47f85..8b8eff3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,7 +9,12 @@
 			<view class="Switching4" v-if="buildingishow" @click="piskbuilding()">切换项目</view>
 		</view>
 
-		<view class="title" style="margin-top: 30rpx;" v-if="Myworkcard">我的工牌</view>
+		<view class="title" style="margin-top: 30rpx;" v-if="Myworkcard">
+			我的工牌
+			<template v-if="equipmentObj.imei">
+				<text style="margin-left: 20rpx;">{{ equipmentObj.imei }}</text>
+			</template>
+		</view>
 		<view v-if="Myworkcard">
 			<view class="Workcard" v-if="Whetheroffline==true">
 				<view class="Workcard-box">
@@ -242,12 +247,13 @@
 				signalDevicetext: "",
 				audioStatus: false,
 				equipmentisshow: false,
-				equipmentobj: {
+				equipmentobj: { // 统计设备状态
 					totalNum: '',
 					onlineNum: '',
 					activeNum: '',
 					lowPowerNum: '',
 				},
+				equipmentObj: {}, // 接口返回设备信息2
 				Menulist: [],
 				realtimeobj: {
 					sumCustomer: '',
@@ -616,6 +622,7 @@
 							if (data.data.data > 100) {
 								this.percentage = 100;
 							} else {
+								this.equipmentObj = data.data.data
 								if (data.data.data.onLine == 0) {
 									this.Whetheroffline = false;
 								} else {
diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue
index 5fb1c76..3ae5cd6 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -1683,7 +1683,7 @@
 					// endTime: this.changanitem.ed, //结束时间
 					// startTime: this.changanitem.bg, //开始时间
 				}
-
+				// 将数据筛选出来并排序并且翻转数据让后端获取第一条加精的数据在分点加精的学习列表使用
 				this.dialogList.forEach(items => {
 					if (items.message && items.message.length > 0) {
 						items.message.forEach(item => {
@@ -1697,6 +1697,7 @@
 						})
 					}
 				})
+				objdata.toDigestList.sort((a, b) => { return Number(a.startTime) - Number(b.startTime)}).reverse()
 
 				this.isshow3 = false;
 				this.$u.post(config.service.addATD, objdata).then(res => {