Explorar el Código

[Feat 0000] 为部分其他设备添加缩略图模型选择的支持,变更加载优先级

houzekong hace 1 día
padre
commit
f928fc2263

+ 2 - 1
src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.ts

@@ -131,8 +131,9 @@ export function mountedThree(sceneSelctor: string, cssSelectors: string[]) {
 
     // 这里根据字典判断
     const store = useModelFileStore();
+    const apiDict = getDictItemsByCode('fanlocal_install_kind');
     const storeData = store.getModelFileDataByKey('fanlocal');
-    const dictCodes = storeData.length ? storeData.map((item) => ({ ...item, value: item.fileName })) : getDictItemsByCode('fanlocal_install_kind');
+    const dictCodes = apiDict && apiDict.length ? apiDict : storeData.map((item) => ({ ...item, value: item.fileName }));
     if (dictCodes && dictCodes.length > 0) {
       for (let i = 0; i < dictCodes.length; i++) {
         const dict = dictCodes[i];

+ 5 - 1
src/views/vent/monitorManager/fireDoorMonitor/fireDoor.threejs.ts

@@ -1,6 +1,7 @@
 import * as THREE from 'three';
 import UseThree from '../../../../utils/threejs/useThree';
 import { getDictItemsByCode } from '/@/utils/dict';
+import { useModelFileStore } from '/@/store/modules/modelFile';
 import { animateCamera } from '/@/utils/threejs/util';
 import useEvent from '../../../../utils/threejs/useEvent';
 
@@ -204,7 +205,10 @@ export const mountedThree = () => {
     model.setEnvMap('test1.hdr');
     model.renderer.toneMappingExposure = 1.0;
     model.camera.position.set(100, 0, 1000);
-    const dictCodes = getDictItemsByCode('fireDoorStyle');
+    const store = useModelFileStore();
+    const apiDict = getDictItemsByCode('fireDoorStyle');
+    const storeData = store.getModelFileDataByKey('door');
+    const dictCodes = apiDict && apiDict.length ? apiDict : storeData.map((item) => ({ ...item, value: item.fileName }));
     if (dictCodes && dictCodes.length > 0) {
       for (let i = 0; i < dictCodes.length; i++) {
         const dict = dictCodes[i];

+ 2 - 1
src/views/vent/monitorManager/gateMonitor/gate.threejs.ts

@@ -870,8 +870,9 @@ export const mountedThree = () => {
     model.renderer.toneMappingExposure = 0.9;
     model.camera.position.set(100, 0, 1000);
     const store = useModelFileStore();
+    const apiDict = getDictItemsByCode('gateStyle');
     const storeData = store.getModelFileDataByKey('gate');
-    const dictCodes = storeData.length ? storeData.map((item) => ({ ...item, value: item.fileName })) : getDictItemsByCode('gateStyle');
+    const dictCodes = apiDict && apiDict.length ? apiDict : storeData.map((item) => ({ ...item, value: item.fileName }));
     if (dictCodes && dictCodes.length > 0) {
       for (let i = 0; i < dictCodes.length; i++) {
         const dict = dictCodes[i];

+ 2 - 1
src/views/vent/monitorManager/mainFanMonitor/main.threejs.ts

@@ -751,8 +751,9 @@ export const mountedThree = (playerVal1) => {
 
       // 这里根据字典判断
       const store = useModelFileStore();
+      const apiDict = getDictItemsByCode('mainFanType');
       const storeData = store.getModelFileDataByKey('fanmain');
-      const dictCodes = storeData.length ? storeData.map((item) => ({ ...item, value: item.fileName })) : getDictItemsByCode('mainFanType');
+      const dictCodes = apiDict && apiDict.length ? apiDict : storeData.map((item) => ({ ...item, value: item.fileName }));
       if (dictCodes && dictCodes.length > 0) {
         for (let i = 0; i < dictCodes.length; i++) {
           const dict = dictCodes[i];

+ 2 - 1
src/views/vent/monitorManager/windowMonitor/window.threejs.ts

@@ -428,8 +428,9 @@ export const mountedThree = () => {
     model.camera.position.set(100, 0, 1000);
     // 根据模型类型判断要初始化哪些模型
     const store = useModelFileStore();
+    const apiDict = getDictItemsByCode('windowModalType');
     const storeData = store.getModelFileDataByKey('windows');
-    const dictCodes = storeData.length ? storeData.map((item) => ({ ...item, value: item.fileName })) : getDictItemsByCode('windowModalType');
+    const dictCodes = apiDict && apiDict.length ? apiDict : storeData.map((item) => ({ ...item, value: item.fileName }));
     for (let i = 0; i < dictCodes.length; i++) {
       const dict = dictCodes[i];
 

+ 5 - 1
src/views/vent/monitorManager/windrectMonitor/windrect.threejs.ts

@@ -10,6 +10,7 @@ import fixedWindRect from './duisheFixed.threejs';
 import useEvent from '../../../../utils/threejs/useEvent';
 import gsap from 'gsap';
 import { getDictItemsByCode } from '/@/utils/dict';
+import { useModelFileStore } from '/@/store/modules/modelFile';
 // import * as dat from 'dat.gui';
 // const gui = new dat.GUI();
 // gui.domElement.style = 'position:absolute;top:100px;left:10px;z-index:99999999999999';
@@ -353,7 +354,10 @@ export const mountedThree = (playerDom) => {
     model.setEnvMap('test1.hdr');
     model.renderer.toneMappingExposure = 1.0;
 
-    const dictCodes = getDictItemsByCode('windrecModel');
+    const store = useModelFileStore();
+    const apiDict = getDictItemsByCode('windrecModel');
+    const storeData = store.getModelFileDataByKey('windrect');
+    const dictCodes = apiDict && apiDict.length ? apiDict : storeData.map((item) => ({ ...item, value: item.fileName }));
     for (let i = 0; i < dictCodes.length; i++) {
       const dict = dictCodes[i];