Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/home/configurable/index copy.vue

@@ -67,7 +67,7 @@
   import ModuleEnhanced from './components/ModuleEnhanced.vue';
   import ModuleOriginal from './components/ModuleOriginal.vue';
   import ModuleCommon from './components/ModuleCommon.vue';
-  import { testConfigBDNew } from './configurable.data';
+  import { testConfigBuErTai } from './configurable.data';
   import { useRoute } from 'vue-router';
 
   interface EnhancedConfig extends Config {
@@ -95,8 +95,8 @@
     }
     // configs.value = testConfigB;
     fetchConfigs('configurable_home').then(() => {
-      configs.value = testConfigBDNew;
-      // configs.value.push(...testConfigBDNew);
+      configs.value = testConfigBuErTai;
+      // configs.value.push(...testConfigBuErTai);
       enhancedConfigs.value = configs.value.map((c) => {
         return {
           visible: true,

src/views/vent/home/configurable/index.vue

@@ -54,8 +54,7 @@
       :page-type="pageType"
     />
     <div style="width: 1000px; height: 570px; position: absolute; left: calc(50% - 500px); top: 60px">
-      <!-- <VentModal /> -->
-      <iframe style="width: 1000px; height: 570px" :src="iframeUrl" ref="frameRef" @load="hideLoading"></iframe>
+      <VentModal />
     </div>
   </div>
 </template>
@@ -65,32 +64,30 @@
   // import MonitorCenter from './components/MonitorCenter.vue';
   import { useInitConfigs } from './hooks/useInit';
   import ModuleBD from './components/ModuleBD.vue';
-  // import { testConfigBDDust } from './configurable.data';
-  // import VentModal from '/@/components/vent/micro/ventModal.vue';
+  import VentModal from '/@/components/vent/micro/ventModal.vue';
   import { getBDDustData } from './configurable.api';
-  import { getToken } from '/@/utils/auth';
+  // import { getToken } from '/@/utils/auth';
 
-  const iframeUrl = ref(
-    `${location.protocol}//${location.hostname}:8091/dashboard/analysis?type=empty&deviceType=empty&showid=1&token=${getToken()}`
-  );
-  const loading = ref(true);
+  // const iframeUrl = ref(
+  //   `${location.protocol}//${location.hostname}:8091/dashboard/analysis?type=empty&deviceType=empty&showid=1&token=${getToken()}`
+  // );
+  // const loading = ref(true);
   const mainTitle = ref('保德煤矿粉尘灾害预警系统');
   const pageType = 'BD_dust';
 
   // const moduleCodes = ['fanlocal', 'fanmain' /** 'vc', 'ar', 'va', 'ws', 'dw' */];
 
-  // const configs = ref(testConfigBDDust);
   const { configs, fetchConfigs } = useInitConfigs();
   const homedata = ref<any>({});
-  function hideLoading() {
-    loading.value = false;
-  }
+  // function hideLoading() {
+  //   loading.value = false;
+  // }
   onMounted(() => {
     // configs.value = testConfigB;
-    fetchConfigs(pageType);
     getBDDustData({}).then((r) => {
       homedata.value = r;
     });
+    fetchConfigs(pageType);
   });
 
   // function redirectTo(url) {