From 4570c70a1d9591941e882d2f01091a992c113b21 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Wed, 7 Jan 2026 10:37:43 +0800
Subject: [PATCH] 消息中心

---
 api/user.js                                          |  4 ++--
 pages-sub/daily/quick-order/add-order.vue            |  1 +
 pages-sub/daily/quick-order/index.vue                |  2 +-
 pages-sub/daily/quick-order/order-detail.vue         | 17 ++++++++++++++++-
 pages-sub/msg/index.vue                              | 57 +++++++++++++++++++++++++++++++++++++--------------------
 pages-sub/problem/work-order-manage/index.vue        | 16 +++++++++++++---
 pages-sub/problem/work-order-manage/order-detail.vue | 69 +++++++++++++++++++++++++++++++--------------------------------------
 pages/index/index.vue                                | 92 ++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
 pages/workbench/index.vue                            |  8 ++++----
 9 files changed, 147 insertions(+), 119 deletions(-)

diff --git a/api/user.js b/api/user.js
index d62cd33..53fd788 100644
--- a/api/user.js
+++ b/api/user.js
@@ -55,8 +55,8 @@ export const refreshToken = (params) => {
  * 获得当前用户的未读站内信数量
  * @returns {Promise}
  */
-export const getMsg = () => {
-  return get('/app-api/system/notify-message/my-page')
+export const getMsg = (params) => {
+  return get('/app-api/system/notify-message/my-page',params)
 }
 
 /**
diff --git a/pages-sub/daily/quick-order/add-order.vue b/pages-sub/daily/quick-order/add-order.vue
index 2e3cbe9..fa166d5 100644
--- a/pages-sub/daily/quick-order/add-order.vue
+++ b/pages-sub/daily/quick-order/add-order.vue
@@ -149,6 +149,7 @@
     <view class="fixed-bottom-btn-wrap">
       <up-button
           type="primary"
+          size="large"
           text="提交工单"
           @click="submitWorkOrder"
       ></up-button>
diff --git a/pages-sub/daily/quick-order/index.vue b/pages-sub/daily/quick-order/index.vue
index 76da1d5..5e1313f 100644
--- a/pages-sub/daily/quick-order/index.vue
+++ b/pages-sub/daily/quick-order/index.vue
@@ -60,7 +60,7 @@
               </view>
               <view class="u-body-item u-flex">
                 <view class="u-body-item-title">工单位置：</view>
-                <view class="u-line-1 u-body-value">{{ item.roadName || '-' }}</view>
+                <view class="u-line-1 u-body-value">{{ item.lonLatAddress || '-' }}</view>
               </view>
 
               <view class="u-body-item u-flex ">
diff --git a/pages-sub/daily/quick-order/order-detail.vue b/pages-sub/daily/quick-order/order-detail.vue
index 2dfb0f7..38e9e64 100644
--- a/pages-sub/daily/quick-order/order-detail.vue
+++ b/pages-sub/daily/quick-order/order-detail.vue
@@ -30,12 +30,27 @@
             align="middle"
         >
           <template #title>
-            <view  style="min-width: 200rpx">工单位置</view>
+            <view  style="min-width: 200rpx">工单道路</view>
           </template>
           <template #value>
             <view  class="up-line-1 common-text-color" >{{orderDetail.roadName || '--'}}</view>
           </template>
 
+
+        </up-cell>
+
+
+        <up-cell
+            align="middle"
+        >
+          <template #title>
+            <view  style="min-width: 200rpx">工单位置</view>
+          </template>
+          <template #value>
+            <view  class="up-line-1 common-text-color" >{{orderDetail.lonLatAddress || '--'}}</view>
+          </template>
+          lonLatAddress
+
         </up-cell>
 
         <!-- 3. 工单名称 -->
diff --git a/pages-sub/msg/index.vue b/pages-sub/msg/index.vue
index e5f1f66..35549c7 100644
--- a/pages-sub/msg/index.vue
+++ b/pages-sub/msg/index.vue
@@ -1,9 +1,19 @@
 <template>
   <view class="user-center-page">
+    <z-paging
+        ref="paging"
+        v-model="dataList"
+        @query="queryList"
+        :auto-show-system-loading="true"
+
+    >
+      <template #empty>
+        <empty-view/>
+      </template>
     <up-card
         :border="false"
         :foot-border-top="false"
-        v-for="(item,index) in orderList"
+        v-for="(item,index) in dataList"
         :key="`${item.orderNo}_${index}`"
         :show-head="false"
     >
@@ -11,17 +21,18 @@
       <template #body>
         <view class="card-body">
           <view class="u-flex common-item-center common-justify-between" style="font-size: 14px;margin-top: 5px;">
-            <view class="u-line-1" style="flex: 1;margin-right: 20px;color: #333"> {{ item.orderName || '无' }}</view>
+            <view class="u-line-1" style="flex: 1;margin-right: 20px;color: #333"> {{ item.templateCode || '无' }}</view>
             <view style="color: #000">{{ timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}</view>
           </view>
           <view class="u-line-1 ">
-            {{ item.remark || '无' }}
+            {{ item.templateContent || '无' }}
           </view>
 
 
         </view>
       </template>
     </up-card>
+    </z-paging>
   </view>
 </template>
 
@@ -35,25 +46,31 @@ const userStore = useUserStore()
 import { timeFormat } from '@/uni_modules/uview-plus';
 // 计算属性获取用户信息（响应式）
 const userInfo = computed(() => userStore.userInfo.user || {})
-const orderList = ref([
-  {
-    orderNo:'123',
-    orderName:'阜成门内大街巡检阜成门内大街巡检阜成门内大街巡检阜成门内大街巡检阜成门内大街巡检阜成门内大街巡检',
-    remark:'阜成门内大街周期计划即将到期，请及时处理。阜成门内大街周期计划即将到期，请及时处理。阜成门内大街周期计划即将到期，请及时处理。阜成门内大街周期计划即将到期，请及时处理。',
-    createTime:'1736160000000'
-  },
-  {
-    orderNo:'1223',
-    orderName:'阜成门内大街巡检阜成门内大街巡检阜成门内大街巡检阜成门内大街巡检阜成门内大街巡检阜成门内大街巡检',
-    remark:'阜成门内大街周期计划即将到期，请及时处理。阜成门内大街周期计划即将到期，请及时处理。阜成门内大街周期计划即将到期，请及时处理。阜成门内大街周期计划即将到期，请及时处理。',
-    createTime:'1736160000000'
+
+const paging = ref(null);
+const dataList = ref([]);
+// 分页查询列表
+const queryList = async (pageNo, pageSize) => {
+  try {
+    const apiParams = {
+      readStatus: false,
+      pageNo,
+      pageSize,
+    };
+    const  res = await getMsg(apiParams)
+    // 适配z-paging分页
+    paging.value.complete(res.list, res.total);
+  } catch (error) {
+    console.error('加载工单失败：', error);
+    paging.value?.complete(false);
+    uni.showToast({title:  res.msg||'加载失败，请重试', icon: 'none'});
   }
-])
+};
 
-// 页面显示时检查登录状态
-onShow( async () => {
-  const  res = await getMsg()
-})
+// // 页面显示时检查登录状态
+// onShow( async () => {
+//   const  res = await getMsg()
+// })
 </script>
 
 
diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue
index 0fddf0c..70a1155 100644
--- a/pages-sub/problem/work-order-manage/index.vue
+++ b/pages-sub/problem/work-order-manage/index.vue
@@ -391,6 +391,16 @@ const handleSearch = (val) => {
   searchValue.value = val;
   paging.value?.reload(); // 搜索刷新列表
 };
+// const isRefreshing = ref(false);
+// const refreshList = () => {
+//   if (isRefreshing.value) return;
+//   isRefreshing.value = true;
+//   paging.value?.reload().finally(() => {
+//     setTimeout(() => {
+//       isRefreshing.value = false;
+//     }, 500);
+//   });
+// };
 // 工单详情
 const handleDetail = (item) => {
   // 0-待办 1我发起的- 2-已办
@@ -513,7 +523,7 @@ const handleProcess = async (item) => {
     }
   } catch (error) {
     console.error('处理工单失败：', error);
-    uni.showToast({title: '处理失败，请重试', icon: 'none'});
+    uni.showToast({title: error.msg||'处理失败，请重试', icon: 'none'});
   }
 };
 
@@ -574,7 +584,7 @@ const confirmReject = async () => {
     paging.value?.reload(); // 刷新列表
   } catch (error) {
     console.error('回退工单失败：', error);
-    uni.showToast({title: '网络异常，回退失败', icon: 'none', duration: 1000});
+    uni.showToast({title:  error.msg||'回退失败', icon: 'none', duration: 1000});
   } finally {
     // 隐藏加载中
     uni.hideLoading();
@@ -641,7 +651,7 @@ const handleAcceptModalConfirm = async () => {
   } catch (error) {
     // 5. 操作失败处理
     console.error('验收失败：', error);
-    uni.showToast({title: '验收提交失败，请重试', icon: 'none', duration: 1000});
+    uni.showToast({title: error.msg||'验收提交失败，请重试', icon: 'none', duration: 1000});
   }
 };
 
diff --git a/pages-sub/problem/work-order-manage/order-detail.vue b/pages-sub/problem/work-order-manage/order-detail.vue
index 0efeea8..fff5c60 100644
--- a/pages-sub/problem/work-order-manage/order-detail.vue
+++ b/pages-sub/problem/work-order-manage/order-detail.vue
@@ -63,7 +63,6 @@
               </template>
             </up-cell>
 
-
             <!-- 情况描述 -->
             <up-cell>
               <template #title>
@@ -101,10 +100,6 @@
               </template>
             </up-cell>
 
-
-
-
-
             <!-- 问题照片 -->
             <up-cell title="问题照片">
               <template #value>
@@ -114,7 +109,6 @@
                       :urls="orderDetail.problemsImgs.slice(0, 3)"
                       :singleSize="70"
                       :multipleSize="70"
-
                       :preview-full-image="true"
                   ></up-album>
                   <text v-else class="empty-text">暂无问题照片</text>
@@ -204,16 +198,10 @@
                     <!-- 1. 原标题内容：节点名称 + 操作人 -->
                     <view class="step-title">
                       {{ item.name }}
-<!--                      <text class="operator-name">-->
-<!--                        {{-->
-<!--                          item.tasks && item.tasks[0]?.assigneeUser?.nickname ? '（' + item.tasks[0].assigneeUser.nickname + '）' : '（未知操作人）'-->
-<!--                        }}-->
-<!--                      </text>-->
                     </view>
 
                     <!-- 2. 原描述内容：时间 + 处理说明（最多200字） -->
                     <view class="step-desc">
-
                       <view class="operator-name up-line-1">
                         处理人：
                         <text>{{ item.tasks?.map(itemName => itemName.assigneeUser?.nickname).filter(Boolean).join('，') }}</text>
@@ -242,7 +230,6 @@
                           :urls="item.tasks[0].attattmentUrls.slice(0, 3)"
                           :singleSize="70"
                           :multipleSize="70"
-
                           :preview-full-image="true"
                           class="step-album"
                       ></up-album>
@@ -251,7 +238,6 @@
                 </template>
               </up-steps-item>
             </template>
-
           </up-steps>
 
           <!-- 流程节点为空时的提示 -->
@@ -280,7 +266,6 @@
             nextStepMap[orderDetail.taskKey].btnText
           }}
         </up-button>
-
       </view>
     </view>
 
@@ -369,7 +354,6 @@
         </view>
       </view>
     </up-modal>
-
   </view>
 </template>
 
@@ -469,6 +453,9 @@ const orderDetail = ref<any>({
   materialImgs: []
 });
 
+// ========== 新增：声明eventChannel变量 ==========
+const eventChannel = ref(null);
+
 /**
  * 当前激活的图片列表（无需函数调用，直接访问）
  */
@@ -591,7 +578,6 @@ const rejectImgs = useUploadImgs({
   fieldName: 'rejectImgs'
 })
 
-
 // ========== 验收弹窗相关状态（新增图片上传实例） ==========
 const acceptModalShow = ref(false); // 验收弹窗显示开关
 const acceptRadioValue = ref('0'); // 单选框值，默认0（通过）
@@ -606,7 +592,6 @@ const acceptImgs = useUploadImgs({
   fieldName: 'acceptImgs'
 })
 
-
 // ========== 生成临时key ==========
 const generateTempKey = () => {
   return 'renew_order_' + Date.now() + '_' + Math.floor(Math.random() * 10000);
@@ -691,11 +676,12 @@ const confirmReject = async () => {
     uni.showToast({title: '回退成功', icon: 'success', duration: 1000});
 
     rejectModalShow.value = false;
-    // 重新获取工单详情，刷新页面
-    // await DetailQuery(taskId.value);
-    uni.reLaunch({
-      url: `/pages-sub/problem/work-order-manage/index`
-    });
+    // 修复：正确使用eventChannel通知列表页刷新
+    if (eventChannel.value) {
+      eventChannel.value.emit('needRefresh');
+    }
+    // 返回列表页
+    uni.navigateBack({delta: 1});
   } catch (error) {
     console.error('回退工单失败：', error);
     uni.showToast({title: '网络异常，回退失败', icon: 'none', duration: 1000});
@@ -711,7 +697,7 @@ const handleProcess = async (item: any) => {
   try {
     if (nextStepMap[item.taskKey]?.name == '养护组长分配') {
       uni.navigateTo({
-        url: `/pages-sub/problem/work-order-manage/distribution-order?taskId=${item.taskId}&orderNo=${item.orderNo}&id=${item.id}`
+        url: `/pages-sub/problem/work-order-manage/distribution-order?taskId=${item.taskId}&orderNo=${item.orderNo}&id=${item.id}&busiLine=${item.busiLine}`
       })
     }
     if (nextStepMap[item.taskKey]?.name == '养护员待实施') {
@@ -770,8 +756,12 @@ const handleProcess = async (item: any) => {
             // 调用回退工单接口
             const res = await universalApproval(requestData);
             uni.showToast({title: '结束成功', icon: 'success', duration: 1000});
-            // 重新获取工单详情，刷新页面
-            await DetailQuery(taskId.value);
+
+            // 通知列表页刷新
+            if (eventChannel.value) {
+              eventChannel.value.emit('needRefresh');
+            }
+            uni.navigateBack({delta: 1});
           } else if (res.cancel) {
             console.log("用户点击取消");
           }
@@ -780,7 +770,7 @@ const handleProcess = async (item: any) => {
     }
   } catch (error) {
     console.error('处理工单失败：', error);
-    uni.showToast({title: '处理失败，请重试', icon: 'none'});
+    uni.showToast({title:  error.msg||'处理失败，请重试', icon: 'none'});
   }
 };
 
@@ -830,22 +820,21 @@ const handleAcceptModalConfirm = async () => {
       }
     }
     const acceptRes = await universalApproval(postData);
-    // 4. 操作成功处理
 
     handleAcceptModalCancel(); // 清空状态
-    // 重新获取工单详情，刷新页面
-    // await DetailQuery(taskId.value);
-    // uni.reLaunch({
-    //   url: `/pages-sub/problem/work-order-manage/index`
-    // });
-    eventChannel.emit('needRefresh');
-    // 4. 返回列表页
+
+    // 通知列表页刷新
+    if (eventChannel.value) {
+      eventChannel.value.emit('needRefresh');
+    }
+    // 返回列表页
     uni.navigateBack({delta: 1});
+
     uni.showToast({title: '提交成功', icon: 'success', duration: 1000});
   } catch (error) {
     // 5. 操作失败处理
     console.error('验收失败：', error);
-    uni.showToast({title: '验收提交失败，请重试', icon: 'none', duration: 1000});
+    uni.showToast({title:  error.msg||'验收提交失败，请重试', icon: 'none', duration: 1000});
   }
 };
 
@@ -856,6 +845,12 @@ onLoad((options: any) => {
   taskId.value = taskIdOpt || '';
   activeTab.value = activeTabOpt || '0';
   processInstanceId.value = processInstanceIdOpt;
+
+  // 初始化eventChannel
+  const pages = getCurrentPages();
+  const currentPage = pages[pages.length - 1];
+  eventChannel.value = currentPage.getOpenerEventChannel();
+
   DetailQuery(taskId.value);
 });
 
@@ -1062,6 +1057,4 @@ onShow(() => {
   width: 70px !important;  // 与多图保持一致
   height: 70px !important;
 }
-
-
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f8dedd8..f9e3a27 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -18,7 +18,7 @@
 
     <view class="content-wrap">
       <!-- 任务完成情况标题 -->
-      <view class="module-title">任务完成情况（K线图）</view>
+      <view class="module-title">任务完成情况</view>
 
       <!-- 任务完成情况卡片 -->
       <view class="task-chart-card">
@@ -35,7 +35,7 @@
           </view>
         </view>
 
-        <!-- 双折线K线图（匹配示例图） -->
+        <!-- 双折线K线图 -->
         <view class="chart-container">
           <uni-charts
               type="line"
@@ -96,18 +96,14 @@
 </template>
 
 <script setup>
-import { ref, watch, computed, onMounted } from 'vue';
+import { ref, watch, computed } from 'vue';
+import {  onShow } from '@dcloudio/uni-app'
 import { useUserStore } from '@/pinia/user';
 import { timeFormat } from '@/uni_modules/uview-plus';
 import uniCharts from '@/components/uni-charts/uni-charts.vue';
+import { getUnreadCount } from "@/api/user";
 
 // ========== 1. 常量抽离 ==========
-const FORMAT_CONST = {
-  DATE: 'MM.DD', // 匹配示例图的日期格式（12.28）
-  DATETIME: 'YYYY-MM-DD HH:mm',
-  TIME: 'HH:mm'
-};
-
 const URGENCY_MAP = {
   特急: 'urgent',
   紧急: 'high',
@@ -117,27 +113,28 @@ const URGENCY_MAP = {
 };
 
 // ========== 2. 响应式数据 ==========
-const msgCount = ref(9999);
+const msgCount = ref();
 const currentTab = ref('todo');
 const dateRange = ref([]);
 
-// 双折线K线图专用数据
+// 折线图数据配置
 const chartWidth = ref(0);
 const chartHeight = ref(300);
-const klineCategories = ref([]); // X轴日期（12.28/12.29...）
+const klineCategories = ref([]); // X轴日期
 const klineChartData = ref([
   {
-    name: '已完成任务数', // 匹配示例图的绿色折线
+    name: '已完成任务数',
     data: [],
     color: '#25AF69'
   },
   {
-    name: '待完成总任务数', // 匹配示例图的棕色折线
+    name: '待完成总任务数',
     data: [],
     color: '#B34C17'
   }
 ]);
-// 图表配置（匹配示例图样式）
+
+// 图表配置
 const klineOption = ref({
   grid: {
     top: '25%',
@@ -150,15 +147,14 @@ const klineOption = ref({
   },
   yAxis: {
     min: 0,
-
     splitLine: { lineStyle: { color: '#f5f5f7' } },
     axisLabel: { fontSize: 12, color: '#666' }
   },
   tooltip: {
     trigger: 'axis',
     formatter: (params) => {
-      return `${params[0].name}<br
-      ${params[0].seriesName}: ${params[0].data}<br
+      return `${params[0].name}<br/>
+      ${params[0].seriesName}: ${params[0].data}<br/>
       ${params[1].seriesName}: ${params[1].data}`;
     }
   },
@@ -204,34 +200,31 @@ const initRecent7Days = () => {
   dateRange.value = [sevenDaysAgo, now];
 };
 
+const getUnread = async ()=>{
+  const res = await  getUnreadCount()
+  console.log(res)
+  msgCount.value = res
+}
+
 /**
- * 初始化双折线K线数据（匹配示例图）
+ * 初始化折线图数据
  */
-const fetchKlineData = async () => {
-  try {
-    // 模拟示例图数据（日期+已完成+待完成）
-    const rawData = [
-      { date: '12.21', done: 10, total: 110 },
-      { date: '12.22', done: 35, total: 70 },
-      { date: '12.23', done: 55, total: 728 },
-      { date: '12.24', done: 35, total: 65 },
-      { date: '12.25', done: 65, total: 78 },
-      { date: '12.26', done: 50, total: 272 },
-      { date: '12.22', done: 35, total: 70 },
-      { date: '12.23', done: 55, total: 78 },
-      { date: '12.24', done: 35, total: 65 },
-      { date: '12.25', done: 65, total: 78 },
-      { date: '12.26', done: 50, total: 72 },
-      { date: '12.27', done: 72, total: 92 }
-    ];
-
-    // 转换为uni-charts格式
-    klineCategories.value = rawData.map(item => item.date);
-    klineChartData.value[0].data = rawData.map(item => item.done);
-    klineChartData.value[1].data = rawData.map(item => item.total);
-  } catch (error) {
-    wx.showToast({ title: '获取K线数据失败', icon: 'none' });
-  }
+const fetchKlineData = () => {
+  // 模拟数据
+  const rawData = [
+    { date: '12.21', done: 10, total: 110 },
+    { date: '12.22', done: 35, total: 70 },
+    { date: '12.23', done: 55, total: 728 },
+    { date: '12.24', done: 35, total: 65 },
+    { date: '12.25', done: 65, total: 78 },
+    { date: '12.26', done: 50, total: 272 },
+    { date: '12.27', done: 72, total: 92 }
+  ];
+
+  // 转换为图表格式
+  klineCategories.value = rawData.map(item => item.date);
+  klineChartData.value[0].data = rawData.map(item => item.done);
+  klineChartData.value[1].data = rawData.map(item => item.total);
 };
 
 // ========== 5. 业务逻辑 ==========
@@ -256,19 +249,19 @@ const handleTaskClick = (item) => {
 };
 
 // ========== 6. 生命周期 ==========
-onMounted(() => {
+onShow(() => {
   chartWidth.value = rpx2px(750 - 60);
   chartHeight.value = rpx2px(300);
   initRecent7Days();
   fetchKlineData();
+  getUnread()
 });
 </script>
 
 <style scoped lang="scss">
-/* 样式保持不变，无需修改 */
+/* 样式变量 */
 $primary-color: #1677ff;
 $danger-color: #E53935;
-$success-color: #4CAF50;
 $text-color: #333;
 $text-color-light: #666;
 $text-color-placeholder: #999;
@@ -297,14 +290,13 @@ $spacing-lg: 30rpx;
   z-index: 1;
 
   .username {
-    font-size: 32rpx;
+    font-size: 16px;
     font-weight: 500;
     margin-bottom: 8rpx;
   }
 
   .login-desc {
-    font-size: 24rpx;
-    opacity: 0.8;
+    font-size:  16px;
   }
 
   .msg-icon {
diff --git a/pages/workbench/index.vue b/pages/workbench/index.vue
index 5c24b2b..9258fcf 100644
--- a/pages/workbench/index.vue
+++ b/pages/workbench/index.vue
@@ -174,7 +174,7 @@ const handleMenuClick = (item: MenuItem) => {
   top: 0;
   left: 0;
   width: 100%;
-  height: 280px;
+  height: 260px;
   background: url("https://img.jichengshanshui.com.cn:28207/appimg/bg.jpg") no-repeat;
   background-size: 100% 100%;
   z-index: 1;
@@ -183,7 +183,7 @@ const handleMenuClick = (item: MenuItem) => {
   padding-left: 20px;
   .welcome-text {
     padding-top: 80px;
-    font-size: 20px;
+    font-size: 16px;
     display: block;
     margin-bottom: 10px;
     font-weight: 500;
@@ -191,7 +191,7 @@ const handleMenuClick = (item: MenuItem) => {
 
   .platform-name {
     margin-bottom: 10px;
-    font-size: 20px;
+    font-size: 16px;
     display: block;
     opacity: 0.95;
   }
@@ -200,7 +200,7 @@ const handleMenuClick = (item: MenuItem) => {
 .content-wrap {
   position: relative;
   z-index: 2;
-  padding: 150px 0 0;
+  padding: 140px 0 0;
   display: flex;
   flex-direction: column;
   gap: 20rpx;
--
libgit2 0.21.4