This commit is contained in:
pycook
2020-02-23 18:41:23 +08:00
parent 9eaca4d6a0
commit 5dc2f89e7f
7 changed files with 32 additions and 29 deletions

View File

@@ -44,7 +44,7 @@ export default {
this.upload2Server()
},
computed: {
mpercent () {
mPercent () {
return Math.round(this.complete / this.total * 10000) / 100
},
progressStatus () {

View File

@@ -389,7 +389,7 @@ export default {
columns.push({
title: this.$t('tip.operate'),
key: 'operation',
width: 100,
width: 115,
fixed: 'right',
scopedSlots: { customRender: 'action' }
})

View File

@@ -79,6 +79,7 @@
</template>
<script>
import i18n from '@/locales'
import DescriptionList from '@/components/DescriptionList'
import { getCITypeGroupById } from '@/api/cmdb/CIType'
@@ -184,9 +185,9 @@ export default {
filters: {
operateTypeFilter (operateType) {
const operateTypeMap = {
'0': this.$t('button.add'),
'1': this.$t('button.delete'),
'2': this.$t('button.update')
'0': i18n.t('button.add'),
'1': i18n.t('button.delete'),
'2': i18n.t('button.update')
}
return operateTypeMap[operateType]
}

View File

@@ -346,7 +346,6 @@ export default {
scrollX += columns[i].width
}
this.columns = columns
this.scrollX = scrollX
this.scrollY = window.innerHeight - this.$refs.table.$el.offsetTop - 300
},
@@ -424,14 +423,17 @@ export default {
}
</script>
<style lang='less'>
.ant-menu-horizontal {
<style lang='less' scoped>
/deep/ .ant-table-thead > tr > th,
/deep/ .ant-table-tbody > tr > td {
white-space: nowrap;
overflow: hidden;
}
/deep/ .ant-menu-horizontal {
border-bottom: 1px solid #ebedf0 !important;
}
.ant-menu-horizontal {
border-bottom: 1px solid #ebedf0 !important;
}
.relation-card > .ant-card-body {
/deep/ .relation-card > .ant-card-body {
padding-top: 0 !important;
}
</style>

View File

@@ -244,11 +244,14 @@ export default {
}
</script>
<style scoped>
.ant-menu-horizontal {
border-bottom: 1px solid #ebedf0 !important;
<style lang='less' scoped>
/deep/ .ant-table-thead > tr > th,
/deep/ .ant-table-tbody > tr > td {
white-space: nowrap;
overflow: hidden;
}
.ant-menu-horizontal {
/deep/ .ant-menu-horizontal {
border-bottom: 1px solid #ebedf0 !important;
}
</style>