From 57c0135413e2f2ea79dcae0bb4ffc960a7a8f90f Mon Sep 17 00:00:00 2001
From: ylj20011123 <YLJ>
Date: Fri, 15 Aug 2025 19:46:40 +0800
Subject: [PATCH] update

---
 pages.json                                    |   7 +-
 pages/attendanceStatus/emergencyEvents.vue    | 410 ++++++---------
 .../emergencyEventsDetail.vue                 | 405 +++++++++++++++
 pages/attendanceStatus/index.vue              | 484 ++++++++++++++----
 pages/commercialBI/noData.vue                 |  95 ++--
 pages/index/components/numberScroll.vue       | 109 ++--
 pages/index/index.vue                         | 163 +++---
 pages/map/index.vue                           |   7 +-
 .../components/mapDetail.vue                  |  17 +-
 static/images/home/address.png                | Bin 0 -> 963 bytes
 static/images/home/navigationIcon.svg         |  22 +
 11 files changed, 1201 insertions(+), 518 deletions(-)
 create mode 100644 pages/attendanceStatus/emergencyEventsDetail.vue
 create mode 100644 static/images/home/address.png
 create mode 100644 static/images/home/navigationIcon.svg

diff --git a/pages.json b/pages.json
index 137b6b3..9e70dc3 100644
--- a/pages.json
+++ b/pages.json
@@ -36,7 +36,6 @@
                     "path": "index",
                     "style": {
                         "navigationBarTitleText": "出勤情况",
-                        "enablePullDownRefresh": true,
                         "navigationStyle": "custom"
                     }
                 },
@@ -49,11 +48,11 @@
                     }
                 },
                 {
-                    "path": "serviceFacility",
+                    "path": "emergencyEventsDetail",
                     "style": {
-                        "navigationBarTitleText": "服务设施管理",
+                        "navigationBarTitleText": "",
                         "enablePullDownRefresh": true,
-                        "navigationBarBackgroundColor": "#ffffff"
+                        "navigationBarBackgroundColor": "#F5F6F7"
                     }
                 }
             ]
diff --git a/pages/attendanceStatus/emergencyEvents.vue b/pages/attendanceStatus/emergencyEvents.vue
index cca4bfb..cae906a 100644
--- a/pages/attendanceStatus/emergencyEvents.vue
+++ b/pages/attendanceStatus/emergencyEvents.vue
@@ -1,9 +1,49 @@
 <!-- 应急事件 -->
 <template>
     <view class="main">
-        <view class="event-list pad15">
-            <!-- 充电桩设备故障 -->
-            <view :class="item.status === 1 ? 'event-item left-ok' : item.status === 2 ? 'event-item' : ''"
+        <view class="emergencyList pad15">
+            <view class="emergencyItem" v-for="(item, index) in showList" :key="index" @click="handleShowDetail(item)"
+                :style="{
+                    marginBottom: index + 1 === showList.length ? '0' : '',
+                    border: item.status === 1 ? '2rpx solid #f4db9c' : item.status === 2 ? '2rpx solid #d3d3d3' : ''
+                }">
+                <view class="emergencyItemTitle">
+                    <view class="emergencyItemTitleLeft">
+                        {{ type === 1 ? item.title || "" : type === 2 ? item.service || "" : "" }}
+                    </view>
+                    <view class="emergencyItemTitleRight">
+                        <view class="emergencyItemStatus" :style="{
+                            background: item.status === 1 ? '#ecbd44' : item.status === 2 ? '#d3d3d3' : '',
+                            color: item.status === 1 ? '#fff' : item.status === 2 ? '#fff' : ''
+                        }">
+                            {{ item.status === 1 ? '已完成' : item.status ===
+                                2 ? '处理中' : '' }}</view>
+                    </view>
+                </view>
+                <view class="emergencyDesc">{{ item.desc || "" }}</view>
+
+                <view class="line"></view>
+
+                <view class="otherMessageRow">
+                    <image class="otherMessageIcon" src="https://eshangtech.com/cyy_DIB/personIcon.png" />
+                    <view class="otherMessageValue">{{ item.person }}</view>
+                </view>
+
+                <view class="otherMessageRow">
+                    <image class="otherMessageIcon" src="https://eshangtech.com/cyy_DIB/phoneLabelIcon.png" />
+                    <view class="otherMessageValue">{{ item.phone }}</view>
+                </view>
+
+                <view class="otherMessageRow" style="margin-bottom: 0;">
+                    <image class="otherMessageIcon" src="https://eshangtech.com/cyy_DIB/timeIcon.png" />
+                    <view class="otherMessageValue">{{ item.time }}</view>
+                </view>
+
+            </view>
+
+
+
+            <!-- <view :class="item.status === 1 ? 'event-item left-ok' : item.status === 2 ? 'event-item' : ''"
                 v-for="(item, index) in showList" :key="index" @click="handleShowDetail(item)">
                 <view class="event-header">
                     <view class="event-title">{{ type === 1 ? item.title || "" : type === 2 ? item.service || "" : "" }}
@@ -25,94 +65,37 @@
                         <text class="line">{{ item.desc || "" }}</text>
                     </view>
                 </view>
-            </view>
-
-            <!-- 顾客投诉 -->
-            <view class="event-item" v-if="false">
-                <view class="event-header">
-                    <view class="event-title">😠 顾客投诉：餐厅服务问题</view>
-                    <view class="event-meta">
-                        <view class="event-time">
-                            <text>🕐</text><text>13:45</text>
-                        </view>
-                        <view class="event-priority priority-high">高优先级</view>
-                    </view>
-                </view>
-                <view class="event-content">
-                    <view class="event-description">
-                        <text class="line">顾客反馈餐厅用餐区卫生状况不佳，桌面未及时清理，垃圾桶满溢。</text>
-                        <text class="line">要求立即整改并给出解决方案。</text>
-                    </view>
-                    <view class="event-actions">
-                        <button class="event-action-btn btn-primary" @click="contactStaff('cleaning')">通知保洁</button>
-                        <button class="event-action-btn btn-warning"
-                            @click="updateEventStatus('complaint', 'processing')">处理中</button>
-                        <button class="event-action-btn btn-success" @click="resolveEvent('complaint')">标记解决</button>
-                    </view>
-                    <view class="event-status">
-                        <view class="status-dot status-processing"></view>
-                        <text>状态：处理中 | 负责人：陈大哥</text>
-                    </view>
-                </view>
-            </view>
-
-            <!-- 安全隐患 -->
-            <view class="event-item warning" v-if="false">
-                <view class="event-header">
-                    <view class="event-title">⚠️ 停车场照明不足</view>
-                    <view class="event-meta">
-                        <view class="event-time">
-                            <text>🕐</text><text>12:30</text>
-                        </view>
-                        <view class="event-priority priority-medium">中优先级</view>
-                    </view>
-                </view>
-                <view class="event-content">
-                    <view class="event-description">
-                        <text class="line">B区停车场2盏路灯损坏，夜间照明不足，存在安全隐患。</text>
-                        <text class="line">建议在晚班前修复，确保顾客夜间停车安全。</text>
-                    </view>
-                    <view class="event-actions">
-                        <button class="event-action-btn btn-primary"
-                            @click="contactMaintenance('lighting')">联系电工</button>
-                        <button class="event-action-btn btn-warning" @click="scheduleRepair('lighting')">排期维修</button>
-                        <button class="event-action-btn btn-success" @click="resolveEvent('lighting')">标记解决</button>
-                    </view>
-                    <view class="event-status">
-                        <view class="status-dot status-pending"></view>
-                        <text>状态：待处理 | 负责人：刘师傅</text>
-                    </view>
-                </view>
-            </view>
-
-            <!-- 已解决事件 -->
-            <view class="event-item resolved" v-if="false">
-                <view class="event-header">
-                    <view class="event-title">✅ 洗手间堵塞问题</view>
-                    <view class="event-meta">
-                        <view class="event-time">
-                            <text>🕐</text><text>11:15</text>
-                        </view>
-                        <view class="event-priority priority-low">已解决</view>
-                    </view>
-                </view>
-                <view class="event-content">
-                    <view class="event-description">
-                        <text class="line">男洗手间第3间堵塞，已联系保洁人员处理完毕，设施恢复正常使用。</text>
-                    </view>
-                    <view class="event-status">
-                        <view class="status-dot status-resolved"></view>
-                        <text>状态：已解决 | 解决时间：11:45 | 处理人：陈大哥</text>
-                    </view>
-                </view>
-            </view>
+            </view> -->
         </view>
 
         <!-- 应急事件详情 -->
         <uni-popup ref="popup" border-radius="10px 10px 0 0" @change="handlePopupChange">
             <!-- 应急事件的 -->
             <view class="eventsPopupBox" v-if="eventsDetail && type === 1">
-                <view class="eventsItemTitle">应急事件</view>
+                <view class="eventsItem">
+                    <view class="eventsHaveImgLabel">
+                        <image class="eventsHaveImg" src="https://eshangtech.com/cyy_DIB/personIcon.png" />
+                        <view class="eventsHaveLabel">联系人：</view>
+                    </view>
+                    <view class="eventsValue">{{ eventsDetail.person || "" }}</view>
+                </view>
+                <view class="eventsItem">
+                    <view class="eventsHaveImgLabel">
+                        <image class="eventsHaveImg" src="https://eshangtech.com/cyy_DIB/phoneLabelIcon.png" />
+                        <view class="eventsHaveLabel">联系电话：</view>
+                    </view>
+                    <view class="eventsValue">{{ eventsDetail.phone || "" }}</view>
+                </view>
+                <view class="eventsItem">
+                    <view class="eventsHaveImgLabel">
+                        <image class="eventsHaveImg" src="https://eshangtech.com/cyy_DIB/timeIcon.png" />
+                        <view class="eventsHaveLabel">处理用时：</view>
+                    </view>
+                    <view class="eventsValue">{{ eventsDetail.haveTime || "" }}</view>
+                </view>
+
+                <view class="line"></view>
+
 
                 <view class="eventsItem">
                     <view class="eventsLabel">标题：</view>
@@ -126,18 +109,7 @@
                     <view class="eventsLabel">事件服务区：</view>
                     <view class="eventsValue">{{ eventsDetail.service || "" }}</view>
                 </view>
