fix(help): 关于信息适配火狐浏览器

1Panel-dev · Nov 15, 2021 · 3b88e3d · 3b88e3d
1 parent 55a2e1e
commit 3b88e3d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/web/dashboard/src/business/app-layout/header-components/Help.vue b/web/dashboard/src/business/app-layout/header-components/Help.vue
@@ -18,7 +18,7 @@
         <strong>{{ $t("commons.personal.version") }}: v1.1.2</strong>
       </div>
       <div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;">
-        <el-row style="font-size: 6px;color: #ffffff;text-align: center">
+        <el-row style="color: #ffffff;text-align: center">
           <el-col :span="6">
             <el-link @click="toGithub" class="iconfont iconhuaban88"><span>{{
                 $t("commons.personal.project_url")

diff --git a/web/kubepi/src/business/app-layout/header-components/Help.vue b/web/kubepi/src/business/app-layout/header-components/Help.vue
@@ -18,7 +18,7 @@
         <strong>{{ $t("commons.personal.version") }}: v1.1.2</strong>
       </div>
       <div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;">
-        <el-row style="font-size: 6px;color: #ffffff;text-align: center">
+        <el-row style="color: #ffffff;text-align: center">
           <el-col :span="6">
             <el-link @click="toGithub" class="iconfont iconhuaban88"><span>{{
                 $t("commons.personal.project_url")

diff --git a/web/kubepi/src/business/cluster-management/index.vue b/web/kubepi/src/business/cluster-management/index.vue
@@ -86,8 +86,9 @@
 
       <el-table-column min-width="200" fix>
         <template v-slot:default="{row}">
-          <div><el-progress type="dashboard" :width="80" :format="formatCpu" :color="colors" :percentage="getCpuUsed(row)"></el-progress>
-          <el-progress type="dashboard" style="white-space: pre-wrap;" :width="80" :format="formatMemory" :color="colors" :percentage="getMemoryUsed(row)"></el-progress>
+          <div>
+            <el-progress type="dashboard" :width="80" :format="formatCpu" :color="colors" :percentage="getCpuUsed(row)"></el-progress>
+            <el-progress type="dashboard" :width="80" :format="formatMemory" :color="colors" :percentage="getMemoryUsed(row)"></el-progress>
           </div>
         </template>
       </el-table-column>
@@ -105,7 +106,7 @@
                        fix/>
 
 
-      <el-table-column :label="$t('commons.table.created_time')" min-width="120" fix>
+      <el-table-column :label="$t('commons.table.imported_time')" min-width="120" fix>
         <template v-slot:default="{row}">
           {{ row.createAt | ageFormat }}
         </template>

diff --git a/web/kubepi/src/i18n/lang/en-US.js b/web/kubepi/src/i18n/lang/en-US.js
@@ -46,6 +46,7 @@ const message = {
             name: "name",
             kind: "kind",
             created_time: "created at",
+            imported_time: "imported at",
             status: "status",
             action: "action",
             creat_by: "created by",

diff --git a/web/kubepi/src/i18n/lang/zh-CN.js b/web/kubepi/src/i18n/lang/zh-CN.js
@@ -50,6 +50,7 @@ const message = {
             name: "名称",
             kind: "类型",
             created_time: "创建时间",
+            imported_time: "导入时间",
             status: "状态",
             action: "操作",
             creat_by: "创建者",