diff --git a/pages-sub/daily/maintain-manage/index.vue b/pages-sub/daily/maintain-manage/index.vue index 1d8a399..2a98361 100644 --- a/pages-sub/daily/maintain-manage/index.vue +++ b/pages-sub/daily/maintain-manage/index.vue @@ -4,7 +4,7 @@ - + > --> - + > --> @@ -58,7 +58,7 @@ - + --> - - 计划明细 + + 养护任务 @@ -93,11 +93,11 @@ {{ item.roadName || '-' }} - + 养护级别： {{uni.$dict.getDictLabel('conserve_level', item.levelId) || '-'}} @@ -308,8 +308,12 @@ const fetchData = async (pageNo, pageSize) => { // 跳转到计划明细页面 const goToDetail = (item) => { + // uni.navigateTo({ + // url: `/pages-sub/daily/maintain-manage/road-detail-list?roadId=${item.roadId}&finish_state=${item.finishState || ''} &businessType=${item.busiLine}` + // }) + uni.navigateTo({ - url: `/pages-sub/daily/maintain-manage/road-detail-list?roadId=${item.roadId}&finish_state=${item.finishState || ''} &businessType=${item.busiLine}` + url: `/pages-sub/daily/maintain-manage/type-list?roadId=${item.roadId}&finish_state=${item.finishState || ''} &businessType=${item.busiLine}` }) } @@ -343,7 +347,6 @@ onShow(()=>{ diff --git a/pages-sub/daily/maintain-manage/type-list-page.vue b/pages-sub/daily/maintain-manage/type-list-page.vue new file mode 100644 index 0000000..de65692 --- /dev/null +++ b/pages-sub/daily/maintain-manage/type-list-page.vue @@ -0,0 +1,283 @@ + + + + + diff --git a/pages-sub/daily/maintain-manage/type-list.vue b/pages-sub/daily/maintain-manage/type-list.vue new file mode 100644 index 0000000..30c0bd4 --- /dev/null +++ b/pages-sub/daily/maintain-manage/type-list.vue @@ -0,0 +1,87 @@ + + + + + + diff --git a/pages-sub/daily/patrol-manage/add-patrol-record.vue b/pages-sub/daily/patrol-manage/add-patrol-record.vue index 62bac2e..4604bdc 100644 --- a/pages-sub/daily/patrol-manage/add-patrol-record.vue +++ b/pages-sub/daily/patrol-manage/add-patrol-record.vue @@ -1,83 +1,83 @@ diff --git a/pages-sub/daily/patrol-manage/index.vue b/pages-sub/daily/patrol-manage/index.vue index 2ac74c7..68ee84d 100644 --- a/pages-sub/daily/patrol-manage/index.vue +++ b/pages-sub/daily/patrol-manage/index.vue @@ -162,7 +162,7 @@ const queryList = async (pageNo, pageSize) => { // 跳转明细 const gotoDetail = (item) => { uni.navigateTo({ - url: `/pages-sub/daily/patrol-manage/pending-plan-detail?batchNo=${item.batchNo}&status=${activeTab.value}` + url: `/pages-sub/daily/patrol-manage/pending-plan-detail?batchNo=${item.batchNo}&status=${activeTab.value}&busiLine=${item.busiLine}` }); }; // 修复点5：优化页面生命周期逻辑 diff --git a/pages.json b/pages.json index 533b064..86d68f9 100644 --- a/pages.json +++ b/pages.json @@ -107,6 +107,23 @@ }, { + "path": "maintain-manage/type-list", + "style": { "navigationBarTitleText": "养护类型" } + }, + + { + "path": "maintain-manage/type-list-page", + "style": { "navigationBarTitleText": "养护" } + }, + + { + "path": "maintain-manage/now-list-page", + "style": { "navigationBarTitleText": "本次养护记录" } + }, + + + + { "path": "maintain-manage/add-record", "style": { "navigationBarTitleText": "新增养护记录" } }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 100f4f1..11725c6 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -132,7 +132,7 @@ import { timeFormat } from '@/uni_modules/uview-plus'; // import uniCharts from '@/components/uni-charts/uni-charts.vue'; import { getUnreadCount } from "@/api/user"; import { - getTaskCompletionSummary, + // getTaskCompletionSummary, taskDetailsWithDistance, taskDetailsWithSmartSort, getCurrentOrg, @@ -319,6 +319,20 @@ const baseList = ref>([]); const orgOptions = ref([]); const value1 = ref(''); const showActionSheet = ref(false); +// 日期选择确认回调 +const handleDateConfirm = async (range: string[]) => { + console.log('选择的日期范围：', range); + dateRange.value = range; + const [startDate, endDate] = range; + // 1. 更新图表数据 + // await initChartData(startDate, endDate); + + // 2. 刷新组织指标卡片（数字指标4格卡片） + if(value1.value){ + await fetchOrgIndicator(Number(value1.value), startDate, endDate); + } +}; + watch(orgOptions, async (list) => { if (list.length && !value1.value) { value1.value = list[0].value; @@ -382,6 +396,8 @@ const handleTabClick = (tabIndex: number) => { currentTabValue.value = tabIndex; showChartArea.value = true; }; + + // ========== 公共函数：请求 orgTaskIndicator 指标接口 ========== const fetchOrgIndicator = async (orgId: number, beginDate: string, endDate: string) => { try { @@ -410,13 +426,13 @@ const initRecent7Days = () => { const end = new Date(now); end.setDate(end.getDate()); const start = new Date(end); - start.setDate(start.getDate() - 6); + start.setDate(start.getDate() ); dateRange.value = [ timeFormat(start, 'yyyy-mm-dd'), timeFormat(end, 'yyyy-mm-dd') ]; console.log(dateRange.value) - initChartData(dateRange.value[0], dateRange.value[1]); + // initChartData(dateRange.value[0], dateRange.value[1]); }; const getUnread = async () => { try { @@ -439,7 +455,7 @@ const getOrg = async () => { const initChartData = async (beginTime: string, endTime: string) => { try { const postData = { beginTime, endTime }; - const res = await getTaskCompletionSummary(postData); + // const res = await getTaskCompletionSummary(postData); 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); @@ -840,11 +856,11 @@ $border-color: #e5e5e5; display: flex; } .task-item__name { - width: 80rpx; + width: 88rpx; } .task-name-text { flex: 1; - font-size: 24rpx; + font-size: 28rpx; color: $text-color; display: -webkit-box; -webkit-line-clamp: 2; @@ -853,7 +869,7 @@ $border-color: #e5e5e5; text-overflow: ellipsis; } &__name { - font-size: 24rpx; + font-size: 28rpx; color: $text-color; display: inline-block; } @@ -861,7 +877,7 @@ $border-color: #e5e5e5; display: flex; align-items: flex-start; gap: 6rpx; - font-size: 24rpx; + font-size: 26rpx; color: $text-color-light; margin-top: $spacing-sm; align-items: center;