From 874e07eab2ffc3143e8795f1894a0902831184d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Mon, 9 Mar 2026 18:56:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=5Ffix=EF=BC=9A=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/components/calendar.vue | 6 ++++--
 src/pages/index/components/todo.vue     | 7 ++++++-
 src/pages/index/index.vue               | 4 +++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/pages/index/components/calendar.vue b/src/pages/index/components/calendar.vue
index 5bbe4fc1..5045575d 100644
--- a/src/pages/index/components/calendar.vue
+++ b/src/pages/index/components/calendar.vue
@@ -106,11 +106,13 @@
 		}
 		return _arr
 	})
-	onMounted(() => {
+	const initDate = () => {
 		nowDate.value = new Date()
 		activeDate.value = formatDate(nowDate.value, 'yyyy-MM-dd')
 		todayWeek.value = nowDate.value.getDay()
-	})
+	}
+	defineExpose({ initDate })
+	onMounted(() => {})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue
index 5f8688b9..59c8aa93 100644
--- a/src/pages/index/components/todo.vue
+++ b/src/pages/index/components/todo.vue
@@ -7,7 +7,7 @@
 	</view>
 	<view class="cont-box">
 		<!-- {{activeDate}} -->
-		<calendarCom @change="changeDate" />
+		<calendarCom ref="calendarComRef" @change="changeDate" />
 		<view class="table-list">
 			<todoItem
 				v-for="(item, index) in tableData"
@@ -38,6 +38,7 @@
 		page: 1,
 		limit: 10
 	});
+	const calendarComRef = ref(null)
 	const changeDate = (date) => {
 		activeDate.value = date;
 		getDataList(date, 1);
@@ -49,6 +50,9 @@
 		pageObj.value.page += 1;
 		getDataList(activeDate.value);
 	};
+	const initCalendar = () => {
+		calendarComRef.value && calendarComRef.value.initDate()
+	}
 	const getDataList = (date, flag) => {
 		common.loading();
 		if (flag === 1) {
@@ -151,6 +155,7 @@
 			});
 		}
 	};
+	defineExpose({initCalendar})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5b6948c8..ddf75a85 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -143,7 +143,7 @@
 			</view>
 			<classScroll :ref="(el) => (classScrollRef[1] = el)" name="recommend_class"></classScroll>
 			<classScroll :ref="(el) => (classScrollRef[2] = el)" name="new_class"></classScroll>
-			<toDoCom></toDoCom>
+			<toDoCom ref="toduRef"></toDoCom>
 			<view class="bottom_line">
 				<uv-divider text="我是有底线的" lineColor="#9cB0DC" :hairline="true"></uv-divider>
 			</view>
@@ -180,6 +180,7 @@
 	const no_read_message_num = ref(0);
 	const classScrollRef = ref([]);
 
