diff --git a/frontend/src/api/calc/type.ts b/frontend/src/api/calc/type.ts index 4c58f8df..fb4759a6 100644 --- a/frontend/src/api/calc/type.ts +++ b/frontend/src/api/calc/type.ts @@ -31,3 +31,9 @@ export interface IResultSuit{ rarity:string value:string } + +export interface IResultSkillCount { + count: number + mode: string + name: string +} diff --git a/frontend/src/assets/img/icon/input_lower.png b/frontend/src/assets/img/icon/input_lower.png new file mode 100644 index 00000000..7e6aa83f Binary files /dev/null and b/frontend/src/assets/img/icon/input_lower.png differ diff --git a/frontend/src/assets/img/icon/input_upper.png b/frontend/src/assets/img/icon/input_upper.png new file mode 100644 index 00000000..69e081ba Binary files /dev/null and b/frontend/src/assets/img/icon/input_upper.png differ diff --git a/frontend/src/components/calc/input/index.vue b/frontend/src/components/calc/input/index.vue index 40a497fb..f316b1e2 100644 --- a/frontend/src/components/calc/input/index.vue +++ b/frontend/src/components/calc/input/index.vue @@ -1,44 +1,69 @@ diff --git a/frontend/src/pages/Character/Result/Index.vue b/frontend/src/pages/Character/Result/Index.vue index 347ab41f..431c65d2 100644 --- a/frontend/src/pages/Character/Result/Index.vue +++ b/frontend/src/pages/Character/Result/Index.vue @@ -25,7 +25,7 @@ const infoStore = useInfoStore() const setStandard = () => { if(!configStore?.result?.state?.uuid) return - infoStore.setStandard(configStore.result.state) + infoStore.setStandard(configStore.result.state,configStore.skillCountConfig) } const clearStandard = () => { diff --git a/frontend/src/pages/Character/Result/components/Skill.vue b/frontend/src/pages/Character/Result/components/Skill.vue index dc2c6bce..5a4b219d 100644 --- a/frontend/src/pages/Character/Result/components/Skill.vue +++ b/frontend/src/pages/Character/Result/components/Skill.vue @@ -2,55 +2,176 @@
-
技能
-
CD
-
伤害
-
秒伤
+
+ {{ header.label }} + +
+
占比
-
-
+
+
Lv {{ skill.lv }}
-
{{ skill.name }} {{ !skill.mode ? '' : `[${skill.mode}]` }}
+
{{ skill.name }} {{ !skill.mode ? '' : `[${skill.mode}]` }}
+
+
{{ skill.cd.toFixed(1) }}s
+
+
-
{{ skill.cd.toFixed(1) }}s
-
+
{{showTotal}}