From d12f09a5b8a65efa586b37d9559e4aa709beaf14 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 8 Jun 2022 17:50:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=90=9C=E7=B4=A2=20loading=20=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=20=E5=9B=BE=E7=89=87=20=E4=B8=8D=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=88=B0localstorage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ChartDiagram/diagram.vue | 22 ++----------- .../common/globalSearch/globalSearch.vue | 2 +- .../src/components/common/js/common.js | 4 +-- .../components/common/project/topologyL5.vue | 32 ++----------------- 4 files changed, 9 insertions(+), 51 deletions(-) diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index b55702c8c..ca0d47e72 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..dcbd509fd 100644 --- a/nezha-fronted/src/components/common/globalSearch/globalSearch.vue +++ b/nezha-fronted/src/components/common/globalSearch/globalSearch.vue @@ -2,7 +2,7 @@
- +
{{$t('overall.cancel')}} diff --git a/nezha-fronted/src/components/common/js/common.js b/nezha-fronted/src/components/common/js/common.js index e88900b91..5ccc57a0b 100644 --- a/nezha-fronted/src/components/common/js/common.js +++ b/nezha-fronted/src/components/common/js/common.js @@ -45,11 +45,11 @@ export function setTopology (key, value) { // const topologyImgList = localStorage.getItem('nz-imgList') ? JSON.parse(localStorage.getItem('nz-imgList')) : {} export function getTopologyImg (key) { - return localStorage.getItem('nz-topologyImg-' + key) + return false } export function setTopologyImg (key, img) { - localStorage.setItem('nz-topologyImg-' + key, img) + // localStorage.setItem('nz-topologyImg-' + key, img) } export function setHexagon (key, value) { diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index ebf26251c..136a01dad 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -351,7 +351,7 @@ import { myCubec, myCubeAnchors } from './L5/services/canvas.js' -import { getTopology, setTopology, getTopologyImg, setTopologyImg } from '../js/common' +import { getTopology, setTopology } from '../js/common' import CanvasProps from './L5/CanvasProps' import topologyTopTool from './L5//topologyTopTool' import CanvasContextMenu from './L5/CanvasContextMenu' @@ -1744,26 +1744,13 @@ 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)) : '' - if (nowImage && nowImage.data) { - promiseArr.push(nowImage) - } else { - promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.id}/1`)) - } + promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.id}/1`)) imgArr.push({ ...item }) }) Promise.all(promiseArr).then((res2, header) => { 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({ @@ -1816,12 +1803,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)) : '' - if (nowImage && nowImage.data) { - promiseArr.push(nowImage) - } else { - promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`)) - } + promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`)) } else if (item.data.imageId) { promiseArr.push(imgDefault) } else { @@ -1837,14 +1819,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