From 1d3624b054a22e7c4b0ca549d9c5d880e1ee4d5e Mon Sep 17 00:00:00 2001
From: 刘淇 <290219706@qq.com>
Date: Mon, 13 Jul 2026 13:40:59 +0800
Subject: [PATCH] 首页。养护任务

---
 api/index/index.js                         |  18 ++++++++++++++++++
 common/config/env.js                       |   3 ++-
 pages-sub/data/tree-archive/addTree.vue    | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
 pages-sub/data/tree-archive/editTree.vue   |  58 ++++++++++++++++++++++++++++++++++++++++++----------------
 pages-sub/data/tree-archive/logDetail.vue  |  15 ++++++++++++---
 pages-sub/data/tree-archive/treeRecord.vue |  12 ++++++------
 pages.json                                 |   3 ++-
 pages/index/index.vue                      | 727 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 8 files changed, 660 insertions(+), 356 deletions(-)

diff --git a/api/index/index.js b/api/index/index.js
index 542906d..fa65633 100644
--- a/api/index/index.js
+++ b/api/index/index.js
@@ -30,5 +30,23 @@ export const iWorkOrderSummary = (params) => {
   return post('/app-api/homePage/summary/iWorkOrderSummary', params);
 };
 
+/**
+ * 距离待办已办
+ * @param {Object} params {mobile, password, code}
+ * @returns {Promise}
+ */
+export const taskDetailsWithDistance = (params) => {
+  return post('/app-api/homePage/summary/taskDetailsWithDistance', params);
+};
+
+/**
+ * 效率待办已办
+ * @param {Object} params {mobile, password, code}
+ * @returns {Promise}
+ */
+export const taskDetailsWithSmartSort = (params) => {
+  return post('/app-api/homePage/summary/taskDetailsWithSmartSort', params);
+};
+
 
 
diff --git a/common/config/env.js b/common/config/env.js
index f5adff5..999e2b2 100644
--- a/common/config/env.js
+++ b/common/config/env.js
@@ -4,7 +4,8 @@ const env = {
   development: {
     baseUrl: 'https://test.jichengshanshui.com.cn:28302',
     // https://test.jichengshanshui.com.cn:28302
-    // http://h95ce3aa.natappfree.cc
+   
+    // baseUrl: 'http://192.168.1.186:48081',
 
     uploadUrl: 'https://test.jichengshanshui.com.cn:28302',
     // baseApi:'admin-api',
diff --git a/pages-sub/data/tree-archive/addTree.vue b/pages-sub/data/tree-archive/addTree.vue
index 0fba291..7c3c58f 100644
--- a/pages-sub/data/tree-archive/addTree.vue
+++ b/pages-sub/data/tree-archive/addTree.vue
@@ -5,11 +5,22 @@
         <up-input v-model.trim="formData.treetype" placeholder="请输入名称" maxlength="30" border="none"/>
       </up-form-item>
 
+      <!-- 树种类型 底部弹窗选择 -->
+      <!-- <up-form-item label="树种类型" prop="treeSpeciesType" required arrow @click="openTreeSpeciesType">
+        <up-input
+          v-model="formData.treeSpeciesTypeName"
+          placeholder="请选择树种类型"
+          readonly
+          border="none"
+          bg-color="transparent"
+        />
+      </up-form-item> -->
+
       <view class="form-row-wrap">
         <up-row gutter="10">
           <up-col span="6">
             <up-form-item label="胸径" prop="dbh" required>
-              <up-input v-model.trim="formData.dbh" placeholder="请输入"  maxlength="10" border="none" input-align="left"/>
+              <up-input v-model.trim="formData.dbh" placeholder="请输入" maxlength="10" border="none" input-align="left"/>
               <template #right>
                 <text style="padding-left: 12rpx;color:#ccc;font-size:14px">厘米</text>
               </template>
@@ -17,7 +28,7 @@
           </up-col>
           <up-col span="6">
             <up-form-item label="高度" prop="treeheight">
-              <up-input v-model.trim="formData.treeheight" placeholder="请输入"  maxlength="10" border="none"
+              <up-input v-model.trim="formData.treeheight" placeholder="请输入" maxlength="10" border="none"
                         input-align="left"/>
               <template #right>
                 <text style="padding-left: 12rpx;color:#ccc;font-size:14px;">米</text>
@@ -65,7 +76,7 @@
             :width="70"
             :height="70"
             :max-count="treeImgs.uploadConfig.maxCount"
-            :upload-text="treeImgs.uploadConfig.uploadText"
+            :upload-text="treeImgs.uploadText"
             :size-type="treeImgs.uploadConfig.sizeType"
         ></up-upload>
       </up-form-item>
@@ -182,11 +193,13 @@
 import { timeFormat } from '@/uni_modules/uview-plus';
 import { ref, reactive, nextTick } from 'vue'
 import { onReady, onLoad, onShow, onUnload } from '@dcloudio/uni-app';
+
 onUnload(() => {
   uni.reLaunch({
     url: '/pages-sub/data/tree-archive/index'
   })
 })
+
 import { addTree } from "@/api/tree-archive/tree-archive.js";
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
 import { useUserStore } from '@/pinia/user';
@@ -224,10 +237,10 @@ const isShow = ref(false)
 const contentHeight = ref(200)
 const treeOwnershipData = ref([])
 const treeLevelData = ref([])
+const treeSpeciesTypeList = ref([])
 const loadingFlag = ref(false)
 const showActionSheet = ref(false);
 const currentActionSheetData = reactive({ type: '', list: [], title: '' });
-// 年月弹窗开关
 const showDatePicker = ref(false);
 const plantingDate = ref(Date.now())
 
@@ -241,9 +254,11 @@ const treeImgs = useUploadImgs({
 })
 if (!Array.isArray(treeImgs.rawImgList.value)) treeImgs.rawImgList.value = [];
 
-// 表单数据：estimationtreeage 改为 plantingDate
+// 表单数据：treeSpeciesType 存编码，treeSpeciesTypeName 页面展示文字
 const formData = reactive({
   treetype: '',
+  // treeSpeciesType: '',
+  treeSpeciesTypeName: '',
   treeheight: '',
   dbh: '',
   treelevel: '',
@@ -252,7 +267,7 @@ const formData = reactive({
   oldtreeownership: '',
   oldtreeownershipText: '',
   latinname: '',
-  plantingDate: '', //栽种年月 yyyy-MM
+  plantingDate: '',
   canopysouthnorth: '',
   canopyeastwest: '',
   weekday: '',
@@ -266,84 +281,107 @@ const formData = reactive({
   maintainunit: ''
 })
 
-// 表单校验规则（移除estimationtreeage，plantingDate非必填）
+// 表单校验规则
 const rules = reactive({
   treetype: [
-    {validator: (rule, val, callback) => {
+    {
+      validator: (rule, val, callback) => {
         if (val && hasEmoji(val)) return callback(new Error('禁止输入表情符号'));
         callback();
-      }, trigger: ['blur','change','input'], priority: 10},
-    {required: true, message: '请输入名称', trigger: ['blur','change','input']},
-    {max:30, message:'名称最多输入30个字符', trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input'], priority: 10
+    },
+    { required: true, message: '请输入名称', trigger: ['blur', 'change', 'input'] },
+    { max: 30, message: '名称最多输入30个字符', trigger: ['blur', 'change', 'input'] }
   ],
+  // treeSpeciesType: [
+  //   { required: true, message: '请选择树种类型', trigger: ['change'] }
+  // ],
   treeheight: [
-    {max: 10, message: '树高不能超过10个字符', trigger: ['blur','change','input']},
-    {pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur','change','input']},
-    {validator: (rule, val, callback) => {
+    { max: 10, message: '树高不能超过10个字符', trigger: ['blur', 'change', 'input'] },
+    { pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur', 'change', 'input'] },
+    {
+      validator: (rule, val, callback) => {
         if (isPureZero(val)) return callback(new Error('不能输入纯0无效值'));
         callback();
-      }, trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input']
+    }
   ],
   dbh: [
-    {validator: (rule, val, callback) => {
+    {
+      validator: (rule, val, callback) => {
         if (val && hasEmoji(val)) return callback(new Error('禁止输入表情符号'));
         callback();
-      }, trigger: ['blur','change','input'], priority:10},
-    {required: true, message: '请输入胸径',trigger: ['blur','change','input']},
-    {max: 10, message: '胸径不能超过10个字符', trigger: ['blur','change','input']},
-    {pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur','change','input']},
-    {validator: (rule, val, callback) => {
+      }, trigger: ['blur', 'change', 'input'], priority: 10
+    },
+    { required: true, message: '请输入胸径', trigger: ['blur', 'change', 'input'] },
+    { max: 10, message: '胸径不能超过10个字符', trigger: ['blur', 'change', 'input'] },
+    { pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur', 'change', 'input'] },
+    {
+      validator: (rule, val, callback) => {
         if (isPureZero(val)) return callback(new Error('不能输入纯0无效值'));
         callback();
-      }, trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input']
+    }
   ],
   weekday: [
-    {max: 10, message: '干周不能超过10个字符', trigger: ['blur','change','input']},
-    {pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur','change','input']},
-    {validator: (rule, val, callback) => {
+    { max: 10, message: '干周不能超过10个字符', trigger: ['blur', 'change', 'input'] },
+    { pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur', 'change', 'input'] },
+    {
+      validator: (rule, val, callback) => {
         if (isPureZero(val)) return callback(new Error('不能输入纯0无效值'));
         callback();
-      }, trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input']
+    }
   ],
   canopyeastwest: [
-    {max: 10, message: '东西冠幅不能超过10个字符',trigger: ['blur','change','input']},
-    {pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur','change','input']},
-    {validator: (rule, val, callback) => {
+    { max: 10, message: '东西冠幅不能超过10个字符', trigger: ['blur', 'change', 'input'] },
+    { pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur', 'change', 'input'] },
+    {
+      validator: (rule, val, callback) => {
         if (isPureZero(val)) return callback(new Error('不能输入纯0无效值'));
         callback();
-      }, trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input']
+    }
   ],
   canopysouthnorth: [
-    {max: 10, message: '南北冠幅不能超过10个字符', trigger: ['blur','change','input']},
-    {pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur','change','input']},
-    {validator: (rule, val, callback) => {
+    { max: 10, message: '南北冠幅不能超过10个字符', trigger: ['blur', 'change', 'input'] },
+    { pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur', 'change', 'input'] },
+    {
+      validator: (rule, val, callback) => {
         if (isPureZero(val)) return callback(new Error('不能输入纯0无效值'));
         callback();
-      }, trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input']
+    }
   ],
-  growlocation: [{required: true, message: '请选择地图位置', trigger: ['blur','change','manual']}],
+  growlocation: [{ required: true, message: '请选择地图位置', trigger: ['blur', 'change', 'manual'] }],
   managedutyunit: [
-    {validator: (rule, val, callback) => {
+    {
+      validator: (rule, val, callback) => {
         if (val && hasEmoji(val)) return callback(new Error('禁止输入表情符号'));
         callback();
-      }, trigger: ['blur','change','input'], priority:10},
-    {required: true, message: '请输入管护单位', trigger: ['blur','change','input']},
-    {max:30, message:'管护单位最多输入30个字符', trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input'], priority: 10
+    },
+    { required: true, message: '请输入管护单位', trigger: ['blur', 'change', 'input'] },
+    { max: 30, message: '管护单位最多输入30个字符', trigger: ['blur', 'change', 'input'] }
   ],
-  oldtreeownershipText: [{required: true, message: '请选择权属分类', trigger: ['blur','change']}],
+  oldtreeownershipText: [{ required: true, message: '请选择权属分类', trigger: ['blur', 'change'] }],
   latinname: [
-    {validator: (rule, val, callback) => {
+    {
+      validator: (rule, val, callback) => {
         if (val && hasEmoji(val)) return callback(new Error('禁止输入表情符号'));
         callback();
-      }, trigger: ['blur','change','input'], priority:10},
-    {max:30, message:'拉丁文最多输入30个字符', trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input'], priority: 10
+    },
+    { max: 30, message: '拉丁文最多输入30个字符', trigger: ['blur', 'change', 'input'] }
   ],
   growthenvironment: [
-    {validator: (rule, val, callback) => {
+    {
+      validator: (rule, val, callback) => {
         if (val && hasEmoji(val)) return callback(new Error('禁止输入表情符号'));
         callback();
-      }, trigger: ['blur','change','input'], priority:10},
-    {max:50, message:'生长环境最多输入50个字符', trigger: ['blur','change','input']}
+      }, trigger: ['blur', 'change', 'input'], priority: 10
+    },
+    { max: 50, message: '生长环境最多输入50个字符', trigger: ['blur', 'change', 'input'] }
   ],
   treeImgList: [treeImgs.imgValidateRule]
 })
@@ -352,10 +390,13 @@ const rules = reactive({
 onLoad((options) => {
   formData.road = options.roadId
 })
+
 onShow(async () => {
   treeLevelData.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_level'))
-  treeOwnershipData.value =  uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_ownership'))
+  treeOwnershipData.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_ownership'))
+  treeSpeciesTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_species_type'))
 })
+
 onReady(() => {
   nextTick(() => {
     formRef.value?.setRules(rules);
@@ -363,22 +404,22 @@ onReady(() => {
 });
 
 // 打开栽种年月选择器
-const openPlantDatePicker = ()=>{
+const openPlantDatePicker = () => {
   showDatePicker.value = true
 }
-// 选中年月回调，自动格式 yyyy-MM
-const onSelectPlantDate = (date)=>{
-console.log(plantingDate.value)
-  console.log(timeFormat(plantingDate.value, 'yyyy-mm'))
-  // date格式：yyyy-MM
-  formData.plantingDate =  timeFormat(plantingDate.value, 'yyyy-mm')
+
+// 年月选择回调
+const onSelectPlantDate = () => {
+  formData.plantingDate = timeFormat(plantingDate.value, 'yyyy-mm')
   showDatePicker.value = false
 }
 
+// 展开/收起更多区域
 const toggleArea = () => {
   isShow.value = !isShow.value
 }
 
+// 打开权属/级别选择弹窗
 const handleActionSheetOpen = (type) => {
   const configMap = {
     ownership: { title: '请选择权属分类', list: treeOwnershipData.value },
@@ -388,11 +429,23 @@ const handleActionSheetOpen = (type) => {
   showActionSheet.value = true;
 };
 
+// 打开树种类型选择弹窗
+const openTreeSpeciesType = () => {
+  Object.assign(currentActionSheetData, {
+    title: '请选择树种类型',
+    list: treeSpeciesTypeList.value,
+    type: 'treeSpecies'
+  })
+  showActionSheet.value = true
+}
+
+// 关闭弹窗
 const handleActionSheetClose = () => {
   showActionSheet.value = false;
   Object.assign(currentActionSheetData, { type: '', list: [], title: '' });
 };
 
+// 弹窗选中回调
 const handleActionSheetSelect = (e) => {
   const { type } = currentActionSheetData;
   if (type === 'ownership') {
@@ -402,6 +455,10 @@ const handleActionSheetSelect = (e) => {
   } else if (type === 'level') {
     formData.treelevel = e.value
     formData.treeleveltext = e.name
+  } else if (type === 'treeSpecies') {
+    formData.treeSpeciesType = e.value
+    formData.treeSpeciesTypeName = e.name
+    formRef.value?.validateField('treeSpeciesType');
   }
   handleActionSheetClose();
 };
@@ -419,13 +476,13 @@ const openMap = () => {
     fail: (err) => {
       console.error('地图选择失败', err);
       if (err.errMsg.includes('auth deny')) {
-        uni.showToast({title: '请授权位置权限', icon: 'none'});
+        uni.showToast({ title: '请授权位置权限', icon: 'none' });
       }
     }
   });
 }
 
-// 提交
+// 提交表单
 const submit = async () => {
   if (loadingFlag.value) return
 
@@ -443,11 +500,11 @@ const submit = async () => {
   formData.treeImgList = uploadImgUrls
   loadingFlag.value = true
   try {
-    const res = await addTree(formData)
-    uni.showToast({title: "新增成功", icon: "success"});
-    uni.redirectTo({url: '/pages-sub/data/tree-archive/index'});
+    await addTree(formData)
+    uni.showToast({ title: "新增成功", icon: "success" });
+    uni.redirectTo({ url: '/pages-sub/data/tree-archive/index' });
   } catch (err) {
-    uni.showToast({title: "新增失败，请重试", icon: "none"});
+    uni.showToast({ title: "新增失败，请重试", icon: "none" });
     console.error(err)
   } finally {
     loadingFlag.value = false
@@ -479,7 +536,7 @@ const submit = async () => {
     position: relative;
     margin-bottom: 0 !important;
   }
-  :deep(.u-form-item__body__right__message ) {
+  :deep(.u-form-item__body__right__message) {
     position: absolute;
     left: 0;
     bottom: -20rpx;
@@ -490,6 +547,7 @@ const submit = async () => {
     box-sizing: border-box;
   }
 }
+
 .form-row-wrap + .u-form-item {
   margin-top: 25rpx !important;
 }
diff --git a/pages-sub/data/tree-archive/editTree.vue b/pages-sub/data/tree-archive/editTree.vue
index 3ca7316..50d14ad 100644
--- a/pages-sub/data/tree-archive/editTree.vue
+++ b/pages-sub/data/tree-archive/editTree.vue
@@ -22,6 +22,17 @@
           <up-input v-model.trim="formData.treetype" placeholder="请输入名称" maxlength="30" border="none"/>
         </up-form-item>
 
+        <!-- 新增：树种类型 底部弹窗选择 -->
+        <!-- <up-form-item label="树种类型" prop="treeSpeciesType" required arrow @click="openTreeSpeciesType">
+          <up-input
+            v-model="formData.treeSpeciesTypeName"
+            placeholder="请选择树种类型"
+            readonly
+            border="none"
+            bg-color="transparent"
+          />
+        </up-form-item> -->
+
         <view class="form-row-wrap">
           <up-row gutter="10">
             <up-col span="6">
@@ -277,8 +288,6 @@ import { onReady, onLoad, onShow, onUnload } from '@dcloudio/uni-app';
 
 import { treeRoadReq, treeLogReq, treeDetailReq, updateTree, inspectionLogReq }
 from "@/api/tree-archive/tree-archive.js";
-// 引入巡检列表接口
-// import { getInspectListReq } from "@/api/tree-archive/tree-archive.js";
 
 import { timeFormat } from '@/uni_modules/uview-plus';
 import { useUploadImgs } from '@/common/utils/useUploadImgs'
@@ -289,11 +298,6 @@ const CONST = {
   UPLOAD_CONFIG: { maxCount: 3, uploadText: '选择图片', sizeType: ['compressed'] }
 }
 
-// ========== 页面关闭统一跳转 ==========
-onUnload(() => {
-  uni.reLaunch({url: '/pages-sub/data/tree-archive/index'})
-})
-
 // ========== 基础变量 ==========
 const rows = ref([])
 const roadId = ref('')
@@ -321,6 +325,7 @@ const isShow = ref(false)
 const contentHeight = ref(200)
 const treeOwnershipData = ref([])
 const treeLevelData = ref([])
+const treeSpeciesTypeList = ref([]) // 树种类型字典列表
 const showActionSheet = ref(false);
 const currentActionSheetData = reactive({type: '', list: [], title: ''});
 
@@ -333,10 +338,12 @@ const treeImgList = useUploadImgs({
 treeImgList.imgList.value = []
 treeImgList.rawImgList.value = []
 
-// ========== 表单数据 移除estimationtreeage，替换为plantingDate ==========
+// ========== 表单数据 ==========
 const formData = reactive({
   id: '',
   treetype: '',
+  // treeSpeciesType: '',    // 树种类型编码（提交接口）
+  treeSpeciesTypeName: '', // 树种类型名称（页面展示）
   treeheight: '',
   dbh: '',
   treelevel: '',
@@ -390,6 +397,10 @@ const rules = reactive({
     {required: true, message: '请输入名称', trigger: ['blur', 'change', 'input']},
     {max: 30, message: '名称最多输入30个字符', trigger: ['blur', 'change', 'input']}
   ],
+  // 树种类型 必填校验
+  // treeSpeciesType: [
+  //   { required: true, message: '请选择树种类型', trigger: ['change'] }
+  // ],
   treeheight: [
     {max: 10, message: '树高不能超过10个字符', trigger: ['blur', 'change', 'input']},
     {pattern: /^\d+(\.\d{1,2})?$/, message: '格式不正确，支持数字或两位小数', trigger: ['blur', 'change', 'input']},
@@ -478,8 +489,11 @@ onLoad((options) => {
 });
 
 onShow(async () => {
+  // 加载全部字典
   treeLevelData.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_level'))
   treeOwnershipData.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_ownership'))
+  treeSpeciesTypeList.value = uni.$dict.transformLabelValueToNameValue(uni.$dict.getDictSimpleList('tree_species_type'))
+
   if (activeTab.value === 0 && treeId.value && !isInit.value) {
     await getTreeDetail()
     isInit.value = true
@@ -511,12 +525,14 @@ const treeRoadQuery = async () => {
   rows.value = res.list
 }
 
-// 获取树木详情
+// 获取树木详情（回显树种类型名称+编码）
 const getTreeDetail = async () => {
   const res = await treeDetailReq({id: treeId.value})
   Object.assign(formData, res)
+  // 字典回显
   formData.oldtreeownershipText = uni.$dict.getDictLabel('tree_ownership', res.oldtreeownership)
   formData.treeleveltext = uni.$dict.getDictLabel('tree_level', formData.treelevel)
+  // formData.treeSpeciesTypeName = uni.$dict.getDictLabel('tree_species_type', formData.treeSpeciesType)
 
   treeImgList.imgList.value = []
   treeImgList.rawImgList.value = []
@@ -545,7 +561,6 @@ const getTreeLogList = async () => {
 
 // 获取巡检记录列表
 const getInspectList = async () => {
-  // 正式环境启用下面接口
   const res = await inspectionLogReq({treeId: treeId.value,pageNo:1,pageSize:100})
   console.log(res)
   inspectRows.value = res.list || []
@@ -556,10 +571,6 @@ const openPlantDatePicker = () => {
   showDatePicker.value = true
 }
 const onSelectPlantDate = (date) => {
-  // date自动 yyyy-MM
-  console.log(plantingDate.value)
-  console.log(timeFormat(plantingDate.value, 'yyyy-mm'))
-  // date格式：yyyy-MM
   formData.plantingDate =  timeFormat(plantingDate.value, 'yyyy-mm')
   showDatePicker.value = false
 }
@@ -567,6 +578,7 @@ const onSelectPlantDate = (date) => {
 // ========== 表单相关方法 ==========
 const toggleArea = () => isShow.value = !isShow.value
 
+// 打开权属/级别弹窗
 const handleActionSheetOpen = (type) => {
   const configMap = {
     ownership: {title: '请选择权属分类', list: treeOwnershipData.value},
@@ -576,11 +588,22 @@ const handleActionSheetOpen = (type) => {
   showActionSheet.value = true;
 };
 
+// 打开树种类型弹窗
+const openTreeSpeciesType = () => {
+  Object.assign(currentActionSheetData, {
+    title: '请选择树种类型',
+    list: treeSpeciesTypeList.value,
+    type: 'treeSpecies'
+  })
+  showActionSheet.value = true
+}
+
 const handleActionSheetClose = () => {
   showActionSheet.value = false;
   Object.assign(currentActionSheetData, {type: '', list: [], title: ''});
 };
 
+// 弹窗选中回调（区分三种类型）
 const handleActionSheetSelect = (e) => {
   const {type} = currentActionSheetData;
   if (type === 'ownership') {
@@ -590,6 +613,11 @@ const handleActionSheetSelect = (e) => {
   } else if (type === 'level') {
     formData.treelevel = e.value
     formData.treeleveltext = e.name
+  } else if (type === 'treeSpecies') {
+    // 树种类型：编码存接口字段，名称页面展示
+    formData.treeSpeciesType = e.value
+    formData.treeSpeciesTypeName = e.name
+    formRef.value?.validateField('treeSpeciesType');
   }
   handleActionSheetClose();
 };
@@ -658,11 +686,9 @@ const toInspectDetailPage = (item) => {
 // 跳转到新增巡检页面
 const toAddInspect = () => {
   const firstItem = inspectRows.value.length > 0 ? inspectRows.value[0] : null
-  // 存入本地缓存
   if (firstItem) {
     uni.setStorageSync('temp_inspect_fill_data', JSON.stringify(firstItem))
   } else {
-    // 没有数据先清空残留缓存
     uni.removeStorageSync('temp_inspect_fill_data')
   }
   uni.navigateTo({
diff --git a/pages-sub/data/tree-archive/logDetail.vue b/pages-sub/data/tree-archive/logDetail.vue
index ba094b0..6fd4976 100644
--- a/pages-sub/data/tree-archive/logDetail.vue
+++ b/pages-sub/data/tree-archive/logDetail.vue
@@ -185,9 +185,18 @@ const formatImgList = (imgList) => {
 
 // ========== 生命周期 ==========
 onUnload(() => {
-  uni.reLaunch({
-    url: '/pages-sub/data/tree-archive/index'
-  })
+ const pages = getCurrentPages()
+  // 页面栈长度 >=2 说明有上两页，回退2级
+  if (pages.length >= 2) {
+    uni.navigateBack({
+      delta: 2
+    })
+  } else {
+    // 兜底：页面栈不足时，跳列表页
+    uni.reLaunch({
+      url: '/pages-sub/data/tree-archive/index'
+    })
+  }
 })
 
 onLoad((options) => {
diff --git a/pages-sub/data/tree-archive/treeRecord.vue b/pages-sub/data/tree-archive/treeRecord.vue
index 48b48eb..ba7f101 100644
--- a/pages-sub/data/tree-archive/treeRecord.vue
+++ b/pages-sub/data/tree-archive/treeRecord.vue
@@ -69,12 +69,12 @@
 <script setup>
 import { ref } from 'vue'
 import { onLoad, onShow, onUnload } from '@dcloudio/uni-app';
-onUnload(() => {
-  // 关闭所有页面，直接打开【行道树档案】主页面 【微信小程序完美兼容，无任何报错】
-  uni.reLaunch({
-    url: '/pages-sub/data/tree-archive/index'
-  })
-})
+// onUnload(() => {
+//   // 关闭所有页面，直接打开【行道树档案】主页面 【微信小程序完美兼容，无任何报错】
+//   uni.reLaunch({
+//     url: '/pages-sub/data/tree-archive/index'
+//   })
+// })
 import { treeRoadReq } from "@/api/tree-archive/tree-archive.js";
 import { timeFormat } from '@/uni_modules/uview-plus';
 const rows = ref([])
diff --git a/pages.json b/pages.json
index 07aba25..75dad52 100644
--- a/pages.json
+++ b/pages.json
@@ -18,7 +18,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7ffd40d..f54192b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,7 +9,7 @@
         </view>
       </view>
       <view class="msg-icon" @click="handleMsgClick" hover-class="msg-icon--hover">
-        <up-icon name="chat" color="#fff" size="24"/>
+        <up-icon name="chat" color="#fff" size="24" />
         <view class="msg-badge">
           <up-badge type="error" showZero="true" max="999" :value="msgCount"></up-badge>
         </view>
@@ -17,161 +17,192 @@
     </view>
 
     <view class="content-wrap">
-      <!-- 任务完成情况标题 -->
-      <view class="module-title">任务完成情况</view>
-
-      <!-- 任务完成情况卡片 -->
-      <view class="task-chart-card">
-        <view class="card-header">
-          <view class="unit-tip">单位: 个</view>
-          <view class="date-picker-wrap">
-            <neo-datetime-pro
-                v-model="dateRange"
-                type="daterange"
-                :clearable="false"
-                placeholder="请选择日期范围"
-                @confirm="handleDateConfirm"
-                :max-date="maxDate"
-
-                @popup-show="handlePopupShow"
-                @popup-hide="handlePopupHide"
-            />
-<!--            :minDate="minDate"-->
+      <!-- 图表区域 增加平滑动画容器 -->
+      <view class="chart-wrap" v-show="showChartArea">
+        <!-- 任务完成情况标题 -->
+        <view class="module-title">任务完成情况</view>
+
+        <!-- 任务完成情况卡片 -->
+        <view class="task-chart-card">
+          <view class="card-header">
+            <view class="unit-tip">单位: 个</view>
+            <view class="date-picker-wrap">
+              <neo-datetime-pro v-model="dateRange" type="daterange" :clearable="false" placeholder="请选择日期范围"
+                @confirm="handleDateConfirm" :max-date="maxDate" @popup-show="handlePopupShow"
+                @popup-hide="handlePopupHide" />
+            </view>
           </view>
-        </view>
 
-        <!-- 双折线K线图 -->
-        <view class="chart-container">
-          <uni-charts
-              v-if="!isDatePickerOpen"
-              type="line"
-              :data="klineChartData"
-              :categories="klineCategories"
-              :option="klineOption"
-              :width="chartWidth"
-              :height="chartHeight"
-          />
+          <!-- 双折线K线图 -->
+          <view class="chart-container">
+            <uni-charts v-if="!isDatePickerOpen" type="line" :data="klineChartData" :categories="klineCategories"
+              :option="klineOption" :width="chartWidth" :height="chartHeight" />
+          </view>
         </view>
       </view>
 
-      <!-- 使用up-tabs组件实现Tab切换 -->
-      <up-tabs
-          :list="tabList"
-          lineWidth="60"
-          @change="handleTabChange"
-          class="task-tab-container"
-          :scrollable="false"
-          :activeStyle="{
-            color: '#000000',
-            fontSize: '14'
-        }"
-          :inactiveStyle="{
-           color: '#787070',
-            fontSize: '14'
-        }"
-      ></up-tabs>
-
-      <!-- z-paging分页列表 -->
-      <z-paging
-          ref="paging"
-          v-model="currentTaskList"
-          @query="queryList"
-          :auto-show-system-loading="true"
-          :page-size="10"
-          use-page-scroll
-      >
-
-        <template #empty>
-          <up-empty/>
-        </template>
-        <view class="task-list-container">
-          <view
-              class="task-item"
-              v-for="(item,index) in currentTaskList"
-              :key="`${item.taskName}_${index}`"
-              hover-class="task-item--hover"
-              @click="handleTaskClick(item)"
-          >
+      <view class="con-wrap">
+        <view class="con-title">养护任务 </view>
+
+        <!-- 手写Tab切换：胶囊分段样式 -->
+        <view class="custom-tab-wrap">
+          <view class="tab-capsule" :class="{ active: currentTabValue === 0 }" @click="handleTabClick(0)">
+            待办事项({{ todoTotal }})
+          </view>
+          <view class="tab-capsule" :class="{ active: currentTabValue === 1 }" @click="handleTabClick(1)">
+            已办事项({{ doneTotal }})
+          </view>
+        </view>
+
+
+        <!-- 动态组信息文案 -->
+        <view class="tip-top" style="padding: 8px 0  0 70px;">
+          <text>{{ tipText }}</text>
+        </view>
+
+        <!-- 顶部进度提示栏 -->
+        <view v-if="showTipHeader" class="tip-header">
+          <up-icon name="checkmark-circle" color="#00b42a" size="20"></up-icon>
+          <text style="color: #1677ff;">今日组内：您已经完成{{ finishNum }}项，小组均值{{ avgNum }}项</text>
+        </view>
+
+
+        <scroll-view 
+          class="task-list-container" 
+          scroll-y 
+          @scroll="onListScroll" 
+          @scrolltoupper="handleTouchTop"
+          enhanced
+        >
+          <view v-if="taskList.length === 0" class="empty-box">
+            <up-empty />
+          </view>
+          <view class="task-item" v-for="(item, index) in taskList" :key="`${item.taskName}_${index}`"
+            hover-class="task-item--hover" @click="handleTaskClick(item)">
             <view class="task-item__content">
-              <view class="task-item__name u-line-1">
-                {{ item.taskName || '无' }}
-              </view>
-              <view class="task-item__footer u-flex common-item-center common-justify-between"
-                    style="font-size: 13px; margin-top: 5px;">
-                <view class="urgency-tag">
-                  紧急程度： {{ uni.$dict.getDictLabel('workorder_pressing_type', item.pressingType) || '--' }}
+              <view class="name-fixed-wrap">
+                <view class="task-item__name ">
+                  事项{{ index + 1 }} 
                 </view>
-                <view style="font-size: 13px;color: #333">{{
-                    timeFormat(item.busiDateTime, 'yyyy-mm-dd hh:MM:ss')
-                  }}
+                <view class="task-name-text">
+                  {{ item.taskName || '无' }}
                 </view>
               </view>
+
+              <view v-if="currentTabValue === 0" class="task-item__footer" style="padding-left:  60px;">
+                <image class="loc-icon" src="https://img.jichengshanshui.com.cn:28207/appimg/定位icon@3x.png" mode="aspectFit"></image>
+                <template v-if="isWalkTextMode">
+                  <text>距离当前{{ item.distance }}m ·约{{ item.estimatedWalkingMinutes }}分钟步行</text>
+                </template>
+                <template v-else>
+                  <text>{{ item.distance }}m ·</text>
+                  <up-icon name="star-fill" color="#ffd21d" size="20"></up-icon>
+                  <text>历史完成率{{ item.efficiencyPercent }}%</text>
+                </template>
+              </view>
             </view>
           </view>
-        </view>
-      </z-paging>
+        </scroll-view>
+      </view>
     </view>
   </view>
 </template>
 
 <script setup lang="ts">
-import {ref, watch, computed, reactive} from 'vue';
-import {onShow} from '@dcloudio/uni-app'
-import {useUserStore} from '@/pinia/user';
-import {timeFormat} from '@/uni_modules/uview-plus';
+import { ref, computed, nextTick } from 'vue';
+import { onShow,onUnload } 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";
-import {getTaskCompletionSummary, getTaskDetails} from "@/api/index/index";
+import { getUnreadCount } from "@/api/user";
+import {
+  getTaskCompletionSummary,
+  taskDetailsWithDistance,
+  taskDetailsWithSmartSort
+} from "@/api/index/index";
 
+const userStore = useUserStore();
+const deptId = computed(() => String(userStore.userInfo?.user?.deptId ?? ''));
+
+// ====================== 只需要在这里统一维护分组配置 ======================
+type GroupItem = {
+  deptId: string;
+  label: string;
+  showTipHeader: boolean; // 是否展示顶部进度条
+  useWalkText: boolean;   // 是否展示步行距离文案
+};
+const groupConfig: GroupItem[] = [
+  { deptId: '364', label: '[组2  A1B2 纯效率·有提醒]', showTipHeader: true, useWalkText: true },
+  { deptId: '337', label: '[组3  A2B1 个性化·无提醒]', showTipHeader: false, useWalkText: false },
+  { deptId: '338', label: '[组4  A2B2 个性化·有提醒]', showTipHeader: true, useWalkText: false },
+];
+// 默认组1配置
+const defaultGroup: GroupItem = { deptId: '', label: '[组1  A1B1 纯效率·无提醒]', showTipHeader: false, useWalkText: true };
+
+// 获取当前部门配置对象
+const currentGroup = computed(() => {
+  const target = groupConfig.find(item => item.deptId === deptId.value);
+  return target ?? defaultGroup;
+});
+
+// 下面全部自动读取配置，无需写if/switch
+const tipText = computed(() => currentGroup.value.label);
+const showTipHeader = computed(() => currentGroup.value.showTipHeader);
+const isWalkTextMode = computed(() => currentGroup.value.useWalkText);
+const useDistanceApi = computed(() => currentGroup.value.useWalkText);
+// =========================================================================
 
-// ========== 2. 响应式数据 ==========
+const finishNum = ref(0);
+const avgNum = ref(0);
 const msgCount = ref(0);
-const currentTab = ref('todo'); // todo:待办 done:已办
-const dateRange = ref([]);
+const currentTabValue = ref(0);
+
+const dateRange = ref<string[]>([]);
 const yesterday = new Date();
-yesterday.setDate(yesterday.getDate() - 1); // 日期减1天 = 昨天
+yesterday.setDate(yesterday.getDate() - 1);
 const maxDate = ref(timeFormat(yesterday, 'yyyy-mm-dd'));
-const minDate = '2026-01-06'
+const minDate = '2026-01-06';
 
-// 新增响应式变量：标记日期选择器弹窗是否打开
 const isDatePickerOpen = ref(false);
-
-// 弹窗打开时触发
 const handlePopupShow = () => {
   isDatePickerOpen.value = true;
 };
-
-// 弹窗关闭时触发
 const handlePopupHide = () => {
   isDatePickerOpen.value = false;
 };
-//  Tab列表配置
-const tabList = ref([]);
-const todoTotal = ref(0); // 待办事项总数
-const doneTotal = ref(0); // 已办事项总数
 
-// 分页相关
-const paging = ref(null);
-const currentTaskList = ref([]); // 当前显示的任务列表（分页数据）
+const todoTotal = ref(0);
+const doneTotal = ref(0);
+const todoFullList = ref<any[]>([]);
+const doneFullList = ref<any[]>([]);
+const taskList = computed(() => {
+  return currentTabValue.value === 0 ? todoFullList.value : doneFullList.value;
+});
+
+const chooseOptions = computed(() => [
+  { title: `待办事项(${todoTotal.value})`, id: 'todo' },
+  { title: `已办事项(${doneTotal.value})`, id: 'done' }
+]);
 
-// 折线图数据配置
+const currentLon = ref<string>('');
+const currentLat = ref<string>('');
 const chartWidth = ref(0);
 const chartHeight = ref(300);
-const klineCategories = ref([]); // X轴日期
+
+const klineCategories = ref<string[]>([]);
 const klineChartData = ref([
   {
     name: '已完成任务数',
-    data: [],
+    data: [] as number[],
     color: '#25AF69'
   },
   {
     name: '总任务数',
-    data: [],
+    data: [] as number[],
     color: '#B34C17'
   }
 ]);
 
-// 图表配置
 const klineOption = ref({
   grid: {
     top: '25%',
@@ -180,16 +211,16 @@ const klineOption = ref({
     bottom: '16%'
   },
   xAxis: {
-    axisLabel: {fontSize: 12, color: '#666'}
+    axisLabel: { fontSize: 12, color: '#666' }
   },
   yAxis: {
     min: 0,
-    splitLine: {lineStyle: {color: '#f5f5f7'}},
-    axisLabel: {fontSize: 12, color: '#666'}
+    splitLine: { lineStyle: { color: '#f5f5f7' } },
+    axisLabel: { fontSize: 12, color: '#666' }
   },
   tooltip: {
     trigger: 'axis',
-    formatter: (params) => {
+    formatter: (params: any[]) => {
       return `${params[0].name}<br/>
       ${params[0].seriesName}: ${params[0].data}<br/>
       ${params[1].seriesName}: ${params[1].data}`;
@@ -198,34 +229,144 @@ const klineOption = ref({
   legend: {
     show: true,
     top: '5%',
-    textStyle: {fontSize: 12}
+    textStyle: { fontSize: 12 }
   }
 });
 
-// ========== 3. 计算属性 ==========
-const userStore = useUserStore();
 const userName = computed(() => userStore.userInfo?.user?.nickname || '用户');
 
-// ========== 4. 工具函数 ==========
-const rpx2px = (rpx) => {
+const rpx2px = (rpx: number) => {
   const systemInfo = uni.getSystemInfoSync();
-  return Math.floor(rpx * (systemInfo.screenWidth / 750));
+  return Math.floor(systemInfo.screenWidth / 750 * rpx);
+};
+
+// ========== 滚动逻辑 终极优化 ==========
+const showChartArea = ref(true);
+// 隐藏阈值：超过80rpx收起
+const scrollHideThreshold = rpx2px(80);
+// 安全显示区间：≤80rpx一律显示，覆盖所有回弹残留(70/80/90)
+const safeShowThreshold = rpx2px(130);
+let scrollTimer: number | null = null;
+
+// 下拉触顶强制展示
+const handleTouchTop = () => {
+  showChartArea.value = true;
 };
 
+const onListScroll = (e: any) => {
+  const scrollTop = e.detail.scrollTop;
+  console.log('scrollTop', scrollTop)
+  if (scrollTimer) clearTimeout(scrollTimer);
+
+  // 实时：只要在安全区间立刻显示
+  if (scrollTop <= safeShowThreshold) {
+    showChartArea.value = true;
+  } else if (scrollTop > scrollHideThreshold) {
+    showChartArea.value = false;
+  }
+
+  // 滚动停止兜底二次校验
+  scrollTimer = setTimeout(() => {
+    if (scrollTop <= safeShowThreshold) {
+      showChartArea.value = true;
+    }
+  }, 100);
+};
+
+// 切换tab重置图表显示
+const handleTabClick = (tabIndex: number) => {
+  if (currentTabValue.value === tabIndex) return;
+  currentTabValue.value = tabIndex;
+  // 切换tab强制显示图表
+  showChartArea.value = true;
+};
+
+// 页面每次显示强制重置图表为显示状态
+onShow(async () => {
+  showChartArea.value = true;
+  chartWidth.value = rpx2px(750 - 60);
+  chartHeight.value = rpx2px(300);
+  initRecent7Days();
+  getUnread();
+  await loadAllTaskByDept();
+});
+
+// 页面销毁清除定时器
+onUnload(() => {
+  if (scrollTimer) clearTimeout(scrollTimer);
+});
+// ======================================
+
+const getCurrentLocation = (): Promise<{ lon: string; lat: string }> => {
+  return new Promise((resolve, reject) => {
+    uni.getSetting({
+      success: (settingRes) => {
+        if (!settingRes.authSetting['scope.userLocation']) {
+          uni.authorize({
+            scope: 'scope.userLocation',
+            success: () => {
+              uni.getLocation({
+                type: 'gcj02',
+                success: (loc) => {
+                  resolve({
+                    lon: loc.longitude.toFixed(6),
+                    lat: loc.latitude.toFixed(6)
+                  })
+                },
+                fail: (err) => {
+                  uni.showToast({ title: '获取位置失败，请打开手机定位', icon: 'none' })
+                  reject(err)
+                }
+              })
+            },
+            fail: () => {
+              uni.showModal({
+                title: '需要定位权限',
+                content: '请允许获取位置才能正常使用',
+                confirmText: '去设置',
+                success: (modal) => {
+                  if (modal.confirm) {
+                    uni.openSetting()
+                  }
+                }
+              })
+              reject('用户拒绝定位权限')
+            }
+          })
+        } else {
+          uni.getLocation({
+            type: 'gcj02',
+            success: (loc) => {
+              resolve({
+                lon: loc.longitude.toFixed(6),
+                lat: loc.latitude.toFixed(6)
+              })
+            },
+            fail: (err) => {
+              uni.showToast({ title: '获取位置失败，请打开手机定位', icon: 'none' })
+              reject(err)
+            }
+          })
+        }
+      },
+      fail: (err) => {
+        reject('获取权限失败：' + err.errMsg)
+      }
+    })
+  })
+}
 
 const initRecent7Days = async () => {
   const yesterday = new Date();
-  yesterday.setDate(yesterday.getDate() - 1); // 结束时间 = 昨天
+  yesterday.setDate(yesterday.getDate() - 1);
   const sevenDaysAgo = new Date(yesterday);
-  sevenDaysAgo.setDate(yesterday.getDate() - 6); // 开始时间 = 昨天往前推6天（共7天）
+  sevenDaysAgo.setDate(yesterday.getDate() - 6);
 
-  // 格式化日期为 YYYY-MM-DD 格式
   dateRange.value = [
     timeFormat(sevenDaysAgo, 'yyyy-mm-dd'),
     timeFormat(yesterday, 'yyyy-mm-dd')
   ];
-
-  initChartData(timeFormat(sevenDaysAgo, 'yyyy-mm-dd'), timeFormat(yesterday, 'yyyy-mm-dd'));
+  initChartData(dateRange.value[0], dateRange.value[1]);
 };
 
 const getUnread = async () => {
@@ -238,145 +379,115 @@ const getUnread = async () => {
   }
 };
 
-/**
- * 初始化图表数据
- * @param {string} beginTime 开始时间
- * @param {string} endTime 结束时间
- */
-const initChartData = async (beginTime, endTime) => {
+const initChartData = async (beginTime: string, endTime: string) => {
   try {
-    let postData = {
-      beginTime: beginTime,
-      endTime: endTime
-    };
+    const postData = { beginTime, endTime };
     const res = await getTaskCompletionSummary(postData);
-    console.log('图表数据:', res);
-    klineCategories.value = res.map(item => item.currentDate);
-    klineChartData.value[0].data = res.map(item => item.completedNum);
-    klineChartData.value[1].data = res.map(item => item.countpendingNum);
+    klineCategories.value = res.map((item: any) => item.currentDate);
+    klineChartData.value[0].data = res.map((item: any) => item.completedNum);
+    klineChartData.value[1].data = res.map((item: any) => item.countpendingNum);
   } catch (error) {
     console.error('获取图表数据失败:', error);
   }
 };
 
-/**
- *  获取所有Tab的总数（初始化时调用）
- */
-const getAllTabTotal = async () => {
+const loadDistanceApiTask = async (lon: string, lat: string) => {
   try {
-    // 同时请求待办和已办的总数（只请求第1页，每页1条，仅获取total）
+    const paramsTodo = { queryType: 1, currentLon: lon, currentLat: lat };
+    const paramsDone = { queryType: 2, currentLon: lon, currentLat: lat };
     const [todoRes, doneRes] = await Promise.all([
-      getTaskDetails({queryType: 1, pageNo: 1, pageSize: 1}),
-      getTaskDetails({queryType: 2, pageNo: 1, pageSize: 1})
+      taskDetailsWithDistance(paramsTodo),
+      taskDetailsWithDistance(paramsDone)
     ]);
-
-    // 更新总数
-    todoTotal.value = todoRes?.total || 0;
-    doneTotal.value = doneRes?.total || 0;
-    console.log('已办:')
-    console.log(doneRes)
-    tabList.value = [
-      {name: `待办事项(${todoTotal.value})`},
-      {name: `已办事项(${doneTotal.value})`},
-    ]
-    console.log('初始化总数：', {todoTotal: todoTotal.value, doneTotal: doneTotal.value});
-  } catch (error) {
-    console.error('获取Tab总数失败:', error);
-    // 保底：如果已办请求失败，至少保证待办数据正常
+    todoFullList.value = todoRes?.sortedTasks || [];
+    doneFullList.value = doneRes?.sortedTasks || [];
+    todoTotal.value = Number(todoRes?.totalPendingTasks) || 0;
+    doneTotal.value = Number(doneRes?.totalPendingTasks) || 0;
+    finishNum.value = todoRes?.teamProgress?.userCompletedCount ?? 0;
+    avgNum.value = doneRes?.teamProgress?.teamAverage ?? 0;
+    await nextTick();
+  } catch (err) {
+    uni.showToast({ title: '加载任务失败', icon: 'none' });
+    console.error('加载distance接口任务报错', err);
+    todoFullList.value = [];
+    doneFullList.value = [];
+    todoTotal.value = 0;
+    doneTotal.value = 0;
   }
 };
 
-// ========== 5. 业务逻辑 ==========
-/**
- *  up-tabs切换事件处理
- * @param {object} item 选中的Tab项
- */
-const handleTabChange = (item) => {
-  // 解析Tab类型（todo/done）
-  console.log(item)
-  const newTab = item.name.includes('待办') ? 'todo' : 'done';
-  if (currentTab.value === newTab) return;
-
-  currentTab.value = newTab;
-  // 切换标签后刷新分页数据
-  paging.value?.reload();
-};
-
-/**
- * 分页查询列表数据
- * @param {number} pageNo 页码
- * @param {number} pageSize 每页条数
- */
-const queryList = async (pageNo, pageSize) => {
+const loadSmartSortTask = async (lon: string, lat: string) => {
   try {
-    // 1:待完成 2:已完成
-    const queryType = currentTab.value === 'todo' ? 1 : 2;
-    const postData = {
-      queryType,
-      pageNo,
-      pageSize,
-    };
-
-    const res = await getTaskDetails(postData);
-    console.log(`${currentTab.value}列表数据:`, res);
-
-    // 更新当前Tab的总数
-    if (currentTab.value === 'todo') {
-      todoTotal.value = res?.total || 0;
-    } else {
-      doneTotal.value = res?.total || 0;
-    }
-
-    // 适配z-paging分页（注意接口返回结构是res.data.list）
-    paging.value.complete(res?.list || [], res?.total || 0);
-  } catch (error) {
-    console.error(`加载${currentTab.value}列表失败：`, error);
-    paging.value?.complete(false);
-    uni.showToast({title: '加载失败，请重试', icon: 'none'});
+    const [todoRes, doneRes] = await Promise.all([
+      taskDetailsWithSmartSort({
+        queryType: 1,
+        currentLon: lon,
+        currentLat: lat
+      }),
+      taskDetailsWithSmartSort({
+        queryType: 2,
+        currentLon: lon,
+        currentLat: lat
+      })
+    ]);
+    todoFullList.value = todoRes?.sortedTasks || [];
+    doneFullList.value = doneRes?.sortedTasks || [];
+    todoTotal.value = Number(todoRes?.totalPendingTasks) || 0;
+    doneTotal.value = Number(doneRes?.totalPendingTasks) || 0;
+    finishNum.value = todoRes?.teamProgress?.userCompletedCount ?? 0;
+    avgNum.value = doneRes?.teamProgress?.teamAverage ?? 0;
+    await nextTick();
+  } catch (err) {
+    uni.showToast({ title: '加载任务失败', icon: 'none' });
+    console.error('加载smartSort接口任务报错', err);
+    todoFullList.value = [];
+    doneFullList.value = [];
+    todoTotal.value = 0;
+    doneTotal.value = 0;
   }
 };
 
-// 日期选择确认事件
-const handleDateConfirm = (e) => {
-  console.log('日期选择确认:', e);
+const loadAllTaskByDept = async () => {
+  const loc = await getCurrentLocation();
+  currentLon.value = loc.lon;
+  currentLat.value = loc.lat;
+  if (useDistanceApi.value) {
+    await loadDistanceApiTask(loc.lon, loc.lat);
+  } else {
+    await loadSmartSortTask(loc.lon, loc.lat);
+  }
+};
 
-  // 更新选中的日期范围
+const handleDateConfirm = (e: string[]) => {
   dateRange.value = e;
-
-  // 加载选择日期后的图表数据
   initChartData(e[0], e[1]);
 };
 
 const handleMsgClick = () => {
-  uni.navigateTo({url: '/pages-sub/msg/index'});
-};
-
-const handleTaskClick = (item) => {
-  // uni.navigateTo({url: `/pages-sub/task/detail?id=${item.id || ''}`});
+  uni.navigateTo({ url: '/pages-sub/msg/index' });
 };
 
-// ========== 6. 生命周期 ==========
-onShow(async () => {
-  // 初始化图表尺寸
-  chartWidth.value = rpx2px(750 - 60);
-  chartHeight.value = rpx2px(300);
-
-  // 初始化默认日期范围（最近7天）
-  initRecent7Days();
-
-  // 获取未读消息数
-  getUnread();
-  await getAllTabTotal();
-
-  // 初始化分页数据（待办列表）
-  if (paging.value) {
-    paging.value.reload();
+const handleTaskClick = (item: any) => {
+  if (item.taskType == "maintain") {
+    if (currentTabValue.value === 0) {
+      uni.navigateTo({ url: `/pages-sub/daily/maintain-manage/add-record?planNo=${item.planNo || ''}` });
+    }
+    if (currentTabValue.value === 1) {
+      uni.navigateTo({ url: `/pages-sub/daily/maintain-manage/finish-plan-detail?planNo=${item.planNo || ''}` });
+    }
   }
-});
+  if (item.taskType == "inspection") {
+    if (currentTabValue.value === 0) {
+      uni.navigateTo({ url: `/pages-sub/daily/patrol-manage/add-patrol-record?planNo=${item.planNo}&batchNo=${item.batchNo}` });
+    }
+    if (currentTabValue.value === 1) {
+      uni.navigateTo({ url: `/pages-sub/daily/patrol-manage/finish-plan-detail?planNo=${item.planNo || ''}` });
+    }
+  }
+};
 </script>
 
 <style scoped lang="scss">
-/* 样式变量 */
 $primary-color: #1677ff;
 $danger-color: #E53935;
 $text-color: #333;
@@ -389,14 +500,18 @@ $card-radius: 5px;
 $spacing-sm: 5px;
 $spacing-md: 10px;
 $spacing-lg: 15px;
-$border-color: #e5e5e5; // 新增边框颜色变量
+$border-color: #e5e5e5;
 
 .page-container {
-  min-height: 100vh;
+  height: 100vh;
   background-color: $bg-color;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
 }
 
 .user-info-bar {
+  flex-shrink: 0;
   background: url("https://img.jichengshanshui.com.cn:28207/appimg/bg.jpg") no-repeat;
   background-size: 100% 100%;
   padding: 80px $spacing-lg 135px;
@@ -404,28 +519,22 @@ $border-color: #e5e5e5; // 新增边框颜色变量
   justify-content: space-between;
   align-items: center;
   color: #fff;
-  //position: relative;
-  //z-index: 1;
 
   .username {
     font-size: 16px;
     margin-bottom: 4px;
   }
-
   .login-desc {
     font-size: 16px;
   }
-
   .msg-icon {
     position: relative;
     padding: 5px;
     top: 10px;
     border-radius: 50%;
-
     &--hover {
       background-color: rgba(255, 255, 255, 0.2);
     }
-
     .msg-badge {
       position: absolute;
       top: -2px;
@@ -435,13 +544,25 @@ $border-color: #e5e5e5; // 新增边框颜色变量
 }
 
 .content-wrap {
+  flex: 1;
   margin-top: -122px;
   border-radius: $border-radius $border-radius 0 0;
   background-color: $bg-color;
-  //position: relative;
-  //z-index: 999;
   overflow: hidden;
-  padding-bottom: $spacing-lg;
+  display: flex;
+  flex-direction: column;
+}
+
+.chart-wrap {
+  flex-shrink: 0;
+  transition: all 0.35s ease-out;
+  opacity: 1;
+  overflow: hidden;
+}
+.chart-wrap[hidden] {
+  opacity: 0;
+  height: 0;
+  margin: 0;
 }
 
 .module-title {
@@ -449,6 +570,7 @@ $border-color: #e5e5e5; // 新增边框颜色变量
   font-size: 14px;
   font-weight: 600;
   color: $text-color-light;
+  flex-shrink: 0;
 }
 
 .task-chart-card {
@@ -456,7 +578,7 @@ $border-color: #e5e5e5; // 新增边框颜色变量
   border-radius: $card-radius;
   margin: 0 $spacing-lg $spacing-md;
   padding: $spacing-md;
-
+  flex-shrink: 0;
   .card-header {
     display: flex;
     justify-content: space-between;
@@ -464,7 +586,6 @@ $border-color: #e5e5e5; // 新增边框颜色变量
     font-size: 12px;
     color: $text-color-placeholder;
     margin-bottom: $spacing-md;
-
     .date-picker-wrap {
       padding: 2px 4px;
       border-radius: 3px;
@@ -476,7 +597,6 @@ $border-color: #e5e5e5; // 新增边框颜色变量
       }
     }
   }
-
   .chart-container {
     width: 100%;
     height: 150px;
@@ -485,53 +605,124 @@ $border-color: #e5e5e5; // 新增边框颜色变量
     justify-content: center;
   }
 }
+.con-wrap {
+  border-radius: 8px;
+  background-color: #fff;
+  margin: 0 15px;
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
 
-.task-tab-container {
-  position: relative;
-  z-index: 4;
-  margin: 0 $spacing-lg $spacing-sm;
+.con-title {
+  padding: 10px 15px;
+  border-bottom: 1px solid #f0e9e9;
+  flex-shrink: 0;
+}
+
+.custom-tab-wrap {
+  display: flex;
+  align-items: center;
+  gap: 20rpx;
+  padding: 20rpx 0 20rpx 20rpx;
+  background: #fff;
+  flex-shrink: 0;
+}
+
+.tab-capsule {
+  padding: 10rpx 20rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  color: #999;
+  background: #f5f5f5;
+  border-radius: 0;
+  transition: all 0.2s ease;
+  font-weight: 500;
+}
+.tab-capsule.active {
+  color: #d4af37;
+  background: #fff8dc;
+}
+
+.tip-header {
+  display: flex;
+  align-items: center;
+  gap: 8rpx;
+  padding: 12rpx 15rpx;
+  background: #e6f7ff;
+  font-size: 14px;
+  color: #000;
+  flex-shrink: 0;
+}
+
+.tip-top {
+  padding: 8px 0  0 70px;
+  flex-shrink: 0;
 }
 
 .task-list-container {
-  margin: 0 $spacing-lg;
-  background-color: $card-bg;
-  border-radius: $card-radius;
-  overflow: hidden; // 防止边框溢出圆角
+  width: 100%;
+  height: 100%;
+  padding-bottom: 300rpx;
+  box-sizing: border-box;
+}
+
+.empty-box {
+  padding: 60rpx 0;
 }
 
 .task-item {
   padding: $spacing-md;
   transition: background-color 0.2s;
   border-bottom: 1px solid $border-color;
-
   &:last-child {
     border-bottom: none;
   }
-
   &--hover {
     background-color: $bg-color;
   }
-
   &__content {
     width: 100%;
   }
-
+  .name-fixed-wrap {
+    display: flex;
+  }
+  .task-item__name {
+    width: 60px;
+  }
+  .task-name-text {
+    flex: 1;
+    font-size: 14px;
+    color: $text-color;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
   &__name {
-    font-size: 13px;
+    font-size: 15px;
     color: $text-color;
-    margin-bottom: $spacing-sm;
+    display: inline-block;
   }
-
   &__footer {
     display: flex;
+    align-items: flex-start;
+    gap: 6rpx;
+    font-size: 13px;
+    color: $text-color-light;
+    margin-top: $spacing-sm;
     align-items: center;
-    justify-content: space-between;
   }
 }
+.loc-icon {
+  width: 20px;
+  height: 20px;
+}
 
-// 紧急程度标签样式
 .urgency-tag {
   color: #7D7D7D;
-
 }
 </style>
\ No newline at end of file
--
libgit2 0.21.4