+	const toduRef = ref(null)
 	// 处理显示的消息数量文本
 	const messageDisplayText = computed(() => {
 		return no_read_message_num.value > 99 ? '99+' : no_read_message_num.value;
@@ -333,6 +334,7 @@
 		statistics_data['get_statistics_data'](); // 获取统计数据
 		nextTick(() => {
 			classScrollRef.value.forEach((item) => item?.get_data());
+			toduRef.value.initCalendar()
 		});
 		noticeMessageCount().then((res) => {
 			no_read_message_num.value = res.body;

From 728194108f3695bf7b4162c8ec4f5d0cefe97d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Mon, 9 Mar 2026 20:02:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=5F=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/components/todo.vue | 461 +++++++++++++++-------------
 1 file changed, 249 insertions(+), 212 deletions(-)

diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue
index 7bbb5543..58331830 100644
--- a/src/pages/index/components/todo.vue
+++ b/src/pages/index/components/todo.vue
@@ -1,231 +1,268 @@
 <template>
-  <view class="module_title_div">
-    <view class="icon icon_1">
-      <!-- <image class="img" :src="icon"></image> -->
-    </view>
-    <view class="text font_pf">我的待办</view>
-  </view>
-  <view class="cont-box">
-    <!-- {{activeDate}} -->
-    <calendarCom ref="calendarComRef" @change="changeDate" />
-    <view class="table-list">
-      <todoItem v-for="(item, index) in tableData" :dataInfo="item" :class="index === tableData.length - 1 ? 'last-item' : ''" @click="handleDetail(item)"></todoItem>
-      <view class="empty-box" v-show="tableData.length === 0">暂无数据</view>
-    </view>
-    <view class="more-btn" v-show="showMoreBtn" @click="getMoreData">点击加载更多</view>
-  </view>
+	<view class="module_title_div">
+		<view class="icon icon_1">
+			<!-- <image class="img" :src="icon"></image> -->
+		</view>
+		<view class="text font_pf">我的待办</view>
+	</view>
+	<view class="cont-box">
+		<!-- {{activeDate}} -->
+		<calendarCom ref="calendarComRef" @change="changeDate" />
+		<view class="table-list">
+			<todoItem v-for="(item, index) in tableData" :dataInfo="item"
+				:class="index === tableData.length - 1 ? 'last-item' : ''" @click="handleDetail(item)"></todoItem>
+			<view class="empty-box" v-show="tableData.length === 0">暂无数据</view>
+		</view>
+		<view class="more-btn" v-show="showMoreBtn" @click="getMoreData">点击加载更多</view>
+	</view>
 </template>
 
 <script setup>
-import { ref, onMounted, computed } from 'vue'
-import calendarCom from './calendar.vue'
-import todoItem from './todo-item.vue'
-import common from '@/common/common.js'
-import { queryHaveToDo } from '@/api/index'
-import { queryTraExamPapersByPapersId } from '@/api/examination.js'
-import { queryTestPapers, queryOrgTree } from '@/api/competition.js'
-import { checkTraPartnerInfoById } from '@/api/sparring.js'
-import { queryTraUserAnonyByUserId } from '@/api/user.js'
-const activeDate = ref('')
-const tableData = ref([])
-const pageObj = ref({
-  totalNum: 0,
-  page: 1,
-  limit: 10
-})
-const calendarComRef = ref(null)
-const changeDate = date => {
-  activeDate.value = date
-  getDataList(date, 1)
-}
-const showMoreBtn = computed(() => {
-  return pageObj.value.totalNum > pageObj.value.page * pageObj.value.limit
-})
-const getMoreData = () => {
-  pageObj.value.page += 1
-  getDataList(activeDate.value)
-}
-const initCalendar = () => {
-  calendarComRef.value && calendarComRef.value.initDate()
-}
-const getDataList = (date, flag) => {
-  common.loading()
-  if (flag === 1) {
-    tableData.value = []
-    pageObj.value = {
-      totalNum: 0,
-      page: 1,
-      limit: 10
-    }
-  }
-  queryHaveToDo({
-    date,
-    ...pageObj.value
-  })
-    .then(res => {
-      let _arr = res.body || []
-      pageObj.value.totalNum = res.total
-      tableData.value = tableData.value.concat(_arr)
-    })
-    .finally(() => {
-      common.hideLoading()
-    })
-}
-const handleDetail = item => {
-  console.log(item)
-  switch (item.type) {
-    case '00':
-      common.navigateTo('/pages/courseDetail/index?crsId=' + item.id)
-      break
-    case '01':
-      toSparringDetail(item)
-      break
-    case '02':
-      toPKDetail(item)
-      break
-    case '03':
-      toExaminationDetail(item)
-      break
-    case '04':
-      common.setPageCache('learning_tasks_details', {
-        ...item,
-        taskId: item.id,
-        taskName: item.name,
-        taskSums: item.planPersionNumber,
-        taskFinishSums: item.realPersionNumber,
-        ossAddr: item.ossKey
-      })
-      common.navigateTo('/pages/learningTasks/details?taskId=' + item.id)
-      break
-    default:
-      break
-  }
-}
-// 去PK
-const toPKDetail = async item => {
-  const comId = item.id
-  common.loading()
-  const result = Promise.all([queryTestPapers({ comId }), queryTraUserAnonyByUserId(), queryOrgTree()])
-  result
-    .then(res => {
-      const papersId = res[0].body
-      common.setPageCache('competition_list', {
-        papersId: papersId, // 试卷id
-        isAnony: res[1].body.isAnony, // 是否匿名 Y是N否
-        ruleDesc: item.ruleDesc, // 规则说明
-        comName: item.comName, // 标题
-        comId: comId
-      })
-      common.setValue('orgTree', res[2].body ?? [])
-      common.hideLoading()
-      common.navigateTo(`/pages/competition/matching?papersId=${papersId}&comId=${comId}`)
-    })
-    .catch(() => {
-      common.msg('网络繁忙,请稍后再试!')
-    })
-}
-// 去考试
-const toExaminationDetail = async item => {
-  common.loading()
-  queryTraExamPapersByPapersId({
-    papersId: item.id
-  })
-    .then(res => {
-      common.setPageCache('testing_hall_details', res.body)
-      common.navigateTo('/pages/testingHall/details')
-    })
-    .catch(() => {})
-    .finally(() => {
-      common.hideLoading()
-    })
-}
-// 跳转 课程详情
-const toSparringDetail = item => {
-  if (item.id) {
-    checkTraPartnerInfoById({
-      traId: item.id
-    }).then(res => {
-      if (res.body.inRange) {
-        common.navigateTo('/pages/sparring/detail?traId=' + item.id)
-      } else {
-        common.show('提示', res.body.message, false)
-      }
-    })
-  }
-}
-defineExpose({ initCalendar })
+	import {
+		ref,
+		onMounted,
+		computed
+	} from 'vue'
+	import calendarCom from './calendar.vue'
+	import todoItem from './todo-item.vue'
+	import common from '@/common/common.js'
+	import {
+		queryHaveToDo
+	} from '@/api/index'
+	import {
+		queryTraExamPapersByPapersId
+	} from '@/api/examination.js'
+	import {
+		queryTestPapers,
+		queryOrgTree
+	} from '@/api/competition.js'
+	import {
+		checkTraPartnerInfoById
+	} from '@/api/sparring.js'
+	import {
+		queryTraUserAnonyByUserId
+	} from '@/api/user.js'
+	const activeDate = ref('')
+	const tableData = ref([])
+	const pageObj = ref({
+		totalNum: 0,
+		page: 1,
+		limit: 10
+	})
+	const calendarComRef = ref(null)
+	const changeDate = date => {
+		activeDate.value = date
+		getDataList(date, 1)
+	}
+	const showMoreBtn = computed(() => {
+		return pageObj.value.totalNum > pageObj.value.page * pageObj.value.limit
+	})
+	const getMoreData = () => {
+		pageObj.value.page += 1
+		getDataList(activeDate.value)
+	}
+	const initCalendar = () => {
+		calendarComRef.value && calendarComRef.value.initDate()
+	}
+	const getDataList = (date, flag) => {
+		common.loading()
+		if (flag === 1) {
+			tableData.value = []
+			pageObj.value = {
+				totalNum: 0,
+				page: 1,
+				limit: 10
+			}
+		}
+		queryHaveToDo({
+				date,
+				...pageObj.value
+			})
+			.then(res => {
+				let _arr = res.body || []
+				pageObj.value.totalNum = res.total
+				tableData.value = tableData.value.concat(_arr)
+			})
+			.finally(() => {
+				common.hideLoading()
+			})
+	}
+	const handleDetail = item => {
+		console.log(item)
+		switch (item.type) {
+			case '00':
+				common.navigateTo('/pages/courseDetail/index?crsId=' + item.id)
+				break
+			case '01':
+				toSparringDetail(item)
+				break
+			case '02':
+				toPKDetail(item)
+				break
+			case '03':
+				toExaminationDetail(item)
+				break
+			case '04':
+				toTaskDetail(item)
+				break
+			default:
+				break
+		}
+	}
+	const toTaskDetail = (item) => {
+		if (item.limitTyp === '02') {
+			if (item.isTimeOut === '01') {
+				return common.msg('任务未开始');
+			} else if (item.isTimeOut === '02') {
+				return common.msg('任务已结束');
+			}
+		}
+		common.setPageCache('learning_tasks_details', {
+			...item,
+			taskId: item.id,
+			taskName: item.name,
+			taskSums: item.planPersionNumber,
+			taskFinishSums: item.realPersionNumber,
+			ossAddr: item.ossKey
+		})
+		common.navigateTo('/pages/learningTasks/details?taskId=' + item.id)
+	}
+	// 去PK
+	const toPKDetail = async item => {
+		console.log(item)
+		if (item.isTimeOut !== '00') {
+			if (item.isTimeOut === '01') common.msg('竞赛未开始');
+			if (item.isTimeOut === '02') common.msg('竞赛已结束');
+			return;
+		}
+		const comId = item.id
+		common.loading()
+		const result = Promise.all([queryTestPapers({
+			comId
+		}), queryTraUserAnonyByUserId(), queryOrgTree()])
+		result
+			.then(res => {
+				const papersId = res[0].body
+				common.setPageCache('competition_list', {
+					papersId: papersId, // 试卷id
+					isAnony: res[1].body.isAnony, // 是否匿名 Y是N否
+					ruleDesc: item.ruleDesc, // 规则说明
+					comName: item.comName, // 标题
+					comId: comId
+				})
+				common.setValue('orgTree', res[2].body ?? [])
+				common.hideLoading()
+				common.navigateTo(`/pages/competition/matching?papersId=${papersId}&comId=${comId}`)
+			})
+			.catch(() => {
+				common.msg('网络繁忙,请稍后再试!')
+			})
+	}
+	// 去考试
+	const toExaminationDetail = async item => {
+		common.loading()
+		queryTraExamPapersByPapersId({
+				papersId: item.id
+			})
+			.then(res => {
+				common.setPageCache('testing_hall_details', res.body)
+				common.navigateTo('/pages/testingHall/details')
+			})
+			.catch(() => {})
+			.finally(() => {
+				common.hideLoading()
+			})
+	}
+	// 跳转 课程详情
+	const toSparringDetail = item => {
+		if (item.id) {
+			checkTraPartnerInfoById({
+				traId: item.id
+			}).then(res => {
+				if (res.body.inRange) {
+					common.navigateTo('/pages/sparring/detail?traId=' + item.id)
+				} else {
+					common.show('提示', res.body.message, false)
+				}
+			})
+		}
+	}
+	defineExpose({
+		initCalendar
+	})
 </script>
 
 <style lang="scss" scoped>
-$bg-margin-left: 30rpx;
+	$bg-margin-left: 30rpx;
 
-.module_title_div {
-  display: flex;
-  margin: 30rpx $bg-margin-left;
-  align-items: center;
+	.module_title_div {
+		display: flex;
+		margin: 30rpx $bg-margin-left;
+		align-items: center;
 
-  .icon {
-    margin-right: 6rpx;
-  }
+		.icon {
+			margin-right: 6rpx;
+		}
 
-  .icon_1 {
-    .img {
-      width: 31rpx;
-      height: 36rpx;
-    }
-  }
+		.icon_1 {
+			.img {
+				width: 31rpx;
+				height: 36rpx;
+			}
+		}
 
-  .icon_2 {
-    margin-top: 10rpx;
+		.icon_2 {
+			margin-top: 10rpx;
 
-    .img {
-      width: 38rpx;
-      height: 38rpx;
-    }
-  }
+			.img {
+				width: 38rpx;
+				height: 38rpx;
+			}
+		}
 
-  .icon_3 {
-    // margin-top: 10rpx;
-    .img {
-      width: 38rpx;
-      height: 31rpx;
-    }
-  }
+		.icon_3 {
 
-  .title {
-    font-size: 34rpx;
-    color: #323e57;
-    font-weight: 700;
-    line-height: 46rpx;
-    text-align: left;
-  }
-}
+			// margin-top: 10rpx;
+			.img {
+				width: 38rpx;
+				height: 31rpx;
+			}
+		}
 
-.cont-box {
-  margin: 0 $bg-margin-left;
-  background-color: #fff;
-  border-radius: 22rpx;
-  padding: 20rpx;
+		.title {
+			font-size: 34rpx;
+			color: #323e57;
+			font-weight: 700;
+			line-height: 46rpx;
+			text-align: left;
+		}
+	}
 
-  .table-list {
-    padding: 16rpx;
+	.cont-box {
+		margin: 0 $bg-margin-left;
+		background-color: #fff;
+		border-radius: 22rpx;
+		padding: 20rpx;
 
-    .last-item {
-      border-bottom: 0 !important;
-    }
-  }
+		.table-list {
+			padding: 16rpx;
 
-  .more-btn {
-    color: rgb(144, 147, 153);
-    text-align: center;
-    font-size: 23rpx;
-  }
-}
+			.last-item {
+				border-bottom: 0 !important;
+			}
+		}
 
-.empty-box {
-  text-align: center;
-  color: #999;
-  font-size: 24rpx;
-  line-height: 120rpx;
-}
-</style>
+		.more-btn {
+			color: rgb(144, 147, 153);
+			text-align: center;
+			font-size: 23rpx;
+		}
+	}
+
+	.empty-box {
+		text-align: center;
+		color: #999;
+		font-size: 24rpx;
+		line-height: 120rpx;
+	}
+</style>
\ No newline at end of file