-                <view class="eventsItem">
-                    <view class="eventsLabel">联系人：</view>
-                    <view class="eventsValue">{{ eventsDetail.person || "" }}</view>
-                </view>
-                <view class="eventsItem">
-                    <view class="eventsLabel">联系电话：</view>
-                    <view class="eventsValue">{{ eventsDetail.phone || "" }}</view>
-                </view>
-                <view class="eventsItem">
-                    <view class="eventsLabel">处理用时：</view>
-                    <view class="eventsValue">{{ eventsDetail.haveTime || "" }}</view>
-                </view>
+
                 <view class="eventsItem">
                     <view class="eventsLabel">死亡人数：</view>
                     <view class="eventsValue">{{ eventsDetail.diePerson || "" }}</view>
@@ -168,12 +140,28 @@
 
             <!-- 日常问题 -->
             <view class="eventsPopupBox" v-if="eventsDetail && type === 2">
-                <view class="eventsItemTitle">应急事件</view>
                 <!-- <view class="eventsItem">
                     <view class="eventsLabel">处理状态：</view>
                     <view class="eventsValue"></view>
                 </view> -->
 
+                <view class="eventsItem">
+                    <view class="eventsHaveImgLabel">
+                        <image class="eventsHaveImg" src="https://eshangtech.com/cyy_DIB/personIcon.png" />
+                        <view class="eventsHaveLabel">联系人：</view>
+                    </view>
+                    <view class="eventsValue">{{ eventsDetail.person || "" }}</view>
+                </view>
+                <view class="eventsItem">
+                    <view class="eventsHaveImgLabel">
+                        <image class="eventsHaveImg" src="https://eshangtech.com/cyy_DIB/phoneLabelIcon.png" />
+                        <view class="eventsHaveLabel">联系电话：</view>
+                    </view>
+                    <view class="eventsValue">{{ eventsDetail.phone || "" }}</view>
+                </view>
+
+                <view class="line"></view>
+
                 <view class="eventsItem">
                     <view class="eventsLabel">事件片区：</view>
                     <view class="eventsValue">{{ eventsDetail.area || "" }}</view>
@@ -190,14 +178,7 @@
                     <view class="eventsLabel">问题描述：</view>
                     <view class="eventsValue">{{ eventsDetail.desc || "" }}</view>
                 </view>
-                <view class="eventsItem">
-                    <view class="eventsLabel">联系人：</view>
-                    <view class="eventsValue">{{ eventsDetail.person || "" }}</view>
-                </view>
-                <view class="eventsItem">
-                    <view class="eventsLabel">联系电话：</view>
-                    <view class="eventsValue">{{ eventsDetail.phone || "" }}</view>
-                </view>
+
 
                 <view class="eventsSmallTitle">协调处理情况</view>
 
@@ -216,7 +197,7 @@
 
                 <view class="eventsSmallTitle">经营公司协调处理情况</view>
 
-                <view class="eventsItemPic">
+                <view class="eventsItem">
                     <view class="eventsLabel">协调处理结果：</view>
                     <view class="eventsPic">{{ eventsDetail.endRes || "" }}</view>
                 </view>
