Forráskód Böngészése

设备详情今日时间

wangming 2 hónapja
szülő
commit
6907447c76

+ 10 - 3
src/pagesA/deviceDetail/deviceDetail.vue

@@ -40,7 +40,7 @@
                     </view>
                 </view>
                 <template v-if="devType == 'LNB'">
-                    <view v-for="(item, index) in targetPoints" :key="index">
+                    <view v-for="item in targetPoints" :key="item.id">
                         <image
                             class="action-icon-M"
                             :style="{
@@ -270,7 +270,6 @@
     </view>
 </template>
 <script>
-import mqtt from "../../utils/mqtt";
 export default {
     data() {
         return {
@@ -289,7 +288,7 @@ export default {
             wsj: false,
             todayWcTimes: "",
             stayDetail: "",
-            todayDate: "2025年8月17日",
+            todayDate: "",
             dev_id: "",
             nowTime: "",
             devName: "",
@@ -638,10 +637,18 @@ export default {
         receptionChange(val) {
             this.targetPoints = val;
         },
+        getToday() {
+            const today = new Date();
+            const year = today.getFullYear();
+            const month = today.getMonth() + 1;
+            const day = today.getDate();
+            this.todayDate = `${year}年${month}月${day}日`;
+        },
     },
     onShow() {
         this.clientIdProp = uni.getStorageSync("clientIDetail");
         this.isInitAlarm = true;
+        this.getToday();
     },
     onLoad(options) {
         const devItem = this.parseDeviceItem(options.devItem);

+ 60 - 28
src/pagesA/discrepancy/discrepancy.vue

@@ -1,25 +1,27 @@
 <template>
     <view class="timeline-container">
-        <view
-            v-for="(item, index) in timelineData"
-            :key="index"
-            class="timeline-item"
-        >
-            <!-- 时间节点 -->
-            <view class="timeline-node">
-                <view class="node-circle"></view>
-                <view
-                    class="node-line"
-                    v-if="index !== timelineData.length - 1"
-                ></view>
-            </view>
+        <view class="timeBox">
+            <view
+                v-for="(item, index) in timelineData"
+                :key="index"
+                class="timeline-item"
+            >
+                <!-- 时间节点 -->
+                <view class="timeline-node">
+                    <view class="node-circle"></view>
+                    <view
+                        class="node-line"
+                        v-if="index !== timelineData.length - 1"
+                    ></view>
+                </view>
 
-            <!-- 内容区域 -->
-            <view class="timeline-content">
-                <view class="timeline-time">{{ item.time }}</view>
-                <view class="timeline-desc" v-if="item.title">{{
-                    item.title
-                }}</view>
+                <!-- 内容区域 -->
+                <view class="timeline-content">
+                    <view class="timeline-time">{{ item.time }}</view>
+                    <view class="timeline-desc" v-if="item.title">{{
+                        item.title
+                    }}</view>
+                </view>
             </view>
         </view>
     </view>
@@ -32,29 +34,53 @@ export default {
             type: Array,
             default: () => [
                 {
-                    time: "16:12",
-                    title: "进入卫生间(房间)",
+                    time: "9:44",
+                    title: "离开房间",
+                },
+                {
+                    time: "9:32",
+                    title: "进入房间",
+                },
+                {
+                    time: "9:29",
+                    title: "离开房间",
+                },
+                {
+                    time: "9:26",
+                    title: "进入房间",
                 },
                 {
-                    time: "16:42",
+                    time: "9:23",
                     title: "离开房间",
                 },
                 {
-                    time: "16:12",
-                    title: "进入卫生间(房间)",
+                    time: "9:08",
+                    title: "进入房间",
                 },
                 {
-                    time: "16:42",
+                    time: "9:17",
                     title: "离开房间",
                 },
                 {
-                    time: "16:12",
-                    title: "进入卫生间(房间",
+                    time: "9:07",
+                    title: "进入房间",
                 },
                 {
-                    time: "16:42",
+                    time: "9:03",
                     title: "离开房间",
                 },
+                {
+                    time: "8:55",
+                    title: "进入房间",
+                },
+                {
+                    time: "8:40",
+                    title: "离开房间",
+                },
+                {
+                    time: "8:30",
+                    title: "进入房间",
+                },
             ],
         },
     },
@@ -66,6 +92,12 @@ export default {
     padding: 20rpx 30rpx;
     height: 100vh;
     background: linear-gradient(180deg, #faede2 0%, #f4f4f4 100%);
+    box-sizing: border-box;
+}
+
+.timeBox {
+    overflow: scroll;
+    height: 98vh;
 }
 
 .timeline-item {