diff --git a/CHANGELOG.md b/CHANGELOG.md index 6747d32..5b60933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -144,6 +144,7 @@ - | 切换日历时查询小红点 | [7091789](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/7091789) - | 初始展示角色修改 | [2ac4053](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/2ac4053) - | 卸载stylus | [610b465](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/610b465) + - | 完善雷达图 | [5f52d35](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/5f52d35) - | 定期任务key值修改 | [c6688db](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/c6688db) - | 定期任务接口 | [aa4981c](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/aa4981c) - | 定期任务插件 | [92b3254](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/92b3254) diff --git a/src/components/Evaluated/EvaluatedNLCP.vue b/src/components/Evaluated/EvaluatedNLCP.vue index 3a7c706..fb6ff14 100644 --- a/src/components/Evaluated/EvaluatedNLCP.vue +++ b/src/components/Evaluated/EvaluatedNLCP.vue @@ -2,9 +2,10 @@ {{ task.name }} - + + - + diff --git a/src/components/Evaluated/EvaluatedXLJH.vue b/src/components/Evaluated/EvaluatedXLJH.vue index cd3d07c..12827a0 100644 --- a/src/components/Evaluated/EvaluatedXLJH.vue +++ b/src/components/Evaluated/EvaluatedXLJH.vue @@ -32,17 +32,38 @@ 轻松完成 - + + + + diff --git a/src/components/Evaluated/components/EvaluatedDetail.vue b/src/components/Evaluated/components/EvaluatedDetail.vue new file mode 100644 index 0000000..ad3049e --- /dev/null +++ b/src/components/Evaluated/components/EvaluatedDetail.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/Evaluated/components/ResultLevel.vue b/src/components/Evaluated/components/ResultLevel.vue new file mode 100644 index 0000000..d706746 --- /dev/null +++ b/src/components/Evaluated/components/ResultLevel.vue @@ -0,0 +1,171 @@ + + + + + diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue index e5c145c..9fd93e9 100644 --- a/src/components/TimeLine/component/TimeBox.vue +++ b/src/components/TimeLine/component/TimeBox.vue @@ -2,7 +2,7 @@ - + @@ -62,7 +62,7 @@ {{ $moment(+task[0].planStart).format('D日') }} - + @@ -95,8 +95,8 @@ - - + + @@ -131,6 +131,8 @@ export default { }; }, + watch: {}, + computed: { ...mapState('role', ['roleId']), ...mapState('task', ['timeUnit', 'tasks', 'taskLoading', 'showSkeleton', 'isEvaluated']), diff --git a/src/pagesYanyuan/ascription/ascription.vue b/src/pagesYanyuan/ascription/ascription.vue index 316c431..295d514 100644 --- a/src/pagesYanyuan/ascription/ascription.vue +++ b/src/pagesYanyuan/ascription/ascription.vue @@ -146,15 +146,15 @@ export default { position.bgPic = 'https://www.tall.wiki/staticrec/yanyuan/bubble-red.png'; position.boxBg = 'bg-red-500'; } else if (value < 5) { - position.color = '#1890FF'; - position.value = '略有困难'; - position.bgPic = 'https://www.tall.wiki/staticrec/yanyuan/bubble-blue.png'; - position.boxBg = 'bg-blue-500'; - } else { position.color = '#F4C130'; - position.value = '轻松完成'; + position.value = '略有困难'; position.bgPic = 'https://www.tall.wiki/staticrec/yanyuan/bubble-yellow.png'; position.boxBg = 'bg-yellow-500'; + } else { + position.color = '#1890FF'; + position.value = '轻松完成'; + position.bgPic = 'https://www.tall.wiki/staticrec/yanyuan/bubble-blue.png'; + position.boxBg = 'bg-blue-500'; } this.lists[index].levels.forEach((line, i) => { diff --git a/src/store/task/mutations.js b/src/store/task/mutations.js index 197f657..50161b9 100644 --- a/src/store/task/mutations.js +++ b/src/store/task/mutations.js @@ -210,6 +210,15 @@ const mutations = { setIsEvaluated(state, show) { state.isEvaluated = show; }, + + /** + * 设置任务展开状态 + * @param {Object} state + * @param {Boolean} data + */ + setShowDetail(state, data) { + state.tasks[data.taskIndex][data.itemIndex].data.showDetail = !state.tasks[data.taskIndex][data.itemIndex].data.showDetail; + }, }; export default mutations;