diff --git a/src/components/AccountListTable/const.js b/src/components/AccountListTable/const.js index fd90265df..6a74b19bd 100644 --- a/src/components/AccountListTable/const.js +++ b/src/components/AccountListTable/const.js @@ -1,4 +1,3 @@ -import { toSafeLocalDateStr } from '@/utils/common' import ChoicesFormatter from '@/components/TableFormatters/ChoicesFormatter' import i18n from '@/i18n/i18n' @@ -7,30 +6,21 @@ export const connectivityMeta = { formatter: ChoicesFormatter, formatterArgs: { faChoices: { - ok: 'fa-check', - failed: 'fa-times', - unknown: 'fa-circle-o' + ok: 'fa-check-circle', + failed: 'fa-times-circle', + unknown: ' ' }, classChoices: { ok: 'text-primary', failed: 'text-danger', - unknown: 'text-warning' + unknown: '' }, - hasTips: true, - getTips: ({ row, cellValue }) => { - const mapper = { - 'ok': i18n.t('assets.Reachable'), - 'failed': i18n.t('assets.Unreachable'), - 'unknown': i18n.t('assets.Unknown') - } - let tips = mapper[cellValue] - if (row['date_verified']) { - const datetime = toSafeLocalDateStr(row['date_verified']) - tips += '
' + datetime - } - return tips + textChoices: { + ok: 'Avail', + failed: 'Failed', + unknown: '-' } }, - width: '90px', + width: '100px', align: 'center' } diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue index d22b92817..63dadc190 100644 --- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue +++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue @@ -127,7 +127,6 @@ :page-size="size" :total="total" :background="paginationBackground" - style="text-align: right; padding: 10px 0;" :layout="paginationLayout" v-bind="extraPaginationAttrs" @size-change="handleSizeChange" diff --git a/src/components/DataTable/compenents/el-data-table/index.less b/src/components/DataTable/compenents/el-data-table/index.less index 2a8c8a98f..f63564f82 100644 --- a/src/components/DataTable/compenents/el-data-table/index.less +++ b/src/components/DataTable/compenents/el-data-table/index.less @@ -1,16 +1,22 @@ -.el-data-table ::v-deep .el-pagination{ - text-align: center !important; - } - .el-data-table ::v-deep .el-table td{ - padding: 4px 0; - } - .el-data-table ::v-deep .el-table th{ - padding: 4px 0; - } - .el-data-table ::v-deep .el-form-item{ - margin-bottom:10px !important ; - margin-top:10px; - } - .el-data-table ::v-deep .el-pagination{ - padding:15px 0 !important ; +.el-data-table ::v-deep .el-table td { + padding: 4px 0; +} + +.el-data-table ::v-deep .el-table th { + padding: 4px 0; +} + +.el-data-table ::v-deep .el-form-item { + margin-bottom: 10px !important; + margin-top: 10px; +} + +.el-data-table ::v-deep .el-pagination { + text-align: right; + padding: 15px 25px 20px 15px; + + .el-pagination__total { + float: left; } +} + diff --git a/src/components/DataTable/index.vue b/src/components/DataTable/index.vue index 7cb3ae911..54f290ef8 100644 --- a/src/components/DataTable/index.vue +++ b/src/components/DataTable/index.vue @@ -189,14 +189,6 @@ export default { margin-top: 15px; } - //分页 - .el-pagination ::v-deep .el-pagination__total{ - float: left; - } - - .el-pagination ::v-deep .el-pagination__sizes{ - float: left; - } //修改颜色 // .el-button--text{ // color: #409EFF; diff --git a/src/router/settings/index.js b/src/router/settings/index.js index 5ee0de411..26bd81766 100644 --- a/src/router/settings/index.js +++ b/src/router/settings/index.js @@ -219,6 +219,17 @@ export default { permissions: ['settings.change_terminal'] } }, + { + path: 'applets/:id', + name: 'AppletDetail', + component: () => import('@/views/settings/Applet/Applet/AppletDetail/index'), + hidden: true, + meta: { + title: i18n.t('route.AppletDetail'), + permissions: ['settings.change_terminal'], + activeMenu: '/settings/applets' + } + }, { path: 'hosts/create', name: 'AppletHostCreate', diff --git a/src/views/assets/Asset/AssetList/components/PlatformDialog.vue b/src/views/assets/Asset/AssetList/components/PlatformDialog.vue index 98d05e706..ebeb673ea 100644 --- a/src/views/assets/Asset/AssetList/components/PlatformDialog.vue +++ b/src/views/assets/Asset/AssetList/components/PlatformDialog.vue @@ -126,7 +126,6 @@ export default { .map(i => this.platforms.find(p => p.id === i)) .filter(p => p) .map(p => p.id) - console.log('This. platform id: ', this.recentPlatformIds) }, onConfirm() { this.iVisible = false