diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 19871f333..e200c4310 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -48,6 +48,10 @@ padding: 5px 70px 4px 10px; } } +.right-box__container.pens-data{ + height: 100%; + padding: 0; +} .right-box__container { color: $--color-text-regular; .right-box-form{ diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss new file mode 100644 index 000000000..eccda1174 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss @@ -0,0 +1,9 @@ +.topo-header { + height: 60px; + box-sizing: border-box; + padding: 14px 20px 14px 10px; + display: flex; + .tools-left{ + display: flex; + } +} diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss new file mode 100644 index 000000000..5b36d64b0 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss @@ -0,0 +1,17 @@ +.meta2d-box{ + width: 100%; + height: 100%; + position: relative; +} +.meta2d-main{ + width: 100%; + height: 100%; +} +.meta2d-chart{ + +} +.meta2d-project{ + height: calc(100% - 78px); + border: 1px solid; + border-color: $--border-color-light; +} diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss new file mode 100644 index 000000000..cb86ec777 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss @@ -0,0 +1,51 @@ +.meta2d-box { + .el-tab-pane{ + height: 100%; + } + .props-box { + width: 500px; + position: absolute; + height: calc(100% - 78px); + top: 61px; + padding: 0 !important; + box-sizing: border-box; + right: 0; + } + .form-row-item{ + vertical-align: top; + width: calc(50% - 15px); + display: inline-block; + box-sizing: border-box; + padding: 0 5px; + margin-bottom: 10px; + .form-row-key{ + margin-bottom: 5px; + } + } + .special-meta2d-select { + .el-input.el-input--prefix.el-input--suffix{ + border: 1px solid $--border-color-light; + height: 28px; + } + .el-select--small{ + width: 100%; + } + .el-input__inner{ + display: none; + } + } + .form-row-item-full{ + width: 100%; + } + .form-row-item:nth-of-type(even) { + /*margin-left: 10px;*/ + } + .form-row-title{ + display: flex; + justify-content: space-between; + margin-bottom: 15px; + } + .form-row-content{ + margin-bottom: 5px; + } +} diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 7fe5b2d04..0e9f4cf1d 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -37,6 +37,9 @@ @import './common/project/L5/topologyTopTool.scss'; @import './common/project/L5/topoTooltip.scss'; @import './common/project/chart.scss'; +@import './common/project/meta2dHeader.scss'; +@import './common/project/meta2dMain.scss'; +@import './common/project/meta2dProps.scss'; @import './common/project/topology.scss'; @import './common/project/topologyL5.scss'; @import './common/rightBox/asset/assetBox.scss'; diff --git a/nezha-fronted/src/components/common/mixin/beforeMeta2d.js b/nezha-fronted/src/components/common/mixin/beforeMeta2d.js index 494055063..1b31433f9 100644 --- a/nezha-fronted/src/components/common/mixin/beforeMeta2d.js +++ b/nezha-fronted/src/components/common/mixin/beforeMeta2d.js @@ -3,7 +3,8 @@ export default { return { topoData: {}, querysArray: {}, - meta2dType: '' + meta2dType: '', + timeType: 1, } }, mounted () { @@ -26,6 +27,7 @@ export default { } this.topoData = res.topo this.querysArray = res.elements + this.timeType = res.timeType || 1 }) } } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dData.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dData.vue index e58205c0a..b409c1af7 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dData.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dData.vue @@ -1,12 +1,390 @@ diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 84c6aec9f..0dab2d59d 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -851,41 +851,5 @@ export default { diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue index cd6cb1f31..4de66a718 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue @@ -94,13 +94,5 @@ export default { diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 037cb74a7..0bda3d352 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -4,7 +4,7 @@
- + @@ -12,6 +12,7 @@ import meta2dHeader from '@/components/common/project/meta2d/meta2dHeader' import meta2dProps from '@/components/common/project/meta2d/meta2dProps' import meta2dMain from '@/components/common/project/meta2d/js/meta2dMain' +import { getTopology, setTopology } from '@/components/common/js/common' export default { name: 'meta2dMain', mixins: [meta2dMain], @@ -23,6 +24,7 @@ export default { default: false }, querysArray: {}, + timeType: {}, projectName: {} }, components: { @@ -41,27 +43,15 @@ export default { }, methods: { + }, + beforeDestroy () { + getTopology(this.meta2dId).destroy() + setTopology(this.meta2dId, null) } } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dProps.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dProps.vue index ad5dfcebe..eae4e7e73 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dProps.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dProps.vue @@ -8,7 +8,7 @@ - + @@ -22,7 +22,8 @@ export default { name: 'meta2dProps', props: { selectPens: {}, - querysArray: {} + querysArray: {}, + timeType: {} }, components: { meta2dElement, @@ -61,13 +62,5 @@ export default { diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue index 126cbe9d2..6326e415e 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue @@ -715,6 +715,7 @@ export default { this.oldcCodeLength = 0 this.codeMirrorValue[this.index] = '' // this.expressionList[this.index] = '' + console.log(this.index) this.$set(this.expressionList, this.index, '') this.$emit('change', '') } @@ -1182,6 +1183,7 @@ export default { deep: true, immediate: true, handler (n, o) { + console.log(n) this.codeMirrorValue[this.index] = n[this.index] if (this.isTopo && this.firstInit) { setTimeout(() => { diff --git a/nezha-fronted/src/components/page/monitor/project/project.vue b/nezha-fronted/src/components/page/monitor/project/project.vue index d2a61c39a..f22ef8e76 100644 --- a/nezha-fronted/src/components/page/monitor/project/project.vue +++ b/nezha-fronted/src/components/page/monitor/project/project.vue @@ -1,7 +1,7 @@