Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3

This commit is contained in:
zyh
2022-06-20 17:24:51 +08:00
4 changed files with 30 additions and 7 deletions

View File

@@ -59,4 +59,15 @@
.el-table--border td:first-child .cell{ .el-table--border td:first-child .cell{
padding-left: 20px !important; padding-left: 20px !important;
} }
.el-table__empty-block{
.el-table__empty-text{
.table-no-data{
height: 200px;
padding-top: 70px;
}
}
}
} }

View File

@@ -198,9 +198,10 @@
background-color: #FA901C; background-color: #FA901C;
border-color: #FA901C; border-color: #FA901C;
border: 1px solid #FA901C; border: 1px solid #FA901C;
margin-right: -1px; // margin-right: -1px;
-webkit-box-shadow: -1px 0 0 0 #fcbc77; -webkit-box-shadow: -1px 0 0 0 #fcbc77;
box-shadow: -1px 0 0 0 #fcbc77; box-shadow: -1px 0 0 0 #fcbc77;
border-radius: 0;
} }
.nz-icon-delete:before{ .nz-icon-delete:before{
color: $--color-text-regular; color: $--color-text-regular;

View File

@@ -51,14 +51,23 @@
</div> </div>
<div slot-scope="scope" v-else class="table-operation-items"> <div slot-scope="scope" v-else class="table-operation-items">
<button class="table-operation-button" @click="Restore(scope.row)"> <button class="table-operation-button" @click="Restore(scope.row)" v-if="scope.row">
<i class="nz-icon-shujubeifenhuifu nz-icon"></i> <i class="nz-icon-shujubeifenhuifu nz-icon"></i>
</button> </button>
<button class="table-operation-edit" @click="del(scope.row)"> <button class="table-operation-edit" @click="del(scope.row)" v-if="scope.row">
<i class="nz-icon nz-icon-delete" style="font-size='12px'"></i> <i class="nz-icon nz-icon-delete" style="font-size='12px'"></i>
</button> </button>
</div> </div>
</el-table-column> </el-table-column>
<template slot="empty">
<div v-if="!loading" class="table-no-data">
<svg class="icon" aria-hidden="true">
<use xlink:href="#nz-icon-no-data-list"></use>
</svg>
<div class="table-no-data__title">No results found</div>
</div>
<div v-else>&nbsp;</div>
</template>
</el-table> </el-table>
</div> </div>
</template> </template>

View File

@@ -88,11 +88,11 @@ export default {
} }
], ],
tableData2: [ tableData2: [
{ // {
list: { // list: {
} // }
} // }
], ],
rightBoxshow: false, rightBoxshow: false,
isRefresh: '' isRefresh: ''
@@ -159,6 +159,8 @@ export default {
if (res.code === 200) { if (res.code === 200) {
if (res.data) { if (res.data) {
this.tableData2 = res.data this.tableData2 = res.data
} else {
this.tableData2 = []
} }
} }
}) })