Bläddra i källkod

[Feat 0000] 主扇斜井SVG开发以及模型类型对接

houzekong 5 månader sedan
förälder
incheckning
05d9959472

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 6389 - 0
src/views/vent/monitorManager/mainFanMonitor/components/mainFanXJSVG.vue


+ 19 - 18
src/views/vent/monitorManager/mainFanMonitor/index.vue

@@ -76,22 +76,22 @@
                     selectData['Fan1StartStatus'] == '0' && globalConfig?.simulatedPassword
                       ? '-'
                       : selectData[data.dataIndex.replace('Fan', 'Fan1')]
-                        ? selectData[data.dataIndex.replace('Fan', 'Fan1')]
-                        : '-'
+                      ? selectData[data.dataIndex.replace('Fan', 'Fan1')]
+                      : '-'
                   }}</div>
                   <div class="item-value" v-if="dataMonitorRowIndex == 1">{{
                     selectData['Fan2StartStatus'] == '0' && globalConfig?.simulatedPassword
                       ? '-'
                       : selectData[data.dataIndex.replace('Fan', 'Fan2')]
-                        ? selectData[data.dataIndex.replace('Fan', 'Fan2')]
-                        : '-'
+                      ? selectData[data.dataIndex.replace('Fan', 'Fan2')]
+                      : '-'
                   }}</div>
                   <div class="item-value" v-if="dataMonitorRowIndex == 2">{{
                     selectData['Fan3StartStatus'] == '0' && globalConfig?.simulatedPassword
                       ? '-'
                       : selectData[data.dataIndex.replace('Fan', 'Fan3')]
-                        ? selectData[data.dataIndex.replace('Fan', 'Fan3')]
-                        : '-'
+                      ? selectData[data.dataIndex.replace('Fan', 'Fan3')]
+                      : '-'
                   }}</div>
                 </div>
                 <div v-else>
@@ -150,8 +150,8 @@
                           selectData[state.dataIndex.replace('Fan', 'Fan1')] === undefined
                             ? '无状态'
                             : selectData[state.dataIndex.replace('Fan', 'Fan1')] == '0'
-                              ? '正常'
-                              : '异常'
+                            ? '正常'
+                            : '异常'
                         }}</div>
                       </template>
                     </div>
@@ -175,8 +175,8 @@
                           selectData[state.dataIndex.replace('Fan', 'Fan2')] == undefined
                             ? '无状态'
                             : selectData[state.dataIndex.replace('Fan', 'Fan2')] == '0'
-                              ? '正常'
-                              : '异常'
+                            ? '正常'
+                            : '异常'
                         }}</div>
                       </template>
                     </div>
@@ -200,8 +200,8 @@
                           selectData[state.dataIndex.replace('Fan', 'Fan3')] == undefined
                             ? '无状态'
                             : selectData[state.dataIndex.replace('Fan', 'Fan3')] == '0'
-                              ? '正常'
-                              : '异常'
+                            ? '正常'
+                            : '异常'
                         }}</div>
                       </template>
                     </div>
@@ -1077,16 +1077,17 @@
         selectData['modalTyoe'] === 'xiejing'
           ? 'mainXjWindRect'
           : selectData['modalTyoe'] === 'lijing1'
-            ? 'mainLjWindRect'
-            : selectData['modalTyoe'] === 'lijing_3'
-              ? 'mainWindRect3'
-              : selectData['modalTyoe'] === 'lijing_1'
-                ? 'mainLjDtWindRect'
-                : 'mainWindRect';
+          ? 'mainLjWindRect'
+          : selectData['modalTyoe'] === 'lijing_3'
+          ? 'mainWindRect3'
+          : selectData['modalTyoe'] === 'lijing_1'
+          ? 'mainLjDtWindRect'
+          : 'mainWindRect';
 
       frontMonitorIsShow.value = false;
       centerMonitorIsShow.value = false;
       backMonitorIsShow.value = false;
+      modelComponent.value = getModelComponent(globalConfig.is2DModel, selectData['modalTyoe']);
       await setModelType(type);
     });
     await getCamera(id, playerRef, renderPlayer);

+ 12 - 6
src/views/vent/monitorManager/mainFanMonitor/main.data.ts

@@ -2040,21 +2040,27 @@ export const lineFormData = reactive({
 });
 
 const componentsCaches = new Map<string, any>();
-export function getModelComponent(is2DModel: boolean = false, type: string = '') {
+export function getModelComponent(is2DModel: boolean = false, modalTyoe: string = '') {
   if (!is2DModel) return EntryThree;
   // @ts-ignore
   return defineAsyncComponent(() => {
     // 为了支持SVG组件切换时不闪烁,先行下载并缓存
     if (!componentsCaches.has('mainFanSVG')) componentsCaches.set('mainFanSVG', import('./components/mainFanSVG.vue'));
+    if (!componentsCaches.has('mainFanXJSVG')) componentsCaches.set('mainFanXJSVG', import('./components/mainFanXJSVG.vue'));
 
-    switch (type) {
-      case 'mainWindRect':
+    switch (modalTyoe) {
+      case 'lijing':
         return componentsCaches.get('mainFanSVG');
-      case 'mainXjWindRect':
+      case 'xiejing':
+        return componentsCaches.get('mainFanXJSVG');
+      case 'lijing1':
+        //立井(风筒竖直)
         return componentsCaches.get('mainFanSVG');
-      case 'mainLjWindRect':
+      case 'lijing_3':
+        //立井(3个井筒)
         return componentsCaches.get('mainFanSVG');
-      case 'mainWindRect3':
+      case 'lijing_1':
+        //立井(1个风筒)
         return componentsCaches.get('mainFanSVG');
       default:
         return componentsCaches.get('mainFanSVG');

Vissa filer visades inte eftersom för många filer har ändrats