diff --git a/CHANGELOG.md b/CHANGELOG.md index bdc413f..a8ecc37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -92,6 +92,7 @@ - | 下拉加载定期任务传参,时间格式化修改 | [0b95a0e](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/0b95a0e) - | 任务开始时间延迟插件 | [992a313](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/992a313) - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/749ae9a) + - | 修改定期任务状态0和4时不加载圆圈 | [30e352f](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/30e352f) - | 修改小红点传参 | [87b20fd](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/87b20fd) - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/531c14d) - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/df6acf2) diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue index b98fcef..4042b07 100644 --- a/src/components/TimeLine/component/TimeStatus.vue +++ b/src/components/TimeLine/component/TimeStatus.vue @@ -118,7 +118,6 @@ export default { * @param {object} event */ changeStatus(event, process) { - console.log('event, process: ', event, process); if (process === 4) { this.addTask(); return; diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue index bd7e511..0663aec 100644 --- a/src/pages/project/project.vue +++ b/src/pages/project/project.vue @@ -44,7 +44,6 @@ export default { * 永久日常任务不发生改变 */ async timeNode(val) { - console.log('时间基准点发生变化: ', val); if (val && this.roleId) { // 根据时间和角色查找日常任务 await this.initTasks(); @@ -59,7 +58,6 @@ export default { */ roleId(val) { if (val) { - console.log('角色发生变化: ', val); this.setTimeNode(Date.now()); // 根据角色查找永久的日常任务 this.getPermanent(val); @@ -146,9 +144,22 @@ export default { this.getGlobalData(); // 向上加载空数据 this.setPrevTasks(); + // storage没有存储值就跳转到当前时间位置 + const storageTaskId = this.$t.storage.getStorageSync('taskId'); + this.$nextTick(() => { + if (!storageTaskId) { + this.$refs.child.setScrollPosition(); + } + }); // 向下加载空数据 this.setNextTasks(); await this.getInitTasks(); + // 从详情页返回时跳转到之前的位置 storage有存储值 + this.$nextTick(() => { + if (storageTaskId) { + this.$refs.child.setScrollPosition(); + } + }); }, // 切换了 颗粒度 || 角色时候 获取初始定期任务 @@ -239,9 +250,6 @@ export default { } const initData = this.setTime(sTime, true); this.setUpTasks(initData); - this.$nextTick(() => { - this.$refs.child.setScrollPosition(); - }); }, // 设置时间轴向下的空数据