Browse Source

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

lxh 3 months ago
parent
commit
c8aea1ad89

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

@@ -260,7 +260,8 @@
       position: absolute;
       width: 100%;
       bottom: 0;
-      font-size: 20px;
+      font-size: 16px;
+      font-weight: bold;
     }
     .list-item__content_D:nth-of-type(2) {
       position: absolute;
@@ -273,7 +274,7 @@
         display: none;
       }
       .list-item__value {
-        font-size: 19px;
+        font-size: 18px;
       }
     }
     .list-item__content_D:nth-of-type(3) {
@@ -287,7 +288,7 @@
         display: none;
       }
       .list-item__value {
-        font-size: 19px;
+        font-size: 18px;
       }
     }
 
@@ -317,7 +318,8 @@
     // position: absolute;
     width: 100%;
     // top: 0;
-    font-size: 18px;
+    font-size: 16px;
+    font-weight: bold;
     margin-top: 10px;
   }
   .list-item__content_E:nth-of-type(2) {
@@ -330,7 +332,7 @@
       display: none;
     }
     .list-item__value {
-      font-size: 18px;
+      font-size: 16px;
     }
   }
   .list-item__content_E:nth-of-type(3) {
@@ -343,7 +345,7 @@
       display: none;
     }
     .list-item__value {
-      font-size: 18px;
+      font-size: 16px;
     }
   }
 

+ 47 - 47
src/views/vent/home/configurable/configurable.data.bd.ts

@@ -231,7 +231,7 @@ export const testConfigBDDust: Config[] = [
         },
       ],
       preset: [],
