diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss index a84dc60e8..6b61df9ec 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/globalSearch.scss @@ -95,6 +95,7 @@ width: 100%; box-sizing: border-box; overflow-y: auto; + overflow-x: hidden; } .list-item{ height: 64px; diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss index b95a032ed..cf0e5620c 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss @@ -59,7 +59,7 @@ } .search-item-value-box{ line-height: 47px; - height: 100%; + height: 13px; width: calc(100% - 120px); display: flex; align-items: center; diff --git a/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss b/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss index aaa29badf..6728eb71c 100644 --- a/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss +++ b/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss @@ -107,17 +107,17 @@ } } .panel-select-item:hover{ - color: #FA901C; + color: $--color-primary; background: $--background-color-base; i{ - color: #FA901C; + color: $--color-primary; } } .panel-select-item.active{ - color: #FA901C; + color: $--color-primary; background: $--background-color-base; i{ - color: #FA901C; + color: $--color-primary; } } } @@ -161,4 +161,8 @@ color:#FF9219 !important; cursor: pointer ; } + .highlight-keyword{ + color:$--color-primary; + background: none; + } } diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index 545be32df..838097238 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -327,7 +327,7 @@ import { myCubec, myCubeAnchors } from '../project/L5/services/canvas.js' -import {getTopology, getTopologyImg, setTopology, setTopologyImg} from '../js/common' +import {getTopology, setTopology} from '../js/common' import CanvasProps from '../project/L5/CanvasProps' import topologyTopTool from '../project/L5/topologyTopTool' import popDataMain from '../project/popData/Main' @@ -1744,7 +1744,7 @@ export default { res.data.list.forEach((item, index) => { item.imageName = item.name delete item.name - const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : '' + const nowImage = '' if (nowImage && nowImage.data) { promiseArr.push(nowImage) } else { @@ -1756,14 +1756,6 @@ export default { this.iconArray = [...res.data.list] this.iconArray.forEach((item, index) => { item.image = res2[index].data - const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : '' - if (!nowImage || (nowImage && !nowImage.data)) { - setTopologyImg(item.id, JSON.stringify({ - data: res2[index].data, - width: res2[index].width, - height: res2[index].height - })) - } const group = this.tools.find(tool => tool.group === item.unit) if (group) { group.children.push({ @@ -1814,7 +1806,7 @@ export default { } imgidList.forEach((item, index) => { if (item.data.imageId && imageAllId.data.list.find(image => item.data.imageId === image.id)) { - const nowImage = getTopologyImg(item.data.imageId) ? JSON.parse(getTopologyImg(item.data.imageId)) : '' + const nowImage = '' if (nowImage && nowImage.data) { promiseArr.push(nowImage) } else { @@ -1835,14 +1827,6 @@ export default { this.iconArray.forEach((item, index) => { if (item.id) { item.image = res2[index].data - const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : '' - if (!nowImage || (nowImage && !nowImage.image)) { - setTopologyImg(item.id, JSON.stringify({ - data: res2[index].data, - width: res2[index].width, - height: res2[index].height - })) - } } }) this.imgInit = true diff --git a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue index 27a617a85..69d2fa6cf 100644 --- a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue +++ b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue @@ -52,7 +52,7 @@