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

This commit is contained in:
@changcode
2021-10-26 17:47:56 +08:00
13 changed files with 140 additions and 695 deletions

View File

@@ -233,101 +233,5 @@ export default {
}
</style>
<style scoped lang="scss">
.order-box{
display: flex;
height:40px;
padding: 0 15px;
line-height: 40px;
align-items: center;
/*.detail-select{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* flex: 1;*/
/* /deep/ .el-input--small{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* input{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* }*/
/* }*/
/*}*/
/*.detail-select:hover{*/
/* /deep/ .el-input--small{*/
/* input{*/
/* background-color: rgba(9,30,66,0.13);*/
/* }*/
/* }*/
/*}*/
/*.detail-button{*/
/* height: 28px;*/
/* line-height: 28px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* .nz-icon{*/
/* color: #344563;*/
/* }*/
/*}*/
/*.detail-button:hover{*/
/* background-color: rgba(9,30,66,0.13);*/
/*}*/
}
.detail-row-box{
height: calc(100% - 40px);
overflow: hidden;
overflow-y: auto;
}
.detail-row{
width: 245px;
padding: 0px 0 0px 15px;
height: 60px;
border-bottom: 1px solid #E7EAED;
cursor: pointer;
}
.detail-row:last-of-type{
border-bottom: none
}
.detail-row-info{
display: flex;
height: 100%;
width: calc(100% - 15px);
justify-content:center;
flex-direction: column;
> div{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.asset-manageIp{
font-size: 16px;
color: #333333;
font-weight: 400;
}
.asset-name {
padding-left: 22px;
width: calc(100% - 22px);
font-size: 14px;
color: #999999;
font-weight: 400;
}
}
.selected{
background: #FFFBF6;
}
.colorEF7458{
color: #EF7458;
}
.color23BF9A{
color: #23BF9A;
}
.colorFA901C{
color: #fa901c;
}
@import '../detailList';
</style>

View File

@@ -27,11 +27,7 @@
@mouseleave="labelHover(item, 'asset', false)">
<div class="detail-row-info">
<div class="asset-manageIp">
<span v-if="item.pingInfo" >
<span :class="{'active-icon green-bg':item.pingInfo.status == 1,'active-icon red-bg':item.pingInfo.status == 0}"></span>
</span>
<span v-else style="display: inline-block;width: 13px">
</span>
<i class="nz-icon nz-icon-overview-alert" :class="item.alertNum>0?'colorEF7458':'color23BF9A'"/>
{{item.name}}
</div>
<div class="asset-name" :title="item.manageIp">{{item.manageIp}}</div>
@@ -178,92 +174,5 @@ export default {
</script>
<style scoped lang="scss">
.order-box{
display: flex;
height:40px;
padding: 0 15px;
line-height: 40px;
align-items: center;
/*.detail-select{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* flex: 1;*/
/* /deep/ .el-input--small{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* input{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* }*/
/* }*/
/*}*/
/*.detail-select:hover{*/
/* /deep/ .el-input--small{*/
/* input{*/
/* background-color: rgba(9,30,66,0.13);*/
/* }*/
/* }*/
/*}*/
/*.detail-button{*/
/* height: 28px;*/
/* line-height: 28px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* .nz-icon{*/
/* color: #344563;*/
/* }*/
/*}*/
/*.detail-button:hover{*/
/* background-color: rgba(9,30,66,0.13);*/
/*}*/
}
.detail-row-box{
height: calc(100% - 40px);
overflow: hidden;
overflow-y: auto;
}
.detail-row{
width: 245px;
padding: 0px 0 0px 15px;
height: 60px;
border-bottom: 1px solid #E7EAED;
cursor: pointer;
}
.detail-row:last-of-type{
border-bottom: none
}
.detail-row-info{
display: flex;
height: 100%;
width: calc(100% - 15px);
justify-content:center;
flex-direction: column;
> div{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.asset-manageIp{
font-size: 16px;
color: #333333;
font-weight: 400;
}
.asset-name {
padding-left: 22px;
width: calc(100% - 22px);
font-size: 14px;
color: #999999;
font-weight: 400;
}
}
.selected{
background: #FFFBF6;
}
@import '../detailList';
</style>

View File

@@ -161,101 +161,5 @@ export default {
</script>
<style scoped lang="scss">
.order-box{
display: flex;
height:40px;
padding: 0 15px;
line-height: 40px;
align-items: center;
/*.detail-select{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* flex: 1;*/
/* /deep/ .el-input--small{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* input{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* }*/
/* }*/
/*}*/
/*.detail-select:hover{*/
/* /deep/ .el-input--small{*/
/* input{*/
/* background-color: rgba(9,30,66,0.13);*/
/* }*/
/* }*/
/*}*/
/*.detail-button{*/
/* height: 28px;*/
/* line-height: 28px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* .nz-icon{*/
/* color: #344563;*/
/* }*/
/*}*/
/*.detail-button:hover{*/
/* background-color: rgba(9,30,66,0.13);*/
/*}*/
}
.detail-row-box{
height: calc(100% - 40px);
overflow: hidden;
overflow-y: auto;
}
.detail-row{
width: 245px;
padding: 0px 0 0px 15px;
height: 60px;
border-bottom: 1px solid #E7EAED;
cursor: pointer;
}
.detail-row:last-of-type{
border-bottom: none
}
.detail-row-info{
display: flex;
height: 100%;
width: calc(100% - 15px);
justify-content:center;
flex-direction: column;
> div{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.asset-manageIp{
font-size: 16px;
color: #333333;
font-weight: 400;
}
.asset-name {
padding-left: 22px;
width: calc(100% - 22px);
font-size: 14px;
color: #999999;
font-weight: 400;
}
}
.selected{
background: #FFFBF6;
}
.colorEF7458{
color: #EF7458;
}
.color23BF9A{
color: #23BF9A;
}
.colorFA901C{
color: #fa901c;
}
@import '../detailList';
</style>

View File

@@ -0,0 +1,101 @@
.order-box{
display: flex;
height:40px;
padding: 0 15px;
line-height: 40px;
align-items: center;
/*.detail-select{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* flex: 1;*/
/* /deep/ .el-input--small{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* input{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* }*/
/* }*/
/*}*/
/*.detail-select:hover{*/
/* /deep/ .el-input--small{*/
/* input{*/
/* background-color: rgba(9,30,66,0.13);*/
/* }*/
/* }*/
/*}*/
/*.detail-button{*/
/* height: 28px;*/
/* line-height: 28px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* .nz-icon{*/
/* color: #344563;*/
/* }*/
/*}*/
/*.detail-button:hover{*/
/* background-color: rgba(9,30,66,0.13);*/
/*}*/
}
.detail-row-box{
height: calc(100% - 40px);
overflow: hidden;
overflow-y: auto;
}
.detail-row{
width: 245px;
padding: 0px 0 0px 15px;
height: 60px;
border-bottom: 1px solid #E7EAED;
cursor: pointer;
}
.detail-row:last-of-type{
border-bottom: none
}
.detail-row-info{
display: flex;
height: 100%;
width: calc(100% - 15px);
justify-content:center;
flex-direction: column;
> div{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.asset-manageIp{
font-size: 16px;
color: #333333;
font-weight: 400;
.nz-icon{
font-size: 14px;
padding-right: 2px;
}
}
.asset-name {
padding-left: 22px;
width: calc(100% - 22px);
font-size: 14px;
color: #999999;
font-weight: 400;
}
}
.selected{
background: #FFFBF6;
}
.colorEF7458{
color: #EF7458;
}
.color23BF9A{
color: #23BF9A;
}
.colorFA901C{
color: #fa901c;
}

View File

@@ -158,101 +158,5 @@ export default {
</script>
<style scoped lang="scss">
.order-box{
display: flex;
height:40px;
padding: 0 15px;
line-height: 40px;
align-items: center;
/*.detail-select{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* flex: 1;*/
/* /deep/ .el-input--small{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* input{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* }*/
/* }*/
/*}*/
/*.detail-select:hover{*/
/* /deep/ .el-input--small{*/
/* input{*/
/* background-color: rgba(9,30,66,0.13);*/
/* }*/
/* }*/
/*}*/
/*.detail-button{*/
/* height: 28px;*/
/* line-height: 28px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* .nz-icon{*/
/* color: #344563;*/
/* }*/
/*}*/
/*.detail-button:hover{*/
/* background-color: rgba(9,30,66,0.13);*/
/*}*/
}
.detail-row-box{
height: calc(100% - 40px);
overflow: hidden;
overflow-y: auto;
}
.detail-row{
width: 245px;
padding: 0px 0 0px 15px;
height: 60px;
border-bottom: 1px solid #E7EAED;
cursor: pointer;
}
.detail-row:last-of-type{
border-bottom: none
}
.detail-row-info{
display: flex;
height: 100%;
width: calc(100% - 15px);
justify-content:center;
flex-direction: column;
> div{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.asset-manageIp{
font-size: 16px;
color: #333333;
font-weight: 400;
}
.asset-name {
padding-left: 22px;
width: calc(100% - 22px);
font-size: 14px;
color: #999999;
font-weight: 400;
}
}
.selected{
background: #FFFBF6;
}
.colorEF7458{
color: #EF7458;
}
.color23BF9A{
color: #23BF9A;
}
.colorFA901C{
color: #fa901c;
}
@import '../detailList';
</style>

View File

@@ -140,101 +140,5 @@ export default {
</script>
<style scoped lang="scss">
.order-box{
display: flex;
height:40px;
padding: 0 15px;
line-height: 40px;
align-items: center;
/*.detail-select{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* flex: 1;*/
/* /deep/ .el-input--small{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* input{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* }*/
/* }*/
/*}*/
/*.detail-select:hover{*/
/* /deep/ .el-input--small{*/
/* input{*/
/* background-color: rgba(9,30,66,0.13);*/
/* }*/
/* }*/
/*}*/
/*.detail-button{*/
/* height: 28px;*/
/* line-height: 28px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* .nz-icon{*/
/* color: #344563;*/
/* }*/
/*}*/
/*.detail-button:hover{*/
/* background-color: rgba(9,30,66,0.13);*/
/*}*/
}
.detail-row-box{
height: calc(100% - 40px);
overflow: hidden;
overflow-y: auto;
}
.detail-row{
width: 245px;
padding: 0px 0 0px 15px;
height: 60px;
border-bottom: 1px solid #E7EAED;
cursor: pointer;
}
.detail-row:last-of-type{
border-bottom: none
}
.detail-row-info{
display: flex;
height: 100%;
width: calc(100% - 15px);
justify-content:center;
flex-direction: column;
> div{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.asset-manageIp{
font-size: 16px;
color: #333333;
font-weight: 400;
}
.asset-name {
padding-left: 22px;
width: calc(100% - 22px);
font-size: 14px;
color: #999999;
font-weight: 400;
}
}
.selected{
background: #FFFBF6;
}
.colorEF7458{
color: #EF7458;
}
.color23BF9A{
color: #23BF9A;
}
.colorFA901C{
color: #fa901c;
}
@import '../detailList';
</style>

View File

@@ -163,101 +163,5 @@ export default {
</script>
<style scoped lang="scss">
.order-box{
display: flex;
height:40px;
padding: 0 15px;
line-height: 40px;
align-items: center;
/*.detail-select{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* flex: 1;*/
/* /deep/ .el-input--small{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* input{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* }*/
/* }*/
/*}*/
/*.detail-select:hover{*/
/* /deep/ .el-input--small{*/
/* input{*/
/* background-color: rgba(9,30,66,0.13);*/
/* }*/
/* }*/
/*}*/
/*.detail-button{*/
/* height: 28px;*/
/* line-height: 28px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* .nz-icon{*/
/* color: #344563;*/
/* }*/
/*}*/
/*.detail-button:hover{*/
/* background-color: rgba(9,30,66,0.13);*/
/*}*/
}
.detail-row-box{
height: calc(100% - 40px);
overflow: hidden;
overflow-y: auto;
}
.detail-row{
width: 245px;
padding: 0px 0 0px 15px;
height: 60px;
border-bottom: 1px solid #E7EAED;
cursor: pointer;
}
.detail-row:last-of-type{
border-bottom: none
}
.detail-row-info{
display: flex;
height: 100%;
width: calc(100% - 15px);
justify-content:center;
flex-direction: column;
> div{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.asset-manageIp{
font-size: 16px;
color: #333333;
font-weight: 400;
}
.asset-name {
padding-left: 22px;
width: calc(100% - 22px);
font-size: 14px;
color: #999999;
font-weight: 400;
}
}
.selected{
background: #FFFBF6;
}
.colorEF7458{
color: #EF7458;
}
.color23BF9A{
color: #23BF9A;
}
.colorFA901C{
color: #fa901c;
}
@import '../detailList';
</style>

View File

@@ -138,101 +138,5 @@ export default {
</script>
<style scoped lang="scss">
.order-box{
display: flex;
height:40px;
padding: 0 15px;
line-height: 40px;
align-items: center;
/*.detail-select{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* flex: 1;*/
/* /deep/ .el-input--small{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* input{*/
/* height: 30px;*/
/* line-height: 30px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* color: #344563;*/
/* }*/
/* }*/
/*}*/
/*.detail-select:hover{*/
/* /deep/ .el-input--small{*/
/* input{*/
/* background-color: rgba(9,30,66,0.13);*/
/* }*/
/* }*/
/*}*/
/*.detail-button{*/
/* height: 28px;*/
/* line-height: 28px;*/
/* background-color: rgba(9,30,66,0.08);*/
/* border: none;*/
/* .nz-icon{*/
/* color: #344563;*/
/* }*/
/*}*/
/*.detail-button:hover{*/
/* background-color: rgba(9,30,66,0.13);*/
/*}*/
}
.detail-row-box{
height: calc(100% - 40px);
overflow: hidden;
overflow-y: auto;
}
.detail-row{
width: 245px;
padding: 0px 0 0px 15px;
height: 60px;
border-bottom: 1px solid #E7EAED;
cursor: pointer;
}
.detail-row:last-of-type{
border-bottom: none
}
.detail-row-info{
display: flex;
height: 100%;
width: calc(100% - 15px);
justify-content:center;
flex-direction: column;
> div{
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.asset-manageIp{
font-size: 16px;
color: #333333;
font-weight: 400;
}
.asset-name {
/*padding-left: 22px;*/
/*width: calc(100% - 22px);*/
font-size: 14px;
color: #999999;
font-weight: 400;
}
}
.selected{
background: #FFFBF6;
}
.colorEF7458{
color: #EF7458;
}
.color23BF9A{
color: #23BF9A;
}
.colorFA901C{
color: #fa901c;
}
@import '../detailList';
</style>

View File

@@ -225,6 +225,7 @@ export default {
} else {
this.dataListLayout.push('clickSearch')
}
localStorage.setItem('dataList-layout' + this.tableId, JSON.stringify(this.dataListLayout))
},
addSilence (row, type) {
this.blankSilenceObject.startAt = bus.timeFormate(bus.getOffsetTimezoneData(), 'yyyy-MM-dd hh:mm:ss')

View File

@@ -460,16 +460,17 @@ export default {
<style lang="scss" scoped>
.tooltip-box{
background: #FFFFFF;
box-shadow: 1px 2px 8px 0 rgba(0,0,0,0.11);
border-radius: 4px;
padding: 10px;
max-height: 400px;
min-height: 200px;
height: 100%;
box-sizing: border-box;
.tooltip-box-chart{
padding: 10px;
max-height: 400px;
min-height: 200px;
height: 100%;
box-sizing: border-box;
background: #FFFFFF;
border: 1px solid #E7EAED;
box-shadow: 0 6px 16px 0 rgba(0,0,0,0.08);
border-radius: 3px 3px 3px 3px;
.tooltip-box-chart{
max-height: 400px;
min-height: 200px;
height: 100%;
@@ -491,10 +492,11 @@ export default {
font-weight: 400;
word-break: break-word;
padding-right: 5px;
height: calc(100% - 24px) !important;
margin-top: 24px;
height: calc(100% - 29px) !important;
margin-top: 29px;
padding-top: 5px;
line-height: 16px;
border-top: 1px dashed #DCE1E7;
}
}
.tooltip-box-info{
@@ -505,14 +507,18 @@ export default {
min-width: 186px;
max-width: 300px;
}
/deep/ .line-area{
padding: 0;
}
}
/deep/ .topology-chart-title{
text-align: left;
width: 100%;
line-height: 20px;
height: 24px;
padding: 5px 10px 0 10px;
box-sizing: border-box;
text-align: left;
width: 100%;
line-height: 19px;
padding: 5px 0 5px 10px;
height: 29px;
box-sizing: border-box;
border-bottom: 1px dashed #DCE1E7;
}
.topology-tool-tip /deep/ .topology-chart-title{
margin-top: -23px;

View File

@@ -8,7 +8,7 @@
:api="url"
:custom-table-title.sync="tools.customTableTitle"
:from="fromRoute.alertMessage"
:layout="['searchInput', 'elementSet', 'clickSearch', 'pagination']"
:layout="dataListLayout"
:search-msg="searchMsg"
@search="search"
v-loading="tools.loading"
@@ -17,6 +17,9 @@
<el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-public-box-select-top right-public-box-dropdown-top">
<el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<button id="asset-filter" :class="[dataListLayout.indexOf('clickSearch') > -1?'is-focus':'' ]" class="top-tool-btn margin-r-10" @click.stop="showClickSearch">
<i class="nz-icon nz-icon-funnel"></i>
</button>
<pick-time v-model="searchTime" :default-pick="12" :refresh-data-func="getTableData" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
<button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcelLower')" class="top-tool-btn margin-r-10"
type="button" @click="showExportDialog">
@@ -154,6 +157,7 @@ export default {
return {
chartLoading: false,
stateOptions: alertMessageConstant.states,
dataListLayout: localStorage.getItem('dataList-layout' + 'alertMessageTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'alertMessageTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination'],
state: '1',
dialogShowText: false,
dialogText: '',

View File

@@ -213,7 +213,7 @@ export default {
batchShow: false
},
silenceBoxShow: false,
dataListLayout: ['searchInput', 'elementSet', 'clickSearch', 'pagination', 'detailViewSet'],
dataListLayout: localStorage.getItem('dataList-layout' + 'assetTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'assetTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination', 'detailViewSet'],
assetNzTableHeightOffset: 281, // 包含click-search时nz-table的高度
blankObject: {
id: '',

View File

@@ -317,7 +317,7 @@ export default {
tableId: 'endpointTable',
queryPermission: 'account_view',
endpointTableHeight: 'calc(100% - 244px)', // 主列表table高度
dataListLayout: ['searchInput', 'elementSet', 'clickSearch', 'pagination', 'detailViewSet'],
dataListLayout: localStorage.getItem('dataList-layout' + 'endpointTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'endpointTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination', 'detailViewSet'],
searchMsg: { // 给搜索框子组件传递的信息
zheze_none: true,
searchLabelList: [