Explorar el Código

[Feat 0000] 保德首页配置修改

houzekong hace 5 meses
padre
commit
2e38aa7625

+ 1 - 1
src/views/vent/home/configurable/components/detail/ComplexList.vue

@@ -160,7 +160,7 @@
       height: 100%;
       display: flex;
       align-items: center;
-      flex-basis: 140px;
+      flex-basis: 100px;
       flex-grow: 1;
     }
     .list-item__title_B {

+ 3 - 3
src/views/vent/home/configurable/configurable.data.ts

@@ -1559,12 +1559,12 @@ export const testConfigBDDust: Config[] = [
           readFrom: 'historyList',
           xAxis: [
             {
-              label: 'null',
+              label: '${time}',
             },
           ],
           yAxis: [
             {
-              label: 'A',
+              label: '浓度',
               align: 'left',
             },
           ],
@@ -1995,7 +1995,7 @@ export const testConfigBDFire: Config[] = [
       gallery: [
         {
           type: 'G',
-          readFrom: '',
+          readFrom: 'obfObj',
           items: [
             {
               label: '一氧化碳',

+ 10 - 4
src/views/vent/home/configurable/dustBD.vue

@@ -53,7 +53,9 @@
       :visible="true"
       :page-type="pageType"
     />
-    <VentModal style="width: 100%; height: 100%; position: absolute; z-index: -1" />
+    <div style="width: 1000px; height: 570px; position: absolute; left: calc(50% - 500px); top: 60px">
+      <VentModal />
+    </div>
   </div>
 </template>
 <script lang="ts" setup>
@@ -102,14 +104,14 @@
 
     .top-bg {
       width: 100%;
-      height: 56px;
+      height: 86px;
       background: url(/@/assets/images/home-container/configurable/firehome/fire-title.png) no-repeat center;
       position: absolute;
       z-index: 1;
       .main-title {
-        height: 56px;
+        height: 86px;
         font-family: 'douyuFont';
-        font-size: 20px;
+        font-size: 26px;
         letter-spacing: 2px;
         display: flex;
         justify-content: center;
@@ -274,4 +276,8 @@
       cursor: pointer;
     }
   }
+
+  :deep(.loading-box) {
+    position: unset;
+  }
 </style>

+ 10 - 4
src/views/vent/home/configurable/fireBD.vue

@@ -53,7 +53,9 @@
       :visible="true"
       :page-type="pageType"
     />
-    <VentModal style="width: 100%; height: 100%; position: absolute; z-index: -1" />
+    <div style="width: 1000px; height: 570px; position: absolute; left: calc(50% - 500px); top: 60px">
+      <VentModal />
+    </div>
   </div>
 </template>
 <script lang="ts" setup>
@@ -103,14 +105,14 @@
 
     .top-bg {
       width: 100%;
-      height: 56px;
+      height: 86px;
       background: url(/@/assets/images/home-container/configurable/firehome/fire-title.png) no-repeat center;
       position: absolute;
       z-index: 1;
       .main-title {
-        height: 56px;
+        height: 86px;
         font-family: 'douyuFont';
-        font-size: 20px;
+        font-size: 26px;
         letter-spacing: 2px;
         display: flex;
         justify-content: center;
@@ -274,4 +276,8 @@
       line-height: 50px;
     }
   }
+
+  :deep(.loading-box) {
+    position: unset;
+  }
 </style>

+ 27 - 21
src/views/vent/home/configurable/index.vue

@@ -33,16 +33,16 @@
         </div>
       </div>
     </div>
-    <!-- <div class="right-t">
-      <div class="tcontent-l" @click="redirectTo('https://bing.cn')">
+    <div class="right-t">
+      <div class="tcontent-l" @click="redirectTo('/grout-home')">
         <div>智能</div>
-        <div>浆系统</div>
+        <div>浆系统</div>
       </div>
-      <div class="tcontent-r" @click="redirectTo('https://bing.cn')">
+      <div class="tcontent-r" @click="redirectTo('/nitrogen-home')">
         <div>智能</div>
-        <div>注系统</div>
+        <div>注系统</div>
       </div>
-    </div> -->
+    </div>
     <ModuleBD
       v-for="cfg in configs"
       :key="cfg.deviceType"
@@ -53,7 +53,9 @@
       :visible="true"
       :page-type="pageType"
     />
-    <VentModal style="width: 100%; height: 100%; position: absolute; z-index: -1" />
+    <div style="width: 1000px; height: 570px; position: absolute; left: calc(50% - 500px); top: 60px">
+      <VentModal />
+    </div>
   </div>
 </template>
 <script lang="ts" setup>
@@ -62,30 +64,31 @@
   // import MonitorCenter from './components/MonitorCenter.vue';
   // import { useInitConfigs } from './hooks/useInit';
   import ModuleBD from './components/ModuleBD.vue';
-  import { testConfigBDDust } from './configurable.data';
+  import { testConfigBDFire } from './configurable.data';
   import VentModal from '/@/components/vent/micro/ventModal.vue';
-  import { getBDDustData } from './configurable.api';
+  import { getBDFireData } from './configurable.api';
 
-  const mainTitle = ref('保德煤矿粉尘灾害预警系统');
-  const pageType = 'BD_dust';
+  const mainTitle = ref('保德煤矿火灾预警系统');
+  const pageType = 'BD_fire';
 
   // const moduleCodes = ['fanlocal', 'fanmain' /** 'vc', 'ar', 'va', 'ws', 'dw' */];
 
-  const configs = ref(testConfigBDDust);
+  const configs = ref(testConfigBDFire);
   // const { configs, fetchConfigs } = useInitConfigs();
+
   const homedata = ref<any>({});
 
   onMounted(() => {
     // configs.value = testConfigB;
-    getBDDustData({}).then((r) => {
+    getBDFireData({}).then((r) => {
       homedata.value = r;
     });
     // fetchConfigs(pageType);
   });
 
-  // function redirectTo(url) {
-  //   window.open(url);
-  // }
+  function redirectTo(url) {
+    window.open(url);
+  }
 </script>
 <style lang="less" scoped>
   @font-face {
@@ -102,14 +105,14 @@
 
     .top-bg {
       width: 100%;
-      height: 56px;
+      height: 86px;
       background: url(/@/assets/images/home-container/configurable/firehome/fire-title.png) no-repeat center;
       position: absolute;
       z-index: 1;
       .main-title {
-        height: 56px;
+        height: 86px;
         font-family: 'douyuFont';
-        font-size: 20px;
+        font-size: 26px;
         letter-spacing: 2px;
         display: flex;
         justify-content: center;
@@ -234,6 +237,7 @@
     display: flex;
     align-items: center;
     justify-content: space-around;
+    z-index: 1;
 
     .tcontent-l {
       flex: 1;
@@ -252,7 +256,6 @@
       text-align: center;
       padding-top: 40px;
       line-height: 50px;
-      cursor: pointer;
     }
     .tcontent-r {
       flex: 1;
@@ -271,7 +274,10 @@
       text-align: center;
       padding-top: 40px;
       line-height: 50px;
-      cursor: pointer;
     }
   }
+
+  :deep(.loading-box) {
+    position: unset;
+  }
 </style>