-      mock: BDdustMock,
+      // mock: BDdustMock,
     },
     showStyle: {
       size: 'width:440px;height:460px;',
@@ -241,7 +241,7 @@ export const testConfigBDDust: Config[] = [
   },
   {
     deviceType: '',
-    moduleName: '设备信息',
+    moduleName: '喷雾设备信息',
     pageType: '',
     moduleData: {
       header: {
@@ -363,7 +363,7 @@ export const testConfigBDDust: Config[] = [
       list: [],
       complex_list: [],
       preset: [],
-      mock: BDdustMock,
+      // mock: BDdustMock,
     },
     showStyle: {
       size: 'width:980px;height:280px;',
@@ -438,7 +438,7 @@ export const testConfigBDDust: Config[] = [
       complex_list: [],
       preset: [],
       to: 'http://10.248.210.154:8801',
-      mock: BDdustMock,
+      // mock: BDdustMock,
     },
     showStyle: {
       size: 'width:440px;height:300px;',
@@ -447,8 +447,8 @@ export const testConfigBDDust: Config[] = [
     },
   },
   {
-    deviceType: 'devGbsb',
-    moduleName: '隔爆设施管理台账',
+    deviceType: '',
+    moduleName: '煤尘爆炸性',
     pageType: '',
     moduleData: {
       header: {
@@ -456,7 +456,7 @@ export const testConfigBDDust: Config[] = [
         readFrom: '',
         selector: {
           show: false,
-          value: '',
+          value: '${name}',
         },
         slot: {
           show: false,
@@ -472,49 +472,50 @@ export const testConfigBDDust: Config[] = [
         direction: 'row',
         items: [
           {
-            name: 'table',
+            name: 'board',
             basis: '100%',
           },
         ],
       },
-      board: [],
-      chart: [],
-      gallery: [],
-      gallery_list: [],
-      table: [
+      board: [
         {
-          type: 'A',
-          readFrom: 'devGbsb',
-          columns: [
+          type: 'E',
+          readFrom: '',
+          layout: 'label-top',
+          items: [
             {
-              name: '地点',
-              prop: 'strinstallpos',
+              label: '火焰长度',
+              value: '>400mm',
             },
             {
-              name: '吊挂位置',
-              prop: 'addr',
+              label: '抑制煤层爆炸最低岩粉量',
+              value: '85%',
             },
             {
-              name: '性质',
-              prop: 'kind',
+              label: '鉴定结论',
+              value: '有煤层爆炸性',
             },
           ],
         },
       ],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [],
       list: [],
       complex_list: [],
       preset: [],
-      mock: BDdustMock,
+      // mock: BDdustMock,
     },
     showStyle: {
-      size: 'width:440px;height:280px;',
+      size: 'width:440px;height:260px;',
       version: '保德',
       position: 'top:370px;right:10px;',
     },
   },
   {
-    deviceType: 'statics',
-    moduleName: '粉尘静态指标',
+    deviceType: 'devGbsb',
+    moduleName: '隔爆设施管理台账',
     pageType: '',
     moduleData: {
       header: {
@@ -522,7 +523,7 @@ export const testConfigBDDust: Config[] = [
         readFrom: '',
         selector: {
           show: false,
-          value: '${name}',
+          value: '',
         },
         slot: {
           show: false,
@@ -538,45 +539,44 @@ export const testConfigBDDust: Config[] = [
         direction: 'row',
         items: [
           {
-            name: 'board',
+            name: 'table',
             basis: '100%',
           },
         ],
       },
-      board: [
+      board: [],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [
         {
-          type: 'E',
-          readFrom: '',
-          layout: 'label-top',
-          items: [
+          type: 'A',
+          readFrom: 'devGbsb',
+          columns: [
             {
-              label: '火焰长度',
-              value: '>400mm',
+              name: '地点',
+              prop: 'strinstallpos',
             },
             {
-              label: '抑制煤层爆炸最低岩粉量',
-              value: '75%',
+              name: '吊挂位置',
+              prop: 'addr',
             },
             {
-              label: '鉴定结论',
-              value: '有煤层爆炸性',
+              name: '性质',
+              prop: 'kind',
             },
           ],
         },
       ],
-      chart: [],
-      gallery: [],
-      gallery_list: [],
-      table: [],
       list: [],
       complex_list: [],
       preset: [],
-      mock: BDdustMock,
+      // mock: BDdustMock,
     },
     showStyle: {
-      size: 'width:440px;height:260px;',
+      size: 'width:440px;height:280px;',
       version: '保德',
-      position: 'top:660px;right:10px;',
+      position: 'top:640px;right:10px;',
     },
   },
 ];
@@ -6204,7 +6204,7 @@ export const testConfigBDFire: Config[] = [
       list: [],
       complex_list: [],
       preset: [],
-      mock: BDfireMock,
+      // mock: BDfireMock,
     },
     showStyle: {
       size: 'width:440px;height:260px;',

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

@@ -66,7 +66,7 @@
   import ModuleBD from './components/ModuleBD.vue';
   import VentModal from '/@/components/vent/micro/ventModal.vue';
   import { getDisHome } from './configurable.api';
-  import { testConfigBDDust } from './configurable.data.bd';
+  // import { testConfigBDDust } from './configurable.data.bd';
   // import { getToken } from '/@/utils/auth';
 
   const { configs, fetchConfigs } = useInitConfigs();
@@ -77,7 +77,7 @@
   // }
   onMounted(() => {
     fetchConfigs('BD_dust').then(() => {
-      configs.value = testConfigBDDust;
+      // configs.value = testConfigBDDust;
 
       getDisHome({
         dataList: configs.value

+ 6 - 6
src/views/vent/home/configurable/fireBD.vue

@@ -162,13 +162,13 @@
 
     // .module-left {
     //   position: absolute;
-    //   width: 450px;
+    //   width: 440px;
     //   height: 280px;
     //   left: 0;
     // }
     // .module-right {
     //   position: absolute;
-    //   width: 450px;
+    //   width: 440px;
     //   height: 280px;
     //   right: 0;
     // }
@@ -207,8 +207,8 @@
     position: absolute;
     height: 115px;
     top: 40px;
-    left: 5px;
-    width: 450px;
+    left: 10px;
+    width: 440px;
     background-image: url('/@/assets/images/home-container/configurable/firehome/qkjaq.png');
     background-color: #000723;
     background-repeat: no-repeat;
@@ -268,9 +268,9 @@
     position: absolute;
     // height: 160px;
     height: 115px;
-    right: 5px;
+    right: 10px;
     top: 50px;
-    width: 450px;
+    width: 440px;
     background-image: url('/@/assets/images/home-container/configurable/firehome/common-border2.png');
     background-color: #000723;
     background-repeat: no-repeat;

+ 52 - 70
src/views/vent/home/configurable/index.vue

@@ -23,26 +23,28 @@
         </div>
         <div class="tcontent-c">
           <div style="margin-bottom: 15px; color: #009bff; font-size: 24px; font-weight: bolder; letter-spacing: 10px">
-            {{ data.fireAllMineWarn }}
+            {{ data.dustAllMineWarn }}
           </div>
-          <div style="color: #fff; font-size: 12px">自燃倾向性等级 : 自燃</div>
+          <!-- <div style="color: #fff; font-size: 12px">自燃倾向性等级 : 容易自燃</div> -->
         </div>
         <div class="tcontent-r">
-          <div>火灾</div>
+          <div>粉尘</div>
           <div>风险</div>
         </div>
       </div>
     </div>
-    <div class="right-t">
-      <div class="tcontent-l" @click="redirectTo('/grout-home')">
-        <div>智能注浆系统</div>
+    <!-- <div class="right-t">
+      <div class="tcontent-l" @click="redirectTo('https://bing.cn')">
+        <div>智能</div>
+        <div>灌浆系统</div>
       </div>
-      <div class="tcontent-r" @click="redirectTo('/nitrogen-home')">
-        <div>智能注氮系统</div>
+      <div class="tcontent-r" @click="redirectTo('https://bing.cn')">
+        <div>智能</div>
+        <div>注氟系统</div>
       </div>
-    </div>
+    </div> -->
     <ModuleBD
-      v-for="cfg in cfgs"
+      v-for="cfg in configs"
       :key="cfg.deviceType"
       :show-style="cfg.showStyle"
       :module-data="cfg.moduleData"
@@ -51,64 +53,36 @@
       :data="data"
       :visible="true"
     />
-    <ModuleBDDual
-      v-if="cfgA && cfgB"
-      :show-style="cfgA.showStyle"
-      :module-data-a="cfgA.moduleData"
-      :module-name-a="cfgA.moduleName"
-      :device-type-a="cfgA.deviceType"
-      :module-data-b="cfgB.moduleData"
-      :module-name-b="cfgB.moduleName"
-      :device-type-b="cfgB.deviceType"
-      :data="data"
-      :visible="true"
-    />
-    <div style="width: 1000px; height: 550px; position: absolute; left: calc(50% - 500px); top: 60px">
+    <div style="width: 1000px; height: 570px; position: absolute; left: calc(50% - 500px); top: 60px">
       <VentModal />
     </div>
   </div>
 </template>
 <script lang="ts" setup>
-  import { computed, onMounted, onUnmounted } from 'vue';
+  import { onMounted, onUnmounted } from 'vue';
   // import { CaretDownOutlined } from '@ant-design/icons-vue';
   // import MonitorCenter from './components/MonitorCenter.vue';
   import { useInitConfigs, useInitPage } from './hooks/useInit';
   import ModuleBD from './components/ModuleBD.vue';
-  import ModuleBDDual from './components/ModuleBDDual.vue';
   import VentModal from '/@/components/vent/micro/ventModal.vue';
   import { getDisHome } from './configurable.api';
-  import { testConfigBDFire } from './configurable.data.bd';
+  import { testConfigBDDust } from './configurable.data.bd';
   // import { getToken } from '/@/utils/auth';
 
-  const cfgs = computed(() =>
-    configs.value.filter((_, index) => {
-      return index !== 4 && index !== 3;
-    })
-  );
-  const cfgA = computed<any>(() =>
-    configs.value.find((_, index) => {
-      return index === 3;
-    })
-  );
-  const cfgB = computed<any>(() =>
-    configs.value.find((_, index) => {
-      return index === 4;
-    })
-  );
   const { configs, fetchConfigs } = useInitConfigs();
-  const { mainTitle, data, updateData } = useInitPage('保德煤矿火灾预警系统');
+  const { mainTitle, data, updateData } = useInitPage('保德煤矿粉尘灾害预警系统');
   let interval: number | undefined;
   // function hideLoading() {
   //   loading.value = false;
   // }
   onMounted(() => {
-    // fetchConfigs('BD_fire').then(() => {
-    configs.value = testConfigBDFire;
+    // fetchConfigs('BD_dust').then(() => {
+    configs.value = testConfigBDDust;
 
     getDisHome({
       dataList: configs.value
         .map((e) => e.deviceType)
-        .concat('fireAllMineWarn')
+        .concat('dustAllMineWarn')
         .join(','),
     }).then(updateData);
     // });
@@ -116,7 +90,7 @@
     //   getDisHome({
     //     dataList: configs.value
     //       .map((e) => e.deviceType)
-    //       .concat('fireAllMineWarn')
+    //       .concat('dustAllMineWarn')
     //       .join(','),
     //   }).then(updateData);
     // }, 60000);
@@ -125,10 +99,6 @@
   onUnmounted(() => {
     clearInterval(interval);
   });
-
-  function redirectTo(url) {
-    window.open(url);
-  }
 </script>
 <style lang="less" scoped>
   @font-face {
@@ -162,13 +132,13 @@
 
     // .module-left {
     //   position: absolute;
-    //   width: 440px;
+    //   width: 450px;
     //   height: 280px;
     //   left: 0;
     // }
     // .module-right {
     //   position: absolute;
-    //   width: 440px;
+    //   width: 450px;
     //   height: 280px;
     //   right: 0;
     // }
@@ -206,7 +176,7 @@
   .left-t {
     position: absolute;
     height: 115px;
-    top: 40px;
+    top: 50px;
     left: 10px;
     width: 440px;
     background-image: url('/@/assets/images/home-container/configurable/firehome/qkjaq.png');
@@ -266,11 +236,10 @@
   }
   .right-t {
     position: absolute;
-    // height: 160px;
-    height: 115px;
-    right: 10px;
+    height: 160px;
+    right: 0;
     top: 50px;
-    width: 440px;
+    width: 450px;
     background-image: url('/@/assets/images/home-container/configurable/firehome/common-border2.png');
     background-color: #000723;
     background-repeat: no-repeat;
@@ -279,31 +248,44 @@
     display: flex;
     align-items: center;
     justify-content: space-around;
-    z-index: 1;
 
     .tcontent-l {
       flex: 1;
-      height: 100%;
-      font-size: 16px;
+      height: 70%;
+      font-size: 20px;
       font-weight: bold;
-      background-image: url(/@/assets/images/home-container/configurable/firehome/znzjxt.png);
-      background-size: auto 100%;
+      background-image: url(/@/assets/images/home-container/configurable/firehome/img-5.png),
+        url(/@/assets/images/home-container/configurable/firehome/ggxt.png);
+      background-size:
+        auto 100%,
+        auto auto;
       background-repeat: no-repeat;
-      background-position: center;
+      background-position:
+        center,
+        center top;
       text-align: center;
-      padding-top: 85px;
+      padding-top: 40px;
+      line-height: 50px;
+      cursor: pointer;
     }
     .tcontent-r {
       flex: 1;
-      height: 100%;
-      font-size: 16px;
+      height: 70%;
+      font-size: 20px;
       font-weight: bold;
-      background-image: url(/@/assets/images/home-container/configurable/firehome/znzdxt.png);
-      background-size: auto 100%;
+      background-image: url(/@/assets/images/home-container/configurable/firehome/img-5.png),
+        url(/@/assets/images/home-container/configurable/firehome/zjxt.png);
+      background-size:
+        auto 100%,
+        auto auto;
       background-repeat: no-repeat;
-      background-position: center;
+      background-position:
+        center,
+        center top;
       text-align: center;
-      padding-top: 85px;
+      padding-top: 40px;
+      line-height: 50px;
+      cursor: pointer;
     }
   }