工作台

刘淇
1 parent 37c26bd3
Showing 7 changed files with 80 additions and 123 deletions
App.vue
api/patrol-manage/patrol-plan.js
api/user.js
pages-sub/daily/patrol-manage/add-patrol-record/index.vue
pages-sub/daily/patrol-manage/patrol-plan/index.vue
pages-sub/daily/patrol-manage/pending-plan-detail/index.vue
pages/workbench/index.vue
@@ -47,4 +47,18 @@ page {
   background-color: #f8f8f8;
   height: 100%;
 }
+
+// 底部按钮样式
+.fixed-bottom-btn-wrap {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  padding: 0;
+  /* #ifdef MP-WEIXIN */
+  //padding-bottom: constant(safe-area-inset-bottom);
+  //padding-bottom: env(safe-area-inset-bottom);
+  /* #endif */
+}
 </style>
 \ No newline at end of file
@@ -19,11 +19,11 @@ export const inspectionPlanPage = (params) =&gt; {
 };
  
 /**
- * 退出登录
+ * 巡检计划明细
  * @returns {Promise}
  */
-export const logout = () => {
-  return post('/admin-api/system/auth/logout');
+export const inspectionPlanDetail = (data) => {
+  return post('/app-api/app/garden/inspection-plan-detail/get-details',data);
 };
  
 /**
@@ -33,3 +33,11 @@ export const logout = () =&gt; {
 export const moduleList = () => {
   return get('/app-api/member/app-module/list');
 };
+
+/**
+ * 字典数据
+ * @returns {Promise}
+ */
+export const getSimpleDictDataList = () => {
+  return get({ url: '/system/dict-data/simple-list' })
+}
@@ -74,7 +74,7 @@
     </up-form>
  
     <!-- 底部提交按钮 -->
-    <view class="submit-btn-wrap">
+    <view class="fixed-bottom-btn-wrap">
       <up-button
           type="primary"
           size="default"
@@ -197,19 +197,4 @@ const submit = () =&gt; {
  
  
  
-// 底部按钮样式
-.submit-btn-wrap {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  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);
-  /* #endif */
-}
-
 </style>
 \ No newline at end of file
@@ -23,7 +23,10 @@
           placeholder="请输入道路名称"
           bg-color="#f5f5f5"
           shape="round"
+          :show-action="true" actionText="搜索" :animation="true"
           @search="handleSearch"
+          @custom="handleSearch"
+          :clearabled="false"
           maxlength="50"
           style="margin: 20rpx 20rpx 0"
       ></up-search>
@@ -65,7 +68,9 @@
             </view>
             <view class="row-item">
               <text class="label">计划时间：</text>
-              <text class="value up-line-1">{{ formatPlanTime(item.beginTime, item.endTime) }}</text>
+<!--              <text class="value up-line-1">{{ formatPlanTime(item.beginTime, item.endTime) }}</text>-->
+              <text class="value up-line-1">{{ timeFormat(item.beginTime,'yyyy-mm-dd')}} 至 {{ timeFormat(item.endTime,'yyyy-mm-dd')}} </text>
+
             </view>
           </view>
         </view>
@@ -76,6 +81,7 @@
 </template>
  
 <script setup>
+import { timeFormat } from '@/uni_modules/uview-plus';
 import { ref } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
 import { inspectionPlanPage } from "@/api/patrol-manage/patrol-plan";
@@ -107,18 +113,6 @@ const planTypeMap = {
   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)
@@ -4,129 +4,110 @@
     <view class="detail-card">
       <!-- 标题行 -->
       <view class="detail-item">
-        <text class="label">标题：</text>
+        <text class="label">计划名称：</text>
         <text class="value up-line-1">{{ planInfo && planInfo.title ? planInfo.title : '-' }}</text>
       </view>
  
       <!-- 计划编码行 -->
       <view class="detail-item">
         <text class="label">计划编码：</text>
-        <text class="value up-line-1">{{ planInfo && planInfo.code ? planInfo.code : '-' }}</text>
+        <text class="value up-line-1">{{ planInfo.planNo ? planInfo.planNo : '-' }}</text>
       </view>
  
       <!-- 养护周期行 -->
       <view class="detail-item">
         <text class="label">养护周期：</text>
-        <text class="value up-line-1">{{ planInfo && planInfo.cycle ? planInfo.cycle : '-' }}</text>
+        <text class="value up-line-1">{{ planInfo && planInfo.rate ? planInfo.rate : '-' }}</text>
       </view>
  
       <!-- 计划完成次数行 -->
       <view class="detail-item">
         <text class="label">计划完成次数：</text>
-        <text class="value up-line-1">{{ planInfo && planInfo.planCount ? planInfo.planCount : 0 }} 次</text>
+        <text class="value up-line-1">{{ planInfo && planInfo.planNum ? planInfo.planNum : 0 }} 次</text>
       </view>
  
       <!-- 已完成次数行 + 查看记录按钮 -->
       <view class="detail-item flex-between">
         <view class="left-wrap">
           <text class="label">已完成次数：</text>
-          <text class="value up-line-1">{{ planInfo && planInfo.finishCount ? planInfo.finishCount : 0 }} 次</text>
+          <text class="value up-line-1">{{ planInfo && planInfo.planFinishNum ? planInfo.planFinishNum : 0 }} 次</text>
         </view>
         <!-- 查看记录按钮（限制宽度+紧凑样式） -->
-        <u-button
+        <up-button
             type="primary"
             size="mini"
-            :disabled="!(planInfo && planInfo.code)"
             @click="gotoFinishPlanDetail"
-            class="view-record-btn"
+            :style="{ width: '80px', height: '28px', fontSize: '14px', borderRadius: 4 }"
         >
           查看记录
-        </u-button>
+        </up-button>
       </view>
  
       <!-- 计划有效期行 -->
       <view class="detail-item">
         <text class="label">计划有效期：</text>
-        <text class="value up-line-1">{{ planInfo && planInfo.validTime ? planInfo.validTime : '-' }}</text>
+<!--        <text class="value up-line-1">{{ planInfo && planInfo.validTime ? planInfo.validTime : '-' }}</text>-->
+        <text class="value up-line-1">{{ timeFormat(planInfo.beginTime,'yyyy-mm-dd')}} 至 {{ timeFormat(planInfo.endTime,'yyyy-mm-dd')}} </text>
       </view>
     </view>
  
     <!-- 底部新增记录按钮 -->
-    <view class="fixed-btn-wrap">
-      <u-button
+    <view class="fixed-bottom-btn-wrap">
+      <up-button
           type="primary"
           size="default"
-          @click="addNewRecord"
-          :disabled="!(planInfo && planInfo.code)"
-          :style="{ width: '100%', height: '88rpx', fontSize: '30rpx', borderRadius: 0 }"
+          @click="submit"
+          :style="{ width: '100%', height: '88rpx', fontSize: '32rpx', borderRadius: 0 }"
       >
         新增记录
-      </u-button>
+      </up-button>
     </view>
   </view>
 </template>
  
 <script setup>
+import { timeFormat } from '@/uni_modules/uview-plus';
 import { ref } from 'vue';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-
+import { inspectionPlanDetail } from "@/api/patrol-manage/patrol-plan";
 // 响应式数据定义
-const planInfo = ref({
-  title: '123213',
-  code: '',
-  cycle: '',
-  planCount: 0,
-  finishCount: 0,
-  validTime: ''
-});
-const planId = ref('')
-
+const planInfo = ref({});
+const batchNo = ref('')
+const finishState = ref('')
 // 页面加载接收参数
 onLoad((options) => {
-  console.log('计划ID：', options.id);
-  planId.value = options.id;
+  console.log('计划ID：', options.batchNo);
+  batchNo.value = options.batchNo;
+  finishState.value = options.status
 });
-
 // 页面显示时请求数据
 onShow(() => {
-  if (!planId.value) {
+  if (!batchNo.value) {
     uni.showToast({
       title: '计划ID不存在',
       icon: 'none'
     });
     return;
   }
-  getPlanDetail(planId.value);
+  getPlanDetail(batchNo.value);
 });
-
-// 模拟接口请求
-const getPlanDetail = (id) => {
-  setTimeout(() => {
-    planInfo.value = {
-      title: '朝阳区望京街道道路养护计划朝阳区望京街道道路养护计划朝阳区望京街道道路养护计划',
-      code: 'YH-2025-0891YH-2025-0891YH-2025-0891YH-2025-0891',
-      cycle: '每月1次',
-      planCount: 12,
-      finishCount: 3,
-      validTime: '2025-01-01 至 2025-12-31'
-    };
-  }, 300);
+const getPlanDetail = async () => {
+  const queryData = {
+    batchNo: batchNo.value,
+    finishState: finishState.value
+  }
+  console.log(queryData)
+  const planInfoRes = await inspectionPlanDetail(queryData)
+  planInfo.value = planInfoRes[0]
+  console.log(planInfoRes)
 };
-
 // 跳转到已完成计划明细
 const gotoFinishPlanDetail = () => {
-  // if (!planInfo.value || !planInfo.value.code) {
-  //   uni.showToast({
-  //     title: '计划数据未加载完成',
-  //     icon: 'none'
-  //   });
-  //   return;
-  // }
+
   uni.navigateTo({
-    url: `/pages-sub/daily/patrol-manage/finish-plan-detail/index?planId=${planInfo.value.code}`
+    url: `/pages-sub/daily/patrol-manage/finish-plan-detail/index?batchNo=${planInfo.value.code}`
   });
 };
-
 // 新增记录
 const addNewRecord = () => {
   if (!planInfo.value || !planInfo.value.code) {
@@ -137,7 +118,7 @@ const addNewRecord = () =&gt; {
     return;
   }
   uni.navigateTo({
-    url: `/pages-sub/daily/patrol-manage/add-patrol-record/index?planId=${planInfo.value.code}`
+    url: `/pages-sub/daily/patrol-manage/add-patrol-record/index?batchNo=${planInfo.value.code}`
   });
 };
 </script>
@@ -196,31 +177,4 @@ const addNewRecord = () =&gt; {
   word-break: break-all;
 }
  
-// 查看记录按钮样式（核心优化）
-.view-record-btn {
-  width: 160rpx !important; // 固定宽度，按需调整
-  padding: 0 !important; // 移除内边距，减少宽度
-  margin-right: 10rpx;
-  font-size: 24rpx !important; // 缩小字体，更紧凑
-  height: 50rpx !important; // 调整高度，比例协调
-}
-
-// 底部固定按钮容器
-.fixed-btn-wrap {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 999;
-  padding: 0;
-  background-color: #f8f8f8;
-}
-
-// 兼容小程序底部安全区
-/* #ifdef MP-WEIXIN */
-.fixed-btn-wrap {
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-}
-/* #endif */
 </style>
 \ No newline at end of file
@@ -19,10 +19,10 @@
       <view v-else class="menu-card-wrap">
  
         <up-card
-                 :title-size="18"
-                 v-for="(parentModule, index) in moduleList"
-                 :key="parentModule.id"
-                 :title="parentModule.name"
+            :title-size="18"
+            v-for="(parentModule, index) in moduleList"
+            :key="parentModule.id"
+            :title="parentModule.name"
         >
  
           <template #body>
@@ -59,8 +59,10 @@
 <script setup lang="ts">
 // 原始代码完全保留
 import {ref, nextTick} from 'vue';
-import {onShow} from '@dcloudio/uni-app';
-import {useUserStore} from '@/pinia/user';
+import { onShow } from '@dcloudio/uni-app';
+import { useUserStore } from '@/pinia/user';
+import globalConfig from '@/common/config/global';
+import cache from '@/common/utils/cache';
  
 interface MenuItem {
   id: number;
@@ -94,7 +96,8 @@ const headClick = () =&gt; {
  
 onShow(async () => {
   try {
-    const rawMenuData = userStore.moduleListInfo as MenuItem[];
+    const rawMenuData = userStore.moduleListInfo || cache.get(globalConfig.cache.moduleListKey);
+    // const rawMenuData = userStore.moduleListInfo as MenuItem[];
     const menuData = rawMenuData || [];
     moduleList.value = menuData;
     await nextTick();
@@ -153,7 +156,6 @@ const handleMenuClick = (item: MenuItem) =&gt; {
 .content-wrap {
   position: relative;
   z-index: 2;
-  padding: 0 20rpx;
   padding-top: 160px;
 }