gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
@changcode
2021-05-25 17:58:49 +08:00
parent 7bb2975867 51016fd361
commit b65cb0625e
18 changed files with 45 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/assets/css/common/tableCommon.scss
View File

@@ -229,6 +229,7 @@
height: 49px;
border-bottom: 1px solid $--right-box-border-color;
background-color: white;
box-sizing: content-box;
}
thead {
color: #333;

3
nezha-fronted/src/components/charts/chart-list-group.vue
View File

@@ -643,7 +643,7 @@ export default {
this.modelStaticData(chartInfo, filterType)
} else {
// 没有数据的设置提示信息暂无数据-针对每一个图
const len = chartItem.elements.length
const len = chartItem.elements ? chartItem.elements.length : 0
if (len === 0) {
this.$nextTick(() => {
if (this.$refs['editChart' + chartItem.id] && this.$refs['editChart' + chartItem.id].length > 0) {
@@ -693,7 +693,6 @@ export default {
})
// 一个图表的所有element单独获取数据
axios.all(axiosArr).then((res) => {
if (res.length > 0) {
const series = []
let singleStatRlt = ''

3
nezha-fronted/src/components/charts/chart-list.vue
View File

@@ -315,7 +315,6 @@ export default {
this.tempDom.width = span.offsetWidth
},
start (event) {
// console.log('start', event, this.dataList);
event.item.querySelector('.chartTitle').style.background = '#d8dce1'
const projectAndAssetFeatureInfos = event.item.querySelectorAll('.feature-content')
if (projectAndAssetFeatureInfos && projectAndAssetFeatureInfos.length > 0) {
@@ -611,9 +610,11 @@ export default {
return
}
if (param.from == fromRoute.chartTemp) { // 模板列表
if (this.panelDataList[0] && this.panelDataList[0].children) {
this.panelDataList[0].children.forEach((item1, i) => {
item1.chartIndex = i
})
}
this.dataList = this.panelDataList
this.$nextTick(() => {
this.dataList.forEach((item, index) => {

2
nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
View File

@@ -357,7 +357,7 @@ export default {
.record-console {
padding: 10px 4px 10px 10px;
background-color: black;
height: calc(100% - 80px);
height: calc(100% - 65px);
}
.terminal-replay-progress {
height: 20px;

3
nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
View File

@@ -14,6 +14,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{$emit('messageDetail', row)}"
>
<el-table-column
:resizable="false"
@@ -169,7 +170,7 @@ export default {
label: 'ID',
prop: 'id',
show: true,
width: 80,
width: 160,
sortable: 'custom'
}, {
label: this.$t('alert.rule'),

3
nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
View File

@@ -4,10 +4,12 @@
ref="dataTable"
:data="tableData"
:height="height"
tooltip-effect="light"
border
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{queryMessage(row)}"
>
<el-table-column
:resizable="false"
@@ -27,6 +29,7 @@
:sort-orders="['ascending', 'descending']"
:sortable="item.sortable"
:width="`${item.width}`"
:show-overflow-tooltip="item.prop === 'description'"
class="data-column"
>
<template slot="header">

6
nezha-fronted/src/components/common/table/asset/assetMetaTable.vue
View File

@@ -100,29 +100,33 @@ export default {
label: this.$t('config.assetLabel.name'),
prop: 'name',
show: true,
width: 100,
sortable: 'custom'
}, {
label: this.$t('config.assetLabel.key'),
prop: 'metaKey',
show: true,
width: 200,
sortable: 'custom'
}, {
label: this.$t('config.assetLabel.group'),
prop: 'group',
show: true,
width: 200,
sortable: 'custom'
}, {
label: this.$t('config.assetLabel.search'),
prop: 'search',
width: 120,
show: true
}, {
label: this.$t('config.assetLabel.display'),
prop: 'display',
width: 120,
show: true
}, {
label: this.$t('config.assetLabel.type'),
prop: 'type',
width: 150,
show: true
}, {
label: this.$t('config.assetLabel.params'),

1
nezha-fronted/src/components/common/table/asset/assetTable.vue
View File

@@ -8,6 +8,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{$emit('showBottomBox', 'panelTab', row)}"
>
<el-table-column
:resizable="false"

1
nezha-fronted/src/components/common/table/settings/chartTmplTable.vue
View File

@@ -8,6 +8,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{showBottomBox('panel', row)}"
>
<el-table-column
:resizable="false"

1
nezha-fronted/src/components/common/table/settings/endpointTable.vue
View File

@@ -8,6 +8,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{$emit('showBottomBox', 'panelTab', row)}"
>
<el-table-column
:resizable="false"

16
nezha-fronted/src/components/common/table/settings/modelTable.vue
View File

@@ -95,24 +95,24 @@ export default {
label: this.$t('config.model.name'),
prop: 'name',
show: true,
width: 450,
width: 350,
sortable: 'custom'
}, {
label: this.$t('config.model.brand'),
prop: 'brand',
show: true,
width: 160,
width: 200,
sortable: 'custom'
}, {
label: this.$t('config.model.assetNum'),
prop: 'assetNum',
show: true,
width: 120,
sortable: 'custom'
}, {
label: this.$t('config.model.remark'),
prop: 'remark',
show: true
}, {
label: this.$t('config.model.assetNum'),
prop: 'assetNum',
show: true,
width: 200,
sortable: 'custom'
}
]
}

11
nezha-fronted/src/components/common/table/settings/moduleTable.vue
View File

@@ -8,6 +8,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{showBottomBox('endpoint', row)}"
>
<el-table-column
:resizable="false"
@@ -104,31 +105,31 @@ export default {
label: this.$t('project.module.type'),
prop: 'type',
show: false,
width: 150
width: 200
}, {
label: this.$t('project.project.projectName'),
prop: 'project',
show: true,
width: 150,
width: 200,
sortable: 'custom'
},
{
label: this.$t('project.endpoint.endpoint'),
prop: 'endpointNum',
show: true,
width: 150,
width: 200,
sortable: 'custom'
}, {
label: this.$t('project.module.alerts'),
prop: 'alertNum',
show: true,
width: 150,
width: 200,
sortable: 'custom'
},
{
label: this.$t('overall.remark'),
prop: 'remark',
show: false,
show: true,
minWidth: 150
}
]

1
nezha-fronted/src/components/common/table/settings/projectTable.vue
View File

@@ -9,6 +9,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{changeProjectTopo(row)}"
>
<el-table-column
:resizable="false"

1
nezha-fronted/src/components/common/table/settings/terminalLogTable.vue
View File

@@ -8,6 +8,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{showBottomBox(row.status==0 ? 'monitorTab' : 'cmdTab', row)}"
>
<el-table-column
:resizable="false"

1
nezha-fronted/src/components/common/table/settings/userTable.vue
View File

@@ -8,6 +8,7 @@
@header-dragend="dragend"
@sort-change="tableDataSort"
@selection-change="selectionChange"
@row-dblclick="(row)=>{showBottomBox('operationLogTab', row)}"
>
<el-table-column
:resizable="false"

1
nezha-fronted/src/components/layout/container.vue
View File

@@ -20,7 +20,6 @@ export default {
height: calc(100% - 50px);
background-color: #f6f6f6;
width: 100%;
padding-right: 10px;
&>div {
height: 100%;
}

2
nezha-fronted/src/components/page/config/about.vue
View File

@@ -49,7 +49,7 @@ export default {
justify-content: center;
height: 100%;
background-color: white;
border: 10px solid #eee;
border: 10px solid #f6f6f6;
box-sizing: border-box;
.about-label {

2
nezha-fronted/src/components/page/dashboard/overview/overview2.scss
View File

@@ -1,6 +1,6 @@
.overview {
height: calc(100% - 20px) !important;
padding: 0 0 0 10px;
padding: 0 10px;
background-color: #f6f6f6;
}
.overview-content-header{