Quellcode durchsuchen

[Mod 0000] 去除了5.5首页的模拟数据

houzekong vor 2 Wochen
Ursprung
Commit
84dced1d53

+ 2 - 2
src/views/vent/home/configurable/ventV5.vue

@@ -88,7 +88,7 @@
   import { list } from './configurable.api';
   import { useRoute, useRouter } from 'vue-router';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { testConfigVent, testConfigVentRealtime } from './configurable.data';
+  // import { testConfigVent, testConfigVentRealtime } from './configurable.data';
 
   const { sysDataType = 'monitor', title = '智能通风管控系统' } = useGlobSetting();
   const { configs, isOriginal, isCommon, fetchConfigs } = useInitConfigs();
@@ -106,7 +106,7 @@
 
   function refresh() {
     fetchConfigs(isDataRealTime.value ? 'vent_realtime' : 'vent').then(() => {
-      configs.value = isDataRealTime.value ? testConfigVentRealtime : testConfigVent;
+      // configs.value = isDataRealTime.value ? testConfigVentRealtime : testConfigVent;
       updateEnhancedConfigs(configs.value);
 
       list({}).then(updateData);

+ 10 - 6
src/views/vent/monitorManager/windowMonitor/index.vue

@@ -237,7 +237,7 @@
 
   const modelRef = ref();
   /** 模型对应的组件,根据实际情况分为二维三维 */
-  const modelComponent = getModelComponent(true, sysOrgCode);
+  const modelComponent = getModelComponent(globalConfig.is2DModel, sysOrgCode);
 
   const { currentRoute } = useRouter();
 
@@ -622,12 +622,16 @@
   onMounted(() => {
     const { query } = unref(currentRoute);
     if (query['deviceType']) deviceType.value = query['deviceType'] as string;
-    loading.value = true;
-    mountedThree().then(async () => {
+    if (globalConfig.is2DModel) {
       getMonitor(true);
-      loading.value = false;
-      addMonitorText(selectData.value);
-    });
+    } else {
+      loading.value = true;
+      mountedThree().then(async () => {
+        getMonitor(true);
+        loading.value = false;
+        addMonitorText(selectData.value);
+      });
+    }
   });
   onUnmounted(() => {
     destroy();