diff --git a/src/views/stationData/topology/components/detailDrawer.vue b/src/views/stationData/topology/components/detailDrawer.vue index 0df2a20..1adea95 100644 --- a/src/views/stationData/topology/components/detailDrawer.vue +++ b/src/views/stationData/topology/components/detailDrawer.vue @@ -217,7 +217,6 @@ async function loadChardData() { return } clearData() - onCollapse(true) const limit = chartLimit.value const offset = chartOffset.value const options: any = { diff --git a/src/views/stationData/topology/index.vue b/src/views/stationData/topology/index.vue index 6ec6028..41a1424 100644 --- a/src/views/stationData/topology/index.vue +++ b/src/views/stationData/topology/index.vue @@ -28,6 +28,7 @@ import DetailDrawer from "./components/detailDrawer.vue"; import { VueNode } from "g6-extension-vue"; import { isEmpty } from "@/utils/is"; import { useMessage } from "@/composables/useMessage"; +import { bms_cellRewriteName } from "@/views/stationData/utils"; const router = useRouter() const message = useMessage() @@ -66,7 +67,7 @@ async function loadDeviceTopology() { type: deviceInfo?.type ?? 'emu', children: [] } - topologyTree.value.children = Array.isArray(res?.data) ? res.data : [] + topologyTree.value.children = Array.isArray(res?.data) ? bms_cellRewriteName(res.data) : [] } } diff --git a/src/views/stationData/transfer/components/deviceDrawer.vue b/src/views/stationData/transfer/components/deviceDrawer.vue index 985d714..a1dd4f2 100644 --- a/src/views/stationData/transfer/components/deviceDrawer.vue +++ b/src/views/stationData/transfer/components/deviceDrawer.vue @@ -77,6 +77,7 @@ import { useMessage } from '@/composables/useMessage' import dayjs from 'dayjs' import { nextTick } from "vue"; import EdfsWrap from "@/components/Edfs-wrap.vue"; +import { bms_cellRewriteName } from "@/views/stationData/utils"; const time = ref<[string, string]>() @@ -189,7 +190,6 @@ async function loadChardData() { message.error('请选择点位') return } - onCollapse(true) clearData() const limit = chartLimit.value const offset = chartOffset.value @@ -357,7 +357,7 @@ async function loadPointGroup() { if (res.code === 0) { curGroup.value = res.data[0]?.type curGroupName.value = res.data[0]?.name - pointGroup.value = Array.isArray(res?.data) ? res.data : [] + pointGroup.value = Array.isArray(res?.data) ? bms_cellRewriteName(res.data) : [] return Promise.resolve() } else { return Promise.reject() @@ -401,7 +401,8 @@ const disabledDate = (time: any) => { } const collapsed = ref(false) -function onCollapse(value?:boolean) { + +function onCollapse(value?: boolean) { collapsed.value = value ?? !collapsed.value } diff --git a/src/views/stationData/utils.ts b/src/views/stationData/utils.ts index ffc03db..fce53bc 100644 --- a/src/views/stationData/utils.ts +++ b/src/views/stationData/utils.ts @@ -1,4 +1,5 @@ import { getPubTopic, getSubTopic } from "@/utils/zmq"; +import type { IPointGroupOV } from "../../api/module/transfer"; // 获取设备状态主题 export const getDeviceTopic = getSubTopic('client', 'status', 'transfer') @@ -36,4 +37,23 @@ export const upgradeProgressStatusMap = [ status: 4, text: '安装中', }, -] \ No newline at end of file +] + + +export function bms_cellRewriteName(data: IPointGroupOV[]) { + return data.map((node: IPointGroupOV,index) => { + const newNode = { ...node } + + // 修改当前节点 + if (newNode.type === "bms_cell") { + newNode.cnName = `BMS单体${index + 1}` // 你可以改成任意规则 + } + + // 递归处理 children + if (Array.isArray(newNode.children) && newNode.children.length) { + newNode.children = bms_cellRewriteName(newNode.children) + } + + return newNode + }) +} \ No newline at end of file