From ce92769b3a4ea421350366364aa8f872ccfec203 Mon Sep 17 00:00:00 2001 From: "2192596591@qq.com" <2192596591@qq.com> Date: Tue, 24 Mar 2026 08:54:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 5 ++ .../right-aside/select-item-props-setting.vue | 8 +- src/components/vue-xq-test/vue-run-info.vue | 82 ++++++++++--------- .../vue-xq-test/vue-signal-gaudy.vue | 1 + .../vue-xq-test/vue-synthesize-table.vue | 34 ++++++-- src/utils/globalUtils.ts | 49 ++++++----- src/utils/stompService.ts | 40 +++++---- 7 files changed, 126 insertions(+), 93 deletions(-) diff --git a/src/App.vue b/src/App.vue index d35907c..1bc5aa3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -471,6 +471,11 @@ leftAsideStore.registerConfig('vue公共组件', [ label: '火灾报警主机' } ] + }, + isSwitch: { + type: 'switch', + val: true, + title: '辅助框' } } }, diff --git a/src/components/mt-edit/components/layout/right-aside/select-item-props-setting.vue b/src/components/mt-edit/components/layout/right-aside/select-item-props-setting.vue index cf5ed0b..1b99113 100644 --- a/src/components/mt-edit/components/layout/right-aside/select-item-props-setting.vue +++ b/src/components/mt-edit/components/layout/right-aside/select-item-props-setting.vue @@ -194,6 +194,7 @@ import { ref, computed, onMounted } from 'vue'; import { modelApi, BASE_URL } from '@/utils/request'; import imageModel from '@/components/mt-edit/components/layout/base-panel/imageModel.vue'; import { globalStore } from '@/components/mt-edit/store/global'; +import { type DataItem } from '@/components/mt-edit/store/types'; type SelectItemPropsSettingProps = { propsInfo: ILeftAsideConfigItemPublicProps | undefined; }; @@ -215,7 +216,7 @@ interface RecServiceType { } interface ExtendedParentWindow extends Window { - Rec?: RecServiceType; + globalData: Map | Record; } const selectItemPropsSettingProps = withDefaults(defineProps(), {}); @@ -327,14 +328,15 @@ const filteredData = computed(() => { }); }); +// 获取数据源 function assembleList() { // debugger; let code: number | undefined; if (inputTypeTagValue.value !== undefined) code = getNameForNode(inputTypeTagValue.value); - gridData.splice(0, gridData.length); - let globalDataRaw = (window.parent as ExtendedParentWindow).Rec?.service.node.runtimes; + let globalDataRaw = (window as unknown as ExtendedParentWindow).globalData; + // let globalDataRaw = (window.parent as ExtendedParentWindow).Rec?.service.node.runtimes; // 安全地访问 globalData，兼容对象和 Map 类型 // const globalDataRaw = (window as any).globalData; diff --git a/src/components/vue-xq-test/vue-run-info.vue b/src/components/vue-xq-test/vue-run-info.vue index 197603d..3195e7d 100644 --- a/src/components/vue-xq-test/vue-run-info.vue +++ b/src/components/vue-xq-test/vue-run-info.vue @@ -4,45 +4,45 @@

运行信息

- - 设备状态： + + 设备状态： - 正常/中断 + 正常/中断 - - 温度： + + 温度： - 23℃ + 23℃ - - 湿度： + + 湿度： - 45%RH + 45%RH - - 风力： + + 风力： - 三级（5m/s） + 三级（5m/s） - - 风向： + + 风向： - 东风 + 东风 - - 雨量： + + 雨量： - 20mm + 20mm
@@ -51,18 +51,18 @@ 火灾报警系统 - - + 设备状态 - 正常/故障 + 正常/故障 - 通信状态 - 正常/中断 + 正常/中断 - + 火灾总告警 @@ -76,22 +76,22 @@ 2号主变灭火系统（排油注氮灭火） - + 启动方式 - 自动/手动 + 自动/手动 设备状态 - 正常/故障 + 正常/故障 通信状态 - 正常/中断 + 正常/中断 - + 火灾总告警
@@ -117,7 +117,7 @@ - 灭火手动操作 + 灭火手动操作 手动启动 紧急停止 @@ -126,25 +126,25 @@
- - 设备状态： + + 设备状态： - 正常/故障 + 正常/故障 - - 通信状态： + + 通信状态： - 正常/中断 + 正常/中断 - - 电源状态： + + 电源状态： - 主供电源工作 + 主供电源工作
@@ -206,6 +206,10 @@ const props = defineProps({ dataSource: { type: String, default: '--' + }, + isSwitch: { + type: Boolean, + default: true } }); diff --git a/src/components/vue-xq-test/vue-signal-gaudy.vue b/src/components/vue-xq-test/vue-signal-gaudy.vue index 5dc1961..83760b8 100644 --- a/src/components/vue-xq-test/vue-signal-gaudy.vue +++ b/src/components/vue-xq-test/vue-signal-gaudy.vue @@ -1,4 +1,5 @@