From 8ff72ddb8c60e0b918d69f590cb9d2f1b5bea486 Mon Sep 17 00:00:00 2001 From: song Date: Fri, 13 Aug 2021 09:34:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E6=9C=9F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=AA=A8=E6=9E=B6=E5=B1=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 ++- src/components/TimeLine/component/TimeBox.vue | 6 ++--- .../TimeLine/component/TimeStatus.vue | 24 +++++++++++++++---- src/pages/project/project.vue | 5 +++- src/store/task/mutations.js | 9 +++++++ src/store/task/state.js | 1 + 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f988898..edbc072 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-08-12) +# 0.1.0 (2021-08-13) ### 🌟 新功能 范围|描述|commitId @@ -108,6 +108,7 @@ - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4d0ae46) - | 时间轴上下滚动数据加载bug修改 | [e82ede4](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/e82ede4) - | 时间轴插件 | [225d3cc](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/225d3cc) + - | 时间轴无任务时时间刻度加载修改 | [4921672](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/4921672) - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/ca78d02) - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/7d3b906) - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/ccsens_fe/TALL-MUI-3/commits/19228d6) diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue index 65f8f82..42b3156 100644 --- a/src/components/TimeLine/component/TimeBox.vue +++ b/src/components/TimeLine/component/TimeBox.vue @@ -21,7 +21,7 @@ @click="onClickTask(+task.planStart)" class="h-16" margin="0" - v-if="!tasks && !tasks.length" + v-if="showSkeleton" > @@ -38,7 +38,7 @@ @click="onClickTask(+task.planStart)" class="h-16" margin="0" - v-if="tasks && tasks.length && task.process !== 4" + v-if="tasks && tasks.length && task.process !== 4 && !showSkeleton" > @@ -86,7 +86,7 @@ export default { computed: { ...mapState('role', ['roleId']), - ...mapState('task', ['timeUnit', 'tasks', 'taskLoading', 'topEnd', 'bottomEnd']), + ...mapState('task', ['timeUnit', 'tasks', 'taskLoading', 'topEnd', 'bottomEnd', 'showSkeleton']), ...mapGetters('task', ['startTimeFormat']), }, diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue index 1fefc6a..3b8996b 100644 --- a/src/components/TimeLine/component/TimeStatus.vue +++ b/src/components/TimeLine/component/TimeStatus.vue @@ -10,19 +10,33 @@ :active-color="orderStyle.color" bg-color="rgba(255,255,255,0)" border-width="4" - :width="task.process !== 4 ? 66 : 50" + width="66" + v-if="task.process !== 4" > - - - - + + + + + + + + + + diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue index f3526a3..99098f1 100644 --- a/src/pages/project/project.vue +++ b/src/pages/project/project.vue @@ -80,7 +80,7 @@ export default { ...mapMutations('user', ['setToken']), ...mapMutations('project', ['setProject', 'setProjectName']), ...mapMutations('role', ['setInvisibleRoles', 'setVisibleRoles', 'setRoleId']), - ...mapMutations('task', ['setUpTasks', 'setDownTasks', 'setDailyTasks', 'setTimeNode', 'clearEndFlag']), + ...mapMutations('task', ['setUpTasks', 'setDownTasks', 'setDailyTasks', 'setTimeNode', 'clearEndFlag', 'setShowSkeleton']), /** * 初始化 @@ -161,6 +161,7 @@ export default { */ async getTasks(query) { try { + this.setShowSkeleton(true); const { roleId, timeNode, timeUnit } = this; const params = { roleId, @@ -171,7 +172,9 @@ export default { }; await this.getRegulars(params); + this.setShowSkeleton(false); } catch (error) { + this.setShowSkeleton(false); console.error('error: ', error); } }, diff --git a/src/store/task/mutations.js b/src/store/task/mutations.js index cda9e99..18c10a9 100644 --- a/src/store/task/mutations.js +++ b/src/store/task/mutations.js @@ -185,6 +185,15 @@ const mutations = { const item = state.tasks.find(i => i.id === data.id); item.process = data.taskStatus; }, + + /** + * 设置骨架屏是否显示 + * @param {Object} state + * @param {Boolean} show + */ + setShowSkeleton(state, show) { + state.showSkeleton = show; + }, }; export default mutations; diff --git a/src/store/task/state.js b/src/store/task/state.js index 75d0f09..7131793 100644 --- a/src/store/task/state.js +++ b/src/store/task/state.js @@ -43,6 +43,7 @@ const state = { // planStart: uni.$t.time.add(+new Date().getTime(), 1, 'day').valueOf(), // }, ], + showSkeleton: false, // 定期任务骨架屏 }; export default state;