Fix tag color and resolve merge conflict in Scheduler.vue

Changed the tag color for '碳-5' from 'none' to 'default' in Plans.vue. Also resolved a merge conflict in Scheduler.vue related to the .plan-header class styling.
2025-09-08 23:39:53 +08:00
parent 02788d3bfc
commit afd450eee6
3 changed files with 6 additions and 1 deletions
--- a/frontend/src/views/Plans.vue
+++ b/frontend/src/views/Plans.vue
@@ -853,7 +853,7 @@ const getSimpleTaskTagColor = (taskName: string) => {
    '红票-5': 'volcano',
    '技能-5': 'cyan',
    '经验-6/5': 'gold',
-    '碳-5': 'none',
+    '碳-5': 'default',
    '奶/盾芯片': 'green',
    '奶/盾芯片组': 'green',
    '术/狙芯片': 'purple',