From eece9e52f39ced8f8cf22ee4c0c0bf577a97769f Mon Sep 17 00:00:00 2001 From: donghao <donghao@supervision.ltd> Date: Thu, 29 Feb 2024 10:06:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=AE=97=E5=8A=9B=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=97=B4=E8=B7=9D=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DsBox/src/dsTag1.tsx | 10 +++++++++- .../components/computePowerType.vue | 2 +- .../computePowerAllocation/computePowerAllocation.scss | 6 ++++-- .../computePowerAllocationIndex.vue | 8 +++++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/components/DsBox/src/dsTag1.tsx b/src/components/DsBox/src/dsTag1.tsx index 2739088..f8ccd60 100644 --- a/src/components/DsBox/src/dsTag1.tsx +++ b/src/components/DsBox/src/dsTag1.tsx @@ -1,3 +1,11 @@ +/* + * @Author: donghao donghao@supervision.ltd + * @Date: 2024-02-26 10:32:17 + * @LastEditors: donghao donghao@supervision.ltd + * @LastEditTime: 2024-02-29 09:57:04 + * @FilePath: \General-AI-Platform-Web-Client\src\components\DsBox\src\dsTag1.tsx + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ /** * @交互说明 * @@ -80,7 +88,7 @@ export default defineComponent({ style={{ backgroundColor: props.info.color }} ></div> <p class="w-[188px] h-[20px] single-line text-sm"> - <span class="px-[8px]">{props.info.proportion}%</span> + <span class="px-[8px]">{props.info.proportion.toFixed(1)}%</span> <span>{props.info.name}</span> </p> </div> diff --git a/src/pages/dataScreen/views/computePowerAllocation/components/computePowerType.vue b/src/pages/dataScreen/views/computePowerAllocation/components/computePowerType.vue index b7459fe..5426b75 100644 --- a/src/pages/dataScreen/views/computePowerAllocation/components/computePowerType.vue +++ b/src/pages/dataScreen/views/computePowerAllocation/components/computePowerType.vue @@ -89,7 +89,7 @@ const currentInfo = computed(() => props.info); </svg> <div class="flex"> <p class="pl-[8px]">{{ currentInfo.name }}:</p> - <p class="">{{ currentInfo.proportion }}%</p> + <p class="">{{ currentInfo.proportion.toFixed(1) }}%</p> <p class="pl-[8px]" v-if="currentInfo.pretreatmentEfficiency"> 预计处理效率: {{ currentInfo.pretreatmentEfficiency }}帧/秒 </p> diff --git a/src/pages/dataScreen/views/computePowerAllocation/computePowerAllocation.scss b/src/pages/dataScreen/views/computePowerAllocation/computePowerAllocation.scss index 2b10536..17898c7 100644 --- a/src/pages/dataScreen/views/computePowerAllocation/computePowerAllocation.scss +++ b/src/pages/dataScreen/views/computePowerAllocation/computePowerAllocation.scss @@ -105,9 +105,11 @@ // } .device_icons { + margin-top: 20px; + // background-color: red; + width: 848px; .device-icon-box { - width: 587px; - height: 592px; + height: 608px; } .bg_device_inner { width: 88px; diff --git a/src/pages/dataScreen/views/computePowerAllocation/computePowerAllocationIndex.vue b/src/pages/dataScreen/views/computePowerAllocation/computePowerAllocationIndex.vue index 8e1d66c..ed04995 100644 --- a/src/pages/dataScreen/views/computePowerAllocation/computePowerAllocationIndex.vue +++ b/src/pages/dataScreen/views/computePowerAllocation/computePowerAllocationIndex.vue @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-01-19 09:22:30 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-02-28 17:27:57 + * @LastEditTime: 2024-02-29 10:02:55 * @FilePath: \General-AI-Platform-Web-Client\src\views\computePowerAllocation\index.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -147,7 +147,9 @@ const poolsData: ComputePowerPoolItem[] = [ class="cp_bg_logo_icon" :class="`cp_bg_logo_icon_${v.type}`" /> - <span class="pl-[12px]">{{ v.label }}</span> + <span class="pl-[12px] two-line w-[230px]">{{ + v.label + }}</span> </div> <div class="bg_banner_group_logo" @@ -190,7 +192,7 @@ const poolsData: ComputePowerPoolItem[] = [ <li v-for="(v, k) in poolsData" :key="k" - class="flex items-center justify-center mx-[12px] mb-[8px]" + class="flex items-center justify-center mx-[12px] mb-[24px]" > <ComputePowerType :info="v" /> </li>