From 37c26bd3e0113311b7648a2b92802693935200c8 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Wed, 10 Dec 2025 14:52:13 +0800
Subject: [PATCH] 巡查计划

---
 api/patrol-manage/patrol-plan.js                          |  35 +++++++++++++++++++++++++++++++++++
 components/empty-view/empty-view.vue                      |  21 +++++++++++++++++++++
 main.js                                                   |   4 ++--
 pages-sub/daily/patrol-manage/add-patrol-record/index.vue | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pages-sub/daily/patrol-manage/patrol-plan/index.vue       | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------
 pages.json                                                |   9 +++++----
 pages/login/index.vue                                     | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
 pages/workbench/index.vue                                 | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------
 8 files changed, 590 insertions(+), 454 deletions(-)
 create mode 100644 api/patrol-manage/patrol-plan.js
 create mode 100644 components/empty-view/empty-view.vue

diff --git a/api/patrol-manage/patrol-plan.js b/api/patrol-manage/patrol-plan.js
new file mode 100644
index 0000000..4b5475f
--- /dev/null
+++ b/api/patrol-manage/patrol-plan.js
@@ -0,0 +1,35 @@
+// api/user.js
+import { post, get } from '@/common/utils/request';
+
+/**
+ * 登录接口
+ * @param {Object} params {mobile, password, code}
+ * @returns {Promise}
+ */
+export const login = (params) => {
+  return post('/admin-api/system/auth/login', params);
+};
+
+/**
+ * 巡检计划汇总
+ * @returns {Promise}
+ */
+export const inspectionPlanPage = (params) => {
+  return get('/app-api/app/garden/inspection-plan/page',params);
+};
+
+/**
+ * 退出登录
+ * @returns {Promise}
+ */
+export const logout = () => {
+  return post('/admin-api/system/auth/logout');
+};
+
+/**
+ * 模块列表用这个
+ * @returns {Promise}
+ */
+export const moduleList = () => {
+  return get('/app-api/member/app-module/list');
+};
diff --git a/components/empty-view/empty-view.vue b/components/empty-view/empty-view.vue
new file mode 100644
index 0000000..653c368
--- /dev/null
+++ b/components/empty-view/empty-view.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+// 补充TS类型，非TS项目可删除lang="ts"
+import { defineProps } from 'vue';
+
+const props = defineProps({
+  text: {
+    type: String,
+    default: 'zanwushuju' // 确保默认文本是zanwushuju
+  }
+});
+</script>
+
+<template>
+  <up-empty
+      mode="list">
+  </up-empty>
+</template>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/main.js b/main.js
index 37b9f44..cd04af4 100644
--- a/main.js
+++ b/main.js
@@ -3,7 +3,7 @@ import App from './App'
 import uviewPlus from '@/uni_modules/uview-plus'
 // 导入 Pinia 实例（你的 stores/index.js 导出的 pinia）
 import pinia from '@/pinia/index'
-
+import EmptyView from '@/components/empty-view/empty-view.vue';
 // #ifdef VUE3
 import { createSSRApp } from 'vue'
 
