[Fix 0000]粉尘 火灾 通风新首页样式调试

src/views/vent/deviceManager/configurationTable/types.ts

@@ -155,7 +155,7 @@ export interface ModuleDataBoard extends ReadFrom {
 
 export interface ModuleDataList extends ReadFrom {
   /** 列表预设的背景类型 */
-  type: 'timeline' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'timelineNew';
+  type: 'timeline' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'G' | 'H' | 'I' | 'J' | 'K' | 'timelineNew' | 'fireList';
   /** 是否需要根据数据来决定所展示的项目数量，需要确保 items 至少有一项，且 readFrom 指向数组 */
   mapFromData?: boolean;
   /** 核心配置，每个列表项对应一项 */

src/views/vent/home/configurable/components/ModuleDustNew.vue

@@ -109,7 +109,7 @@ const daneClass = computed(() => {
     return 'right-1';
   }
   if (headerPosition === 'rightCenter') {
-    return 'right-1';
+    return 'right-2';
   }
   if (headerPosition === 'rightBottom') {
     return 'right-3';
@@ -213,6 +213,7 @@ watch(
 .left-1 {
   background: var(--image-Left1) no-repeat;
   background-size: 100% 100%;
+  margin-left: 35px;
 }
 .left-2 {
   background: var(--image-Left2) no-repeat;
@@ -225,6 +226,7 @@ watch(
 .right-1 {
   background: var(--image-Right1) no-repeat;
   background-size: 100% 100%;
+  margin-left: -32px;
 }
 .right-2 {
   background: var(--image-Right2) no-repeat;

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

@@ -21,7 +21,11 @@
       <div v-for="config in layoutConfig" :key="config.name" :style="{ flexBasis: config.basis, overflow: config.overflow ? 'auto' : 'none' }">
         <!-- 告示板部分 -->
         <template v-if="config.name === 'board'">
-          <div v-if="config.basis !== '100%'" class="content__module flex flex-justify-around flex-items-center flex-wrap">
+          <div
+            v-if="config.pageType == 'vent_New'"
+            style="padding-top: 11%"
+            class="content__module content__module1 flex flex-justify-around flex-items-center flex-wrap"
+          >
             <MiniBoard
               v-for="item in config.items"
               :key="item.prop"
@@ -31,11 +35,7 @@
               :layout="config.layout"
             />
           </div>
-          <div
-            v-else-if="config.basis == '100%'"
-            style="padding-top: 11%"
-            class="content__module content__module1 flex flex-justify-around flex-items-center flex-wrap"
-          >
+          <div v-else class="content__module flex flex-justify-around flex-items-center flex-wrap">
             <MiniBoard
               v-for="item in config.items"
               :key="item.prop"
@@ -63,6 +63,9 @@
             <CustomList class="content__module" :type="config.type" :list-config="config.items" />
           </template>
         </template>
+        <template v-if="config.name === 'fireList'">
+          <CustomList class="content__module" :type="config.type" :list-config="config.items" />
+        </template>
         <!-- 画廊部分 -->
         <template v-if="config.name === 'gallery'">
           <CustomGallery class="content__module" :type="config.type" :gallery-config="config.items" />

src/views/vent/home/configurable/components/detail/CustomList.vue

@@ -278,7 +278,51 @@ withDefaults(
 .list-item__content_H > div {
   flex-basis: 33.3%;
 }
-
+.list_fireList {
+  background: none;
+}
+.list__wrapper_fireList {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  margin-left: 70px;
+}
+.list-item_fireList {
+  width: 167px;
+  height: 58px;
+  align-items: center;
+  text-align: center;
+  background-image: var(--image-list_bg_i);
+  background-repeat: no-repeat;
+  background-size: auto 100%;
+  margin: 5px 10px;
+}
+.list-item__content_fireList {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+.list-item__content_fireList > .list-item__label {
+  width: 60px;
+  height: 100%;
+  left: 0;
+  position: absolute;
+  font-size: 20px;
+  line-height: 63px;
+  color: #009bff;
+}
+.list-item__content_fireList > .list-item__info {
+  height: 50%;
+  left: 70px;
+  position: absolute;
+}
+.list-item__content_fireList > .list-item__value {
+  top: 50%;
+  height: 50%;
+  left: 70px;
+  position: absolute;
+  font-size: 18px;
+}
 .list_I {
   background: none;
 }

src/views/vent/home/configurable/components/originalNew/NewNav.vue

@@ -64,16 +64,14 @@ let props = defineProps({
 let menuList = ref<any[]>([
   {
     name: '智能通风',
-    MenuItemList: [{ name: '多灾融合预警' }, { name: '通风监测预警' }, { name: '火灾监测预警' }, { name: '粉尘监测预警' }, { name: '瓦斯监测预警' }],
+    targatUrl: '/configurable/ventNew/home',
   },
   {
     name: '火灾监控',
-    // MenuItemList: [{ name: '多灾融合预警' }, { name: '通风监测预警' }, { name: '火灾监测预警' }, { name: '粉尘监测预警' }, { name: '瓦斯监测预警' }],
     targatUrl: '/configurable/fireNew/home',
   },
   {
     name: '粉尘监控',
-    // MenuItemList: [{ name: '多灾融合预警' }, { name: '通风监测预警' }, { name: '火灾监测预警' }, { name: '粉尘监测预警' }, { name: '瓦斯监测预警' }],
     targatUrl: '/configurable/dustNew/home',
   },
   {
@@ -86,33 +84,11 @@ let menuList = ref<any[]>([
   },
 ]); //一级菜单列表
 let activeIndex = ref(0); //当前激活menu索引
-let activeIndexL = ref(0); //当前激活menu索引
-let activeIndexR = ref(null); //当前激活menu索引
 const router = useRouter();
 let isShowMenuItem = ref(false); //是否显示menuItem下拉选项菜单
-let isShowMenuItemL = ref(false); //是否显示menuItem下拉选项菜单
-let isShowMenuItemR = ref(false); //是否显示menuItem下拉选项菜单
 let menuItemActive = ref(0); //menuItem当前激活选项
 const leftMenus = computed(() => menuList.value.slice(0, 4));
 const rightMenus = computed(() => menuList.value.slice(4));
-//menu选项切换
-function menuLeftClick(index) {
-  activeIndexL.value = index;
-  isShowMenuItemL.value = !isShowMenuItemL.value;
-}
-//menuItem选项切换
-function menuItemLeftClick(index) {
-  menuItemActive.value = index;
-  isShowMenuItemL.value = false;
-}
-function menuRightClick(index) {
-  activeIndexR.value = index;
-  isShowMenuItemR.value = !isShowMenuItemR.value;
-}
-function menuItemRightClick(index) {
-  menuItemActive.value = index;
-  isShowMenuItemL.value = false;
-}
 function menuClick(data) {
   activeIndex.value = data.index;
   isShowMenuItem.value = !isShowMenuItem.value;

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

@@ -740,6 +740,7 @@ export const testConfigNewFire: Config[] = [
           {
             name: 'list',
             basis: '60%',
+            pageType: 'New_fire',
           },
           {
             name: 'blast_delta',
@@ -755,7 +756,7 @@ export const testConfigNewFire: Config[] = [
       table: [],
       list: [
         {
-          type: 'I',
+          type: 'fireList',
           readFrom: '',
           items: [
             {

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

@@ -3005,7 +3005,7 @@ export const testConfigVentNew: Config[] = [
         },
       },
       background: {
-        show: true,
+        show: false,
         type: 'video',
         link: '/video/mainFan.mp4',
       },
@@ -3013,6 +3013,10 @@ export const testConfigVentNew: Config[] = [
         direction: 'column',
         items: [
           {
+            name: 'qh_curve',
+            basis: '67%',
+          },
+          {
             name: 'board',
             basis: '30%',
           },
@@ -3026,19 +3030,15 @@ export const testConfigVentNew: Config[] = [
           items: [
             {
               label: '风量(m³/min)',
-              value: '${m3}',
+              value: '${flow_merge}',
             },
             {
-              label: '风压(Pa)',
-              value: '${Fan1StartStatus}',
-              trans: {
-                '1': '${Fan1FreqHz}',
-                '0': '${Fan1FreqHz}',
-              },
+              label: '负压(Pa)',
+              value: '${fy_merge}',
             },
             {
               label: '漏风率(%)',
-              value: '${DataPa}',
+              value: '${leakage}',
             },
           ],
         },
@@ -3049,7 +3049,13 @@ export const testConfigVentNew: Config[] = [
       gallery: [],
       complex_list: [],
       gallery_list: [],
-      preset: [],
+      preset: [
+        {
+          readFrom: '',
+          fan1Prop: ['flow_merge', 'fy_merge'],
+          fan2Prop: ['flow_merge', 'fy_merge'],
+        },
+      ],
     },
     showStyle: {
       size: 'width:380px;height:280px;',
@@ -3386,7 +3392,8 @@ export const testConfigVentNew: Config[] = [
         items: [
           {
             name: 'board',
-            basis: '100%',
+            basis: '30%',
+            pageType: 'vent_New',
           },
         ],
       },