fix: 修复 project页面侧滑样式问题,system页面列表样式问题

This commit is contained in:
@changcode
2021-09-08 16:22:49 +08:00
parent ab7e092c70
commit 65c07e5a43
7 changed files with 11 additions and 5 deletions

View File

@@ -73,6 +73,9 @@ li{
.margin-r-20 { .margin-r-20 {
margin-right: 20px !important; margin-right: 20px !important;
} }
.project-search.alert-table.asset-table.endpoint-table {
margin-right: 0px !important;
}
.margin-t-20 { .margin-t-20 {
margin-top: 20px !important; margin-top: 20px !important;
} }

View File

@@ -13,7 +13,7 @@
v-loading="tools.loading" v-loading="tools.loading"
> >
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData"> <el-select v-model="state" size="small" value-key="value" @change="getTableData">
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</template> </template>

View File

@@ -10,6 +10,7 @@
:layout="dataListLayout" :layout="dataListLayout"
:search-msg="searchMsg" :search-msg="searchMsg"
@search="search" @search="search"
:search-right="true"
> >
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">
<asset-table <asset-table

View File

@@ -9,6 +9,7 @@
:from="fromRoute.endpoint" :from="fromRoute.endpoint"
:layout="['searchInput', 'pagination']" :layout="['searchInput', 'pagination']"
:search-msg="searchMsg" :search-msg="searchMsg"
:search-right="true"
@search="search" @search="search"
> >
<template v-slot:default="slotProps"> <template v-slot:default="slotProps">

View File

@@ -10,7 +10,7 @@
<slot name="top-tool-left"></slot> <slot name="top-tool-left"></slot>
</div> </div>
<div :class="{'top-tool-main-right-to-left': bottomBox.showSubList}" class="top-tool-right"> <div :class="{'top-tool-main-right-to-left': bottomBox.showSubList}" class="top-tool-right">
<div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20"> <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20" :class="{'project-search alert-table asset-table endpoint-table': searchRight}">
<search-input ref="searchInput" :from="from" :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input> <search-input ref="searchInput" :from="from" :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input>
</div> </div>
<slot name="top-tool-right"></slot> <slot name="top-tool-right"></slot>
@@ -91,7 +91,8 @@ export default {
searchMsg: { searchMsg: {
type: Object type: Object
}, },
nzTableHeightOffset: Number nzTableHeightOffset: Number,
searchRight: Boolean
}, },
computed: { computed: {
nzTableHeight () { nzTableHeight () {

View File

@@ -12,7 +12,7 @@
</template> </template>
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button id="api-key-add" v-has="'system_apiKey_add'" :title="$t('config.system.notification.create')" class="top-tool-btn margin-r-10" type="button" @click="addApiKey"> <button id="api-key-add" v-has="'system_apiKey_add'" :title="$t('config.system.notification.create')" class="top-tool-btn" type="button" @click="addApiKey">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon"></i>
</button> </button>
</template> </template>

View File

@@ -13,7 +13,7 @@
</template> </template>
<template v-slot:top-tool-right> <template v-slot:top-tool-right>
<button id="notify-add" v-has="'snmp_mibFile_add'" :title="$t('config.system.notification.create')" class="top-tool-btn margin-r-10" type="button" @click="addNotify"> <button id="notify-add" v-has="'snmp_mibFile_add'" :title="$t('config.system.notification.create')" class="top-tool-btn" type="button" @click="addNotify">
<i class="nz-icon-create-square nz-icon"></i> <i class="nz-icon-create-square nz-icon"></i>
</button> </button>
</template> </template>