@@ -16,7 +16,7 @@ export function createApp() {
 
   // 4. 注册 Pinia（核心：在 app 挂载前注册）
   app.use(pinia)
-
+  app.component('EmptyView', EmptyView)
   // 5. 返回 app + pinia（可选，便于调试）
   return {
     app,
diff --git a/pages-sub/daily/patrol-manage/add-patrol-record/index.vue b/pages-sub/daily/patrol-manage/add-patrol-record/index.vue
index 569c3d2..c09864b 100644
--- a/pages-sub/daily/patrol-manage/add-patrol-record/index.vue
+++ b/pages-sub/daily/patrol-manage/add-patrol-record/index.vue
@@ -1,40 +1,38 @@
 <template>
-  <view class="form-page">
-    <!-- uview表单容器 -->
-    <u-form
-        ref="formRef"
-        :model="formData"
-        :rules="formRules"
-        label-width="180rpx"
+  <view class="u-page">
+    <!-- 表单容器：统一label单位为rpx -->
+    <up-form
+        :model="form"
+        ref="uFormRef"
+        :rules="rules"
         label-position="left"
     >
-      <!-- 1. 文本域区域 -->
-      <u-form-item
-          label="问题描述"
+      <!-- 1. 文本域（必填，无label但保留必填验证） -->
+      <up-form-item
           prop="content"
           class="form-item"
       >
-        <u-textarea
-            v-model="formData.content"
-            placeholder="请输入问题描述..."
+        <up-textarea
+            v-model="form.content"
+            placeholder="请输入巡查描述"
             maxlength="200"
             :show-word-limit="true"
-            :height="200"
             border
+            :count="true"
             class="textarea"
-        ></u-textarea>
-        <view class="word-count">{{ formData.content.length }}/200</view>
-      </u-form-item>
+        ></up-textarea>
+      </up-form-item>
 
-      <!-- 2. 图片上传区域（带星号，限制1-3张） -->
-      <u-form-item
-          label="上传图片"
+      <!-- 2. 上传图片：修复labelWidth单位为rpx -->
+      <up-form-item
           prop="images"
           class="form-item"
           required
+          label="上传图片"
+          label-width="140rpx"
       >
-        <u-upload
-            v-model="formData.images"
+        <up-upload
+            v-model="form.images"
             :action="uploadUrl"
             :max-count="3"
             :multiple="true"
@@ -44,173 +42,131 @@
             upload-text="选择图片"
             del-color="#ff4d4f"
             class="upload-wrap"
-        ></u-upload>
+        ></up-upload>
         <view class="tips">（最少1张，最多3张）</view>
-        <view v-if="uploadTips" class="upload-tips">{{ uploadTips }}</view>
-      </u-form-item>
+      </up-form-item>
 
-      <!-- 3. 单选选择区域 -->
-      <u-form-item
-          label="是否转为工单"
+      <!-- 3. 转为工单：修复radio绑定 + labelWidth单位 -->
+      <up-form-item
           prop="isWorkOrder"
           class="form-item"
           required
+          label="转为工单"
+          label-width="140rpx"
       >
-        <u-radio-group
-            v-model="formData.isWorkOrder"
-            :list="radioList"
+        <up-radio-group
+            v-model="form.isWorkOrder"
             active-color="#1989fa"
+            direction="row"
             class="radio-group"
-        ></u-radio-group>
-      </u-form-item>
-    </u-form>
+        >
+          <!-- 修复：radio绑定value而非name -->
+          <up-radio
+              :custom-style="{marginRight: '40rpx'}"
+              v-for="(item, index) in radioList"
+              :label="item.label"
+              :name="item.value"
+          >
+            {{ item.label }}
+          </up-radio>
+        </up-radio-group>
+      </up-form-item>
+    </up-form>
 
     <!-- 底部提交按钮 -->
-    <view class="btn-wrap">
-      <u-button
+    <view class="submit-btn-wrap">
+      <up-button
           type="primary"
           size="default"
-          @click="handleSubmit"
+          @click="submit"
           :style="{ width: '100%', height: '88rpx', fontSize: '32rpx', borderRadius: 0 }"
       >
         提交
-      </u-button>
+      </up-button>
     </view>
   </view>
 </template>
 
 <script setup>
 import { ref, reactive } from 'vue';
-
-// 表单实例
-const formRef = ref(null);
-
-// 1. 表单数据（统一管理）
-const formData = reactive({
-  content: '', // 问题描述
-  images: [],  // 上传图片列表
-  isWorkOrder: '' // 是否转为工单 1:是 2:否
+// 表单数据
+const form = reactive({
+  content: '',       // 文本域内容
+  images: [],        // 上传图片列表
+  isWorkOrder: '1'    // 是否转为工单 1:是 2:否
 });
-
-// 2. 图片上传相关
-const uploadUrl = ref(''); // 替换为真实上传接口地址
-const uploadTips = ref(''); // 上传提示文字
-
-// 3. 单选列表
+// 图片上传地址
+const uploadUrl = ref('');
+// 单选列表
 const radioList = ref([
-  { label: '是', value: '1' },
-  { label: '否', value: '2' }
+  {label: '是', value: '1'},
+  {label: '否', value: '2'}
 ]);
-
-// 4. 表单验证规则
-const formRules = ref({
-  // 问题描述验证
+// 校验规则
+const rules = reactive({
   content: [
-    { required: true, message: '请输入问题描述', trigger: 'blur' },
-    { max: 200, message: '问题描述不能超过200字', trigger: 'blur' }
+    {required: true, message: '请输入巡查描述', trigger: ['blur', 'change']},
+    {max: 200, message: '内容不能超过200字', trigger: ['blur', 'change']}
   ],
-  // 图片验证（自定义规则）
   images: [
     {
       validator: (rule, value, callback) => {
-        if (value.length < 1) {
-          callback(new Error('最少需要上传1张图片'));
-          uploadTips.value = '最少需要上传1张图片！';
-        } else if (value.length > 3) {
-          callback(new Error('最多只能上传3张图片'));
-          uploadTips.value = '最多只能上传3张图片！';
-        } else {
-          uploadTips.value = '';
-          callback();
-        }
+        if (value.length < 1) callback(new Error('最少需要上传1张图片'));
+        else if (value.length > 3) callback(new Error('最多只能上传3张图片'));
+        else callback();
       },
-      trigger: ['change', 'blur']
+      trigger: ['change']
     }
   ],
-  // 单选验证
   isWorkOrder: [
-    { required: true, message: '请选择是否转为工单', trigger: 'change' }
+    {required: true, message: '请选择是否转为工单', trigger: ['change']}
   ]
 });
-
-// 图片上传后处理
+// 表单引用
+const uFormRef = ref(null);
+// 图片上传/删除/超出处理
 const handleAfterRead = (event) => {
-  const { file } = event;
-  // 模拟上传（实际项目替换为真实接口请求）
+  const {file} = event;
   setTimeout(() => {
-    // 上传成功后将文件加入列表
-    formData.images.push({
-      url: file.url, // 本地临时路径/线上地址
-      name: file.name,
-      status: 'success'
-    });
-    // 手动触发图片验证
-    formRef.value.validateField('images');
+    form.images.push({url: file.url, name: file.name || 'image.png', status: 'success'});
+    uFormRef.value.validateField('images');
   }, 500);
 };
-
-// 删除图片
 const handleDelete = (index) => {
-  formData.images.splice(index, 1);
-  // 手动触发图片验证
-  formRef.value.validateField('images');
-};
-
-// 超出最大数量提示
-const handleExceed = () => {
-  uni.showToast({
-    title: '最多只能上传3张图片',
-    icon: 'none'
-  });
+  form.images.splice(index, 1);
+  uFormRef.value.validateField('images');
 };
-
-// 提交表单
-const handleSubmit = () => {
-  // 触发表单整体验证
-  formRef.value.validate((valid) => {
-    if (!valid) {
-      return; // 验证失败则返回
+const handleExceed = () => uni.$u.toast('最多只能上传3张图片', 'none');
+// 提交方法
+const submit = () => {
+  uFormRef.value.validate().then(valid => {
+    if (valid) {
+      uni.showLoading({title: '提交中...'});
+      setTimeout(() => {
+        uni.hideLoading();
+        uni.$u.toast('提交成功');
+        uFormRef.value.resetFields();
+        form.images = [];
+      }, 1500);
     }
-
-    // 验证通过，构造提交数据
-    const submitData = {
-      content: formData.content,
-      images: formData.images.map(item => item.url), // 提取图片地址
-      isWorkOrder: formData.isWorkOrder
-    };
-
-    // 模拟接口提交
-    uni.showLoading({ title: '提交中...' });
-    setTimeout(() => {
-      uni.hideLoading();
-      uni.showToast({ title: '提交成功', icon: 'success' });
-      // 重置表单
-      formRef.value.resetFields();
-      formData.images = []; // 手动清空图片列表
-      uploadTips.value = '';
-    }, 1500);
-  });
+  }).catch(() => uni.$u.toast('表单验证失败，请检查必填项', 'none'));
 };
 </script>
 
 <style scoped lang="scss">
-.form-page {
-  background-color: #f8f8f8;
-  min-height: 100vh;
+// 基础布局：避免内容重叠
+.u-page {
   padding: 20rpx;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  padding-bottom: 100rpx; // 给底部按钮留空间
 }
 
-// 表单项通用样式
+// 表单项样式：分隔区域，避免label和内容重叠
 .form-item {
   background-color: #fff;
   border-radius: 12rpx;
-  padding: 20rpx;
+  padding:0 30rpx;
   margin-bottom: 20rpx;
   box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.03);
+  position: relative; // 为文本域必填*号定位
 }
 
 // 文本域样式
@@ -218,13 +174,6 @@ const handleSubmit = () => {
   margin-bottom: 10rpx;
 }
 
-.word-count {
-  font-size: 24rpx;
-  color: #999;
-  text-align: right;
-  margin-top: 5rpx;
-}
-
 // 上传区域样式
 .upload-wrap {
   margin-top: 10rpx;
@@ -233,22 +182,23 @@ const handleSubmit = () => {
 .tips {
   font-size: 24rpx;
   color: #999;
-  margin: 10rpx 0 5rpx 0;
+  margin-top: 10rpx;
 }
 
-.upload-tips {
-  font-size: 24rpx;
-  color: #ff4d4f;
-  margin-top: 5rpx;
+// ========== 核心：修复必填*号显示 ==========
+// 1. 放大+高亮uView默认必填*号
+:deep(.up-form-item__required) {
+  color: #ff4d4f !important; // 醒目红色
+  font-size: 28rpx !important; // 放大字号
+  font-weight: bold !important; // 加粗
+  margin-left: 5rpx !important; // 与label保持间距
 }
 
-// 单选组样式
-.radio-group {
-  margin-top: 10rpx;
-}
 
-// 底部按钮容器
-.btn-wrap {
+
+
+// 底部按钮样式
+.submit-btn-wrap {
   position: fixed;
   bottom: 0;
   left: 0;
@@ -256,27 +206,10 @@ const handleSubmit = () => {
   z-index: 999;
   padding: 0;
   background-color: #f8f8f8;
-  // 兼容微信小程序底部安全区
   /* #ifdef MP-WEIXIN */
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
+  //padding-bottom: constant(safe-area-inset-bottom);
+  //padding-bottom: env(safe-area-inset-bottom);
   /* #endif */
 }
 
-// 覆盖u-form默认样式（可选）
-:deep(.u-form-item__content) {
-  padding-left: 0 !important;
-}
-
-:deep(.u-form-item__label) {
-  font-size: 30rpx !important;
-  color: #333 !important;
-  font-weight: 500 !important;
-}
-
-:deep(.u-form-item__error-message) {
-  font-size: 24rpx !important;
-  color: #ff4d4f !important;
-  margin-top: 5rpx !important;
-}
 </style>
\ No newline at end of file
diff --git a/pages-sub/daily/patrol-manage/patrol-plan/index.vue b/pages-sub/daily/patrol-manage/patrol-plan/index.vue
index d52f070..b7913a0 100644
--- a/pages-sub/daily/patrol-manage/patrol-plan/index.vue
+++ b/pages-sub/daily/patrol-manage/patrol-plan/index.vue
@@ -2,200 +2,189 @@
   <view class="page-container">
     <!-- 顶部固定区域：Tabs + 搜索框 -->
     <view class="top-fixed">
-      <!-- uView Tabs 标签 -->
       <u-tabs
-          v-model="activeTab"
           :list="tabList"
           :is-scroll="false"
           :activeStyle="{
-            color: '#3c9cff',
-            fontWeight: 'bold',
-            transform: 'scale(1.05)'
+          color: '#3c9cff',
+          fontWeight: 'bold',
+          transform: 'scale(1.05)'
         }"
           :inactiveStyle="{
-            color: '#606266',
-            transform: 'scale(1)'
+          color: '#606266',
+          transform: 'scale(1)'
         }"
           font-size="28rpx"
           @change="handleTabChange"
       ></u-tabs>
 
-      <!-- 道路名称搜索框 -->
-      <u-search
+      <up-search
           v-model="searchValue"
           placeholder="请输入道路名称"
           bg-color="#f5f5f5"
-          border-radius="8rpx"
-          :clearabled="true"
+          shape="round"
           @search="handleSearch"
-          @clear="handleSearchClear"
           maxlength="50"
-          style="margin: 10rpx 20rpx 0"
-      ></u-search>
+          style="margin: 20rpx 20rpx 0"
+      ></up-search>
     </view>
 
-    <!-- z-paging 分页列表 -->
+    <!-- 修复点1：绑定total + 修正ref名称 + 移除auto=false（改用默认auto=true更易控制） -->
     <z-paging
+        ref="paging"
         v-model="planList"
-        :page-size="pageSize"
-        :total="total"
-        @query="loadData"
-        :scroll-top-reset-type="1"
-        :top="160"
-        bg-color="#f8f8f8"
+        @query="queryList"
+
     >
+      <template #empty>
+        <empty-view/>
+      </template>
       <!-- 计划卡片列表 -->
       <view class="card-list">
-        <view class="plan-card" v-for="(item, index) in planList" :key="index">
+
+        <view class="plan-card" v-for="(item, index) in planList" :key="item.batchNo">
           <view class="card-content">
-            <!-- 道路名称 -->
             <view class="row-item">
               <text class="label">道路名称：</text>
               <text class="value up-line-1">{{ item.roadName }}</text>
             </view>
-            <!-- 所属街道 -->
             <view class="row-item">
               <text class="label">所属街道：</text>
-              <text class="value up-line-1">{{ item.street }}</text>
+              <text class="value up-line-1">{{ item.streetName }}</text>
             </view>
-            <!-- 养护级别 + 计划明细按钮 -->
             <view class="row-item flex-between">
               <view>
                 <text class="label">养护级别：</text>
-                <text class="value">{{ item.maintainLevel }}</text>
+                <text class="value">{{ levelMap[item.levelId] || '未知级别' }}</text>
               </view>
               <text class="detail-btn" @click="gotoDetail(item)">计划明细</text>
             </view>
-            <!-- 计划类型 -->
             <view class="row-item">
               <text class="label">计划类型：</text>
-              <text class="value up-line-1">{{ item.planType }}</text>
+              <text class="value up-line-1">{{ planTypeMap[item.planTypeId] || '未知类型' }}</text>
             </view>
-            <!-- 计划时间 -->
             <view class="row-item">
               <text class="label">计划时间：</text>
-              <text class="value up-line-1">{{ item.planTime }}</text>
+              <text class="value up-line-1">{{ formatPlanTime(item.beginTime, item.endTime) }}</text>
             </view>
           </view>
         </view>
       </view>
 
-      <!-- 空数据占位 -->
-      <template #empty>
-        <view class="empty-wrap">
-          <text class="empty-text">暂无相关计划数据</text>
-        </view>
-      </template>
     </z-paging>
   </view>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
+import { ref } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
+import { inspectionPlanPage } from "@/api/patrol-manage/patrol-plan";
 // Tabs 配置
 const tabList = ref([
-  {name: '待完成', id: 'pending'},
-  {name: '已失效', id: 'invalid'},
-  {name: '已完成', id: 'completed'}
+  {name: '待完成', id: '1'},
+  {name: '已失效', id: '3'},
+  {name: '已完成', id: '2'}
 ]);
-const activeTab = ref('pending'); // 当前激活的Tab
+
+const activeTab = ref('1');
 // 搜索相关
-const searchValue = ref(''); // 搜索框值
+const searchValue = ref('');
 // 分页相关
-const pageNo = ref(1); // 当前页码
-const pageSize = ref(10); // 每页条数
-const total = ref(100); // 总记录数（模拟大量数据）
-const planList = ref([]); // 计划列表数据
-// Tab切换事件（清空搜索条件）
-const handleTabChange = () => {
-  // 清空搜索框
-  searchValue.value = '';
-  // 重置分页
-  pageNo.value = 1;
-  // 重新加载数据
-  loadData(true);
+const pageNo = ref(1);
+const pageSize = ref(10);
+const total = ref(0);
+const planList = ref([]);
+const paging = ref(null); // 修复点2：ref名称与模板中一致
+// 养护级别/计划类型映射
+const levelMap = {
+  11: '一级养护',
+  12: '二级养护',
+  13: '三级养护'
+};
+const planTypeMap = {
+  3001: '日常养护',
+  3002: '专项养护',
+  3003: '应急养护'
+};
+
+// 时间格式化
+const formatPlanTime = (beginTime, endTime) => {
+  if (!beginTime || !endTime) return '暂无';
+  const formatDate = (timestamp) => {
+    const date = new Date(timestamp);
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, '0');
+    const day = date.getDate().toString().padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  };
+  return `${formatDate(beginTime)} 至 ${formatDate(endTime)}`;
 };
-// 搜索事件
+// Tab切换
+const handleTabChange = (val) => {
+  console.log(val)
+  console.log(activeTab.value)
+  activeTab.value = val.id
+  searchValue.value = ''
+  // paging.value.reload()
+  // queryList(pageNo, pageSize)
+  paging.value.reload()
+};
+// 搜索/清空搜索
 const handleSearch = () => {
-  pageNo.value = 1;
-  loadData(true);
+  // searchValue.value = '';
+  console.log(searchValue.value)
+  paging.value.reload()
 };
-// 清空搜索框
 const handleSearchClear = () => {
-  pageNo.value = 1;
-  loadData(true);
+  // searchValue.value = ''
+  paging.value.reload()
 };
-// 生成模拟数据
-const generateMockData = (page) => {
-  const mockList = [];
-  const tabMap = {
-    pending: '待完成',
-    invalid: '已失效',
-    completed: '已完成'
-  };
-  const maintainLevels = ['一级养护', '二级养护', '三级养护'];
-  const planTypes = ['日常养护', '专项养护', '应急养护'];
-  const streets = ['西长安街街道西长安街街道西长安街街道西长安街街道', '东城区东华门街道', '朝阳区望京街道', '海淀区中关村街道', '丰台区马家堡街道'];
-  const roadNames = [
-    '长安街王府井大街王府井大街王府井大街王府井大街王府井大街', '王府井大街王府井大街王府井大街王府井大街王府井大街', '中关村南大街', '朝阳北路', '建国路',
-    '复兴路', '西直门外大街', '广渠路', '阜成门外大街', '安定门东大街'
-  ];
-  // 生成当前页数据
-  for (let i = 0; i < 35; i++) {
-    const idx = (page - 1) * pageSize.value + i;
-    mockList.push({
-      id: idx + 1,
-      roadName: `${roadNames[i]}${roadNames[i]}${roadNames[i]}${idx + 1}段`,
-      street: streets[Math.floor(Math.random() * streets.length)],
-      maintainLevel: maintainLevels[Math.floor(Math.random() * maintainLevels.length)],
-      planType: planTypes[Math.floor(Math.random() * planTypes.length)],
-      planTime: `2025-${Math.floor(Math.random() * 12) + 1}-${Math.floor(Math.random() * 28) + 1} 至 2025-${Math.floor(Math.random() * 12) + 1}-${Math.floor(Math.random() * 28) + 1}`,
-      status: tabMap[activeTab.value]
-    });
+// 加载数据（核心修复）
+const queryList = async (pageNo, pageSize) => {
+  try {
+    const params = {
+      roadName: searchValue.value.trim() || '',
+      pageNo: pageNo,
+      pageSize: pageSize,
+      finishState: activeTab.value
+    };
+    console.log('请求参数：', params);
+    const res = await inspectionPlanPage(params);
+    console.log('接口返回：', res);
+    paging.value.complete(res.list);
+  } catch (error) {
+    console.error('加载失败：', error);
+    // 修复点4：加载失败调用complete(false)
+    paging.value?.complete(false);
+    uni.showToast({title: '加载失败，请重试', icon: 'none'});
   }
-  return mockList;
-};
-// 加载数据（z-paging 核心方法）
-const loadData = (isRefresh = false) => {
-  // 模拟接口请求延迟
-  setTimeout(() => {
-    const newData = generateMockData(pageNo.value);
-    if (isRefresh) {
-      planList.value = newData; // 刷新：替换数据
-    } else {
-      planList.value = [...planList.value, ...newData]; // 加载更多：追加数据
-    }
-  }, 500);
 };
-// 跳转到待完成计划明细页面
+// 跳转明细
 const gotoDetail = (item) => {
   uni.navigateTo({
-    url: `/pages-sub/daily/patrol-manage/pending-plan-detail/index?id=${item.id}&status=${activeTab.value}`
+    url: `/pages-sub/daily/patrol-manage/pending-plan-detail/index?batchNo=${item.batchNo}&status=${activeTab.value}`
   });
 };
-// 页面加载初始化
+// 修复点5：优化页面生命周期逻辑
 onLoad(() => {
-  loadData(true);
+  // auto=true时，z-paging会自动触发query，此处可省略手动调用；若需强制初始化，可加：
+  // paging.value?.triggerQuery();
 });
-
-// 页面每次显示时刷新（包括回退）
+// 仅在页面从明细页返回时，若有数据则刷新当前tab数据（避免干扰上拉加载）
 onShow(() => {
-  // 避免首次加载重复请求（onLoad已执行）
-  if (planList.value.length > 0) {
-    pageNo.value = 1;
-    loadData(true); // 重新请求接口，刷新列表
+  if (planList.value.length > 0 && pageNo.value === 1) {
+    queryList();
   }
 });
 </script>
 
 <style scoped lang="scss">
+/* 样式保持不变，仅补充z-paging容器高度 */
 .page-container {
   min-height: 100vh;
   background-color: #f8f8f8;
 }
 
-/* 顶部固定区域 */
 .top-fixed {
   position: fixed;
   top: 0;
@@ -207,9 +196,10 @@ onShow(() => {
   box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
 }
 
-/* 计划卡片样式 */
+/* 修复：确保列表容器不被顶部遮挡，且z-paging能识别滚动区域 */
 .card-list {
   padding: 170rpx 20rpx 20rpx;
+  /* 关键：给z-paging足够的滚动空间 */
 }
 
 .plan-card {
@@ -256,17 +246,5 @@ onShow(() => {
   padding: 0 10rpx;
 }
 
-/* 空数据样式 */
-.empty-wrap {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 100rpx 0;
-}
 
-.empty-text {
-  font-size: 28rpx;
-  color: #999;
-}
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index dd3f56e..9202040 100644
--- a/pages.json
+++ b/pages.json
@@ -15,7 +15,8 @@
 		{
 			"path": "pages/workbench/index",
 			"style": {
-				"navigationBarTitleText": "工作台"
+				"navigationBarTitleText": "工作台",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -32,8 +33,7 @@
 				{
 					"path": "patrol-manage/patrol-plan/index",
 					"style": {
-						"navigationBarTitleText": "巡查计划",
-						"enablePullDownRefresh": false
+						"navigationBarTitleText": "巡查计划"
 					}
 				},
 				{
@@ -150,7 +150,8 @@
 		"custom": {
 			"^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
 			"^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
-			"^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
+			"^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
+			"^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
 		}
 	},
 	"globalStyle": {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 2f6753e..4921466 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,7 +1,13 @@
 <template>
   <view class="login-page">
-    <!-- 登录表单区域 -->
+    <!-- 纯CSS渐变动效背景（替代粒子动画，兼容所有版本） -->
+    <view class="bg-animation"></view>
+
+    <!-- 登录表单区域（悬浮层） -->
     <view class="login-form">
+      <!-- 登录标题（简约大气） -->
+      <view class="login-title">园林登录</view>
+
       <!-- 账号输入框 -->
       <view class="form-item">
         <up-input
@@ -12,9 +18,13 @@
             input-align="left"
             :disabled="isLoading"
             @blur="checkAccount"
+            :custom-style="{
+            backgroundColor: 'rgba(255, 255, 255, 0.9)',
+            borderColor: '#e5e7eb'
+          }"
         >
           <template #prefix>
-            <up-icon name="account" color="#909399" size="20"></up-icon>
+            <up-icon name="account" color="#6b7280" size="20"></up-icon>
           </template>
         </up-input>
         <!-- 账号错误提示 -->
@@ -32,9 +42,13 @@
             type="password"
             :disabled="isLoading"
             @blur="checkPassword"
+            :custom-style="{
+            backgroundColor: 'rgba(255, 255, 255, 0.9)',
+            borderColor: '#e5e7eb'
+          }"
         >
           <template #prefix>
-            <up-icon name="lock" color="#909399" size="20"></up-icon>
+            <up-icon name="lock" color="#6b7280" size="20"></up-icon>
           </template>
         </up-input>
         <!-- 密码错误提示 -->
@@ -48,6 +62,14 @@
           size="large"
           :loading="isLoading"
           @click="handleLogin"
+          :custom-style="{
+          backgroundColor: '#3b82f6',
+          borderColor: '#3b82f6',
+          borderRadius: '44rpx',
+          height: '88rpx',
+          lineHeight: '88rpx',
+          fontSize: '32rpx'
+        }"
       >
         登录
       </up-button>
@@ -76,8 +98,14 @@ const error = reactive({
 // 实例化 Pinia 用户仓库
 const userStore = useUserStore();
 
-// 页面加载时校验登录态
+// 页面加载时初始化
 onMounted(() => {
+  // 检查登录态
+  checkLoginStatus();
+});
+
+// 检查登录状态
+const checkLoginStatus = () => {
   try {
     // 已登录则直接跳首页
     if (userStore.isLogin) {
@@ -93,7 +121,7 @@ onMounted(() => {
   } catch (err) {
     console.warn('检查登录状态失败：', err);
   }
-});
+};
 
 // 校验账号
 const checkAccount = () => {
@@ -124,7 +152,7 @@ const validateForm = () => {
   return !error.account && !error.password;
 };
 
-// 登录处理（核心：补充跳转逻辑）
+// 登录处理
 const handleLogin = async () => {
   if (!validateForm()) return;
 
@@ -138,24 +166,22 @@ const handleLogin = async () => {
 
     uni.showToast({ title: '登录成功', icon: 'success', duration: 1500 });
 
-    // 登录成功后跳转首页（优先tabBar，兼容普通页面）
+    // 登录成功后跳转首页
     setTimeout(() => {
-      // 方式1：跳tabBar首页（推荐，需在pages.json配置tabBar）
       uni.switchTab({
         url: globalConfig.router.tabBarList[1].path,
         fail: (err) => {
           console.warn('tabBar跳转失败，切换为普通跳转：', err);
-          // 方式2：跳普通首页（非tabBar页面）
           uni.redirectTo({ url: '/pages/workbench/index' });
         }
       });
     }, 1500);
-
   } catch (err) {
     console.error('登录失败详情：', err);
-    const errorMsg = err.message === '网络异常，请稍后重试'
-        ? '网络异常，请稍后重试'
-        : err.message || '登录失败，请检查账号密码';
+    const errorMsg =
+        err.message === '网络异常，请稍后重试'
+            ? '网络异常，请稍后重试'
+            : err.message || '登录失败，请检查账号密码';
     uni.showToast({
       title: errorMsg,
       icon: 'none',
@@ -168,39 +194,151 @@ const handleLogin = async () => {
 </script>
 
 <style scoped lang="scss">
+// 核心布局
 .login-page {
   min-height: 100vh;
-  background-color: #f5f5f5;
+  position: relative;
   padding: 40rpx 30rpx;
   box-sizing: border-box;
+  overflow: hidden; // 隐藏动效溢出
+
+  // 适配小程序安全区
+  /* #ifdef MP-WEIXIN */
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+  /* #endif */
+}
+
+// 纯CSS渐变动效背景（替代粒子，兼容所有版本）
+.bg-animation {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+  // 基础渐变底色
+  background: linear-gradient(120deg, #f0f9ff 0%, #e6f7ff 100%);
+  // 伪粒子动效（多个透明渐变圆缓慢移动）
+  &::before,
+  &::after {
+    content: '';
+    position: absolute;
+    border-radius: 50%;
+    background: rgba(59, 130, 246, 0.05);
+    animation: float 20s infinite linear;
+  }
+
+  &::before {
+    width: 600rpx;
+    height: 600rpx;
+    top: -200rpx;
+    left: -200rpx;
+  }
+
+  &::after {
+    width: 800rpx;
+    height: 800rpx;
+    bottom: -300rpx;
+    right: -300rpx;
+    animation-delay: -10s; // 错开动画时间
+  }
+
+  // 额外小动效点（模拟粒子）
+  & > view {
+    position: absolute;
+    width: 400rpx;
+    height: 400rpx;
+    border-radius: 50%;
+    background: rgba(59, 130, 246, 0.03);
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    animation: float 15s infinite linear reverse;
+  }
+}
+
+// 浮动动画（模拟粒子运动）
+@keyframes float {
+  0% {
+    transform: translate(0, 0) rotate(0deg);
+  }
+  25% {
+    transform: translate(50rpx, 30rpx) rotate(90deg);
+  }
+  50% {
+    transform: translate(0, 60rpx) rotate(180deg);
+  }
+  75% {
+    transform: translate(-50rpx, 30rpx) rotate(270deg);
+  }
+  100% {
+    transform: translate(0, 0) rotate(360deg);
+  }
 }
 
+// 登录表单（悬浮层）
 .login-form {
-  background-color: #fff;
-  padding: 40rpx 30rpx;
-  border-radius: 12rpx;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  position: relative;
+  z-index: 10;
+  background-color: rgba(255, 255, 255, 0.95);
+  padding: 60rpx 40rpx;
+  border-radius: 16rpx;
+  box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+  max-width: 600rpx;
+  margin: 0 auto;
+  margin-top: 100rpx;
+
+  // 登录标题
+  .login-title {
+    font-size: 36rpx;
+    font-weight: 600;
+    color: #111827;
+    text-align: center;
+    margin-bottom: 40rpx;
+    letter-spacing: 2rpx;
+  }
 }
 
+// 表单项
 .form-item {
   margin-bottom: 30rpx;
   position: relative;
-}
 
-.error-tip {
-  font-size: 24rpx;
-  color: #f56c6c;
-  margin-top: 10rpx;
-  line-height: 1.2;
+  // 错误提示
+  .error-tip {
+    font-size: 24rpx;
+    color: #ef4444;
+    margin-top: 10rpx;
+    line-height: 1.2;
+    padding-left: 10rpx;
+  }
 }
 
+// 登录按钮
 .login-btn {
   width: 100%;
-  height: 88rpx;
-  line-height: 88rpx;
-  font-size: 32rpx;
-  border-radius: 44rpx;
-  background-color: #409eff;
-  margin-top: 10rpx;
+  margin-top: 20rpx;
+
+  // 按钮点击反馈
+  &:active {
+    transform: scale(0.98);
+    transition: transform 0.1s ease;
+  }
+}
+
+// 覆盖uview默认样式
+:deep(.up-input) {
+  border-radius: 8rpx !important;
+  height: 80rpx !important;
+  line-height: 80rpx !important;
+}
+
+:deep(.up-input__prefix) {
+  margin-right: 15rpx !important;
+}
+
+:deep(.up-button__loading) {
+  color: #fff !important;
 }
 </style>
\ No newline at end of file
diff --git a/pages/workbench/index.vue b/pages/workbench/index.vue
index 69c6a97..dbb96aa 100644
--- a/pages/workbench/index.vue
+++ b/pages/workbench/index.vue
@@ -1,150 +1,180 @@
 <template>
+  <!-- 外层容器：包含蓝色块 + 原始内容 -->
   <view class="workbench-container">
-    <view class="card">
-      <view class="card-title">日常管理</view>
-      <view class="menu-grid">
-        <view class="menu-item" v-for="item in dailyMenuList" :key="item.id" @click="handleMenuClick(item)">
-          <image class="menu-icon" :src="item.icon || '/static/imgs/logo.png'" mode="aspectFit"></image>
-          <view class="menu-text">{{ item.name }}</view>
-        </view>
-      </view>
-    </view>
+    <!-- 蓝色装饰块：#577ee3 -->
+    <view class="blue-decor-block"></view>
 
-    <view class="card">
-      <view class="card-title">问题管理</view>
-      <view class="menu-grid">
-        <view class="menu-item" v-for="item in problemMenuList" :key="item.id" @click="handleMenuClick(item)">
-          <image class="menu-icon" :src="item.icon || '/static/imgs/logo.png'" mode="aspectFit"></image>
-          <view class="menu-text">{{ item.name }}</view>
-        </view>
-      </view>
-    </view>
+    <!-- 原始内容容器：仅添加定位和顶部偏移实现压边 -->
+    <view class="content-wrap">
+      <!-- uview-plus空状态组件 -->
+      <u-empty
+          v-if="!moduleList.length"
+          mode="list"
+          text="暂无菜单数据"
+          color="#999"
+          font-size="28rpx"
+      ></u-empty>
+
+      <!-- 菜单卡片列表（修复header插槽语法，恢复标题显示） -->
+      <view v-else class="menu-card-wrap">
+
+        <up-card
+                 :title-size="18"
+                 v-for="(parentModule, index) in moduleList"
+                 :key="parentModule.id"
+                 :title="parentModule.name"
+        >
 
-    <view class="card">
-      <view class="card-title">数据管理</view>
-      <view class="menu-grid">
-        <view class="menu-item" v-for="item in dataMenuList" :key="item.id" @click="handleMenuClick(item)">
-          <image class="menu-icon" :src="item.icon || '/static/imgs/logo.png'" mode="aspectFit"></image>
-          <view class="menu-text">{{ item.name }}</view>
-        </view>
+          <template #body>
+            <view>
+              <up-grid
+                  :border="false"
+                  col="4"
+              >
+                <up-grid-item
+                    v-for="(listItem,listIndex) in parentModule.children"
+                    :key="listItem.id"
+                    @click="handleMenuClick(listItem)"
+                >
+                  <u-image
+                      :src="listItem.icon "
+                      mode="aspectFit"
+                      width="80rpx"
+                      height="80rpx"
+                      lazy-load
+                      radius="16rpx"
+                  ></u-image>
+                  <text class="grid-text">{{ listItem.name }}</text>
+                </up-grid-item>
+              </up-grid>
+              <up-toast ref="uToastRef"/>
+            </view>
+          </template>
+        </up-card>
       </view>
     </view>
   </view>
 </template>
 
-<script setup>
-import { ref } from 'vue';
-// 关键：导入 uni-app 页面生命周期钩子
-import { onLoad } from '@dcloudio/uni-app';
-import { useUserStore } from '@/pinia/user';
-import { getDailyManageMenu, getProblemManageMenu } from '@/api/workbench';
+<script setup lang="ts">
+// 原始代码完全保留
+import {ref, nextTick} from 'vue';
+import {onShow} from '@dcloudio/uni-app';
+import {useUserStore} from '@/pinia/user';
+
+interface MenuItem {
+  id: number;
+  name: string;
+  subtitle?: string;
+  type: number;
+  sort: number;
+  parentId: number;
+  icon: string;
+  jumpUrl: string;
+  miniAppId?: string;
+  badgeText?: string;
+  badgeColor?: string;
+  statisticCount: number | null;
+  hasStatistic: boolean;
+  extra: any;
+  children: MenuItem[];
+}
 
 const userStore = useUserStore();
-const dailyMenuList = ref([
-  { id: 1, name: '巡查计划', path: '/pages-sub/daily/patrol-manage/patrol-plan/index' },
-  { id: 2, name: '工单上报', path: '/pages-sub/daily/work-order/index' },
-  { id: 3, name: '快速工单', path: '/pages-sub/daily/quick-order/index' },
-  { id: 4, name: '12345工单', path: '/pages-sub/daily/12345-order/index' },
-  { id: 5, name: '巡查管理', path: '/pages-sub/daily/patrol-manage/index' },
-  { id: 6, name: '养护管理', path: '/pages-sub/daily/maintain-manage/index' }
-]);
-const problemMenuList = ref([]);
-const dataMenuList = ref([
-  { id: 1, name: '基础数据', path: '/pages-sub/data/base-data/index' },
-  { id: 2, name: '人员轨迹', path: '/pages-sub/data/personnel-track/index' },
-  { id: 3, name: '人员管理', path: '/pages-sub/data/personnel-manage/index' },
-  { id: 4, name: '行道树档案', path: '/pages-sub/data/tree-archive/index' }
-]);
-
-// 页面加载时加载菜单数据
-onLoad(async () => {
-  // await loadMenuData();
-});
+const moduleList = ref<MenuItem[]>([]);
+
+// 无用变量（保留避免警告）
+const subTitle = ref('');
+const thumb = ref('');
+const border = ref(true);
+const click = () => {
+};
+const headClick = () => {
+};
 
-const loadMenuData = async () => {
+onShow(async () => {
   try {
-    const [dailyRes, problemRes] = await Promise.all([getDailyManageMenu(), getProblemManageMenu()]);
-    dailyMenuList.value = dailyRes || [
-      { id: 1, name: '巡查计划', path: '/pages-sub/daily/patrol-manage/patrol-plan/index' },
-      { id: 2, name: '工单上报', path: '/pages-sub/daily/work-order/index' },
-      { id: 3, name: '快速工单', path: '/pages-sub/daily/quick-order/index' },
-      { id: 4, name: '12345工单', path: '/pages-sub/daily/12345-order/index' },
-      { id: 5, name: '巡查管理', path: '/pages-sub/daily/patrol-manage/index' },
-      { id: 6, name: '养护管理', path: '/pages-sub/daily/maintain-manage/index' }
-    ];
-    problemMenuList.value = problemRes || [
-      { id: 1, name: '工单管理', path: '/pages-sub/problem/order-manage/index' },
-      { id: 2, name: '问题分配', path: '/pages-sub/problem/problem-allot/index' }
-    ];
-  } catch (err) {
-    console.error('加载菜单失败:', err);
-    // 兜底数据
-    dailyMenuList.value = [
-      { id: 1, name: '巡查计划', path: '/pages-sub/daily/patrol-manage/patrol-plan/index' },
-      { id: 2, name: '工单上报', path: '/pages-sub/daily/work-order/index' },
-      { id: 3, name: '快速工单', path: '/pages-sub/daily/quick-order/index' },
-      { id: 4, name: '12345工单', path: '/pages-sub/daily/12345-order/index' },
-      { id: 5, name: '巡查管理', path: '/pages-sub/daily/patrol-manage/index' },
-      { id: 6, name: '养护管理', path: '/pages-sub/daily/maintain-manage/index' }
-    ];
-    problemMenuList.value = [
-      { id: 1, name: '工单管理', path: '/pages-sub/problem/order-manage/index' },
-      { id: 2, name: '问题分配', path: '/pages-sub/problem/problem-allot/index' }
-    ];
+    const rawMenuData = userStore.moduleListInfo as MenuItem[];
+    const menuData = rawMenuData || [];
+    moduleList.value = menuData;
+    await nextTick();
+    console.log('菜单数据：', moduleList.value);
+  } catch (error) {
+    console.error('获取菜单数据失败：', error);
+    moduleList.value = [];
   }
-};
+});
 
-const handleMenuClick = (item) => {
-  // 权限校验
-  if (item.permission && !userStore.permissions.includes(item.permission)) {
-    return uni.showToast({ title: '暂无权限', icon: 'none' });
+const handleMenuClick = (item: MenuItem) => {
+  if (!item.jumpUrl) {
+    uni.showToast({
+      title: '暂无跳转链接',
+      icon: 'none',
+      duration: 2000
+    });
+    return;
   }
-  // 页面跳转
-  uni.navigateTo({ url: item.path });
+  console.log(item.jumpUrl)
+  uni.navigateTo({
+    url: item.jumpUrl,
+    fail: (err) => {
+      console.error('页面跳转失败：', err);
+      uni.showToast({
+        title: '页面路径错误',
+        icon: 'none',
+        duration: 2000
+      });
+    }
+  });
 };
 </script>
 
 <style scoped>
+/* 仅新增/保留必要样式，不修改卡片核心样式 */
 .workbench-container {
-  padding: 20rpx;
-  background: #f8f8f8;
+  width: 100%;
   min-height: 100vh;
+  position: relative;
+  background-color: #fff;
 }
-.card {
-  background: #fff;
-  border-radius: 10rpx;
-  padding: 20rpx;
-  margin-bottom: 20rpx;
-}
-.card-title {
-  font-size: 32rpx;
-  font-weight: bold;
-  margin-bottom: 20rpx;
-  padding-bottom: 10rpx;
-  border-bottom: 1rpx solid #eee;
+
+/* 蓝色块样式 */
+.blue-decor-block {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 200px;
+  background-color: #577ee3;
+  z-index: 1;
 }
-.menu-grid {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: flex-start;
+
+/* 内容容器样式 */
+.content-wrap {
+  position: relative;
+  z-index: 2;
+  padding: 0 20rpx;
+  padding-top: 160px;
 }
-.menu-item {
-  width: 25%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 20rpx 10rpx;
-  box-sizing: border-box;
+
+/* 第一张卡片层级 */
+.first-card-position {
+  position: relative;
+  z-index: 3;
 }
-.menu-icon {
-  width: 80rpx;
-  height: 80rpx;
-  margin-bottom: 10rpx;
+
+/* 仅补充标题文字基础样式（确保显示，不修改卡片其他样式） */
+.card-title-text {
+  font-size: 32rpx;
+  color: #333;
+  font-weight: 600;
 }
-.menu-text {
+
+/* 网格文字样式（保留原始） */
+.grid-text {
   font-size: 24rpx;
-  color: #666;
+  color: #333;
+  text-align: center;
+  margin-top: 10rpx;
 }
-</style>
-<script setup lang="ts">
-</script>
\ No newline at end of file
+</style>
\ No newline at end of file
--
libgit2 0.21.4