diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss index e60eae3d2..99a8337a5 100644 --- a/nezha-fronted/src/assets/css/common/tableCommon.scss +++ b/nezha-fronted/src/assets/css/common/tableCommon.scss @@ -423,6 +423,7 @@ position: absolute; bottom: 1px; height: 48px; + z-index: 1; width: calc(100% - 20px); } } diff --git a/nezha-fronted/src/assets/css/components/page/integration/integration.scss b/nezha-fronted/src/assets/css/components/page/integration/integration.scss index 95534d907..8fd8ac571 100644 --- a/nezha-fronted/src/assets/css/components/page/integration/integration.scss +++ b/nezha-fronted/src/assets/css/components/page/integration/integration.scss @@ -415,6 +415,7 @@ .el-select{ width: 310px; .el-input__inner{ + font-size: 14px; color: $--color-text-primary; } } @@ -450,6 +451,7 @@ height: 36px !important; line-height: 36px !important; padding-left: 12px; + font-size: 14px; color: $--color-text-regular; border-color: $--border-color-light; background: $--select-page-hover-background-color !important; diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue index 64194a4d7..210029540 100644 --- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue +++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue @@ -17,6 +17,7 @@ :show-zoom="false" class="meta2d-chart" :is-chart="true" + :iconArray="iconArray" :ref="'topology' + index" /> @@ -37,7 +38,8 @@ export default { data () { return { topologyLoading: false, - allProject: [] + allProject: [], + iconArray: [] } }, mixins: [chartMixin], @@ -136,6 +138,9 @@ export default { }, mounted () { // this.queryAllProjectData() + this.$get('/topology/icon').then(res => { + this.iconArray = [...res.data.list] + }) }, beforeDestroy () { this.allProject = [] diff --git a/nezha-fronted/src/components/common/mixin/beforeMeta2d.js b/nezha-fronted/src/components/common/mixin/beforeMeta2d.js index 4062f49aa..adb15bcb0 100644 --- a/nezha-fronted/src/components/common/mixin/beforeMeta2d.js +++ b/nezha-fronted/src/components/common/mixin/beforeMeta2d.js @@ -4,7 +4,8 @@ export default { topoData: {}, querysArray: [], meta2dType: '', - params: {} + params: {}, + iconArray: [] } }, watch: { diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js index cba3b49b2..ee7b048fe 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js @@ -73,7 +73,7 @@ export default { nodesArr: [], offsetX: 0, offsetY: 0, - moduleId: '' + moduleId: '', } }, mixins: [topoUtil], @@ -152,8 +152,11 @@ export default { pen.text = name } if (pen.data && pen.data.imageId) { + const imageInfo = this.iconArray.find(item => item.id === pen.data.imageId) pen.imageId = pen.data.imageId - pen.image = `/monitor/project/topo/icon/${pen.data.imageId}/0` + if (imageInfo) { + pen.image = `/topology/icon/0/${imageInfo.unit}/${imageInfo.name}` + } } pen.data = { params: { // 用于编辑时 重置为节点初始状态 diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index d14e82270..269d99725 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -126,6 +126,12 @@ export default { mixins: [meta2dMain, topoUtil], props: { meta2dId: {}, // 唯一id 不可重复 + iconArray: { + type: Array, + default: () => { + return [] + } + }, topoData: {}, // topo图数据 isChart: { type: Boolean, diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue index ce0ec006c..4d9b1efc2 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue @@ -36,7 +36,7 @@
- +
{{btn.imageName}}
@@ -167,12 +167,12 @@ export default { selectImg: '', unit: '', imageName: '', - baseUrl: '', + baseUrl: 'http://192.168.44.22/', token: '' } }, mounted () { - this.baseUrl = localStorage.getItem('nz-baseURL') + // this.baseUrl = localStorage.getItem('nz-baseURL') this.token = localStorage.getItem('nz-token') if (this.icon) { const iconId = this.icon.charCodeAt().toString(16) @@ -186,13 +186,13 @@ export default { }, methods: { imageInit () { // 加载所有图片 - this.$get('monitor/project/topo/icon').then(res => { + this.$get('/topology/icon').then(res => { this.imgageLoading = true this.tools = [...Tools] this.iconArray = [...res.data.list] this.iconArray.forEach((item, index) => { item.imageName = item.name - item.image = `/monitor/project/topo/icon/${item.id}/0` + item.image = `/topology/icon/0/${item.unit}/${item.name}` if (this.imgId == item.id) { this.unit = item.unit this.imageName = item.imageName @@ -284,7 +284,7 @@ export default { }) }, delImg (item) { - this.$delete('monitor/project/topo/icon?ids=' + item.imageId).then(res => { + this.$delete('topology/icon?ids=' + item.imageId).then(res => { if (res.code == 200) { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.deleteSuccess') }) const findItem = this.tools.find(group => group.group === item.unit) @@ -295,7 +295,7 @@ export default { }) }, delCollpseTitle (item) { - this.$delete('monitor/project/topo/iconUnit?unit=' + item.group).then(res => { + this.$delete('/topology/unit?unit=' + item.group).then(res => { if (res.code == 200) { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.deleteSuccess') }) this.tools = this.tools.filter(group => group.group !== item.group) @@ -398,7 +398,7 @@ export default { form.append('unit', this.uploadPic.unit) form.append('width', this.imgWidth) form.append('height', this.imgHeight) - this.$post('monitor/project/topo/icon', form, { 'Content-Type': 'multipart/form-data' }).then(res => { + this.$post('/topology/icon', form, { 'Content-Type': 'multipart/form-data' }).then(res => { this.imageSave = false if (res.code == 200) { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue index be19923ab..38d042bc1 100644 --- a/nezha-fronted/src/components/common/table/nzDataList.vue +++ b/nezha-fronted/src/components/common/table/nzDataList.vue @@ -40,7 +40,7 @@
-