diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index 713da357c..5ea9cc41f 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -229,6 +229,7 @@ height: 49px; border-bottom: 1px solid $--right-box-border-color; background-color: white; + box-sizing: content-box; } thead { color: #333; diff --git a/nezha-fronted/src/components/charts/chart-list-group.vue b/nezha-fronted/src/components/charts/chart-list-group.vue index 389088c32..0d5279e32 100644 --- a/nezha-fronted/src/components/charts/chart-list-group.vue +++ b/nezha-fronted/src/components/charts/chart-list-group.vue @@ -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 = '' diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 5f2b26992..c85a176be 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -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) { // 模板列表 - this.panelDataList[0].children.forEach((item1, i) => { - item1.chartIndex = i - }) + 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) => { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue index 6a3c7c2d9..3208d2c39 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue @@ -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; diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index b9c9a24ed..39453cd03 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -14,6 +14,7 @@ @header-dragend="dragend" @sort-change="tableDataSort" @selection-change="selectionChange" + @row-dblclick="(row)=>{$emit('messageDetail', row)}" >