style:样式调整

This commit is contained in:
zhangyu
2020-09-09 15:32:44 +08:00
parent 444e412458
commit ad8e8cb85d
8 changed files with 107 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 501 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 B

View File

@@ -14,6 +14,21 @@
<div class="right-box-title">Alert messages</div> <div class="right-box-title">Alert messages</div>
<!-- end--标题--> <!-- end--标题-->
<!-- begin搜素框-->
<div class="top-tools">
<div class="top-tool-main-right" :class="{'top-tool-main-right-to-left': false}">
<div class="top-tool-search">
<search-input :searchMsg="searchMsg" @search="search" :bottomBox.inTransform="true"></search-input>
</div>
<!--<button type="button" @click="showExportDialog" :title="$t('overall.exportExcelLower')"-->
<!--class="nz-btn nz-btn-size-normal nz-btn-style-light margin-l-20" id="alert-list-export">-->
<!--<i class="el-icon-download"></i>-->
<!--</button>-->
</div>
<div class="pagination-top pagination-top-hide display-none"></div>
</div>
<!-- end搜素框-->
<!-- begin--表格--> <!-- begin--表格-->
<el-scrollbar class="right-box-form-box"> <el-scrollbar class="right-box-form-box">
<el-table <el-table
@@ -235,6 +250,58 @@
width: 150 width: 150
}, },
], ],
searchMsg: { //给搜索框子组件传递的信息
zheze_none: true,
searchLabelList: [{
id: 1,
name: this.$t('alert.alertName'),
type: 'input',
label: 'alertName',
disabled: false
}, /*{
id: 3,
name: this.$t('alert.list.type'),
type: 'select',
label: 'alertType',
disabled: false
}, */{
id: 20,
name: this.$t('alert.severity'),
type: 'selectString',
label: 'severity',
disabled: false
}, {
id: 21,
name: this.$t('asset.asset'),
type: 'asset',
label: 'asset',
disabled: false
}, {
id:22,
name: this.$t('project.project.project'),
type: 'project',
label: 'project',
disabled: false
}, {
id:23,
name: this.$t('project.module.module'),
type: 'module',
label: 'module',
disabled: false
}, {
id:24,
name: this.$t('project.endpoint.endpoint'),
type: 'input',
label: 'endpointId',
disabled: false
}, {
id:25,
name: this.$t('alert.list.state'),
type: 'select',
label: 'alertMessageState',
disabled: false
}],
},
tableData:[], tableData:[],
loading:false, loading:false,
tableHeight:'100%', tableHeight:'100%',
@@ -350,6 +417,30 @@
clickOutside() { clickOutside() {
this.esc(false); this.esc(false);
}, },
search(searchObj) {
let orderBy='';
if(this.searchLabel.orderBy){
orderBy=this.searchLabel.orderBy
}
this.searchLabel = {};
this.pageObj.pageNo = 1;
for (let item in searchObj) {
if (searchObj[item]) {
if (item == "alertMessageState") {
this.$set(this.searchLabel, "state", searchObj[item]);
} else{
this.$set(this.searchLabel, item, searchObj[item]);
}
}
}
if(orderBy){
this.$set(this.searchLabel, 'orderBy', orderBy);
}
this.getAlertList();
},
showExportDialog() {
this.importBox.show = true;
},
}, },
} }
@@ -371,6 +462,12 @@
left: 0; left: 0;
z-index: 11; z-index: 11;
} }
.top-tools{
float: right;
}
/deep/ .top-tools>div{
margin-top: 3px;
}
/* end--table*/ /* end--table*/
</style> </style>

View File

@@ -100,9 +100,9 @@
new Date(bus.computeTimezone(new Date().getTime())) new Date(bus.computeTimezone(new Date().getTime()))
], ],
projectInfo:{ projectInfo:{
title:'Project information', title:'',
id:'1', id:'',
remark:'系统内置project展示系统基础信息', remark:'',
alertStat:[1,2,3], alertStat:[1,2,3],
moduleMum:6, moduleMum:6,
loading:true, loading:true,

View File

@@ -36,7 +36,7 @@
<div class="facade-top" v-if="!editVisNetwork"> <div class="facade-top" v-if="!editVisNetwork">
<div class="facade-top-left" v-loading="projectInfo.loading"> <div class="facade-top-left" v-loading="projectInfo.loading">
<div class="facade-top-title"> <div class="facade-top-title">
{{projectInfo.title}} Project information
</div> </div>
<div> <div>
<!--<span><span class="label">Id :</span>{{projectInfo.id}}</span>--> <!--<span><span class="label">Id :</span>{{projectInfo.id}}</span>-->
@@ -57,7 +57,7 @@
<span><span class="label">Module Mum :</span>{{projectInfo.moduleMum}}</span> <span><span class="label">Module Mum :</span>{{projectInfo.moduleMum}}</span>
</div> </div>
</div> </div>
<div class="facade-top-right" v-loading="projectInfo.loading"> <div class="facade-top-right" v-loading="projectInfo.loading" style="padding: 20px 20px 0 20px;height: calc(100% - 20px);">
<div class="facade-top-title"> <div class="facade-top-title">
<span class="label" style="padding-left: 0;">Alert :</span> <span class="label" style="padding-left: 0;">Alert :</span>
{{total}} {{total}}
@@ -79,7 +79,7 @@
{{projectInfo.alertStat[1] || 0}} {{projectInfo.alertStat[1] || 0}}
</div> </div>
</div> </div>
<div> <div style="margin-bottom: 20px;">
<div class="content-low-title"> <div class="content-low-title">
{{returnSeverityLabel('low')}} {{returnSeverityLabel('low')}}
</div> </div>
@@ -104,6 +104,7 @@
@reload="reload" @reload="reload"
> >
</topology> </topology>
<!--<other />-->
</div> </div>
</div> </div>
@@ -115,12 +116,14 @@
import loading from "@/components/common/loading"; import loading from "@/components/common/loading";
import timePicker from '@/components/common/timePicker'; import timePicker from '@/components/common/timePicker';
import topology from './topology' import topology from './topology'
import other from './other'
export default { export default {
name: 'visNetwork', name: 'visNetwork',
components: { components: {
'loading': loading, 'loading': loading,
'time-picker':timePicker, 'time-picker':timePicker,
'topology':topology, 'topology':topology,
other
}, },
props:{ props:{
chartIndex:{ chartIndex:{
@@ -390,6 +393,7 @@
justify-content: space-between; justify-content: space-between;
color: #fff; color: #fff;
text-align: center; text-align: center;
margin-bottom: 5px;
} }
.facade-top-right-content > div > div:last-child{ .facade-top-right-content > div > div:last-child{
text-align: center; text-align: center;