From e6a0428542af9f5d8f619cfba554d8d993893ca5 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Fri, 26 Dec 2025 14:04:45 +0800
Subject: [PATCH] 单图情况   宽高70*70

---
 api/user.js                                                |   8 ++++++++
 common/config/global.js                                    |   3 ++-
 common/utils/common.js                                     |  21 ++++++++++++++++++++-
 pages-sub/daily/patrol-manage/add-patrol-record.vue        |  22 +++++++++++++++++++---
 pages-sub/daily/patrol-manage/index.vue                    |   1 +
 pages-sub/daily/quick-order/order-detail.vue               |   3 +--
 pages-sub/problem/work-order-manage/add-maintain-order.vue |   5 ++---
 pages-sub/problem/work-order-manage/add-order.vue          | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
 pages-sub/problem/work-order-manage/index.vue              |  21 ++++++++++++++++-----
 pages-sub/problem/work-order-manage/order-detail.vue       |  85 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
 pages.json                                                 |  17 +++++++++--------
 pages/login/index.vue                                      |  10 +++++-----
 pages/workbench/index.vue                                  |  33 +++++++++++++++++++++++++++++++++
 pinia/user.js                                              | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 14 files changed, 461 insertions(+), 134 deletions(-)

diff --git a/api/user.js b/api/user.js
index d1a36f2..58ab7ef 100644
--- a/api/user.js
+++ b/api/user.js
@@ -41,3 +41,11 @@ export const moduleList = () => {
 export const getSimpleDictDataList = () => {
   return get('/admin-api/system/dict-data/simple-list')
 }
+
+/**
+ * 刷新token
+ * @returns {Promise}
+ */
+export const refreshToken = (params) => {
+  return post('/admin-api/system/auth/refresh-token?refreshToken='+params)
+}
diff --git a/common/config/global.js b/common/config/global.js
index 2ed4bd5..5729efd 100644
--- a/common/config/global.js
+++ b/common/config/global.js
@@ -23,7 +23,8 @@ export default {
     expireTimeKey: 'jcss_token_expire',
     userIdKey:'jcss_user_id',
     moduleListKey:'jcss_module_list',
-    dictDataKey:'jcss_dict_data'
+    dictDataKey:'jcss_dict_data',
+    refreshTokenKey: 'jcss_user_refresh_token', // 新增：刷新令牌缓存key
   },
   appName: 'JCSS管理系统',
   tokenExpireTime: 7 * 24 * 60 * 60 * 1000
diff --git a/common/utils/common.js b/common/utils/common.js
index 97fde66..7a1e978 100644
--- a/common/utils/common.js
+++ b/common/utils/common.js
@@ -162,4 +162,23 @@ export const calculateFormatTimeDiff = (startTime, endTime) => {
 
   // 8. 拼接并返回结果
   return validTimeParts.join('');
-};
\ No newline at end of file
+};
+
+
+/**
+ * 将日期数组 [年, 月, 日] 转为标准日期字符串（兼容 iOS/Android）
+ * @param {Array} dateArr 日期数组，如 [2025, 12, 20]
+ * @returns {String} 标准日期字符串，如 '2025-12-20'
+ */
+export const convertArrToDateStr= (dateArr)=> {
+  // 边界判断：非数组/长度不足3，返回空
+  if (!Array.isArray(dateArr) || dateArr.length < 3) {
+    return dateArr;
+  }
+  // 解构年、月、日，补零处理（确保格式统一，如 12月→12，2月→02）
+  const [year, month, day] = dateArr;
+  const formatMonth = month.toString().padStart(2, '0');
+  const formatDay = day.toString().padStart(2, '0');
+  // 拼接为标准字符串
+  return `${year}-${formatMonth}-${formatDay}`;
+}
\ No newline at end of file
diff --git a/pages-sub/daily/patrol-manage/add-patrol-record.vue b/pages-sub/daily/patrol-manage/add-patrol-record.vue
index 70b49b4..8e0640e 100644
--- a/pages-sub/daily/patrol-manage/add-patrol-record.vue
+++ b/pages-sub/daily/patrol-manage/add-patrol-record.vue
@@ -6,7 +6,7 @@
           label-position="left"
           :model="inspectForm"
           ref="inspectFormRef"
-          labelWidth="190rpx"
+          labelWidth="200rpx"
       >
         <!-- 1. 巡查描述 -->
         <up-form-item
@@ -110,10 +110,20 @@
             border="none"
             readonly
             placeholder="点击选择时间"
+        >
+
 
-        ></up-input>
+        </up-input>
         <template #right>
-          <up-icon name="arrow-right" size="16"></up-icon>
+          <!-- 核心修复：用view包裹图标，添加双重@click.stop -->
+          <view v-if="inspectForm.expectedFinishDate" @click.stop>
+            <up-icon
+                name="close"
+                size="16"
+                @click.stop="clearExpectedFinishDate"
+            ></up-icon>
+          </view>
+          <up-icon name="arrow-right" size="16" v-else></up-icon>
         </template>
         </up-form-item>
 
@@ -292,6 +302,12 @@ export default {
       this.show = false
       this.$refs.inspectFormRef.validateField('expectedFinishDate')
     },
