Selaa lähdekoodia

[Mod 000] 解决局部风机空指针异常; 韩咀光纤测温监测组件切换

hongrunxia 2 päivää sitten
vanhempi
commit
2987b594c0

+ 5 - 4
src/views/vent/monitorManager/deviceMonitor/components/device/device.data.ts

@@ -72,14 +72,15 @@ export function getMonitorComponent() {
     case 'sdmtjtyjlmk': //榆家梁
     case 'sdmtjtcctmk': //榆家梁
     case 'sdmtjtswmk': //上湾
+    case 'zmhjhzmy': // 韩咀
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
       break;
-      case 'sdmtjtwlmlmk': //乌兰木伦
+    case 'sdmtjtwlmlmk': //乌兰木伦
       FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
       break;
     default:
-      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
-    // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
+      // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.wlml.vue'));
+      FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.sw.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal-Gx.vue'));
     // FiberModal = defineAsyncComponent(() => import('./modal/fiber.modal.cct.vue'));
@@ -92,7 +93,7 @@ export function getMonitorComponent() {
   const GaspatrolModal = defineAsyncComponent(() => import('./modal/gaspatrol.modal.vue'));
   const WisdomBallModal = defineAsyncComponent(() => import('./modal/wisdomball.modal.vue'));
 
-  return {FiremonModal, FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal, WisdomBallModal };
+  return { FiremonModal, FiberModal, BundleModal, DustModal, BallvalveModal, AtomizingModal, GaspatrolModal, WisdomBallModal };
 }
 
 export const chartsColumnList = [

+ 8 - 11
src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.ts

@@ -173,24 +173,21 @@ export const destroy = () => {
 
 // 为了兼容性而添加的方法导出
 export function addText(d, e) {
-  if (modelContextList[0]) {
-    // @ts-ignore
-    modelContextList[0].context?.addText(d);
-    modelContextList[1].context?.addText(e);
-    modelContextList[2].context?.addText(e);
-  }
+  if (modelContextList[0]) modelContextList[0].context?.addText(d);
+  if (modelContextList[1]) modelContextList[1].context?.addText(e);
+  if (modelContextList[2]) modelContextList[2].context?.addText(d);
 }
 export function addCssText() {
-  if (modelContextList[0]) {
-    // @ts-ignore
-    modelContextList[0].context?.addCssText();
-    modelContextList[2].context?.addCssText();
-  }
+  if (modelContextList[0] && modelContextList[0].context && modelContextList[0].context['addCssText']) modelContextList[0].context['addCssText']();
+  if (modelContextList[2] && modelContextList[2].context && modelContextList[2].context['addCssText']) modelContextList[2].context['addCssText']();
 }
 export function playSmoke(d) {
   if (modelContextList[0]) {
     // @ts-ignore
     modelContextList[0].context?.playSmoke(d);
+  }
+  if (modelContextList[2]) {
+    // @ts-ignore
     modelContextList[2].context?.playSmoke(d);
   }
 }