Selaa lähdekoodia

[Fix 0000] 修复了新模型选择不兼容旧版的问题

houzekong 2 päivää sitten
vanhempi
commit
f83ca702e0

+ 1 - 2
src/components/Form/src/jeecg/components/ModelSelect.vue

@@ -15,7 +15,7 @@
           <div class="model-select-grid-thumb-wrap">
             <AntImage v-if="hasOpened" :src="getFileAccessHttpUrl(opt.filePath)" :preview="true" width="64" class="model-select-thumb" />
           </div>
-          <span class="model-select-name">{{ opt.fileName + deviceType }}</span>
+          <span class="model-select-name">{{ deviceType }}:{{ opt.fileName }}</span>
         </div>
       </div>
     </template>
@@ -63,7 +63,6 @@
       const getOptions = computed((): OptionsItem[] => {
         const key = props.deviceType;
         if (!key || !modelFileData.value) return [];
-        console.log('debug m', modelFileData.value);
         const items = modelFileData.value[key.split('_')[0]];
         if (!items) return [];
         return items.map((item) => ({

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

@@ -16,6 +16,7 @@ import FmXR from './gate.threejs.xr';
 import { animateCamera } from '/@/utils/threejs/util';
 import useEvent from '../../../../utils/threejs/useEvent';
 import { useModelFileStore } from '/@/store/modules/modelFile';
+import { getDictItemsByCode } from '/@/utils/dict';
 // import { useGlobSetting } from '/@/hooks/setting';
 
 // 模型对象、 文字对象
@@ -868,7 +869,8 @@ export const mountedThree = () => {
     model.setEnvMap('test1.hdr');
     model.renderer.toneMappingExposure = 0.9;
     model.camera.position.set(100, 0, 1000);
-    const dictCodes = useModelFileStore().getModelFileDataByKey('gate');
+    const store = useModelFileStore();
+    const dictCodes = store.getModelFileDataByKey('gate').length ? store.getModelFileDataByKey('gate') : getDictItemsByCode('gateStyle');
     if (dictCodes && dictCodes.length > 0) {
       for (let i = 0; i < dictCodes.length; i++) {
         const dict = dictCodes[i];