zishuo/KubePi
1
0
Fork 0
mirror of https://github.com/1Panel-dev/KubePi.git synced 2025-10-05 15:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(node): 禁用调度标签修改

Browse Source
This commit is contained in:
ssongliu
2021-10-29 15:08:54 +08:00
parent 2e9551c46a
commit ff7b71259a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/dashboard/src/business/app-layout/header-components/Help.vue
View File

@@ -15,7 +15,7 @@
<img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo"> <img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo">
<p>{{ $t("commons.personal.introduction") }}</p> <p>{{ $t("commons.personal.introduction") }}</p>
<p>{{ $t("commons.personal.introduction2") }}</p> <p>{{ $t("commons.personal.introduction2") }}</p>
<strong>{{ $t("commons.personal.version") }}: v1.1.1</strong> <strong>{{ $t("commons.personal.version") }}: v1.1.2</strong>
</div> </div>
<div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;"> <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="font-size: 6px;color: #ffffff;text-align: center">

8
web/dashboard/src/business/cluster/nodes/index.vue
View File

@@ -41,15 +41,15 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column :label="$t('commons.table.status')"> <el-table-column :label="$t('commons.table.status')">
<template v-slot:default="{row}"> <template v-slot:default="{row}">
<el-button v-if="row.nodeStatus.indexOf('Cordoned') !== -1" type="warning" size="mini" plain round>
Cordoned
</el-button>
<el-button v-if="row.nodeStatus.indexOf('NotReady') !== -1" type="warning" size="mini" plain round> <el-button v-if="row.nodeStatus.indexOf('NotReady') !== -1" type="warning" size="mini" plain round>
NotReady NotReady
</el-button> </el-button>
<el-button v-else type="success" size="mini" plain round> <el-button v-else type="success" size="mini" plain round>
Ready Ready
</el-button> </el-button>
<el-button v-if="row.nodeStatus.indexOf('SchedulingDisabled') !== -1" type="warning" size="mini" plain round>
SchedulingDisabled
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('business.node.role')" prop="metadata.labels" min-width="180px" show-overflow-tooltip> <el-table-column :label="$t('business.node.role')" prop="metadata.labels" min-width="180px" show-overflow-tooltip>
@@ -134,7 +134,7 @@ export default {
} }
} }
if (node.spec.unschedulable) { if (node.spec.unschedulable) {
node.nodeStatus += ", Cordoned" node.nodeStatus += ", SchedulingDisabled"
} }
} }
this.paginationConfig.total = res.total this.paginationConfig.total = res.total

2
web/kubepi/src/business/app-layout/header-components/Help.vue
View File

@@ -15,7 +15,7 @@
<img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo"> <img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo">
<p>{{ $t("commons.personal.introduction") }}</p> <p>{{ $t("commons.personal.introduction") }}</p>
<p>{{ $t("commons.personal.introduction2") }}</p> <p>{{ $t("commons.personal.introduction2") }}</p>
<strong>{{ $t("commons.personal.version") }}: v1.1.1</strong> <strong>{{ $t("commons.personal.version") }}: v1.1.2</strong>
</div> </div>
<div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;"> <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="font-size: 6px;color: #ffffff;text-align: center">