+    // 新增：清除希望完成时间的方法
+    clearExpectedFinishDate() {
+      this.inspectForm.expectedFinishDate = ''
+      // 清除后触发一次字段校验，确保校验状态更新
+      this.$refs.inspectFormRef.validateField('expectedFinishDate')
+    },
 
     deleteImg(event) {
       this.imagesList.splice(event.index, 1)
diff --git a/pages-sub/daily/patrol-manage/index.vue b/pages-sub/daily/patrol-manage/index.vue
index ffdfd7b..f31fae4 100644
--- a/pages-sub/daily/patrol-manage/index.vue
+++ b/pages-sub/daily/patrol-manage/index.vue
@@ -108,6 +108,7 @@ import { timeFormat } from '@/uni_modules/uview-plus';
 import { ref } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { inspectionPlanPage } from "@/api/patrol-manage/patrol-plan";
+import { convertArrToDateStr } from "@/common/utils/common";
 // Tabs 配置
 const tabList = ref([
   {name: '待完成', id: '1'},
diff --git a/pages-sub/daily/quick-order/order-detail.vue b/pages-sub/daily/quick-order/order-detail.vue
index 0e626a7..2dfb0f7 100644
--- a/pages-sub/daily/quick-order/order-detail.vue
+++ b/pages-sub/daily/quick-order/order-detail.vue
@@ -21,7 +21,7 @@
         <up-cell
             title="工单编号"
             :value="orderDetail.orderNo || '--'"
-            class="up-line-1"
+
             align="middle"
         ></up-cell>
 
@@ -42,7 +42,6 @@
         <up-cell
             title="工单名称"
             :value="orderDetail.orderName || '--'"
-            class="up-line-1"
             align="middle"
         ></up-cell>
 
diff --git a/pages-sub/problem/work-order-manage/add-maintain-order.vue b/pages-sub/problem/work-order-manage/add-maintain-order.vue
index 838609c..0ca8c54 100644
--- a/pages-sub/problem/work-order-manage/add-maintain-order.vue
+++ b/pages-sub/problem/work-order-manage/add-maintain-order.vue
@@ -64,6 +64,7 @@
               active-color="#1989fa"
               inactive-color="#666666"
               @change = "imgTabChange"
+
           >
             <!-- 使用content插槽自定义每个tab的内容，添加红色*号 -->
             <template #content="{ item, index }">
@@ -822,7 +823,5 @@ const submitWorkOrder = async () => {
   font-weight: bold;
 }
 
-.tab-text {
-  font-size: 28rpx;
-}
+
 </style>
\ No newline at end of file
diff --git a/pages-sub/problem/work-order-manage/add-order.vue b/pages-sub/problem/work-order-manage/add-order.vue
index 7e22adf..80fa5be 100644
--- a/pages-sub/problem/work-order-manage/add-order.vue
+++ b/pages-sub/problem/work-order-manage/add-order.vue
@@ -7,6 +7,29 @@
           ref="workOrderFormRef"
           labelWidth="190rpx"
       >
+        <!-- 业务线单选框：移入form内，作为第一个表单项（核心调整） -->
+        <up-form-item
+            label="业务线"
+            prop="busiLineCn"
+            border-bottom
+            required
+        >
+            <up-radio-group
+                v-model="workOrderForm.busiLineCn"
+                placement="row"
+                @change="handleBusiLineChange"
+            >
+              <up-radio
+
+                  v-for="item in busiLineOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :name="item.name"
+              ></up-radio>
+            </up-radio-group>
+
+        </up-form-item>
+
         <!-- 1. 工单位置（地图选择） -->
         <up-form-item
             label="工单位置"
@@ -101,7 +124,7 @@
         </up-form-item>
 
         <!-- 问题照片（核心修复：绑定纯数组） -->
-        <up-form-item label="问题照片" prop="problemImgs" required>
+        <up-form-item label="问题照片" prop="problemImgs" border-bottom required>
           <up-upload
               :file-list="problemImgs.imgList.value||[]"
               @after-read="problemImgs.uploadImgs"
@@ -128,7 +151,15 @@
               placeholder="点击选择时间"
           ></up-input>
           <template #right>
-            <up-icon name="arrow-right" size="16"></up-icon>
+            <!-- 核心修复：用view包裹图标，添加双重@click.stop -->
+            <view v-if="workOrderForm.expectedFinishDate" @click.stop>
+              <up-icon
+                  name="close"
+                  size="16"
+                  @click.stop="clearExpectedFinishDate"
+              ></up-icon>
+            </view>
+            <up-icon name="arrow-right" size="16" v-else></up-icon>
           </template>
         </up-form-item>
       </up-form>
@@ -165,13 +196,51 @@
 </template>
 
 <script setup>
-import { ref, reactive, watch } from 'vue'
+import { ref, reactive } from 'vue'
 import { onReady, onShow, onLoad } from '@dcloudio/uni-app';
-import { useUploadImgs } from '@/common/utils/useUploadImgs' // 引入改造后的上传逻辑
+import { useUploadImgs } from '@/common/utils/useUploadImgs'
 import { getRoadListByLatLng } from '@/api/common'
 import { universalApproval, workorderCreate } from '@/api/work-order-manage/work-order-manage'
 import { timeFormat } from '@/uni_modules/uview-plus'
 import { nextStepMap } from '@/common/utils/common'
+import { useUserStore } from '@/pinia/user';
+
+// ========== 状态管理 ==========
+const userStore = useUserStore();
+
+// ========== 业务线相关状态（核心改造：已整合到workOrderForm中，删除冗余selectedBusiLine） ==========
+// 业务线映射表（键：英文标识，值：中文名称；新增反向映射：中文->英文）
+const busiLineMap = ref({
+  'yl': '园林',
+  'sz': '市政',
+  'wy': '物业',
+  // 反向映射：用于通过中文名称（workOrderForm.busiLineCn）获取对应的英文标识
+  '园林': 'yl',
+  '市政': 'sz',
+  '物业': 'wy'
+});
+
+// 业务线选项列表（仅保留name字段=中文名称，适配单选框配置）
+const busiLineOptions = ref([]);
+// 格式化业务线选项（兼容1个/2个/3个的情况，生成中文名称列表）
+const formatBusiLineOptions = () => {
+  if (!userStore.userInfo?.user?.busiLine) {
+    busiLineOptions.value = [];
+    return;
+  }
+  const rawBusiLines = userStore.userInfo.user.busiLine.split(','); // 拆分字符串为数组 ["yl", "sz", "wy"]
+  console.log(rawBusiLines)
+  // 核心改造：仅生成name字段（值为中文名称），适配单选框:label="item.name"
+  busiLineOptions.value = rawBusiLines.map(item => ({
+    name: busiLineMap.value[item.trim()] // name=中文名称（园林/市政/物业）
+  }));
+  console.log(busiLineOptions.value)
+};
+
+// ========== 工具方法：通过中文名称获取对应的英文标识 ==========
+const getBusiLineEnByCn = (cnName) => {
+  return busiLineMap.value[cnName] || '';
+};
 
 // ========== 表单Ref ==========
 const workOrderFormRef = ref(null)
@@ -190,7 +259,6 @@ if (!Array.isArray(problemImgs.rawImgList.value)) {
   problemImgs.rawImgList.value = [];
 }
 
-
 // ========== 页面状态 ==========
 // 通用弹窗控制
 const showActionSheet = ref(false)
@@ -213,22 +281,26 @@ const roadNameList = ref([])
 const orderNameList = ref([])
 const pressingTypeList = ref([])
 
-// ========== 工单表单数据 ==========
+// ========== 工单表单数据（核心调整：新增busiLineCn字段，绑定业务线） ==========
 const workOrderForm = reactive({
-  roadId: 0,                     // 道路ID
-  roadName: '',                  // 道路名称
-  workLocation: '',              // 工单位置
-  orderName: '',                 // 工单名称
-  pressingType: '',               // 紧急程度值（提交接口用）
-  pressingTypeName: '',          // 紧急程度名称（显示用）
-  problemDesc: '',               // 情况描述
-  lat: 0,                        // 纬度
-  lon: 0,                        // 经度
-  expectedFinishDate: '',                // 希望完成时间
+  busiLineCn: '', // 新增：业务线中文名称（用于form绑定、校验、回显）
+  roadId: 0,                     // 原有字段
+  roadName: '',                  // 原有字段
+  workLocation: '',              // 原有字段
+  orderName: '',                 // 原有字段
+  pressingType: '',              // 原有字段
+  pressingTypeName: '',          // 原有字段
+  problemDesc: '',               // 原有字段
+  lat: 0,                        // 原有字段
+  lon: 0,                        // 原有字段
+  expectedFinishDate: '',        // 原有字段
 })
 
-// ========== 表单校验规则 ==========
+// ========== 表单校验规则（核心调整：新增busiLineCn校验规则） ==========
 const workOrderFormRules = reactive({
+  busiLineCn: [ // 新增：业务线必选校验
+    { type: 'string', required: true, message: '请选择业务线', trigger: ['change', 'blur'] }
+  ],
   workLocation: [
     { type: 'string', required: true, message: '请选择工单位置', trigger: ['change', 'blur'] }
   ],
@@ -249,12 +321,19 @@ const workOrderFormRules = reactive({
 })
 
 // ========== 生命周期 ==========
-// 页面加载：读取本地存储的工单数据（核心改造）
+// 页面加载：读取本地存储的工单数据（适配workOrderForm.busiLineCn）
 onLoad((options) => {
+  // 初始化业务线选项
+  formatBusiLineOptions();
+  // 默认选中第一个业务线（赋值给workOrderForm.busiLineCn，核心调整）
+  if (busiLineOptions.value.length > 0) {
+    workOrderForm.busiLineCn = busiLineOptions.value[0].name;
+  }
+
   // 判断是否为重新提交状态
   console.log('434')
   console.log(options)
-  if (options.isRenew ==1 && options.tempKey) {
+  if (options.isRenew == 1 && options.tempKey) {
     isRenew.value = true;
     const tempKey = options.tempKey;
 
@@ -307,9 +386,14 @@ onShow(() => {
   console.log('紧急程度列表：', pressingTypeList.value)
 })
 
-// ========== 核心方法：工单数据回显 ==========
+// ========== 核心方法：工单数据回显（适配workOrderForm.busiLineCn） ==========
 const echoOrderData = (orderItem) => {
-  // 1. 基础表单字段回显（适配工单字段与表单字段映射）
+  // 1. 回显业务线：将工单的英文busiLine转为中文名称，赋值给workOrderForm.busiLineCn（核心调整）
+  if (orderItem.busiLine) {
+    workOrderForm.busiLineCn = busiLineMap.value[orderItem.busiLine]; // 英文->中文（如wy->物业）
+  }
+
+  // 2. 原有基础表单字段回显
   workOrderForm.roadId = orderItem.roadId || 0;
   workOrderForm.roadName = orderItem.roadName || '';
   workOrderForm.workLocation = orderItem.lonLatAddress || orderItem.roadName || '';
@@ -321,7 +405,7 @@ const echoOrderData = (orderItem) => {
   workOrderForm.lon = orderItem.lon || 0;
   workOrderForm.expectedFinishDate =  timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss')  || timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss');
 
-  // 2. 上传图片回显（兼容useUploadImgs格式）
+  // 3. 上传图片回显（兼容useUploadImgs格式）
   if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
     const imgList = orderItem.problemsImgs.map((imgUrl, index) => ({
       url: imgUrl,
@@ -332,25 +416,70 @@ const echoOrderData = (orderItem) => {
     problemImgs.rawImgList.value = imgList;
   }
 
-  // 3. 自动获取道路列表（保证下拉框正常使用）
+  // 4. 自动获取道路列表（修改：传递当前选中的业务线英文标识）
   if (orderItem.lat && orderItem.lon) {
-    getRoadListByLatLng({
-      companyCode: 'sls',
-      latitude: orderItem.lat,
-      longitude: orderItem.lon
-    }).then((roadRes) => {
-      if (Array.isArray(roadRes)) {
-        roadNameList.value = roadRes.map((item) => ({
-          name: item.roadName || '',
-          code: item.roadCode || '',
-          id: item.roadId || 0
-        }));
-      }
-    }).catch(err => console.error('回显道路列表失败：', err));
+    getRoadListByBusiLine(); // 改用封装后的方法，自动携带选中的业务线
   }
 };
 
-// ========== 方法定义 ==========
+// ========== 业务线相关方法（适配workOrderForm.busiLineCn） ==========
+/**
+ * 业务线切换事件：清空道路信息 + 重新请求道路列表
+ */
+const handleBusiLineChange = () => {
+  // 1. 清空已渲染的道路名称和表单字段
+  workOrderForm.roadName = '';
+  workOrderForm.roadId = 0;
+  // 2. 清空道路名称列表数据
+  roadNameList.value = [];
+  // 3. 若已选择工单位置，重新请求对应业务线的道路列表
+  if (workOrderForm.workLocation) {
+    getRoadListByBusiLine();
+  }
+};
+
+/**
+ * 封装：根据当前选中业务线（中文）获取英文标识，再请求道路列表
+ */
+const getRoadListByBusiLine = async () => {
+  if (!workOrderForm.lat || !workOrderForm.lon) {
+    return;
+  }
+  // 核心：从workOrderForm.busiLineCn获取中文名称，转为英文标识（核心调整）
+  const busiLineEn = getBusiLineEnByCn(workOrderForm.busiLineCn);
+  if (!busiLineEn) {
+    uni.showToast({ title: '业务线标识异常', icon: 'none' });
+    return;
+  }
+
+  try {
+    uni.showLoading({ title: '获取道路名称中...' });
+    const roadRes = await getRoadListByLatLng({
+      busiLine: busiLineEn, // 传递英文标识（yl/sz/wy），接口正常使用
+      // companyCode: 'sls', // 传递英文标识（yl/sz/wy），接口正常使用
+      latitude: workOrderForm.lat,
+      longitude: workOrderForm.lon
+    });
+    uni.hideLoading();
+    if (Array.isArray(roadRes)) {
+      roadNameList.value = roadRes.map((item) => ({
+        name: item.roadName || '',
+        code: item.roadCode || '',
+        id: item.roadId || 0
+      }));
+    } else {
+      roadNameList.value = [{ name: '未查询到道路名称', code: '', id: 0 }];
+      uni.showToast({ title: '未查询到该位置的道路信息', icon: 'none' });
+    }
+  } catch (err) {
+    uni.hideLoading();
+    console.error('获取道路名称失败：', err);
+    uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' });
+    roadNameList.value = [{ name: '获取失败，请重新选择位置', code: '', id: 0 }];
+  }
+};
+
+// ========== 通用弹窗方法 ==========
 /**
  * 打开通用下拉弹窗
  */
@@ -425,7 +554,20 @@ const handleActionSheetSelect = (e) => {
  * 返回上一页
  */
 const navigateBack = () => {
-  uni.navigateBack()
+  uni.reLaunch({
+    url: '/pages-sub/problem/work-order-manage/index', // 列表页路径
+    fail: () => {
+      // 兜底：若 reLaunch 失败，返回2层（跳过提交页）
+      uni.navigateBack({ delta: 2 });
+    }
+  });
+}
+
+// 新增：清除希望完成时间的方法
+const clearExpectedFinishDate = ()=> {
+  workOrderForm.expectedFinishDate = ''
+  // 清除后触发一次字段校验，确保校验状态更新
+  // this.$refs.inspectFormRef.validateField('expectedFinishDate')
 }
 
 /**
@@ -445,31 +587,8 @@ const chooseWorkLocation = () => {
       workOrderFormRef.value?.validateField('workLocation')
       workOrderFormRef.value?.validateField('roadName')
 
-      try {
-        uni.showLoading({ title: '获取道路名称中...' })
-        const roadRes = await getRoadListByLatLng({
-          companyCode: 'sls',
-          latitude: res.latitude,
-          longitude: res.longitude
-        })
-        uni.hideLoading()
-
-        if (Array.isArray(roadRes)) {
-          roadNameList.value = roadRes.map((item) => ({
-            name: item.roadName || '',
-            code: item.roadCode || '',
-            id: item.roadId || 0
-          }))
-        } else {
-          roadNameList.value = [{ name: '未查询到道路名称', code: '', id: 0 }]
-          uni.showToast({ title: '未查询到该位置的道路信息', icon: 'none' })
-        }
-      } catch (err) {
-        uni.hideLoading()
-        console.error('获取道路名称失败：', err)
-        uni.showToast({ title: '获取道路名称失败，请重试', icon: 'none' })
-        roadNameList.value = [{ name: '获取失败，请重新选择位置', code: '', id: 0 }]
-      }
+      // 改用封装后的方法，自动携带选中的业务线英文标识
+      await getRoadListByBusiLine();
     },
     fail: (err) => {
       console.error('选择位置失败：', err)
@@ -495,13 +614,20 @@ const hideKeyboard = () => {
 }
 
 /**
- * 提交工单（区分新增/重新提交，接口隔离）
+ * 提交工单（区分新增/重新提交，接口隔离：从workOrderForm.busiLineCn取值）
  */
 const submitWorkOrder = async () => {
   try {
-    // 先执行表单校验
+    // 先执行表单校验（包含业务线校验）
     await workOrderFormRef.value.validate()
 
+    // 核心：从workOrderForm.busiLineCn获取中文名称，转为英文标识（核心调整）
+    const busiLineEn = getBusiLineEnByCn(workOrderForm.busiLineCn);
+    if (!busiLineEn) {
+      uni.showToast({ title: '业务线选择异常，请重新选择', icon: 'none' });
+      return;
+    }
+
     // 构建公共提交数据
     const commonSubmitData = {
       roadId: workOrderForm.roadId,
@@ -514,11 +640,10 @@ const submitWorkOrder = async () => {
       lonLatAddress: workOrderForm.workLocation,
       pressingType: workOrderForm.pressingType,
       orderName: workOrderForm.orderName,
-      // expectedFinishDate: workOrderForm.expectedFinishDate,
       expectedFinishDate: new Date(workOrderForm.expectedFinishDate).getTime(),
       sourceId: 1,
-      sourceName: '园林',
-      busiLine: 'yl'
+      sourceName: workOrderForm.busiLineCn, // 从form字段获取业务线中文名称
+      busiLine: busiLineEn // 传递英文标识（yl/sz/wy），接口正常使用
     }
 
     // 显示加载中
@@ -567,7 +692,7 @@ const submitWorkOrder = async () => {
       // 接口调用失败
       console.error(isRenew.value ? '工单重新提交失败：' : '工单提交失败：', error)
       uni.showToast({
-        title: isRenew.value ? '重新提交失败，请重试' : '提交失败，请重试',
+        title: isRenew.value ? error.msg : error.msg,
         icon: 'none',
         duration: 2000
       })
@@ -583,6 +708,7 @@ const submitWorkOrder = async () => {
   padding-bottom: 100rpx; // 给底部按钮留空间
 }
 
+
 // 工单表单内容容器
 .work-order-form-content {
   background: #fff;
diff --git a/pages-sub/problem/work-order-manage/index.vue b/pages-sub/problem/work-order-manage/index.vue
index 055f646..d4860bf 100644
--- a/pages-sub/problem/work-order-manage/index.vue
+++ b/pages-sub/problem/work-order-manage/index.vue
@@ -51,6 +51,7 @@
         v-model="orderList"
         @query="queryList"
         :auto-show-system-loading="true"
+
     >
       <template #empty>
         <empty-view/>
@@ -75,7 +76,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">
                 <view class="u-body-item-title">工单名称：</view>
@@ -253,6 +254,7 @@
               :file-list="acceptImgs.imgList"
               @after-read="acceptImgs.uploadImgs"
               @delete="acceptImgs.deleteImg"
+
               multiple
               width="70"
               height="70"
@@ -268,7 +270,7 @@
 
 <script setup>
 import { ref, computed, watch } from 'vue';
-import { onShow } from '@dcloudio/uni-app';
+import { onShow, onLoad } from '@dcloudio/uni-app';
 import { timeFormat } from '@/uni_modules/uview-plus';
 import {
   myBuzSimplePage,
@@ -276,7 +278,7 @@ import {
   doneBuzSimplePage,
   universalApproval
 } from '@/api/work-order-manage/work-order-manage'
-// 假设从用户store获取角色信息
+// 从用户store获取角色信息
 import { useUserStore } from '@/pinia/user';
 import { nextStepMap, buzStatusMap } from '@/common/utils/common'
 // 引入图片上传组合式函数（与参考页面一致）
@@ -399,7 +401,16 @@ const handleSearch = (val) => {
 const handleDetail = (item) => {
   // 0-待办 1我发起的- 2-已办
   uni.navigateTo({
-    url: `/pages-sub/problem/work-order-manage/order-detail?taskId=${item.taskId}&activeTab=${activeTab.value}&processInstanceId=${item.processInstanceId}`
+    url: `/pages-sub/problem/work-order-manage/order-detail?taskId=${item.taskId}&activeTab=${activeTab.value}&processInstanceId=${item.processInstanceId}`,
+    events: {
+      // 自定义事件名：needRefresh（与详情页保持一致）
+      needRefresh: () => {
+        console.log('详情页返回，触发工单列表刷新');
+        if (paging.value) {
+          paging.value.reload(); // 刷新z-paging列表
+        }
+      }
+    }
   });
 };
 
@@ -640,7 +651,7 @@ const handleAcceptModalConfirm = async () => {
 };
 
 // 页面初始化
-onShow(() => {
+onLoad(() => {
   // 初始化加载列表
   paging.value?.reload();
 });
diff --git a/pages-sub/problem/work-order-manage/order-detail.vue b/pages-sub/problem/work-order-manage/order-detail.vue
index 6675130..2f63cee 100644
--- a/pages-sub/problem/work-order-manage/order-detail.vue
+++ b/pages-sub/problem/work-order-manage/order-detail.vue
@@ -38,12 +38,12 @@
                 <view style="min-width: 200rpx">工单位置</view>
               </template>
               <template #value>
-                <view class="common-text-color up-line-1">{{ orderDetail.roadName || '--' }}</view>
+                <view class="common-text-color up-line-1">{{ orderDetail.lonLatAddress || '--' }}</view>
               </template>
             </up-cell>
 
             <!-- 工单名称 -->
-            <up-cell  align="middle">
+            <up-cell align="middle">
               <template #title>
                 <view style="min-width: 200rpx">工单名称</view>
               </template>
@@ -99,7 +99,9 @@
                   <up-album
                       v-if="!!orderDetail.problemsImgs?.length"
                       :urls="orderDetail.problemsImgs.slice(0, 3)"
-                      singleSize="70"
+                      :singleSize="70"
+                      :multipleSize="70"
+
                       :preview-full-image="true"
                   ></up-album>
                   <text v-else class="empty-text">暂无问题照片</text>
@@ -134,7 +136,9 @@
                 </template>
                 <template #value>
                   <view class="common-text-color up-line-1">
-                    {{ Array.isArray(orderDetail.coHandlersName) && orderDetail.coHandlersName.length > 0 ? orderDetail.coHandlersName.join(',') : '--' }}
+                    {{
+                      Array.isArray(orderDetail.coHandlersName) && orderDetail.coHandlersName.length > 0 ? orderDetail.coHandlersName.join(',') : '--'
+                    }}
                   </view>
                 </template>
               </up-cell>
@@ -154,10 +158,11 @@
               <up-album
                   v-if="currentImgList.length"
                   :urls="currentImgList.slice(0, 3)"
-                  singleSize="80"
-                  multipleSize="80"
+                  :singleSize="70"
+                  :multipleSize="70"
+
                   :preview-full-image="true"
-                  class="img-album"
+                  class="img-album custom-album"
               ></up-album>
               <text v-else class="empty-img-text">暂无图片</text>
             </view>
@@ -176,19 +181,21 @@
               inactive-color="#999"
               class="vertical-steps"
           >
-            <template >
+            <template>
               <up-steps-item
                   v-for="(item, index) in processData.activityNodes"
                   :key="`${item.id}_${index}`"
               >
                 <!-- 唯一自定义模板：content，包含标题、描述、相册所有内容 -->
                 <template #content>
-                  <view class="step-content-wrap" >
+                  <view class="step-content-wrap">
                     <!-- 1. 原标题内容：节点名称 + 操作人 -->
                     <view class="step-title">
                       {{ item.name }}
                       <text class="operator-name">
-                        {{ item.tasks && item.tasks[0]?.assigneeUser?.nickname ? '（' + item.tasks[0].assigneeUser.nickname + '）' : '（未知操作人）' }}
+                        {{
+                          item.tasks && item.tasks[0]?.assigneeUser?.nickname ? '（' + item.tasks[0].assigneeUser.nickname + '）' : '（未知操作人）'
+                        }}
                       </text>
                     </view>
 
@@ -202,7 +209,7 @@
                       </view>
 
                       <view class="reason-line up-line-1" v-if="index!==0&&item.endTime">
-                        总耗时：{{ calculateFormatTimeDiff(item.startTime , item.endTime) }}
+                        总耗时：{{ calculateFormatTimeDiff(item.startTime, item.endTime) }}
                       </view>
 
                       <!-- 原因行 -->
@@ -216,8 +223,9 @@
                       <up-album
                           v-if="item.tasks && item.tasks[0]?.attattmentUrls && item.tasks[0].attattmentUrls.length"
                           :urls="item.tasks[0].attattmentUrls.slice(0, 3)"
-                          singleSize="70"
-                          multipleSize="70"
+                          :singleSize="70"
+                          :multipleSize="70"
+
                           :preview-full-image="true"
                           class="step-album"
                       ></up-album>
@@ -359,9 +367,9 @@ import {
   getApprovalDetail,
   universalApproval
 } from '@/api/work-order-manage/work-order-manage';
-import { nextStepMap, buzStatusMap, calculateFormatTimeDiff } from '@/common/utils/common'
+import {nextStepMap, buzStatusMap, calculateFormatTimeDiff} from '@/common/utils/common'
 // 引入图片上传组合式函数
-import { useUploadImgs } from '@/common/utils/useUploadImgs'
+import {useUploadImgs} from '@/common/utils/useUploadImgs'
 
 // 状态管理
 const loading = ref(true);
@@ -407,7 +415,7 @@ const orderDetail = ref<any>({
   curingLevelName: '',
   commitDate: 0,
   finishDate: 0,
-  expectedFinishDate:0,
+  expectedFinishDate: 0,
   pressingType: 0,
   userId: 0,
   userName: '',
@@ -450,7 +458,7 @@ const orderDetail = ref<any>({
 const currentImgList = ref([])
 
 const tabKeyMap = ['startImgs', 'processingImgs', 'endImgs', 'personImgs', 'materialImgs'];
-const imgTabChange = (({index}: {index: number}) => {
+const imgTabChange = (({index}: { index: number }) => {
   console.log(index)
   const currentKey = tabKeyMap[index]
   console.log(currentKey)
@@ -476,7 +484,7 @@ const getLimitReason = (reason: string | null | undefined) => {
  * @returns {number} 当前激活的步骤索引（从0开始）
  */
 const getCurrentStepIndex = () => {
-  const { activityNodes } = processData.value;
+  const {activityNodes} = processData.value;
   if (!activityNodes || !activityNodes.length) return 0;
 
   // 2. 若没有处理中的节点（全部已完成），则激活最后一个节点
@@ -568,7 +576,7 @@ const rejectImgs = useUploadImgs({
 // 监听上传实例响应式变化，解决u-upload不刷新问题
 watch(() => rejectImgs.rawImgList.value, (newVal) => {
   rejectImgs.imgList = newVal
-}, { deep: true })
+}, {deep: true})
 
 // ========== 验收弹窗相关状态（新增图片上传实例） ==========
 const acceptModalShow = ref(false); // 验收弹窗显示开关
@@ -586,7 +594,7 @@ const acceptImgs = useUploadImgs({
 // 监听验收图片上传实例响应式变化
 watch(() => acceptImgs.rawImgList.value, (newVal) => {
   acceptImgs.imgList = newVal
-}, { deep: true })
+}, {deep: true})
 
 // ========== 生成临时key ==========
 const generateTempKey = () => {
@@ -742,7 +750,7 @@ const handleProcess = async (item: any) => {
             const requestData = {
               "returnImgs": rejectImgs.getSuccessImgUrls(),
               "workerDataId": item.id,
-              "taskKey":'ylInspectorStart',
+              "taskKey": 'ylInspectorStart',
               "taskId": item.taskId,
               "operateType": 200,
               "agree": 1,
@@ -812,13 +820,17 @@ const handleAcceptModalConfirm = async () => {
     }
     const acceptRes = await universalApproval(postData);
     // 4. 操作成功处理
-    uni.showToast({title: '提交成功', icon: 'success', duration: 1000});
+
     handleAcceptModalCancel(); // 清空状态
     // 重新获取工单详情，刷新页面
     // await DetailQuery(taskId.value);
-    uni.reLaunch({
-      url: `/pages-sub/problem/work-order-manage/index`
-    });
+    // uni.reLaunch({
+    //   url: `/pages-sub/problem/work-order-manage/index`
+    // });
+    eventChannel.emit('needRefresh');
+    // 4. 返回列表页
+    uni.navigateBack({delta: 1});
+    uni.showToast({title: '提交成功', icon: 'success', duration: 1000});
   } catch (error) {
     // 5. 操作失败处理
     console.error('验收失败：', error);
@@ -888,13 +900,14 @@ onShow(() => {
   // 图片内容区
   .img-tab-content {
     padding: 20rpx 15px ;
-    min-height: 120rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
+    //min-height: 120rpx;
+    //display: flex;
+    //align-items: center;
+    //justify-content: center;
+    //
     .img-album {
-      width: 100%;
+      //width: 100%;
+
     }
 
     .empty-img-text {
@@ -973,8 +986,7 @@ onShow(() => {
       padding: 10rpx 0;
 
       .step-album {
-        width: 100%;
-        max-width: 300rpx;
+        //width: 100%;
       }
 
       .no-img-tip {
@@ -1034,4 +1046,11 @@ onShow(() => {
 .mt-30 {
   margin-top: 30rpx;
 }
+// 针对 up-album 单图容器的样式（穿透 scoped 限制）
+:deep .u-album__row__wrapper image {
+  width: 70px !important;  // 与多图保持一致
+  height: 70px !important;
+}
+
+
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 9c99689..8f25f83 100644
--- a/pages.json
+++ b/pages.json
@@ -1,24 +1,25 @@
 {
 	"pages": [
 		{
-			"path": "pages/login/index",
+			"path": "pages/workbench/index",
 			"style": {
-				"navigationBarTitleText": "登录"
+				"navigationBarTitleText": "工作台",
+				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/index/index",
+			"path": "pages/login/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "登录"
 			}
 		},
 		{
-			"path": "pages/workbench/index",
+			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "工作台",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "首页"
 			}
 		},
+
 		{
 			"path": "pages/mine/index",
 			"style": {
@@ -91,7 +92,7 @@
 
 				{
 					"path": "maintain-manage/road-detail-list",
-					"style": { "navigationBarTitleText": "道路明细列表" }
+					"style": { "navigationBarTitleText": "计划明细" }
 				},
 
 				{
diff --git a/pages/login/index.vue b/pages/login/index.vue
index e4b5616..c8033d1 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -107,10 +107,10 @@ const checkLoginStatus = () => {
     // 已登录则直接跳首页
     if (userStore.isLogin) {
       uni.switchTab({
-        url: globalConfig.router.tabBarList[1].path,
+        url: '/pages/workbench/index',
         fail: () => {
           // 非tabBar页面用redirectTo
-          uni.redirectTo({ url: '/pages/workbench/index' });
+          uni.reLaunch({ url: '/pages/workbench/index' });
         }
       });
       return;
@@ -157,7 +157,7 @@ const handleLogin = async () => {
       password: form.password
     });
 
-    uni.showToast({ title: '登录成功', icon: 'success', duration: 1500 });
+    uni.showToast({ title: '登录成功', icon: 'success', duration: 1000 });
 
     // 登录成功后跳转首页
     setTimeout(() => {
@@ -165,10 +165,10 @@ const handleLogin = async () => {
         url: globalConfig.router.tabBarList[1].path,
         fail: (err) => {
           console.warn('tabBar跳转失败，切换为普通跳转：', err);
-          uni.redirectTo({ url: '/pages/workbench/index' });
+          uni.reLaunch({ url: '/pages/workbench/index' });
         }
       });
-    }, 1500);
+    }, 1000);
   } catch (err) {
     console.error('登录失败详情：', err);
     const errorMsg =
diff --git a/pages/workbench/index.vue b/pages/workbench/index.vue
index a9cdf30..47085e4 100644
--- a/pages/workbench/index.vue
+++ b/pages/workbench/index.vue
@@ -98,6 +98,39 @@ const filteredModuleList = computed(() => {
 onShow(async () => {
   try {
     loading.value = true;
+
+    // ========== 核心新增：登录状态判断 ==========
+    // 1. 定义登录判断逻辑（多维度校验，确保准确性）
+    const isLogin = () => {
+
+      // 从缓存获取token（核心登录标识）
+      const token = cache.get(globalConfig.cache.tokenKey) || userStore.token;
+      // 从缓存/Pinia获取用户信息
+      const userInfo = cache.get(globalConfig.cache.userInfoKey) || userStore.userInfo;
+      // 满足任一核心条件即视为已登录
+      return  (!!token && !!userInfo);
+    };
+
+    // 2. 未登录处理：跳转登录页，阻止后续逻辑执行
+    if (!isLogin()) {
+      uni.showToast({ title: '请先登录', icon: 'none', duration: 1500 });
+      // 延迟跳转，确保提示语正常显示
+      setTimeout(() => {
+        // 使用reLaunch跳转，清空页面栈，避免返回当前菜单页
+        uni.reLaunch({
+          url: '/pages/login/login', // 替换为你的实际登录页路径
+          fail: (err) => {
+            console.error('跳转登录页失败：', err);
+            uni.showToast({ title: '跳转登录页异常', icon: 'none' });
+          }
+        });
+      }, 1500);
+      // 隐藏加载状态
+      loading.value = false;
+      // 终止后续代码执行
+      return;
+    }
+
     const rawMenuData = userStore.moduleListInfo || cache.get(globalConfig.cache.moduleListKey);
     moduleList.value = rawMenuData || [];
     loading.value = false;
diff --git a/pinia/user.js b/pinia/user.js
index 7a26025..fb0c04e 100644
--- a/pinia/user.js
+++ b/pinia/user.js
@@ -1,12 +1,17 @@
 import { defineStore } from 'pinia';
 import cache from '@/common/utils/cache';
 import globalConfig from '@/common/config/global';
-import { login, getUserInfo, logout, moduleList, getSimpleDictDataList } from '@/api/user';
+// 新增：导入 refreshToken 接口
+import { login, getUserInfo, logout, moduleList, getSimpleDictDataList, refreshToken } from '@/api/user';
+
+// 新增：定义刷新Token的定时器标识（避免重复创建定时器）
+let refreshTokenTimer = null;
 
 export const useUserStore = defineStore('user', {
   // 修复1：删除重复的 state 定义，只保留根层级的 state
   state: () => ({
     token: cache.get(globalConfig.cache.tokenKey) || '', // 初始值从缓存取（兼容持久化）
+    refreshToken: cache.get(globalConfig.cache.refreshTokenKey) || '', // 新增：Refresh Token 状态
     userInfo: cache.get(globalConfig.cache.userInfoKey) || {},
     userId: cache.get(globalConfig.cache.userIdKey) || '',
     moduleListInfo: cache.get(globalConfig.cache.moduleListKey) || '',
@@ -23,14 +28,22 @@ export const useUserStore = defineStore('user', {
       }
       return true;
     },
-    permissions: (state) => state.userInfo.permissions || []
+    permissions: (state) => state.userInfo.permissions || [],
+    // 新增：判断是否需要刷新Token（过期前30秒触发，避免已过期才刷新）
+    needRefreshToken: (state) => {
+      if (!state.token || !state.refreshToken) return false;
+      const remainingTime = state.expireTime - Date.now();
+      // 剩余时间大于0秒 且 小于30秒（即将过期）
+      return remainingTime > 0 && remainingTime < 30 * 1000;
+    }
   },
 
   actions: {
     async login(params) {
       try {
         const res = await login(params);
-        const { accessToken, expiresTime, userId } = res;
+        // 新增：从登录接口返回值中获取 refreshToken（若接口返回字段名不一致，可调整，如 res.refresh_token）
+        const { accessToken, expiresTime, userId, refreshToken } = res;
 
         if (!accessToken) {
           throw new Error('登录失败，未获取到令牌');
@@ -38,6 +51,7 @@ export const useUserStore = defineStore('user', {
 
         // 更新 Pinia state
         this.token = accessToken;
+        this.refreshToken = refreshToken || ''; // 新增：存储Refresh Token
         this.expireTime = expiresTime;
         this.userId = userId;
         this.userInfo = {};
@@ -70,6 +84,9 @@ export const useUserStore = defineStore('user', {
           uni.showToast({ title: '获取字典失败，可正常使用', icon: 'none' });
         }
 
+        // 新增：登录成功后，启动 Token 自动刷新定时器
+        this.startRefreshTokenTimer();
+
         return { ...res, userInfo, moduleListInfo };
       } catch (err) {
         console.error('登录流程失败：', err);
@@ -77,6 +94,73 @@ export const useUserStore = defineStore('user', {
       }
     },
 
+    // 新增：调用刷新Token接口，返回刷新是否成功
+    async refreshTokenApi() {
+      // 前置校验：无Refresh Token直接返回失败
+      if (!this.refreshToken) {
+        console.warn('无刷新令牌，无法刷新Token');
+        this.logout(); // 无刷新令牌，直接退出登录
+        return false;
+      }
+
+      try {
+        // 调用修正后的 refreshToken 接口，传入当前的 refreshToken
+        const res = await refreshToken(this.refreshToken);
+
+        // 校验接口返回结果（根据你的实际接口返回格式调整）
+        if (!res || !res.accessToken) {
+          throw new Error('刷新Token失败，未获取到新令牌');
+        }
+
+        // 更新 Token 相关状态
+        this.token = res.accessToken; // 新的访问令牌
+        this.refreshToken = res.refreshToken || this.refreshToken; // 若接口返回新的Refresh Token则更新
+        this.expireTime = res.expiresTime; // 新的过期时间
+        console.log('Token 刷新成功');
+        return true;
+      } catch (err) {
+        console.error('刷新Token失败：', err);
+        // 刷新失败，直接退出登录
+        this.logout();
+        return false;
+      }
+    },
+
+    // 新增：启动 Token 自动刷新定时器
+    startRefreshTokenTimer() {
+      // 先清除已有定时器，避免重复创建
+      if (refreshTokenTimer) {
+        clearTimeout(refreshTokenTimer);
+        refreshTokenTimer = null;
+      }
+
+      // 计算剩余时间（过期前30秒执行刷新）
+      const remainingTime = this.expireTime - Date.now() - 30 * 1000;
+      if (remainingTime <= 0) {
+        // 剩余时间不足，立即执行刷新
+        this.refreshTokenApi();
+        return;
+      }
+
+      // 设置定时器，到期后执行刷新
+      refreshTokenTimer = setTimeout(async () => {
+        const refreshSuccess = await this.refreshTokenApi();
+        // 刷新成功后，重新启动定时器（循环自动刷新）
+        if (refreshSuccess) {
+          this.startRefreshTokenTimer();
+        }
+      }, remainingTime);
+      console.log(`Token 自动刷新定时器已启动，将在 ${Math.ceil(remainingTime / 1000)} 秒后执行刷新`);
+    },
+
+    // 新增：停止 Token 自动刷新定时器（避免内存泄漏）
+    stopRefreshTokenTimer() {
+      if (refreshTokenTimer) {
+        clearTimeout(refreshTokenTimer);
+        refreshTokenTimer = null;
+      }
+    },
+
     // 修复3：重构字典获取方法（加 Token 校验 + 强制携带 Token + 宽松错误处理）
     async getAndSaveDictData() {
       // 前置校验：无登录态直接返回，不请求接口
@@ -136,6 +220,9 @@ export const useUserStore = defineStore('user', {
     },
 
     logout() {
+      // 新增：退出登录时，停止刷新定时器
+      this.stopRefreshTokenTimer();
+
       const pages = getCurrentPages();
       if (pages.length === 0) return;
 
@@ -146,6 +233,7 @@ export const useUserStore = defineStore('user', {
 
       if (currentPageRoute === loginPath) {
         this.token = '';
+        this.refreshToken = ''; // 新增：清空Refresh Token
         this.userInfo = {};
         this.userId = '';
         this.moduleListInfo = '';
@@ -164,6 +252,7 @@ export const useUserStore = defineStore('user', {
           console.error('退出登录接口调用失败：', err);
         } finally {
           this.token = '';
+          this.refreshToken = ''; // 新增：清空Refresh Token
           this.userInfo = {};
           this.userId = '';
           this.moduleListInfo = '';
@@ -197,6 +286,9 @@ export const useUserStore = defineStore('user', {
         }
         return false;
       }
+
+      // 新增：已登录时，启动刷新定时器（防止页面刷新后定时器丢失）
+      this.startRefreshTokenTimer();
       return true;
     }
   },
@@ -212,6 +304,7 @@ export const useUserStore = defineStore('user', {
     serializer: {
       serialize: (state) => {
         uni.setStorageSync(globalConfig.cache.tokenKey, state.token);
+        uni.setStorageSync(globalConfig.cache.refreshTokenKey, state.refreshToken); // 新增：持久化Refresh Token
         uni.setStorageSync(globalConfig.cache.userIdKey, state.userId);
         uni.setStorageSync(globalConfig.cache.expireTimeKey, state.expireTime);
         uni.setStorageSync(globalConfig.cache.userInfoKey, state.userInfo);
@@ -222,6 +315,7 @@ export const useUserStore = defineStore('user', {
       deserialize: (value) => {
         return {
           token: uni.getStorageSync(globalConfig.cache.tokenKey) || '',
+          refreshToken: uni.getStorageSync(globalConfig.cache.refreshTokenKey) || '', // 新增：读取Refresh Token
           userId: uni.getStorageSync(globalConfig.cache.userIdKey) || '',
           expireTime: uni.getStorageSync(globalConfig.cache.expireTimeKey) || 0,
           userInfo: uni.getStorageSync(globalConfig.cache.userInfoKey) || {},
@@ -231,6 +325,6 @@ export const useUserStore = defineStore('user', {
         };
       }
     },
-    paths: []
+    // paths: []
   }
 });
\ No newline at end of file
--
libgit2 0.21.4