ソースを参照

[Fix 0000] 修复了兼容了SVG模型的部分设备页面在初始化三维内容时失效的问题

houzekong 6 日 前
コミット
24da89a046

+ 3 - 1
src/views/vent/monitorManager/gateMonitor/gate.data.ts

@@ -2,6 +2,8 @@ import { defineAsyncComponent } from 'vue';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { rules } from '/@/utils/helper/validator';
+import EntryThree from './components/entryThree.vue';
+
 export const columns: BasicColumn[] = [
   {
     title: '名称',
@@ -317,10 +319,10 @@ export const chartsColumns = [
 ];
 
 export function getModelComponent(is2DModel: boolean = false, sysOrgCode?: string) {
+  if (!is2DModel) return EntryThree;
   // @ts-ignore
   return defineAsyncComponent(() => {
     // return import('./components/gateTripleSVG.vue');
-    if (!is2DModel) return import('./components/entryThree.vue');
     switch (sysOrgCode) {
       // case '000000':
       //   双道风门

+ 3 - 2
src/views/vent/monitorManager/windowMonitor/window.data.ts

@@ -2,6 +2,8 @@ import { BasicColumn } from '/@/components/Table';
 import { defineAsyncComponent } from 'vue';
 import { FormSchema } from '/@/components/Table';
 import { rules } from '/@/utils/helper/validator';
+import EntryThree from './components/entryThree.vue';
+
 export const columns: BasicColumn[] = [
   {
     title: '名称',
@@ -306,10 +308,9 @@ export const chartsColumns = [
 
 const componentsCaches = new Map<string, any>();
 export function getModelComponent(is2DModel: boolean = false, type: string = '') {
+  if (!is2DModel) return EntryThree;
   // @ts-ignore
   return defineAsyncComponent(() => {
-    if (!is2DModel) return import('./components/entryThree.vue');
-
     // 为了支持SVG组件切换时不闪烁,先行下载并缓存
     if (!componentsCaches.has('windowSVG')) componentsCaches.set('windowSVG', import('./components/windowSVG.vue'));
     if (!componentsCaches.has('windowDualSVG')) componentsCaches.set('windowDualSVG', import('./components/windowDualSVG.vue'));

+ 2 - 2
src/views/vent/monitorManager/windrectMonitor/windrect.data.ts

@@ -1,7 +1,7 @@
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { rules } from '/@/utils/helper/validator';
-import { reactive } from 'vue';
+import EntryThree from './components/entryThree.vue';
 import { defineAsyncComponent } from 'vue';
 
 export const resultColumns: BasicColumn[] = [
@@ -430,9 +430,9 @@ export const option = {
 };
 const componentsCaches = new Map<string, any>();
 export function getModelComponent(is2DModel: boolean = false, type: string = '') {
+  if (!is2DModel) return EntryThree;
   // @ts-ignore
   return defineAsyncComponent(() => {
-    if (!is2DModel) return import('./components/entryThree.vue');
     // 为了支持SVG组件切换时不闪烁,先行下载并缓存
     if (!componentsCaches.has('scanSVG')) componentsCaches.set('scanSVG', import('./components/scanSVG.vue'));
     if (!componentsCaches.has('fixedSVG')) componentsCaches.set('fixedSVG', import('./components/fixedSVG.vue'));