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

src/views/vent/home/configurable/components/content-green.vue

@@ -18,7 +18,7 @@
       Not Supportted Link Or Browser
     </video>
     <div class="flex w-full h-full" :style="{ flexDirection: layout.direction }">
-      <div v-for="config in layoutConfig" :key="config.name" :style="{ flexBasis: config.basis, overflow: config.overflow ? 'auto' : 'none' }">
+      <div v-for="config in layoutConfig" :key="config.name" :style="{ flexBasis: config.basis, overflow: config.overflow ? 'none' : 'none' }">
         <!-- 告示板部分 -->
         <template v-if="config.name === 'board'">
           <div class="content__module flex flex-justify-around flex-items-center flex-wrap">

src/views/vent/home/configurable/components/detail/MiniBoard-green.vue

@@ -191,8 +191,8 @@
   .mini-board__value_B {
     // color: @vent-gas-primary-text;
     color:#3ecca7;
-    font-size: 16px;
-    font-weight: bold;
+    font-size: 12px;
+    font-family:'douyuFont';
     height: 28px;
     line-height: 28px;
   }
@@ -211,11 +211,11 @@
   }
 
   .mini-board__value_D {
-    font-size: 16px;
-    font-weight: bold;
+    font-size: 12px;
     height: 28px;
     line-height: 32px;
     color:#3ecca7;
+    font-family:'douyuFont'
   }
   .mini-board__label_D {
     line-height: 18px;

src/views/vent/home/configurable/components/green-nav.vue

@@ -87,7 +87,7 @@ let menuItemActive = ref(0)//menuItem当前激活选项
 //menu选项切换
 function menuClick(index) {
   activeIndex.value = index
-  isShowMenuItem.value=true
+  isShowMenuItem.value=!isShowMenuItem.value
 }
 //menuItem选项切换
 function menuItemClick(ind) {
@@ -138,7 +138,7 @@ function menuItemClick(ind) {
       line-height: 60px;
       text-align: center;
       margin: 0px 20px;
-      font-size: 16px;
+      font-size: 18px;
       letter-spacing: 2px;
       background: url('../../../../../assets/images/home-green/green-menu-bg.png') no-repeat;
       background-size: 100% 100%;

src/views/vent/home/configurable/components/green-right-tag.vue

@@ -2,6 +2,7 @@
 <template>
   <div class="greenRightTag">
     <div class="wind-tag" v-for="(item, index) in tagList">
+      <div class=wind-tag-icon></div>
       <div class="wind-tag-label">{{ item.label }}</div>
       <div class="wind-tag-val">{{ item.value }}</div>
     </div>
@@ -43,6 +44,58 @@ let tagList = ref<any[]>([
     background: url('../../../../../assets//images/home-green/green-wind-tag.png') no-repeat;
     background-size: 100% 100%;
 
+    &:nth-child(1) {
+      .wind-tag-icon {
+        position: absolute;
+        width: 37px;
+        height: 37px;
+        background: url(/src/assets/images/home-green/green-zhfl.png) no-repeat;
+        left: 50%;
+        top: 16px;
+        transform: translate(-50%, 0);
+
+      }
+    }
+
+    &:nth-child(2) {
+      .wind-tag-icon {
+        position: absolute;
+        width: 37px;
+        height: 37px;
+        background: url(/src/assets/images/home-green/green-zjfl.png) no-repeat;
+        left: 50%;
+        top: 16px;
+        transform: translate(-50%, 0);
+
+      }
+    }
+
+    &:nth-child(3) {
+      .wind-tag-icon {
+        position: absolute;
+        width: 37px;
+        height: 37px;
+        background: url(/src/assets/images/home-green/green-jhfl.png) no-repeat;
+        left: 50%;
+        top: 16px;
+        transform: translate(-50%, 0);
+
+      }
+    }
+
+    &:nth-child(4) {
+      .wind-tag-icon {
+        position: absolute;
+        width: 37px;
+        height: 37px;
+        background: url(/src/assets/images/home-green/green-yxfl.png) no-repeat;
+        left: 50%;
+        top: 16px;
+        transform: translate(-50%, 0);
+
+      }
+    }
+
     .wind-tag-label {
       position: absolute;
       left: 0;
@@ -54,14 +107,15 @@ let tagList = ref<any[]>([
 
     .wind-tag-val {
       position: absolute;
-    left: 0;
-    bottom: 5px;
-    width: 100%;
-    text-align: center;
-    font-size: 16px;
-    font-weight: 700;
-    color: #39f4e0;
+      left: 0;
+      bottom: 5px;
+      width: 100%;
+      text-align: center;
+      font-size: 14px;
+      font-family: 'douyuFont';
+      color: #39f4e0;
     }
+
   }
 }
 </style>

src/views/vent/home/configurable/components/header-green.vue

@@ -99,7 +99,7 @@
     border-image-slice: 1;
   } */
    .select-text{
-    padding-left:20px;
+    padding-left:26px;
    }
 
   ::v-deep .zxm-select:not(.zxm-select-customize-input) .zxm-select-selector {

src/views/vent/home/configurable/components/original/moduleBottom-green.vue

@@ -32,7 +32,7 @@
   .module-content {
     // --image-model_original_title_bg_expand: url('@/assets/images/home-container/configurable/model_original_title_bg_expand.png');
       --image-model_original_title_bg_expand: url('@/assets/images/home-green/green-title-bg.png');
-    --bg-height: 33px;
+    --bg-height: 28px;
     color: #fff;
     box-sizing: border-box;
     position: absolute;
@@ -44,10 +44,12 @@
     width: 100%;
     height: var(--bg-height);
     background: var(--image-model_original_title_bg_expand) no-repeat;
-    background-size: 100% 100%;
     position: relative;
-    text-align: center;
+    // text-align: center;
     line-height: var(--bg-height);
+       padding-left:36px;
+    font-weight:bold;
+    font-size:16px;
   }
 
   // .module-content__title {

src/views/vent/home/configurable/components/original/moduleLeft-green.vue

@@ -31,7 +31,7 @@
 
   .module-content {
     --image-model_original_title_bg: url('@/assets/images/home-green/green-title-bg.png');
-    --bg-height: 33px;
+    --bg-height: 28px;
     color: #fff;
     box-sizing: border-box;
     position: absolute;
@@ -44,10 +44,12 @@
     width: 100%;
     height: var(--bg-height);
     background: var(--image-model_original_title_bg) no-repeat;
-    background-size: 100% 100%;
     position: relative;
-    text-align: center;
+    // text-align: center;
     line-height: var(--bg-height);
+    padding-left:36px;
+    font-weight:bold;
+    font-size:16px;
   }
 
   // .module-content__title {

src/views/vent/home/configurable/configurable.data.ts

@@ -1,4 +1,4 @@
-import { truncateSync } from 'fs-extra';
+// import { truncateSync } from 'fs-extra';
 import { Config } from '../../deviceManager/configurationTable/types';
 // import { BDdustMock, BDfireMock } from './configurable.data.bd';
 
@@ -144,56 +144,140 @@ export const testConfigVent: Config[] = [
       position: 'top:295px;left:15px;',
     },
   },
+  // {
+  //   deviceType: '',
+  //   moduleName: '通风设施远程控制',
+  //   pageType: 'vent',
+  //   moduleData: {
+  //     header: {
+  //       show: false,
+  //       readFrom: '',
+  //       selector: {
+  //         show: false,
+  //         value: '',
+  //       },
+  //       slot: {
+  //         show: false,
+  //         value: '',
+  //       },
+  //     },
+  //     background: {
+  //       // show: true,
+  //       show: false,
+  //       type: 'video',
+  //       link: '/video/gate.mp4',
+  //     },
+  //     layout: {
+  //       direction: 'row',
+  //       items: [
+  //         {
+  //           name: 'device_alarm',
+  //           basis: '100%',
+  //         },
+  //       ],
+  //     },
+  //     board: [],
+  //     list: [],
+  //     chart: [],
+  //     table: [],
+  //     gallery: [],
+  //     complex_list: [],
+  //     gallery_list: [],
+  //     preset: [
+  //       {
+  //         readFrom: 'device',
+  //       },
+  //     ],
+  //     to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=gate_xinJianFuXieJin',
+  //   },
+  //   showStyle: {
+  //     size: 'width:390px;height:260px;',
+  //     version: '原版',
+  //     position: 'top:555px;left:15px;',
+  //   },
+  // },
   {
-    deviceType: '',
-    moduleName: '通风设施远程控制',
-    pageType: 'vent',
+    deviceType: 'warn',
+    moduleName: '预警监测',
+    pageType: 'vent_realtime',
     moduleData: {
       header: {
-        show: false,
+        show: true,
         readFrom: '',
         selector: {
           show: false,
           value: '',
         },
         slot: {
-          show: false,
-          value: '',
+          show: true,
+          value: '网络异常：${warn[0].netstatus.val}',
         },
       },
       background: {
-        // show: true,
         show: false,
         type: 'video',
-        link: '/video/gate.mp4',
+        link: '',
       },
       layout: {
         direction: 'row',
         items: [
           {
-            name: 'device_alarm',
+            name: 'list',
             basis: '100%',
           },
         ],
       },
       board: [],
-      list: [],
-      chart: [],
-      table: [],
-      gallery: [],
-      complex_list: [],
-      gallery_list: [],
-      preset: [
+      list: [
         {
-          readFrom: 'device',
+          type: 'timeline',
+          readFrom: 'warn[0]',
+          items: [
+            {
+              label: '报警',
+              value: '${alarm.val}',
+              info: '',
+              color: 'red',
+            },
+            {
+              label: '重大风险预警',
+              value: '${red.val}',
+              info: '',
+              color: 'red',
+            },
+            {
+              label: '较大风险预警',
+              value: '${orange.val}',
+              info: '',
+              color: 'orange',
+            },
+            {
+              label: '一般风险预警',
+              value: '${yellow.val}',
+              info: '',
+              color: 'yellow',
+            },
+            {
+              label: '低风险预警',
+              value: '${blue.val}',
+              info: '',
+              color: 'blue',
+            },
+          ],
         },
       ],
-      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=gate_xinJianFuXieJin',
+      preset: [],
+      table: [],
+      gallery: [],
+      chart: [],
+      gallery_list: [],
+      complex_list: [],
+      to: '/monitorChannel/monitor-alarm-home',
     },
     showStyle: {
       size: 'width:390px;height:260px;',
       version: '原版',
-      position: 'top:575px;left:15px;',
+      position: 'top:555px;left:15px;',
     },
   },
 
@@ -428,93 +512,93 @@ export const testConfigVent: Config[] = [
       position: 'bottom:15px;left:975px;',
     },
   },
-  {
-    // deviceType: 'warn',
-    // moduleName: '预警监测',
-    deviceType: '',
-    moduleName: '智能通风Deepseek',
-    pageType: 'vent',
-    moduleData: {
-      header: {
-        show: true,
-        readFrom: '',
-        selector: {
-          show: false,
-          value: '',
-        },
-        slot: {
-          show: true,
-          value: '网络异常：${warn[0].netstatus.val}',
-        },
-      },
-      background: {
-        show: false,
-        type: 'video',
-        link: '',
-      },
-      layout: {
-        direction: 'row',
-        items: [
-          {
-            // name: 'list',
-            name: 'ai_chat',
-            basis: '100%',
-          },
-        ],
-      },
-      board: [],
-      list: [
-        {
-          type: 'timeline',
-          readFrom: 'warn[0]',
-          items: [
-            {
-              label: '报警',
-              value: '${alarm.val}',
-              info: '',
-              color: 'red',
-            },
-            {
-              label: '重大风险预警',
-              value: '${red.val}',
-              info: '',
-              color: 'red',
-            },
-            {
-              label: '较大风险预警',
-              value: '${orange.val}',
-              info: '',
-              color: 'orange',
-            },
-            {
-              label: '一般风险预警',
-              value: '${yellow.val}',
-              info: '',
-              color: 'yellow',
-            },
-            {
-              label: '低风险预警',
-              value: '${blue.val}',
-              info: '',
-              color: 'blue',
-            },
-          ],
-        },
-      ],
-      preset: [{ readFrom: '' }],
-      table: [],
-      gallery: [],
-      chart: [],
-      gallery_list: [],
-      complex_list: [],
-      to: '/monitorChannel/monitor-alarm-home',
-    },
-    showStyle: {
-      size: 'width:390px;height:260px;',
-      version: '原版',
-      position: 'top:855px;left:15px',
-    },
-  },
+  //  {
+  //     // deviceType: 'warn',
+  //     // moduleName: '预警监测',
+  //     deviceType: '',
+  //     moduleName: '智能通风Deepseek',
+  //     pageType: 'vent',
+  //     moduleData: {
+  //       header: {
+  //         show: true,
+  //         readFrom: '',
+  //         selector: {
+  //           show: false,
+  //           value: '',
+  //         },
+  //         slot: {
+  //           show: true,
+  //           value: '网络异常：${warn[0].netstatus.val}',
+  //         },
+  //       },
+  //       background: {
+  //         show: false,
+  //         type: 'video',
+  //         link: '',
+  //       },
+  //       layout: {
+  //         direction: 'row',
+  //         items: [
+  //           {
+  //             // name: 'list',
+  //             name: 'ai_chat',
+  //             basis: '100%',
+  //           },
+  //         ],
+  //       },
+  //       board: [],
+  //       list: [
+  //         {
+  //           type: 'timeline',
+  //           readFrom: 'warn[0]',
+  //           items: [
+  //             {
+  //               label: '报警',
+  //               value: '${alarm.val}',
+  //               info: '',
+  //               color: 'red',
+  //             },
+  //             {
+  //               label: '重大风险预警',
+  //               value: '${red.val}',
+  //               info: '',
+  //               color: 'red',
+  //             },
+  //             {
+  //               label: '较大风险预警',
+  //               value: '${orange.val}',
+  //               info: '',
+  //               color: 'orange',
+  //             },
+  //             {
+  //               label: '一般风险预警',
+  //               value: '${yellow.val}',
+  //               info: '',
+  //               color: 'yellow',
+  //             },
+  //             {
+  //               label: '低风险预警',
+  //               value: '${blue.val}',
+  //               info: '',
+  //               color: 'blue',
+  //             },
+  //           ],
+  //         },
+  //       ],
+  //       preset: [{ readFrom: '' }],
+  //       table: [],
+  //       gallery: [],
+  //       chart: [],
+  //       gallery_list: [],
+  //       complex_list: [],
+  //       to: '/monitorChannel/monitor-alarm-home',
+  //     },
+  //     showStyle: {
+  //       size: 'width:390px;height:260px;',
+  //       version: '原版',
+  //       position: 'top:855px;left:15px',
+  //     },
+  //   },
 ];
 
 export const testConfigDust: Config[] = [
@@ -2141,7 +2225,6 @@ export const testConfigVentNew: Config[] = [
       size: 'width:380px;height:280px;',
       version: '原版',
       position: 'top:60px;left:0;',
-      headerPosition: 'leftTop',
     },
   },
   {
@@ -2194,7 +2277,6 @@ export const testConfigVentNew: Config[] = [
       size: 'width:377px;height:280px;',
       version: '原版',
       position: 'top:350px;left:0;',
-      headerPosition: 'leftCenter',
     },
   },
   {
@@ -2273,7 +2355,6 @@ export const testConfigVentNew: Config[] = [
       size: 'width:387px;height:280px;',
       version: '新版',
       position: 'top:640px;left:0;',
-      headerPosition: 'leftBottom',
     },
   },
   {
@@ -2321,7 +2402,6 @@ export const testConfigVentNew: Config[] = [
       size: 'width:1000px;height:120px;',
       version: '新版',
       position: 'top:85px;left:460px;',
-      headerPosition: 'centerTop',
     },
   },
   {
@@ -2369,7 +2449,6 @@ export const testConfigVentNew: Config[] = [
       size: 'width:1000px;height:100px;',
       version: '新版',
       position: 'bottom:0;left:460px;',
-      headerPosition: 'centerBottom',
     },
   },
   {
@@ -2441,7 +2520,6 @@ export const testConfigVentNew: Config[] = [
       size: 'width:377px;height:280px;',
       version: '原版',
       position: 'top:60px;right:0;',
-      headerPosition: 'rightTop',
     },
   },
 
@@ -2510,7 +2588,6 @@ export const testConfigVentNew: Config[] = [
       size: 'width:377px;height:280px;',
       version: '新版',
       position: 'top:350px;right:0;',
-      headerPosition: 'rightCenter',
     },
   },
   {
@@ -2590,7 +2667,6 @@ export const testConfigVentNew: Config[] = [
       size: 'width:377px;height:280px;',
       version: '新版',
       position: 'top:640px;right:0;',
-      headerPosition: 'rightBottom',
     },
   },
 ];

src/views/vent/home/configurable/vent-Green.vue

@@ -52,7 +52,7 @@
         class="switch-button report-mode right-525px"
         @click="switchDataMode"
       ></div> -->
-        <div class="switch-button icon-goto right-475px" @click="goMicroApp()"></div>
+        <!-- <div class="switch-button icon-goto right-475px" @click="goMicroApp()"></div> -->
       </div>
     </template>
   </div>