@@ -342,8 +323,10 @@ export default {
     },
     methods: {
         handleShowDetail(obj) {
-            this.$refs.popup.open('center')
-            this.eventsDetail = obj
+            // this.$refs.popup.open('center')
+            // this.eventsDetail = obj
+            this.$util.toNextRoute("navigateTo", `/pages/attendanceStatus/emergencyEventsDetail?detail=${JSON.stringify(obj)}&type=${this.type}`);
+
         },
         handlePopupChange(e) {
             this.showPopup = e.show
@@ -425,162 +408,71 @@ export default {
         }
     }
 
-    .event-list {
+    .emergencyList {
         padding: 30rpx;
 
-        .event-item {
-            background: #fff;
-            border-radius: 24rpx;
-            margin-bottom: 30rpx;
-            overflow: hidden;
+        .emergencyItem {
+            width: 100%;
+            border-radius: 8rpx;
+            background-color: #fff;
             box-shadow: @shadow;
-            border-left: 8rpx solid @danger;
+            box-sizing: border-box;
+            padding: 24rpx;
+            margin-bottom: 24rpx;
 
-            &.warning {
-                border-left-color: @warn;
-            }
+            .emergencyItemTitle {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                margin-bottom: 24rpx;
 
-            &.resolved {
-                border-left-color: @ok;
-                opacity: .85;
-            }
-
-            &.left-ok {
-                border-left-color: @ok;
-            }
-
-            &.left-warn {
-                border-left-color: @warn;
-            }
-
-            .event-header {
-                padding: 30rpx;
-                border-bottom: 1rpx solid #f1f3f4;
-                background: #fff;
-
-                .event-title {
-                    font-weight: 700;
-                    font-size: 32rpx;
-                    margin-bottom: 10rpx;
-                    display: flex;
-                    align-items: center;
-                    gap: 16rpx;
+                .emergencyItemTitleLeft {
+                    font-size: 28rpx;
+                    font-weight: 600;
+                    display: inline-block;
+                    width: 80%;
                 }
 
-                .event-meta {
-                    display: flex;
-                    justify-content: space-between;
-                    align-items: center;
+                .emergencyItemStatus {
                     font-size: 24rpx;
-                    color: @muted;
-
-                    .event-time {
-                        display: flex;
-                        align-items: center;
-                        gap: 8rpx;
-                    }
-
-                    .event-priority {
-                        padding: 6rpx 16rpx;
-                        border-radius: 20rpx;
-                        font-size: 22rpx;
-                        font-weight: 700;
-
-                        &.priority-high {
-                            background: #ffe6e6;
-                            color: #d32f2f;
-                        }
-
-                        &.priority-medium {
-                            background: #fff3e0;
-                            color: #f57c00;
-                        }
-
-                        &.priority-low {
-                            background: #e8f5e8;
-                            color: #388e3c;
-                        }
-
-                        &.ok {
-                            background: #e8f5e8;
-                            color: #2e7d32;
-                        }
-                    }
+                    padding: 4rpx 16rpx;
+                    border-radius: 32rpx;
                 }
+
             }
 
-            .event-content {
-                padding: 30rpx 30rpx 0;
+            .emergencyDesc {
+                font-size: 24rpx;
+            }
 
-                .event-description {
-                    margin-bottom: 24rpx;
-                    line-height: 1.6;
-                    color: #333;
+            .line {
+                width: 100%;
+                height: 2rpx;
+                background-color: #dad9d3;
+                margin: 24rpx 0;
 
-                    .line {
-                        display: block;
-                    }
+            }
+
+            .otherMessageRow {
+                width: 100%;
+                margin-bottom: 8rpx;
+                display: flex;
+                align-items: flex-start;
+
+                .otherMessageIcon {
+                    width: 30rpx;
+                    height: 30rpx;
+                    margin-right: 16rpx;
+                    margin-top: 6rpx;
                 }
 
-                .event-actions {
-                    display: flex;
-                    gap: 20rpx;
-                    flex-wrap: wrap;
-                    margin-bottom: 16rpx;
-
-                    .event-action-btn {
-                        padding: 16rpx 24rpx;
-                        border: none;
-                        border-radius: 12rpx;
-                        font-size: 24rpx;
-                        font-weight: 700;
-                        color: #fff;
-
-                        &.btn-primary {
-                            background: @primary;
-                        }
-
-                        &.btn-success {
-                            background: @ok;
-                        }
-
-                        &.btn-warning {
-                            background: @warn;
-                            color: #fff;
-                        }
-                    }
-                }
-
-                .event-status {
-                    display: flex;
-                    align-items: center;
-                    gap: 10rpx;
+                .otherMessageValue {
                     font-size: 24rpx;
-                    margin-top: 10rpx;
-                    padding: 16rpx 20rpx;
-                    background: @bg;
-                    border-radius: 12rpx;
 
-                    .status-dot {
-                        width: 16rpx;
-                        height: 16rpx;
-                        border-radius: 50%;
-
-                        &.status-processing {
-                            background: @warn;
-                        }
-
-                        &.status-resolved {
-                            background: @ok;
-                        }
-
-                        &.status-pending {
-                            background: @danger;
-                        }
-                    }
                 }
             }
         }
+
     }
 
     .add-event-btn {
@@ -678,6 +570,24 @@ export default {
             display: flex;
             align-items: flex-start;
 
+            .eventsHaveImgLabel {
+                display: flex;
+                width: 200rpx;
+                align-items: center;
+
+                .eventsHaveImg {
+                    width: 30rpx;
+                    height: 30rpx;
+                    margin-right: 16rpx;
+                    margin-top: 6rpx;
+                }
+
+                .eventsHaveLabel {
+                    width: 154rpx;
+                    font-size: 26rpx;
+                }
+            }
+
             .eventsLabel {
                 width: 200rpx;
                 text-align: left;
@@ -690,6 +600,14 @@ export default {
             }
         }
 
+        .line {
+            width: 100%;
+            height: 2rpx;
+            background-color: #dad9d3;
+            margin: 24rpx 0;
+
+        }
+
         .eventsSmallTitle {
             margin: 16rpx 0;
             width: 100%;
@@ -708,6 +626,8 @@ export default {
 
             .eventsPic {
                 flex: 1;
+                display: flex;
+                align-items: center;
                 font-size: 24rpx;
 
                 .eventsPicItem {
diff --git a/pages/attendanceStatus/emergencyEventsDetail.vue b/pages/attendanceStatus/emergencyEventsDetail.vue
new file mode 100644
index 0000000..d3d6139
--- /dev/null
+++ b/pages/attendanceStatus/emergencyEventsDetail.vue
@@ -0,0 +1,405 @@
+<template>
+    <view class="main">
+        <view class="detailBox">
+            <view class="pageTitle">{{ detailObj.title || "" }}</view>
+
+            <view class="userDetailBox" :style="{ marginTop: pageType === 1 ? '' : '0' }">
+                <view class="userDetailBoxTop">
+                    <view class="userDetailBoxService">{{ detailObj.service || "" }}</view>
+
+                    <view class="userDetailBoxServiceRight">
+                        <view class="userDetailBoxStatus" :style="{
+                            background: detailObj.status === 1 ? '#ecbd44' : detailObj.status === 2 ? '#d3d3d3' : '',
+                            color: detailObj.status === 1 ? '#fff' : detailObj.status === 2 ? '#fff' : ''
+                        }">
+                            {{ detailObj.status === 1 ? '已完成' : detailObj.status ===
+                                2 ? '处理中' : '' }}</view>
+                    </view>
+                </view>
+
+                <view class="eventsItem" style="margin-top: 24rpx;">
+                    <view class="eventsHaveImgLabel">
+                        <image class="eventsHaveImg" src="https://eshangtech.com/cyy_DIB/personIcon.png" />
+                        <view class="eventsHaveLabel">联系人：</view>
+                    </view>
+                    <view class="eventsValue">{{ detailObj.person || "" }}</view>
+                </view>
+                <view class="eventsItem">
+                    <view class="eventsHaveImgLabel">
+                        <image class="eventsHaveImg" src="https://eshangtech.com/cyy_DIB/phoneLabelIcon.png" />
+                        <view class="eventsHaveLabel">联系电话：</view>
+                    </view>
+                    <view class="eventsValue">{{ detailObj.phone || "" }}</view>
+                </view>
+                <view class="eventsItem" style="margin-bottom: 0;">
+                    <view class="eventsHaveImgLabel">
+                        <image class="eventsHaveImg" src="https://eshangtech.com/cyy_DIB/timeIcon.png" />
+                        <view class="eventsHaveLabel">处理用时：</view>
+                    </view>
+                    <view class="eventsValue">{{ detailObj.haveTime || "" }}</view>
+                </view>
+
+            </view>
+        </view>
+
+        <view class="pageText" v-if="pageType === 1">应急事件</view>
+        <view class="pageText" v-if="pageType === 2">日常问题</view>
+
+        <view class="detailBox" v-if="pageType === 1">
+            <view class="userDetailBox noBoxShow">
+                <!-- <view class="eventsItem">
+                    <view class="eventsLabel">标题：</view>
+                    <view class="eventsValue">{{ detailObj.title || "" }}</view>
+                </view> -->
+                <view class="eventsItem">
+                    <view class="eventsLabel">事件片区：</view>
+                    <view class="eventsValue">{{ detailObj.area || "" }}</view>
+                </view>
+                <!-- <view class="eventsItem">
+                    <view class="eventsLabel">事件服务区：</view>
+                    <view class="eventsValue">{{ detailObj.service || "" }}</view>
+                </view>
+
+                <view class="eventsItem">
+                    <view class="eventsLabel">死亡人数：</view>
+                    <view class="eventsValue">{{ detailObj.diePerson || "" }}</view>
+                </view> -->
+                <view class="eventsItem">
+                    <view class="eventsLabel">事件概况：</view>
+                    <view class="eventsValue">{{ detailObj.desc || "" }}</view>
+                </view>
+                <view class="eventsItem">
+                    <view class="eventsLabel">事件损失情况：</view>
+                    <view class="eventsValue">{{ detailObj.lossDesc || "" }}</view>
+                </view>
+                <view class="eventsItem">
+                    <view class="eventsLabel">处理结果：</view>
+                    <view class="eventsValue">{{ detailObj.res || "" }}</view>
+                </view>
+                <view class="eventsItemPic">
+                    <view class="eventsLabel">事件现场照片：</view>
+                    <view class="eventsPic" v-if="detailObj.imgList && detailObj.imgList.length > 0">
+                        <view class="eventsPicItem" v-for="(item, index) in detailObj.imgList" :key="index"
+                            @click="showImg(detailObj.imgList, index)">
+                            <image class="eventsPicImg" :src="item.url" />
+
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <view class="detailBox" v-if="pageType === 2" style="padding-bottom: 24rpx;">
+            <view class="userDetailBox noBoxShow">
+                <view class="eventsItem">
+                    <view class="eventsLabel">事件片区：</view>
+                    <view class="eventsValue">{{ detailObj.area || "" }}</view>
+                </view>
+                <!-- <view class="eventsItem">
+                    <view class="eventsLabel">事件服务区：</view>
+                    <view class="eventsValue">{{ detailObj.service || "" }}</view>
+                </view> -->
+                <view class="eventsItem">
+                    <view class="eventsLabel">类型：</view>
+                    <view class="eventsValue">{{ detailObj.type || "" }}</view>
+                </view>
+                <view class="eventsItem" style="margin-bottom: 0;">
+                    <view class="eventsLabel">问题描述：</view>
+                    <view class="eventsValue">{{ detailObj.desc || "" }}</view>
+                </view>
+            </view>
+
+        </view>
+
+        <view class="pageText" v-if="pageType === 2">协调处理情况</view>
+
+        <view class="detailBox" v-if="pageType === 2" style="padding-bottom: 24rpx;">
+            <view class="eventsItem">
+                <view class="eventsLabel">协调处理结果：</view>
+                <view class="eventsValue">{{ detailObj.startRes || "" }}</view>
+            </view>
+            <view class="eventsItem">
+                <view class="eventsLabel">办理人：</view>
+                <view class="eventsValue">{{ detailObj.startPerson || "" }}</view>
+            </view>
+            <view class="eventsItem" style="margin-bottom: 0;">
+                <view class="eventsLabel">办理完成时间：</view>
+                <view class="eventsValue">{{ detailObj.startTime || "" }}</view>
+            </view>
+        </view>
+
+        <view class="pageText" v-if="pageType === 2">经营公司协调处理情况</view>
+
+        <view class="detailBox" v-if="pageType === 2" style="padding-bottom: 24rpx;">
+            <view class="eventsItem">
+                <view class="eventsLabel">协调处理结果：</view>
+                <view class="eventsPic">{{ detailObj.endRes || "" }}</view>
+            </view>
+            <view class="eventsItem">
+                <view class="eventsLabel">办理人：</view>
+                <view class="eventsValue">{{ detailObj.endPerson || "" }}</view>
+            </view>
+            <view class="eventsItem">
+                <view class="eventsLabel">办理完成时间：</view>
+                <view class="eventsValue">{{ detailObj.endTime || "" }}</view>
+            </view>
+            <view class="eventsItemPic" style="margin-bottom: 0;">
+                <view class="eventsLabel">事件现场照片：</view>
+                <view class="eventsPic" v-if="detailObj.imgList && detailObj.imgList.length > 0">
+                    <view class="eventsPicItem" v-for="(item, index) in detailObj.imgList" :key="index"
+                        @click="showImg(detailObj.imgList, index)">
+                        <image class="eventsPicImg" :src="item.url" />
+
+                    </view>
+                </view>
+            </view>
+        </view>
+
+
+    </view>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            detailObj: null,
+            pageType: 0
+        }
+    },
+    onLoad(query) {
+        if (query.detail) {
+            this.detailObj = JSON.parse(query.detail)
+        }
+        if (query.type) {
+            this.pageType = Number(query.type)
+        }
+
+        if (this.pageType === 1) {
+            uni.setNavigationBarTitle({
+                title: '应急事件'
+            })
+        } else {
+            uni.setNavigationBarTitle({
+                title: '日常问题'
+            })
+        }
+    },
+    methods: {
+        // 图片预览
+        showImg(list, index) {
+            console.log('list', list);
+            console.log('indexindex', index);
+            let urls = []
+            list.forEach((item) => {
+                urls.push(item.url)
+            })
+
+            uni.previewImage({
+                urls: urls,
+                current: list[index].url,
+            });
+        },
+    }
+}
+</script>
+<style scoped lang="scss">
+.main {
+    width: 100vw;
+    min-height: 100vh;
+    background-color: #f0f2f3;
+    box-sizing: border-box;
+    padding-bottom: constant(safe-area-inset-bottom);
+    /* 兼容旧版 iOS */
+    padding-bottom: env(safe-area-inset-bottom);
+
+    /* 兼容新版 */
+    .detailBox {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 24rpx 24rpx 48rpx;
+        background-color: #fff;
+
+        .pageTitle {
+            width: 100%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            font-size: 30rpx;
+        }
+
+        .userDetailBox {
+            width: calc(100% - 32rpx);
+            margin-top: 24rpx;
+            margin-left: 16rpx;
+            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+            box-sizing: border-box;
+            padding: 16rpx 24rpx;
+
+            .userDetailBoxTop {
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+
+                .userDetailBoxService {
+                    font-size: 28rpx;
+                }
+
+                .userDetailBoxStatus {
+                    display: inline-block;
+                    font-size: 24rpx;
+                    padding: 4rpx 16rpx;
+                    border-radius: 32rpx;
+                }
+            }
+
+
+            .eventsItem {
+                width: 100%;
+                margin-bottom: 16rpx;
+                display: flex;
+                align-items: flex-start;
+
+                .eventsHaveImgLabel {
+                    display: flex;
+                    width: 200rpx;
+                    align-items: center;
+
+                    .eventsHaveImg {
+                        width: 30rpx;
+                        height: 30rpx;
+                        margin-right: 16rpx;
+                        margin-top: 6rpx;
+                    }
+
+                    .eventsHaveLabel {
+                        width: 154rpx;
+                        font-size: 24rpx;
+                    }
+                }
+
+                .eventsLabel {
+                    width: 200rpx;
+                    text-align: left;
+                    font-size: 24rpx;
+                }
+
+                .eventsValue {
+                    flex: 1;
+                    font-size: 24rpx;
+                }
+            }
+
+            .eventsItemPic {
+                width: 100%;
+
+                .eventsLabel {
+                    width: 200rpx;
+                    text-align: left;
+                    font-size: 24rpx;
+                }
+
+                .eventsPic {
+                    flex: 1;
+                    display: flex;
+                    align-items: center;
+                    font-size: 24rpx;
+
+                    .eventsPicItem {
+                        width: 100rpx;
+                        height: 100rpx;
+                        margin-right: 8rpx;
+                        margin-bottom: 8rpx;
+
+                        .eventsPicImg {
+                            width: 100%;
+                            height: 100%;
+                        }
+                    }
+                }
+            }
+        }
+
+        .noBoxShow {
+            box-shadow: none;
+            margin-top: 0;
+            padding: 0 24rpx;
+            margin-left: 0;
+        }
+
+
+        .eventsItem {
+            width: 100%;
+            margin-bottom: 16rpx;
+            display: flex;
+            align-items: flex-start;
+
+            .eventsHaveImgLabel {
+                display: flex;
+                width: 200rpx;
+                align-items: center;
+
+                .eventsHaveImg {
+                    width: 30rpx;
+                    height: 30rpx;
+                    margin-right: 16rpx;
+                    margin-top: 6rpx;
+                }
+
+                .eventsHaveLabel {
+                    width: 154rpx;
+                    font-size: 24rpx;
+                }
+            }
+
+            .eventsLabel {
+                width: 200rpx;
+                text-align: left;
+                font-size: 24rpx;
+            }
+
+            .eventsValue {
+                flex: 1;
+                font-size: 24rpx;
+            }
+        }
+
+        .eventsItemPic {
+            width: 100%;
+
+            .eventsLabel {
+                width: 200rpx;
+                text-align: left;
+                font-size: 24rpx;
+            }
+
+            .eventsPic {
+                flex: 1;
+                display: flex;
+                align-items: center;
+                font-size: 24rpx;
+
+                .eventsPicItem {
+                    width: 100rpx;
+                    height: 100rpx;
+                    margin-right: 8rpx;
+                    margin-bottom: 8rpx;
+
+                    .eventsPicImg {
+                        width: 100%;
+                        height: 100%;
+                    }
+                }
+            }
+        }
+    }
+
+    .pageText {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 16rpx 40rpx;
+        font-size: 24rpx;
+        color: #8d8e8e;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/attendanceStatus/index.vue b/pages/attendanceStatus/index.vue
index c3bb047..6696d3c 100644
--- a/pages/attendanceStatus/index.vue
+++ b/pages/attendanceStatus/index.vue
@@ -23,12 +23,44 @@
             </view>
         </view>
 
-        <!-- 居中的日历时间 -->
-        <view class="dateBox">
-            <view class="centerDateBox" @click="open">
-                <text class="date-text">{{ selectDate }}</text>
-                <text class="date-icon">📅</text>
+        <!-- 服务区的信息 -->
+        <view class="serviceDetail" style="margin-top: 16rpx;">
+            <view class="detailTop">
+                <view class="serviceImg" v-if="serviceInfo.ImageLits && serviceInfo.ImageLits.length > 0">
+                    <swiper scroll-x="true" circular="true" class="banner" indicator-dots="true"
+                        indicator-active-color="#272625" autoplay interval="3000" :current="pageMsg.current"
+                        style="width: 100%; height: 100%">
+                        <swiper-item v-for="(img, i) in serviceInfo.ImageLits" :key="i"
+                            style="width: 100%; height: 100%">
+                            <image style="width: 100%; height: 100%" mode="aspectFill" lazy-load="true" :src="img">
+                            </image>
+                        </swiper-item>
+                    </swiper>
+                </view>
             </view>
+            <!-- <view class="detailBottom">
+                <view class="detailFirst">
+                    <text class="serviceName">{{
+                        serviceInfo.SERVERPART_NAME || ""
+                        }}</text>
+                    <text class="serviceStatus">营业中</text>
+                </view>
+                <view class="detailSecond">
+                    <image class="detailFixedIcon" src="/static/images/home/address.png" />
+                    <text class="address">
+                        <text class="distance">{{
+                            serviceInfo.SERVERPART_DISTANCE === 0
+                                ? 0
+                                : serviceInfo.SERVERPART_DISTANCE || "-"
+                        }}km</text>
+                        <text class="addressText">{{ serviceInfo.ServerpartInfo.SERVERPART_ADDRESS || "-"
+                            }}{{ serviceInfo.ServerpartInfo.EXPRESSWAY_NAME || "-" }}</text>
+                    </text>
+                </view>
+                <view class="navigationBox" @click="handleGomap">
+                    <image class="navigationIcon" src="/static/images/home/navigationIcon.svg" />
+                </view>
+            </view> -->
         </view>
 
         <!-- 插入日历 即悬浮框 -->
@@ -53,39 +85,59 @@
             </view> -->
         </view>
 
-        <!-- 特情事件提醒横幅 -->
-        <view class="emergency-banner" style="margin-top: 24rpx;" @click="showEmergencyDetails(1)">
-            <view class="emergency-header">
-                <view class="emergency-title">
-                    <text>🚨 应急事件提醒</text>
-                    <view class="emergency-count">{{ emergencyCount }}</view>
+
+        <view class="thingBox">
+            <!-- 特情事件提醒横幅 -->
+            <view class="emergency-banner" @click="showEmergencyDetails(1)">
+                <view class="emergency-header">
+                    <view class="emergency-title">
+                        <text>🚨 应急事件</text>
+                        <view class="emergency-count">{{ 2 }}</view>
+                    </view>
+                    <!-- <text>👉</text> -->
+                </view>
+            </view>
+
+            <!-- 一般警告提醒 -->
+            <view class="warning-banner" @click="showEmergencyDetails(2)">
+                <view class="emergency-header">
+                    <view class="emergency-title">
+                        <text>⚠️ 日常问题</text>
+                        <view class="emergency-count">{{ 2 }}</view>
+                    </view>
+                    <!-- <text>👉</text> -->
                 </view>
-                <text>👉</text>
             </view>
         </view>
 
-        <!-- 一般警告提醒 -->
-        <view class="warning-banner" @click="showEmergencyDetails(2)">
-            <view class="emergency-header">
-                <view class="emergency-title">
-                    <text>⚠️ 日常问题</text>
-                    <view class="emergency-count">{{ warningCount }}</view>
-                </view>
-                <text>👉</text>
-            </view>
-        </view>
+
 
         <!-- 在岗人员 -->
         <view class="onDutyPersonBox">
             <view class="onDutyPersonBoxHeader">
                 <text class="title">{{ selectTab === 1 ? "👥 当前在岗人员" : selectTab === 2 ? "📋 请假人员列表" : selectTab === 3
                     ? "👑 值班经理信息" : ""
-                    }}</text>
-                <view class="tab-indicators">
+                }}</text>
+
+
+                <!-- 居中的日历时间 -->
+                <view class="dateBox">
+                    <view class="centerDateBox">
+                        <image class="arrowIcon" src="https://eshangtech.com/cyy_DIB/leftArrowIcon.png"
+                            @click="handleChangeDate(2)" />
+                        <view class="center" @click="open">
+                            <text class="date-text">{{ selectDate }}</text>
+                            <!-- <text class="date-icon">📅</text> -->
+                        </view>
+                        <image class="arrowIcon" src="https://eshangtech.com/cyy_DIB/rightArrowIcon.png"
+                            @click="handleChangeDate(1)" />
+                    </view>
+                </view>
+
+                <!-- <view class="tab-indicators">
                     <view class="tab-dot" :class="{ active: selectTab === 1 }"></view>
                     <view class="tab-dot" :class="{ active: selectTab === 2 }"></view>
-                    <view class="tab-dot" :class="{ active: selectTab === 3 }"></view>
-                </view>
+                </view> -->
             </view>
 
             <!-- 当前在岗人员 -->
@@ -169,7 +221,7 @@
         <!-- 其他跳转链接 -->
         <view class="otherJumpUrl">
             <view class="jumpItem" v-for="(item, index) in jumpItemList" :key="index"
-                :style="{ marginBottom: index < 4 ? '24rpx' : '' }" @click="handleClickJump(item.value)">
+                @click="handleClickJump(item.value)">
                 <image class="jumpIcon" :src="item.url" />
                 <view class="jumpText">{{ item.label }}</view>
             </view>
@@ -281,6 +333,7 @@
 </template>
 
 <script>
+import request from "@/util/index.js";
 export default {
     data() {
         const nowDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD') // 有数据的最近日期
@@ -414,7 +467,7 @@ export default {
                     toLateTime: "",// 迟到时长
                     offWorkPlace: "",// 下班打卡地
                     offWorkTime: "",// 下班打卡时间
-                    earlyWorkTime: "",// 早退时长
+                    earlyWorkTime: "",// 早退时长 
                     monthDay: "23",// 当月排班天数
                     AttendanceDay: "13",// 出勤天数
                     leaveDay: "8",// 休息天数
@@ -426,12 +479,12 @@ export default {
                 { name: "王五", post: "经理", status: 1, phone: "6666", address: "G56杭瑞高速主干道昆明至滇西方向" },
             ],// 值班经理 
             jumpItemList: [
-                { label: "特情事件", value: 1, url: "" },
-                { label: "设施状态", value: 2, url: "" },
-                { label: "考勤统计", value: 3, url: "" },
-                { label: "请假管理", value: 4, url: "" },
-                { label: "排班表", value: 5, url: "" },
-                { label: "通知公告", value: 6, url: "" },
+                // { label: "应急事件", value: 1, url: "https://eshangtech.com/cyy_DIB/funIcon1.png" },
+                { label: "设施状态", value: 2, url: "https://eshangtech.com/cyy_DIB/funIcon2.png" },
+                { label: "考勤统计", value: 3, url: "https://eshangtech.com/cyy_DIB/funIcon3.png" },
+                { label: "请假管理", value: 4, url: "https://eshangtech.com/cyy_DIB/funIcon4.png" },
+                { label: "排班表", value: 5, url: "https://eshangtech.com/cyy_DIB/funIcon5.png" },
+                // { label: "通知公告", value: 6, url: "https://eshangtech.com/cyy_DIB/funIcon6.png" },
             ],
             showPopup: false,
             userDetail: null
@@ -440,9 +493,82 @@ export default {
     onLoad() {
         this.menu = uni.getMenuButtonBoundingClientRect()
         let currentService = uni.getStorageSync('currentService')
-        this.serviceInfo = currentService
+        this.handleGetServerpartDetail(currentService.Serverpart_ID || currentService.SERVERPART_ID)
+    },
+    onShow() {
+        let currentService = uni.getStorageSync('currentService')
+        console.log('currentService', currentService);
+
+        if (currentService.Serverpart_ID !== this.serviceInfo.SERVERPART_ID) {
+            this.handleGetServerpartDetail(currentService.Serverpart_ID)
+        }
     },
     methods: {
+        // 修改日期
+        handleChangeDate(type) {
+            //  type  1 加一天  2 减一天
+            // 兼容 iOS，把 2025-08-15 转成 2025/08/15
+            const date = new Date(this.selectDate.replace(/-/g, "/"));
+
+            if (type === 1) {
+                date.setDate(date.getDate() + 1); // 加一天
+            } else if (type === 2) {
+                date.setDate(date.getDate() - 1); // 减一天
+            }
+
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, "0");
+            const day = String(date.getDate()).padStart(2, "0");
+
+            this.selectDate = `${year}-${month}-${day}`;
+        },
+        // 查询服务区详情
+        async handleGetServerpartDetail(id) {
+            let currentService = uni.getStorageSync("currentService");
+            let seatInfo = uni.getStorageSync("seatInfo");
+            this.seatInfo = JSON.parse(seatInfo);
+            let req = {
+                ServerpartId: id || currentService.Serverpart_ID || currentService.SERVERPART_ID,
+                latitude: this.seatInfo.latitude,
+                longitude: this.seatInfo.longitude,
+            };
+            console.log('req', req);
+
+            uni.showLoading({
+                title: "加载中...",
+            });
+
+            const data = await request.$webJavaGet(
+                "/third-party/getServerPartInfo",
+                req
+            );
+            uni.hideLoading();
+
+            let obj = data.Result_Data;
+            this.serviceInfo = obj;
+            this.$forceUpdate();
+
+            console.log('this.serviceInfo', this.serviceInfo);
+
+        },
+        // 打开导航
+        handleGomap() {
+            let obj = this.serviceInfo;
+            uni.openLocation({
+                latitude: obj.latitude ? obj.latitude * 1 : obj.SERVERPART_Y * 1,
+                longitude: obj.longitude ? obj.longitude * 1 : obj.SERVERPART_X * 1,
+                scale: 16, // 缩放比例
+                name: obj.SERVERPART_NAME,
+                // address: "", // 这个可能会影响地图的定位，所以可以选择不填
+                success(data) {
+                },
+                fail(err) {
+                },
+            });
+        },
+        handleChangeService() {
+            this.$util.toNextRoute("navigateTo", "/pages/map/index?type=attendanceStatus");
+        },
         open() {
             this.$refs.calendar.open()
         },
@@ -481,8 +607,11 @@ export default {
         },
         // 跳转其他页面
         handleClickJump(value) {
-            if (value === 2) {
-                this.$util.toNextRoute("navigateTo", `/pages/attendanceStatus/serviceFacility`);
+            if (value === 1) {
+                this.showEmergencyDetails(1)
+            } else if (value === 2) {
+                // this.$util.toNextRoute("navigateTo", `/pages/attendanceStatus/serviceFacility`);
+                this.$util.toNextRoute('navigateTo', `/pages/summaryOfPortraits/index?index=0`)
             }
         },
         // 会员详情信息
@@ -514,7 +643,7 @@ export default {
     width: 100vw;
     min-height: 100vh;
     // background-image: url("https://eshangtech.com/minTestImg/pageBg.png");
-    background-color: #fff;
+    background-color: #F5F5F5;
     box-sizing: border-box;
     padding-bottom: env(safe-area-inset-bottom);
 
@@ -579,7 +708,7 @@ export default {
                             .uni-input {
                                 padding: 0;
                                 background: transparent;
-                                font-size: 14px;
+                                font-size: 28rpx;
                                 font-family: PingFangSC-Semibold, PingFang SC;
                                 font-weight: 600;
                                 color: #160002;
@@ -620,31 +749,120 @@ export default {
 
     }
 
-    .dateBox {
-        width: 100vw;
-        box-sizing: border-box;
-        padding: 16rpx 0;
-        display: flex;
-        align-items: center;
-        justify-content: center;
+    .serviceDetail {
+        width: calc(100% - 64rpx);
+        background: #ffffff;
+        border-radius: 16rpx;
+        margin-left: 32rpx;
 
-        .centerDateBox {
-            display: flex;
-            align-items: center;
-            gap: 10rpx;
-            padding: 10rpx 20rpx;
-            border-radius: 30rpx;
-            background-color: #fff;
-            border: 2rpx solid #27B35F;
-            // background: rgba(255, 255, 255, .15);
+        .detailTop {
+            width: 100%;
+            height: 320rpx;
+            border-radius: 16rpx;
+            overflow: hidden;
 
-            .date-text {
-                font-size: 28rpx;
-                font-weight: 700;
+            .serviceImg {
+                width: 100%;
+                height: 100%;
+            }
+        }
+
+        .detailBottom {
+            width: 100%;
+            box-sizing: border-box;
+            padding: 4rpx 24rpx 24rpx;
+            position: relative;
+
+            .detailFirst {
+                width: 100%;
+
+                .serviceName {
+                    width: calc(100% - 190rpx);
+                    font-family: PingFangSC, PingFang SC;
+                    font-weight: 600;
+                    font-size: 30rpx;
+                    color: #130f05;
+                    line-height: 52rpx;
+                    text-align: left;
+                    font-style: normal;
+                    white-space: nowrap;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                    margin-right: 16rpx;
+                }
+
+                .serviceStatus {
+                    font-family: PingFangSC, PingFang SC;
+                    font-weight: 400;
+                    font-size: 22rpx;
+                    color: #009f43;
+                    line-height: 32rpx;
+                    text-align: justify;
+                    font-style: normal;
+                    display: inline-block;
+                    padding: 2rpx 6rpx;
+                    background: #e9f8ee;
+                    border-radius: 4rpx;
+                }
+            }
+
+            .detailSecond {
+                width: 100%;
+                display: flex;
+                align-items: center;
+
+                .detailFixedIcon {
+                    width: 24rpx;
+                    height: 24rpx;
+                    margin-right: 4rpx;
+                }
+
+                .address {
+                    width: calc(100% - 120rpx);
+                    display: inline-block;
+                    text-overflow: ellipsis;
+                    overflow: hidden;
+                    white-space: nowrap;
+
+                    .distance {
+                        font-family: PingFangSC, PingFang SC;
+                        font-weight: 400;
+                        font-size: 24rpx;
+                        color: #130f05;
+                        line-height: 36rpx;
+                        text-align: left;
+                        font-style: normal;
+                        margin-right: 8rpx;
+                    }
+
+                    .addressText {
+                        font-family: PingFangSC, PingFang SC;
+                        font-weight: 400;
+                        font-size: 24rpx;
+                        color: #716f69;
+                        line-height: 36rpx;
+                        text-align: left;
+                        font-style: normal;
+                    }
+                }
+            }
+
+            .navigationBox {
+                width: 64rpx;
+                height: 64rpx;
+                position: absolute;
+                right: 24rpx;
+                top: 32rpx;
+
+                .navigationIcon {
+                    width: 100%;
+                    height: 100%;
+                }
             }
         }
     }
 
+
     .selectDateCalendar {
         /deep/ .uni-calendar-item__weeks-box-item {
             width: calc(100% / 7);
@@ -713,20 +931,66 @@ export default {
         }
     }
 
-    .emergency-banner {
-        background: linear-gradient(135deg, @danger, #ff3838);
-        color: #fff;
-        padding: 20rpx 30rpx;
-        margin: 0 30rpx 30rpx;
-        border-radius: 16rpx;
-        box-shadow: 0 4rpx 12rpx rgba(255, 71, 87, .3);
-        border-left: 8rpx solid #ff1744;
+    .thingBox {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 0 32rpx;
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        gap: 50rpx;
+        margin-top: 24rpx;
 
-        .emergency-header {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            margin-bottom: 10rpx;
+        .emergency-banner {
+            background: linear-gradient(135deg, @danger, #ff3838);
+            color: #fff;
+            padding: 20rpx 30rpx;
+            border-radius: 16rpx;
+            box-shadow: 0 4rpx 12rpx rgba(255, 71, 87, .3);
+            border-left: 8rpx solid #ff1744;
+
+            .emergency-header {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                // margin-bottom: 10rpx; 
+
+                .emergency-title {
+                    font-weight: 700;
+                    font-size: 28rpx;
+                    display: flex;
+                    align-items: center;
+                    gap: 16rpx;
+                }
+
+                .emergency-count {
+                    background: rgba(255, 255, 255, .3);
+                    padding: 4rpx 16rpx;
+                    border-radius: 24rpx;
+                    font-size: 24rpx;
+                    font-weight: 700;
+                }
+            }
+
+            .emergency-preview {
+                font-size: 24rpx;
+                opacity: .9;
+            }
+        }
+
+        .warning-banner {
+            background: linear-gradient(135deg, @warn, #ff8c00);
+            color: #fff;
+            padding: 20rpx 30rpx;
+            border-radius: 16rpx;
+            box-shadow: 0 4rpx 12rpx rgba(255, 159, 67, .3);
+            border-left: 8rpx solid #ff8c00;
+
+            .emergency-header {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                // margin-bottom: 10rpx;
+            }
 
             .emergency-title {
                 font-weight: 700;
@@ -743,51 +1007,15 @@ export default {
                 font-size: 24rpx;
                 font-weight: 700;
             }
-        }
 
-        .emergency-preview {
-            font-size: 24rpx;
-            opacity: .9;
+            .emergency-preview {
+                font-size: 24rpx;
+                opacity: .9;
+            }
         }
     }
 
-    .warning-banner {
-        background: linear-gradient(135deg, @warn, #ff8c00);
-        color: #fff;
-        padding: 20rpx 30rpx;
-        margin: 0 30rpx 30rpx;
-        border-radius: 16rpx;
-        box-shadow: 0 4rpx 12rpx rgba(255, 159, 67, .3);
-        border-left: 8rpx solid #ff8c00;
 
-        .emergency-header {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            margin-bottom: 10rpx;
-        }
-
-        .emergency-title {
-            font-weight: 700;
-            font-size: 28rpx;
-            display: flex;
-            align-items: center;
-            gap: 16rpx;
-        }
-
-        .emergency-count {
-            background: rgba(255, 255, 255, .3);
-            padding: 4rpx 16rpx;
-            border-radius: 24rpx;
-            font-size: 24rpx;
-            font-weight: 700;
-        }
-
-        .emergency-preview {
-            font-size: 24rpx;
-            opacity: .9;
-        }
-    }
 
     .onDutyPersonBox {
         width: calc(100% - 64rpx);
@@ -799,7 +1027,7 @@ export default {
 
         .onDutyPersonBoxHeader {
             background: @bg;
-            padding: 30rpx;
+            padding: 10rpx 30rpx;
             border-bottom: 1rpx solid #e9ecef;
             font-weight: 700;
             font-size: 28rpx;
@@ -823,6 +1051,38 @@ export default {
                     }
                 }
             }
+
+            .dateBox {
+                box-sizing: border-box;
+                padding: 16rpx 0;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                .centerDateBox {
+                    display: flex;
+                    align-items: center;
+                    gap: 10rpx;
+                    padding: 10rpx 20rpx;
+                    border-radius: 30rpx;
+                    background-color: #fff;
+                    // border: 2rpx solid #27B35F;
+                    // background: rgba(255, 255, 255, .15);
+
+                    .arrowIcon {
+                        width: 40rpx;
+                        height: 40rpx;
+                    }
+
+                    .center {
+                        .date-text {
+                            font-size: 28rpx;
+                            font-weight: 700;
+                        }
+                    }
+
+                }
+            }
         }
 
         .onDutyPersonList {
diff --git a/pages/commercialBI/noData.vue b/pages/commercialBI/noData.vue
index 4699c8a..d5445d6 100644
--- a/pages/commercialBI/noData.vue
+++ b/pages/commercialBI/noData.vue
@@ -1,48 +1,66 @@
 <template>
   <div class="main">
-      <image class="typeImg" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/noData.svg"></image>
-      <p class="text" v-if="type==='index'">抱歉,数据为第三方接口传输，无法进行画像分析</p>
-      <p class="noAuthor" v-else-if="type==='noAuthor'">抱歉，您没有权限查看数智化看板，请联系管理员进行授权</p>
-      <p class="text" v-else>抱歉,第三方数据未传,无法分析</p>
+    <image class="typeImg" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/noData.svg"></image>
+    <p class="text" v-if="type === 'index'">抱歉,数据为第三方接口传输，无法进行画像分析</p>
+    <p class="noAuthor" v-else-if="type === 'noAuthor'">抱歉，您没有权限查看数智化看板，请联系管理员进行授权</p>
+    <p class="homeIndex" v-else-if="type === 'homeIndex'">抱歉，您没有权限查看数智化看板，请联系管理员进行授权</p>
+    <p class="text" v-else>抱歉,第三方数据未传,无法分析</p>
   </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
-    name: "noData",
-    data(){
-        return {
-          type:''
-        }
-    },
-    onLoad(query){
-        if (query.type){
-          this.type = query.type
-        }
-        let userInfo = uni.getStorageSync('vuex')
-        userInfo = JSON.parse(userInfo)
-        
-
-
-        if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee']===1){
-            setTimeout(()=>{
-                uni.switchTab({
-                    url:`/pages/index/index`
-                })
-            },200)
-        }
-    },
-    onUnload() {
-        this.$util.addUserBehavior()
-    },
-    methods:{
-
+  name: "noData",
+  data() {
+    return {
+      type: ''
     }
+  },
+  computed: {
+    ...mapGetters({ user: "getUser" }),
+  },
+  watch: {
+    user: {
+      handler(newValue, value) {
+        if (this.type === 'homeIndex') {
+          if (newValue && newValue.WeChat_UserId && newValue.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] === 1) {
+            uni.switchTab({
+              url: `/pages/index/index`
+            })
+          }
+        }
+      }
+    }
+  },
+  onLoad(query) {
+    if (query.type) {
+      this.type = query.type
+    }
+    let userInfo = uni.getStorageSync('vuex')
+    userInfo = JSON.parse(userInfo)
+
+
+
+    if (userInfo.userData.AuthorityInfo['89a1f248-2113-4d57-84b1-c2e6edb9e8ee'] === 1) {
+      setTimeout(() => {
+        uni.switchTab({
+          url: `/pages/index/index`
+        })
+      }, 200)
+    }
+  },
+  onUnload() {
+    this.$util.addUserBehavior()
+  },
+  methods: {
+
+  }
 }
 </script>
 
 <style scoped lang="scss">
-.main{
+.main {
   width: 100%;
   display: flex;
   flex-direction: column;
@@ -50,18 +68,21 @@ export default {
   align-items: center;
   margin-top: 12px;
   padding: 16px 0;
-  .img{
-    width:60px;
+
+  .img {
+    width: 60px;
     height: 60px;
     margin-bottom: 8px;
   }
-  .typeImg{
+
+  .typeImg {
     width: 80px;
     height: 80px;
     margin-top: 40vh;
     margin-bottom: 16px;
   }
-  .text{
+
+  .text {
     font-size: 14px;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
diff --git a/pages/index/components/numberScroll.vue b/pages/index/components/numberScroll.vue
index 36652b0..d5e9d33 100644
--- a/pages/index/components/numberScroll.vue
+++ b/pages/index/components/numberScroll.vue
@@ -1,58 +1,59 @@
 <template>
   <view class="content">
     <!-- num 是字符串，会被切成片渲染 -->
-    <view class="l-num" :style="{width: key===',' || key==='.'?'12rpx':'28rpx'}" v-for="(key,value) in num" :key="value">
+    <view class="l-num" :style="{ width: key === ',' || key === '.' ? '12rpx' : '24rpx' }" v-for="(key, value) in num"
+      :key="value">
       <template v-if="key !== '.' && key !== ','">
-        <view class="l-son" :style="'transform: translateY(-'+(key*52)+'rpx);'" >
-          <view class="l-num l-posi" v-for="(s,i) in range" :style="'transform: translateY('+(i*52)+'rpx);'" :key="i">
-            {{s}}
+        <view class="l-son" :style="'transform: translateY(-' + (key * 52) + 'rpx);'">
+          <view class="l-num l-posi" v-for="(s, i) in range" :style="'transform: translateY(' + (i * 52) + 'rpx);'" :key="i">
+            {{ s }}
           </view>
         </view>
       </template>
       <!-- 小数点 -->
-      <view class="l-num l-posi" v-else>{{key}}</view>
+      <view class="l-num l-posi" v-else>{{ key }}</view>
     </view>
   </view>
 </template>
 
 <script>
 
-let range = new Array(10).fill(0).map((e,i) => i);
+let range = new Array(10).fill(0).map((e, i) => i);
 
 export default {
   data() {
     return {
-      num:'0.00',	//当前显示数字
-      value:'',	//当前数字
-      range:range,//0-9
+      num: '0.00',	//当前显示数字
+      value: '',	//当前数字
+      range: range,//0-9
       turnTime: 100//定时器时间 单位毫秒  可控制数字滚动快慢 数字越高滚动频率越慢
     }
   },
-  props:{
-    number:{
+  props: {
+    number: {
       type: String,
-      default:''
+      default: ''
     }
   },
-  watch:{
-    number:{
-      handler(value){
+  watch: {
+    number: {
+      handler(value) {
         this.value = value;
         this._getNumber();
       },
-      immediate:true,
-      deep:true
+      immediate: true,
+      deep: true
     }
   },
-  onLoad() {},
+  onLoad() { },
   methods: {
 
     // 这里是保留两位小数的
-    _getNumber(){
+    _getNumber() {
       let value = this.value
       let num = this.num;
 
-      if(num == value){
+      if (num == value) {
         return
       }
       // 我的思路是把数字切成一个数组，每个字符对应一个下标
@@ -61,17 +62,17 @@ export default {
       let newShowNumber = []
       let newNowNumber = []
 
-      this.showNumber.forEach(item=>{
-        if (item!==',' && item!=='.'){
+      this.showNumber.forEach(item => {
+        if (item !== ',' && item !== '.') {
           newShowNumber.push(Number(item))
-        }else{
+        } else {
           newShowNumber.push(item)
         }
       })
-      this.nowNumber.forEach(item=>{
-        if (item!==',' && item!=='.'){
+      this.nowNumber.forEach(item => {
+        if (item !== ',' && item !== '.') {
           newNowNumber.push(Number(item))
-        }else{
+        } else {
           newNowNumber.push(item)
         }
       })
@@ -84,46 +85,46 @@ export default {
       let key = sl > ol ? 'nowNumber' : 'showNumber';
 
       // 这个函数是用来补位的，例如原来是1，新数字是100，那么要给位数少的补位 1 ==> 001
-      this._formatNumber(key,sl,ol);
+      this._formatNumber(key, sl, ol);
 
       // 这个是数字变化滚动的具体函数
       this._turnNumber();
     },
 
-    _formatNumber(key,oldV,newV){
+    _formatNumber(key, oldV, newV) {
       let length = Math.abs(oldV - newV);
       let arr = new Array(length).fill(0);
       this[key] = arr.concat(this[key]);
     },
 
-    _turnNumber(){
+    _turnNumber() {
 
       let _this = this;
       // 循环数字数组，
-      _this.showNumber.forEach((e,i) => {
-          // 判断对应位数的值，如果相等就跳过
-          if(e == _this.nowNumber[i]) return;
+      _this.showNumber.forEach((e, i) => {
+        // 判断对应位数的值，如果相等就跳过
+        if (e == _this.nowNumber[i]) return;
 
-          let inter = setInterval(() => {
-            // 数值相等后清除定时器
-            if(e == _this.nowNumber[_this._index(i)]){
+        let inter = setInterval(() => {
+          // 数值相等后清除定时器
+          if (e == _this.nowNumber[_this._index(i)]) {
+            clearInterval(inter);
+          } else {
+            if (e !== ',' && e !== '.') {
+              // 如果大于就 --  小于就 ++
+              _this.showNumber[_this._index(i)] = e > _this.nowNumber[_this._index(i)] ? --e : ++e;
+              // 每次值变化都更新到视图上，这样看上去就像是滚动了一下。好吧，其实就是滚动了
+              _this.num = parseFloat(_this.showNumber.join('')).toFixed(2);
+              _this.num = _this.$util.fmoney(_this.num, 2)
+            } else {
               clearInterval(inter);
-            }else{
-              if (e!==',' && e!=='.'){
-                // 如果大于就 --  小于就 ++
-                _this.showNumber[_this._index(i)] = e > _this.nowNumber[_this._index(i)] ? --e : ++e;
-                // 每次值变化都更新到视图上，这样看上去就像是滚动了一下。好吧，其实就是滚动了
-                _this.num = parseFloat(_this.showNumber.join('')).toFixed(2);
-                _this.num = _this.$util.fmoney(_this.num,2)
-              }else{
-                clearInterval(inter);
-              }
             }
-          },_this.turnTime);
+          }
+        }, _this.turnTime);
       })
     },
     // 保留当前i的值
-    _index(i){
+    _index(i) {
       return i
     }
   }
@@ -131,17 +132,17 @@ export default {
 </script>
 
 <style>
-.content{
+.content {
   width: 100%;
   text-align: center;
 }
 
-.l-input{
+.l-input {
   padding: 30rpx;
 }
 
-.l-num{
-  font-size: 48rpx;
+.l-num {
+  font-size: 32rpx;
   font-family: DINAlternate-Bold, DINAlternate;
   font-weight: bold;
   color: #160002;
@@ -153,14 +154,14 @@ export default {
   position: relative;
 }
 
-.l-son{
+.l-son {
   width: 100%;
   height: calc(100% * 10);
   position: relative;
-  transition:all 0.5s;
+  transition: all 0.5s;
 }
 
-.l-posi{
+.l-posi {
   position: absolute;
   top: 0;
   left: 0;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 35c354b..3431d0a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,7 @@
         </view>
 
         <!-- 月份的轮播框 -->
-        <view class="monthListBox" :style="{ marginTop: menu.bottom + 8 + 'px' }">
+        <view class="monthListBox" :style="{ paddingTop: menu.bottom + 8 + 'px' }">
             <swiper class="swiperBox" previous-margin="40rpx" next-margin="40rpx" :current="selectIndex"
                 @animationfinish="handleChangeSwiper">
                 <swiper-item class="swiperItem" v-for="(item, index) in monthList" :key="index">
@@ -85,7 +85,7 @@
                                             }"></view>
                                             <span class="itemName">{{
                                                 subItem.name
-                                            }}</span>
+                                                }}</span>
                                         </view>
                                         <view class="itemCenter">
                                             {{
@@ -103,7 +103,7 @@
                                                         : '',
                                         }">{{
                                             subItem.addQOQ ? `${subItem.addQOQ}` : ""
-                                            }}</view>
+                                        }}</view>
                                     </view>
                                 </view>
                             </view>
@@ -211,15 +211,15 @@
 
 
         <!--  即时营收 -->
-        <view class="instantRevenue" style="margin-top: 24rpx">
-            <view class="revenue" @click="handlePage">
+        <view class="instantRevenue" style="margin-top: 24rpx;">
+            <view class="revenue" @click="handlePage" style="padding-bottom: 0;">
                 <view class="revenueTop">
                     <view class="revenyeTopLeft">
                         <image class="monthIcon"
                             src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/monthIcon.svg" />
                         <text class="dateText">{{
                             $util.handleGetMonthDay(nowDay)
-                            }}</text>
+                        }}</text>
                         <text class="day">/{{ howDay }}</text>
                     </view>
                     <view class="revenyeTopRight">
@@ -233,6 +233,24 @@
                     <text class="moneyLabel">实时对客销售/元</text>
                 </view>
             </view>
+
+            <!-- <view class="revenue revenueOther">
+                <view class="otherRealDataBox">
+                    <view class="revenueMoneyItem" v-for="(subItem, subIndex) in otherRealData"
+                        :style="{ marginTop: subIndex >= 2 ? '24rpx' : '' }">
+                        <view class="revenueMoneyItemLeft">
+                            <image class="leftIcon" :src="subItem.icon" />
+                        </view>
+
+                        <view class="revenueMoneyItemRight">
+                            <view class="moneyLabel">{{ subItem.label || "" }}</view>
+                            <view class="moneyText">{{ subItem.value || "" }}<span class="moneyUnit">{{ subItem.unit
+                                || "" }}</span>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view> -->
         </view>
 
         <!-- 实时水电、加油、尿素、充电 -->
@@ -247,8 +265,10 @@
 
                         <view class="revenueMoneyItemRight">
                             <view class="moneyLabel">{{ subItem.label || "" }}</view>
-                            <view class="moneyText">{{ subItem.value || "" }}<span class="moneyUnit">{{ subItem.unit
-                                || "" }}</span>
+                            <view class="moneyText">
+                                <span class="money">{{ subItem.value || "" }}</span>
+                                <span class="moneyUnit">/{{ subItem.unit
+                                    || "" }}</span>
                             </view>
                         </view>
                     </view>
@@ -349,14 +369,12 @@ export default {
                 let userInfo = JSON.parse(JSON.stringify(newValue));
                 _this.useInfo = JSON.parse(JSON.stringify(newValue));
 
-                if (
-                    userInfo &&
-                    userInfo.WeChat_UserId &&
-                    userInfo.AuthorityInfo[
-                    "89a1f248-2113-4d57-84b1-c2e6edb9e8ee"
-                    ] === 1
-                ) {
+                if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] === 1) {
                     _this.isReturn = false;
+                } else if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] !== 1) {
+                    uni.redirectTo({
+                        url: `/pages/commercialBI/noData?type=homeIndex`,
+                    });
                 } else {
                     _this.topShowData = null
                     _this.moneyRateList = []
@@ -402,14 +420,15 @@ export default {
         _this.useInfo = JSON.parse(JSON.stringify(this.user));
         // console.log('userInfouserInfo', userInfo);
 
-        if (
-            userInfo &&
-            userInfo.WeChat_UserId &&
-            userInfo.AuthorityInfo[
-            "89a1f248-2113-4d57-84b1-c2e6edb9e8ee"
-            ] === 1
-        ) {
+        console.log('userInfouserInfo', userInfo);
+
+
+        if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] === 1) {
             _this.isReturn = false;
+        } else if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] !== 1) {
+            uni.redirectTo({
+                url: `/pages/commercialBI/noData?type=homeIndex`,
+            });
         }
 
         console.log('userInfouserInfouserInfo', _this.useInfo);
@@ -423,6 +442,21 @@ export default {
         // 隐藏掉小程序本身自带的 tabbar 让自定义的tabbar出现
         uni.hideTabBar();
     },
+    onPullDownRefresh: function () {
+        let _this = this
+        let userInfo = JSON.parse(JSON.stringify(this.user));
+        if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] === 1) {
+            _this.isReturn = false;
+        } else if (userInfo && userInfo.WeChat_UserId && userInfo.AuthorityInfo["89a1f248-2113-4d57-84b1-c2e6edb9e8ee"] !== 1) {
+            uni.redirectTo({
+                url: `/pages/commercialBI/noData?type=homeIndex`,
+            });
+        }
+        if (!_this.isReturn) {
+            _this.handleGetOnLoad()
+        }
+        uni.stopPullDownRefresh();
+    },
     methods: {
         // 在onLoad里面调用的 请求整个页面的数据
         async handleGetOnLoad() {
@@ -534,31 +568,31 @@ export default {
                 list.forEach((item) => {
                     if (item.dataType === 2000) {
                         result.push({
-                            label: `今日油品`,
+                            label: `油品`,
                             value: this.$util.fmoney(item.totalCount),
                             unit: item.totalCountUnit,
-                            icon: "http://saas.eshangtech.com/cyy_DIB/oilIcon.png"
+                            icon: "https://eshangtech.com/cyy_DIB/oilIcon.png"
                         })
                     } else if (item.dataType === 3000) {
                         result.push({
-                            label: `今日加水`,
+                            label: `加水`,
                             value: this.$util.fmoney(item.totalCount),
                             unit: item.totalCountUnit,
-                            icon: "http://saas.eshangtech.com/cyy_DIB/addWaterIcon.png"
+                            icon: "https://eshangtech.com/cyy_DIB/addWaterIcon.png"
                         })
                     } else if (item.dataType === 4000) {
                         result.push({
-                            label: `今日尿素`,
+                            label: `尿素`,
                             value: this.$util.fmoney(item.totalCount),
                             unit: item.totalCountUnit,
-                            icon: "http://saas.eshangtech.com/cyy_DIB/ureaIcon.png"
+                            icon: "https://eshangtech.com/cyy_DIB/ureaIcon.png"
                         })
                     } else if (item.dataType === 5000) {
                         result.push({
-                            label: `今日充电`,
+                            label: `充电`,
                             value: this.$util.fmoney(item.totalTicket),
                             unit: item.totalTicketUnit,
-                            icon: "http://saas.eshangtech.com/cyy_DIB/chargeIcon.png"
+                            icon: "https://eshangtech.com/cyy_DIB/chargeIcon.png"
                         })
                     }
                 })
@@ -816,7 +850,7 @@ export default {
                             .swiperItemContentUnit {
                                 font-family: 'PingFangSC';
                                 font-weight: 400;
-                                font-size: 28rpx;
+                                font-size: 24rpx;
                                 color: #A69E9F;
                                 line-height: 40rpx;
                                 text-align: left;
@@ -835,7 +869,7 @@ export default {
                             .leftRevenueValue {
                                 font-family: 'DINAlternate';
                                 font-weight: bold;
-                                font-size: 40rpx;
+                                font-size: 30rpx;
                                 color: #160002;
                                 line-height: 40rpx;
                                 text-align: left;
@@ -849,7 +883,7 @@ export default {
                                 .addValue {
                                     font-family: 'DINAlternate';
                                     font-weight: bold;
-                                    font-size: 30rpx;
+                                    font-size: 28rpx;
                                     line-height: 40rpx;
                                     text-align: left;
                                     font-style: normal;
@@ -858,7 +892,7 @@ export default {
                                 .rightNav {
                                     font-family: PingFangSC, PingFang SC;
                                     font-weight: 400;
-                                    font-size: 28rpx;
+                                    font-size: 24rpx;
                                     color: #A69E9F;
                                     line-height: 40rpx;
                                     text-align: left;
@@ -1037,7 +1071,7 @@ export default {
                                 .revenueNum {
                                     font-family: DINAlternate-Bold, DINAlternate;
                                     font-weight: bold;
-                                    font-size: 32rpx;
+                                    font-size: 28rpx;
                                     color: #160002;
                                     line-height: 44rpx;
                                     text-align: left;
@@ -1047,7 +1081,7 @@ export default {
                                 .revenueAdd {
                                     font-family: DINAlternate-Bold, DINAlternate;
                                     font-weight: bold;
-                                    font-size: 32rpx;
+                                    font-size: 28rpx;
                                     color: #e83944;
                                     line-height: 44rpx;
                                     text-align: left;
@@ -1076,7 +1110,7 @@ export default {
                             .swiperItemContentUnit {
                                 font-family: 'PingFangSC';
                                 font-weight: 400;
-                                font-size: 28rpx;
+                                font-size: 24rpx;
                                 color: #A69E9F;
                                 line-height: 40rpx;
                                 text-align: left;
@@ -1109,7 +1143,7 @@ export default {
                                 .addValue {
                                     font-family: 'DINAlternate';
                                     font-weight: bold;
-                                    font-size: 30rpx;
+                                    font-size: 28rpx;
                                     line-height: 40rpx;
                                     text-align: left;
                                     font-style: normal;
@@ -1157,7 +1191,7 @@ export default {
             width: 100%;
             height: 100%;
             box-sizing: border-box;
-            padding: 24rpx;
+            padding: 24rpx 24rpx;
             background: linear-gradient(180deg, #F0E4ED 0%, #F0E8F1 18%, #FFFFFF 100%);
             border-radius: 16rpx;
             display: flex;
@@ -1189,7 +1223,7 @@ export default {
                     }
 
                     .day {
-                        font-size: 28rpx;
+                        font-size: 24rpx;
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 400;
                         color: #a69e9f;
@@ -1211,7 +1245,7 @@ export default {
             }
 
             .revenueMoney {
-                height: 52rpx;
+                height: 70rpx;
                 display: flex;
                 align-items: center;
                 justify-content: space-between;
@@ -1219,19 +1253,21 @@ export default {
 
                 .moneyText {
                     font-size: 44rpx;
-                    font-family: DINAlternate, DINAlternate;
+                    font-family: DINAlternate-Bold, DINAlternate;
                     font-weight: bold;
                     color: #160002;
-                    line-height: 52rpx;
                     margin-right: 8rpx;
                 }
 
                 .moneyLabel {
-                    font-size: 28rpx;
-                    font-family: PingFangSC, PingFang SC;
+                    height: 100%;
+                    font-size: 24rpx;
+                    font-family: DINAlternate-Bold, DINAlternate;
                     font-weight: 400;
                     color: #a69e9f;
-                    line-height: 40rpx;
+                    display: inline-flex;
+                    align-items: center;
+                    margin-bottom: 12rpx;
                 }
             }
 
@@ -1268,30 +1304,41 @@ export default {
                         width: calc(100% - 86rpx);
 
                         .moneyLabel {
-                            font-size: 30rpx;
+                            font-size: 28rpx;
                             font-family: PingFangSC, PingFang SC;
                             font-weight: 400;
-                            color: #a69e9f;
+                            color: #000;
                             line-height: 30rpx;
-                            margin-bottom: 16rpx;
+                            // margin-bottom: 16rpx;
                         }
 
                         .moneyText {
-                            font-size: 32rpx;
-                            font-family: 'DINAlternate';
-                            font-weight: bold;
-                            color: #160002;
-                            line-height: 32rpx;
-                            margin-right: 8rpx;
+                            width: 100%;
+                            margin-top: 12rpx;
+                            display: flex;
+                            align-items: center;
+                            justify-content: space-between;
+
+                            .money {
+                                font-size: 28rpx;
+                                font-family: DINAlternate-Bold, DINAlternate;
+                                font-weight: bold;
+                                color: #160002;
+                                line-height: 32rpx;
+                                text-align: left;
+                                display: inline-block;
+                                width: 110rpx;
+                            }
 
                             .moneyUnit {
+                                width: 70rpx;
                                 font-size: 24rpx;
                                 font-family: PingFangSC, PingFang SC;
                                 font-weight: 400;
                                 color: #a69e9f;
                                 line-height: 30rpx;
-                                margin-left: 16rpx;
-
+                                margin-left: 8rpx;
+                                white-space: nowrap;
                             }
                         }
                     }
@@ -1346,7 +1393,7 @@ export default {
                     font-family: PingFangSC, PingFang SC;
                     font-weight: 400;
                     color: #160002;
-                    line-height: 40rpx;
+                    line-height: 30rpx;
                 }
             }
         }
diff --git a/pages/map/index.vue b/pages/map/index.vue
index d804495..b0acea2 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -328,8 +328,11 @@ export default {
         uni.navigateBack({
           delta: 1
         })
-      }
-      else {
+      } else if (this.type === 'attendanceStatus') {
+        uni.navigateBack({
+          delta: 1
+        })
+      } else {
         if (this.chartType) {
           uni.navigateBack({
             delta: 1
diff --git a/pages/summaryOfPortraits/components/mapDetail.vue b/pages/summaryOfPortraits/components/mapDetail.vue
index d54c372..94aada1 100644
--- a/pages/summaryOfPortraits/components/mapDetail.vue
+++ b/pages/summaryOfPortraits/components/mapDetail.vue
@@ -159,7 +159,7 @@
                   </p>
                   <p :class="item.TOILETCOUNT ? 'text' : 'unText'">潮汐厕位<text style="margin-left: 4px">{{
                     item.TOILETCOUNT ? '('
-                      + item.TOILETCOUNT + ')':'' }}</text></p>
+                      + item.TOILETCOUNT + ')' : '' }}</text></p>
                   <p :class="item.HASSHOWERROOM ? 'text' : 'unText'">车辆加水</p>
                 </div>
               </div>
@@ -181,10 +181,10 @@
                 <div class="item">
                   <p :class="item.PACKING ? 'text' : 'unText'">客车车位<text style="margin-left: 4px">{{ item.PACKING ? '('
                     +
-                      item.PACKING + ')':'' }}</text></p>
+                    item.PACKING + ')' : '' }}</text></p>
                   <p :class="item.DANPACKING ? 'text' : 'unText'">危化品车位<text style="margin-left: 4px">{{ item.DANPACKING
                     ? '('
-                    + item.DANPACKING +')':'' }}</text></p>
+                    + item.DANPACKING + ')' : '' }}</text></p>
                 </div>
               </div>
             </div>
@@ -243,6 +243,7 @@ export default {
       currentImg: 0,//当前选中的图片
       come: '',// 来自首页还是用户页,
       topBgRealLength: 0,// 去除添加的上一个 后一个 的真实图片长度
+      seatInfo: {}
     }
   },
   props: {
@@ -338,10 +339,14 @@ export default {
       }
     },
     async handleSearch(seat) {
+      let currentService = uni.getStorageSync("currentService");
+      let seatInfo = uni.getStorageSync("seatInfo");
+      this.seatInfo = JSON.parse(seatInfo);
+
       let reqs = {
-        longitude: seat.longitude,
-        ServerpartId: seat.Serverpart_ID,
-        latitude: seat.latitude
+        longitude: this.seatInfo.longitude,
+        ServerpartId: currentService.Serverpart_ID || currentService.SERVERPART_ID,
+        latitude: this.seatInfo.latitude,
       }
       const totalData = await request.$webGet('CommercialApi/BaseInfo/GetServerpartInfo', reqs)
       console.log('totalData', totalData)
diff --git a/static/images/home/address.png b/static/images/home/address.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c24d039653beffd008c39637b383b7fda164b19
GIT binary patch
literal 963
zcmV;!13dhRP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px&eMv+?R7gvml}nElRTRhnr@EP*Y3N3XkA+4SPU15`gA)^j#B#vCx41Pk@zEc^
zh`K?S8hI=bj4pwVg7E{CVwkC-s#+L}j3h?HsEN-67Z_dm2xyPA(?fS1b8DutXQ=8P
zysOGR=bqm=_uPLSLZ1}`?kGT20=59Sb<zD724(<uq_n4dg`g~B7>2{()=>bD_Q~Ni
zD8EApaX!s26%dBrBVZf{u%3b6iE$VPPZbLP{HTL8n?rXXrZFb$B;Y0h7eSa1LVdg(
zat&ZH^G|hfFdvJNd&aV?dRlhA@0Sg<-v!Z=3y}On%PYAS5O`5?EzHL%Qaw#X-0O;%
znQDRe-Xi3*kjm`#Ujon#CD18-EzHJnR_4orx)P%JyuL05Z|!dU5<uv?M?ka#jJ?8A
zuXO@Bjx$g$7xyvaIlV`OBlUV?Z?#&T@A!niw+DoMU_L4=JMl|=yR!)c?>hi@f%twQ
z?60mK4!t+PczH?Ygg1pyul(oZZUobp0KOMe-JJ!{%`6oL8zs}M{@rm30`DRL>$(99
zT#{0)@9ag9v!*#$oCPo|q$+0t{sK_W<r_C_+g8=z$yy2E<Vk03yH)%XKwU_+HVbeL
zz^0hvQOg?p=z6Zm_op5+$e1SJTt%vpR6s5C_A_G_18+;IUbvnn2Z8q%0ndYQKnS%v
zy@D_t=J?7FL^OA$#T#tf{-c)$IyTpJZ(Nn93(P!7#;QBJ#g-;C{fihU(4mUl{?bYS
zwcx}-2EPbkQb;wCDKu^H{p0r-l-Ey`LHP%S5a0BIgkg9uxb=m8@-eqITGqt3JptNS
z3%o-N>;!POKHGS>TCKLzAdchYN~NJs2sA>#;fhqcie++1IT=OKn&#Z)uK{de@E$4c
z{b_(8aCZ|(EB-=ZaP@trX<pS%YLmNzB!h<WArZxl*pzbY%u@T*W`YqhvjM{6S%W8Y
z;OJms=p6v#RRBNd=i3i%9UuQy@1L5Syrnge)0(*rgx7^oyR!P!6A(pFzS+Dy4Nk`8
znfh#FR0k@Tih4|L24ki$w0hJu&DQ?{Bn_{9a5H$|GiKZl@H-2E=vgBC1ezbIRG#>)
z*DLE;LFb_7d7E+uW{6PKd(3FGV{B1Mecn$eD*`O&!<{gQ-q+tT^HY{(YeDv1D+VM@
lKj9|I7TfKEeIqYA{0nQ>b13#F?MeUu002ovPDHLkV1f_`za0Po

literal 0
HcmV?d00001

diff --git a/static/images/home/navigationIcon.svg b/static/images/home/navigationIcon.svg
new file mode 100644
index 0000000..3f03a11
--- /dev/null
+++ b/static/images/home/navigationIcon.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>云南图标/卫生间_2</title>
+    <defs>
+        <linearGradient x1="50%" y1="100%" x2="50%" y2="1.84889275e-30%" id="linearGradient-1">
+            <stop stop-color="#27B25F" offset="0%"></stop>
+            <stop stop-color="#11BC55" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="100%" x2="50%" y2="1.84889275e-30%" id="linearGradient-2">
+            <stop stop-color="#27B25F" offset="0%"></stop>
+            <stop stop-color="#4CCC7F" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="云南小程序-切图" transform="translate(-87.000000, -37.000000)" fill-rule="nonzero">
+            <g id="编组" transform="translate(87.000000, 37.000000)">
+                <circle id="椭圆形" fill="url(#linearGradient-1)" opacity="0.100000001" cx="16" cy="16" r="16"></circle>
+                <path d="M21.4637385,11.8011725 L18.2390216,21.4753234 C18.0643738,21.9992667 17.4980539,22.2824267 16.9741105,22.1077789 C16.7301391,22.0264551 16.5268764,21.8542657 16.4065504,21.6269833 L14.4619849,17.9539153 C14.368178,17.7767245 14.2232755,17.631822 14.0460847,17.5380151 L10.3730167,15.5934496 C9.88491409,15.3350424 9.69870923,14.7298766 9.95711648,14.241774 C10.0774425,14.0144916 10.2807052,13.8423022 10.5246766,13.7609784 L20.1988275,10.5362615 C20.7227708,10.3616137 21.2890908,10.6447737 21.4637385,11.168717 C21.5321608,11.3739838 21.5321608,11.5959057 21.4637385,11.8011725 Z" id="三角形" fill="url(#linearGradient-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file