瀏覽代碼

[Fix 0000]蓝色预警管控页面优化

bobo04052021@163.com 2 月之前
父節點
當前提交
5ed20e27bb

二進制
src/assets/images/home-warn/2-2.png


+ 221 - 221
src/views/vent/home/configurable/blue/components/NewNavFire.vue

@@ -53,264 +53,264 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, onUnmounted, ref, watch, computed } from 'vue';
-  import { useRouter, useRoute } from 'vue-router';
-  let props = defineProps({
-    Title: {
-      type: String,
-      default: '',
-    },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
-  });
+import { onMounted, onUnmounted, ref, watch, computed } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+let props = defineProps({
+  Title: {
+    type: String,
+    default: '',
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
 
-  let menuList = ref<any[]>([
-    {
-      name: '智能通风',
-      targatUrl: '/micro-vent-3dModal/configurable/ventNew/ventS/home',
-    },
-    {
-      name: '火灾监控',
-      targatUrl: '/micro-vent-3dModal/configurable/fireNew/fireS/home',
-    },
-    {
-      name: '粉尘监控',
-      targatUrl: '/micro-vent-3dModal/configurable/dustNew/dustS/home',
-    },
-    {
-      name: '预警监测',
-      targatUrl: '/warnMonitor/configurable/home',
-    },
-  ]); //一级菜单列表
-  let activeIndex = ref(0); //当前激活menu索引
-  const router = useRouter();
-  const route = useRoute();
-  let isShowMenuItem = ref(false); //是否显示menuItem下拉选项菜单
-  let menuItemActive = ref(0); //menuItem当前激活选项
-  const leftMenus = computed(() => menuList.value.slice(0, 4));
-  const rightMenus = computed(() => menuList.value.slice(4));
-  function menuClick(data) {
-    activeIndex.value = data.index;
-    isShowMenuItem.value = !isShowMenuItem.value;
-    router.push({ path: data.item.targatUrl });
-  }
-  function menuItemClick(index) {
-    menuItemActive.value = index;
-    isShowMenuItem.value = false;
-  }
-  function updateActiveState(path: string) {
-    const currentPath = route.path;
-    menuList.value.forEach((menu, index) => {
-      // 处理有直接链接的菜单项
-      if (menu.targatUrl === currentPath) {
+let menuList = ref<any[]>([
+  {
+    name: '智能通风',
+    targatUrl: '/micro-vent-3dModal/configurable/ventNew/ventS/home',
+  },
+  {
+    name: '火灾监控',
+    targatUrl: '/micro-vent-3dModal/configurable/fireNew/fireS/home',
+  },
+  {
+    name: '粉尘监控',
+    targatUrl: '/micro-vent-3dModal/configurable/dustNew/dustS/home',
+  },
+  {
+    name: '预警监测',
+    targatUrl: '/warnMonitor/configurable/home',
+  },
+]); //一级菜单列表
+let activeIndex = ref(0); //当前激活menu索引
+const router = useRouter();
+const route = useRoute();
+let isShowMenuItem = ref(false); //是否显示menuItem下拉选项菜单
+let menuItemActive = ref(0); //menuItem当前激活选项
+const leftMenus = computed(() => menuList.value.slice(0, 4));
+const rightMenus = computed(() => menuList.value.slice(4));
+function menuClick(data) {
+  activeIndex.value = data.index;
+  isShowMenuItem.value = !isShowMenuItem.value;
+  router.push({ path: data.item.targatUrl });
+}
+function menuItemClick(index) {
+  menuItemActive.value = index;
+  isShowMenuItem.value = false;
+}
+function updateActiveState(path: string) {
+  const currentPath = route.path;
+  menuList.value.forEach((menu, index) => {
+    // 处理有直接链接的菜单项
+    if (menu.targatUrl === currentPath) {
+      activeIndex.value = index;
+      isShowMenuItem.value = false;
+      return;
+    }
+    // 处理有子菜单的菜单项
+    if (menu.MenuItemList) {
+      const itemIndex = menu.MenuItemList.findIndex((item) => item.targatUrl === path);
+      if (itemIndex !== -1) {
         activeIndex.value = index;
-        isShowMenuItem.value = false;
-        return;
-      }
-      // 处理有子菜单的菜单项
-      if (menu.MenuItemList) {
-        const itemIndex = menu.MenuItemList.findIndex((item) => item.targatUrl === path);
-        if (itemIndex !== -1) {
-          activeIndex.value = index;
-          menuItemActive.value = itemIndex;
-          isShowMenuItem.value = true;
-        }
+        menuItemActive.value = itemIndex;
+        isShowMenuItem.value = true;
       }
-    });
-  }
-  watch(
-    () => route.path,
-    (newPath) => {
-      updateActiveState(newPath);
-    },
-    {
-      immediate: true,
     }
-  );
-  onMounted(() => {
-    updateActiveState(route.path);
   });
+}
+watch(
+  () => route.path,
+  (newPath) => {
+    updateActiveState(newPath);
+  },
+  {
+    immediate: true,
+  }
+);
+onMounted(() => {
+  updateActiveState(route.path);
+});
 </script>
 <style lang="less" scoped>
-  @import '/@/design/theme.less';
+@import '/@/design/theme.less';
+
+@font-face {
+  font-family: 'douyuFont';
+  src: url('/@/assets/font/douyuFont.otf');
+}
 
-  @font-face {
+.New-nav {
+  position: relative;
+  width: 100%;
+  height: 100%;
+
+  .main-title {
+    width: 518px;
+    height: 100%;
+    display: flex;
+    align-items: center;
     font-family: 'douyuFont';
-    src: url('/@/assets/font/douyuFont.otf');
+    font-size: 25px;
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+    width: auto;
+    padding: 0;
+    color: #fff;
   }
 
-  .New-nav {
-    position: relative;
-    width: 100%;
+  .nav-menu {
+    position: absolute;
+    top: 0;
+    left: 675px;
     height: 100%;
+    display: flex;
+    position: static; // 移除绝对定位
+    display: flex;
+    width: auto;
+    .nav-menu-left {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      float: left;
+      .nav-menu-active {
+        position: relative;
+        cursor: pointer;
+        width: 100px;
+        height: 35px;
+        margin-top: 10px;
+        margin-right: 40px;
+        line-height: 31px;
+        text-align: center;
+        font-size: 16px;
+        background: url(/src/assets/images/fireNew/2-1.png) no-repeat;
+        background-size: 100% 100%;
+      }
 
-    .main-title {
-      width: 518px;
-      height: 100%;
+      .nav-menu-unactive {
+        position: relative;
+        cursor: pointer;
+        width: 100px;
+        height: 35px;
+        margin-top: 10px;
+        margin-right: 40px;
+        line-height: 31px;
+        text-align: center;
+        font-size: 16px;
+        background: url(/src/assets/images/fireNew/2-2.png) no-repeat;
+        background-size: 100% 100%;
+      }
+    }
+    .nav-menu-right {
       display: flex;
+      flex-direction: row;
       align-items: center;
-      font-family: 'douyuFont';
-      font-size: 25px;
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-      width: auto;
-      padding: 0;
-      color: #fff;
+      float: left;
+      margin-left: 42%;
+      .nav-menu-active {
+        position: relative;
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        margin-top: 10px;
+        margin-right: 40px;
+        line-height: 35px;
+        text-align: center;
+        font-size: 16px;
+        background: url(/src/assets/images/fireNew/2-3.png) no-repeat;
+        background-size: 100% 100%;
+      }
+
+      .nav-menu-unactive {
+        position: relative;
+        cursor: pointer;
+        width: 100px;
+        height: 40px;
+        margin-top: 10px;
+        margin-right: 40px;
+        line-height: 35px;
+        text-align: center;
+        font-size: 16px;
+        background: url(/src/assets/images/fireNew/2-4.png) no-repeat;
+        background-size: 100% 100%;
+      }
     }
 
-    .nav-menu {
+    .nav-menu-item {
       position: absolute;
-      top: 0;
-      left: 675px;
-      height: 100%;
-      display: flex;
-      position: static; // 移除绝对定位
+      top: 23px;
+      width: 130px;
       display: flex;
-      width: auto;
-      .nav-menu-left {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        float: left;
-        .nav-menu-active {
-          position: relative;
-          cursor: pointer;
-          width: 100px;
-          height: 40px;
-          margin-top: 10px;
-          margin-right: 40px;
-          line-height: 35px;
-          text-align: center;
-          font-size: 16px;
-          background: url(/src/assets/images/fireNew/2-1.png) no-repeat;
-          background-size: 100% 100%;
-        }
+      flex-direction: column;
+      align-items: center;
+      box-sizing: border-box;
 
-        .nav-menu-unactive {
-          position: relative;
-          cursor: pointer;
-          width: 100px;
-          height: 40px;
-          margin-top: 10px;
-          margin-right: 40px;
-          line-height: 35px;
-          text-align: center;
-          font-size: 16px;
-          background: url(/src/assets/images/fireNew/2-2.png) no-repeat;
+      .nav-menu-content {
+        width: 100%;
+        height: 100%;
+        overflow-y: auto;
+        margin-top: 25%;
+        .nav-menu-List {
+          background: url('@/assets/images/vent/homeNew/menuList.png') no-repeat;
           background-size: 100% 100%;
         }
-      }
-      .nav-menu-right {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        float: left;
-        margin-left: 42%;
-        .nav-menu-active {
-          position: relative;
-          cursor: pointer;
-          width: 100px;
-          height: 40px;
-          margin-top: 10px;
-          margin-right: 40px;
-          line-height: 35px;
-          text-align: center;
-          font-size: 16px;
-          background: url(/src/assets/images/fireNew/2-3.png) no-repeat;
+        .menu-item-active {
+          color: #ddd;
+          z-index: 999;
+          width: 100%;
+          height: 36px;
+          line-height: 36px;
+          font-size: 14px;
+          background: url('@/assets/images/fireNew/2-2.png') no-repeat;
           background-size: 100% 100%;
         }
 
-        .nav-menu-unactive {
-          position: relative;
-          cursor: pointer;
-          width: 100px;
+        .menu-item-unactive {
+          color: #ddd;
+          width: 100%;
           height: 40px;
-          margin-top: 10px;
-          margin-right: 40px;
-          line-height: 35px;
-          text-align: center;
-          font-size: 16px;
-          background: url(/src/assets/images/fireNew/2-4.png) no-repeat;
-          background-size: 100% 100%;
+          line-height: 40px;
+          font-size: 14px;
         }
       }
+    }
 
-      .nav-menu-item {
-        position: absolute;
-        top: 23px;
-        width: 130px;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        box-sizing: border-box;
-
-        .nav-menu-content {
-          width: 100%;
-          height: 100%;
-          overflow-y: auto;
-          margin-top: 25%;
-          .nav-menu-List {
-            background: url('@/assets/images/vent/homeNew/menuList.png') no-repeat;
-            background-size: 100% 100%;
-          }
-          .menu-item-active {
-            color: #ddd;
-            z-index: 999;
-            width: 100%;
-            height: 36px;
-            line-height: 36px;
-            font-size: 14px;
-            background: url('@/assets/images/fireNew/2-2.png') no-repeat;
-            background-size: 100% 100%;
-          }
-
-          .menu-item-unactive {
-            color: #ddd;
-            width: 100%;
-            height: 40px;
-            line-height: 40px;
-            font-size: 14px;
-          }
-        }
+    @keyframes fadeIn {
+      from {
+        opacity: 0;
       }
 
-      @keyframes fadeIn {
-        from {
-          opacity: 0;
-        }
-
-        to {
-          opacity: 1;
-        }
+      to {
+        opacity: 1;
       }
+    }
 
-      /* 定义淡出动画 */
-      @keyframes fadeOut {
-        from {
-          opacity: 1;
-        }
+    /* 定义淡出动画 */
+    @keyframes fadeOut {
+      from {
+        opacity: 1;
+      }
 
-        to {
-          opacity: 0;
-        }
+      to {
+        opacity: 0;
       }
     }
+  }
 
-    .userInfo {
-      width: 120px;
-      float: right;
-      background: url(/src/assets/images/vent/homeNew/user.png) no-repeat;
-      background-size: 100% 100%;
-      position: absolute;
-      top: 14px;
-      right: 0;
-      .userName {
-        margin-left: 40px;
-        font-size: 20px;
-      }
+  .userInfo {
+    width: 120px;
+    float: right;
+    background: url(/src/assets/images/vent/homeNew/user.png) no-repeat;
+    background-size: 100% 100%;
+    position: absolute;
+    top: 14px;
+    right: 0;
+    .userName {
+      margin-left: 40px;
+      font-size: 20px;
     }
   }
+}
 </style>

+ 19 - 19
src/views/vent/home/configurable/blue/components/center-area-warn.vue

@@ -4,8 +4,8 @@
       <div class="risk-score">
         <div class="vent-icon"></div>
         <div class="item-content">
-          <div class="ite-label">瓦斯监测预警</div>
-          <div class="ite-val">低风险</div>
+          <div class="ite-label" style="margin-left: 50px">瓦斯监测预警</div>
+          <div class="ite-val" style="margin-left: 50px">低风险</div>
         </div>
         <div class="item-content">
           <div class="ite-label">矿井瓦斯等级鉴定</div>
@@ -96,10 +96,10 @@ watch(
 
   .container {
     position: relative;
-    width: 60%;
-    height: 70%;
+    width: 51%;
+    height: 65%;
     margin-top: 16%;
-    margin-left: 20%;
+    margin-left: 23%;
     background: url(/src/assets/images/home-warn/6-1.png) no-repeat center;
     background-size: 100% 100%;
   }
@@ -119,15 +119,15 @@ watch(
     background: url(/src/assets/images/home-warn/6-2.png) no-repeat;
     background-size: 100% 100%;
     .item-content {
-      margin-left: 30px;
+      margin-left: 20px;
     }
   }
 
   .dust-warn {
     position: absolute;
     right: -26%;
-    top: 197px;
-    width: 217px;
+    top: 177px;
+    width: 183px;
     height: 64px;
     color: #fff;
     background: url(/src/assets/images/home-warn/6-3.png) no-repeat;
@@ -137,7 +137,7 @@ watch(
     position: absolute;
     right: -19%;
     bottom: 70px;
-    width: 217px;
+    width: 183px;
     height: 64px;
     color: #fff;
     background: url(/src/assets/images/home-warn/6-7.png) no-repeat;
@@ -145,9 +145,9 @@ watch(
   }
   .db-warn {
     position: absolute;
-    left: -20%;
+    left: -21%;
     bottom: 70px;
-    width: 217px;
+    width: 183px;
     height: 64px;
     color: #fff;
     background: url(/src/assets/images/home-warn/6-8.png) no-repeat;
@@ -155,9 +155,9 @@ watch(
   }
   .vent-warn {
     position: absolute;
-    left: -20%;
+    left: -22%;
     top: 64px;
-    width: 207px;
+    width: 183px;
     height: 64px;
     color: #fff;
     background: url(/src/assets/images/home-warn/6-5.png) no-repeat;
@@ -165,9 +165,9 @@ watch(
   }
   .device-warn {
     position: absolute;
-    right: -21%;
+    right: -22%;
     top: 64px;
-    width: 217px;
+    width: 183px;
     height: 64px;
     color: #fff;
     background: url(/src/assets/images/home-warn/6-6.png) no-repeat;
@@ -175,10 +175,10 @@ watch(
   }
   .fire-warn {
     position: absolute;
-    left: -7%;
-    top: 197px;
+    left: -9%;
+    top: 177px;
     transform: translate(-50%, 0);
-    width: 217px;
+    width: 183px;
     height: 64px;
     color: #fff;
     background: url(/src/assets/images/home-warn/6-4.png) no-repeat;
@@ -205,7 +205,7 @@ watch(
     position: absolute;
     display: flex;
     flex-direction: column;
-    margin-left: 100px;
+    margin-left: 88px;
     line-height: 33px;
   }
   .ite-val {

+ 1 - 2
src/views/vent/home/configurable/blue/components/detail/MiniBoard-Warn.vue

@@ -332,8 +332,7 @@ defineEmits(['click']);
   display: flex;
   flex-direction: column;
   align-items: center;
-  width: 121px;
-  height: 100%;
+  height: 80%;
   background: url('@/assets/images/home-warn/3-1.png') no-repeat;
   background-size: 100% 100%;
 }

+ 1 - 1
src/views/vent/home/configurable/blue/components/moduleBottom-warn.vue

@@ -39,7 +39,7 @@ function clickHandler() {
   z-index: 999;
   background: url('@/assets/images/home-warn/2-2.png') no-repeat;
   background-size: 100% 100%;
-  padding: 15px 15px 0px 15px;
+  padding: 13px 15px 0px 15px;
 }
 
 .module-content__title__expand {

+ 9 - 7
src/views/vent/home/configurable/blue/components/yj_gasWarn.vue

@@ -48,31 +48,33 @@ let props = defineProps({
   --image-model_fire-container_A: url('@/assets/images/home-warn/5-1.png');
   --image-model_fire-container_B: url('@/assets/images/home-warn/5-2.png');
   height: 100%;
-  padding: 10px 25px 0px 25px;
+  padding-left: 10px;
+  padding-top: 10px;
   box-sizing: border-box;
 
   .fire-container_A {
     position: relative;
     width: 100%;
-    height: 50%;
+    height: 60%;
+    top: 5%;
   }
 
   .fire-container_B {
     position: relative;
     width: 100%;
-    height: 50%;
+    height: 60%;
   }
   .title-box-label_icon_A {
     width: 20px;
     height: 20px;
-    margin-left: 16px;
+    margin-left: 15px;
     background: url('@/assets/images/home-warn/5-4.svg') no-repeat;
     background-size: 100% 100%;
   }
   .title-box-label_icon_B {
     width: 20px;
     height: 20px;
-    margin-left: 16px;
+    margin-left: 15px;
     background: url('@/assets/images/home-warn/5-5.svg') no-repeat;
     background-size: 100% 100%;
   }
@@ -118,12 +120,12 @@ let props = defineProps({
   }
 
   .title-box_A {
-    width: 100%;
+    width: 88%;
     height: 40px;
   }
 
   .title-box_B {
-    width: 100%;
+    width: 88%;
     height: 40px;
   }
 

+ 40 - 14
src/views/vent/home/configurable/blue/components/yj_ventWarn.vue

@@ -3,6 +3,7 @@
     <div v-for="(item, index) in ventData" :key="index" class="vent_warn_item">
       <div class="risk-label">{{ item.name }}</div>
       <div class="risk_progress_container">
+        <div class="progress_marker_icon" :style="getMarkerIconStyle(item)"></div>
         <div class="risk_progress" :style="getProgressStyle(item)"></div>
       </div>
       <div class="risk-value">{{ item.value }}</div>
@@ -11,16 +12,15 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, watch, onMounted, nextTick } from 'vue';
+import { watch } from 'vue';
 
-let props = defineProps({
+const props = defineProps({
   ventData: {
     type: Array,
-    default: () => {
-      return [];
-    },
+    default: () => [],
   },
 });
+
 const colorMap = {
   报警: ['#62465d', '#f50405'],
   重大风险: ['#60685e', '#f37606'],
@@ -31,17 +31,31 @@ const colorMap = {
 
 const getProgressStyle = (item) => {
   const maxValue = 10;
-  const [startColor, endColor] = colorMap[item.name];
+  const progress = item.value > 0 ? (item.value / maxValue) * 100 : 0;
+  const [startColor, endColor] = colorMap[item.name] || ['#ccc', '#ccc'];
 
   return {
-    width: `${item.value > 0 ? (item.value / maxValue) * 100 : 0}%`,
+    width: `${progress}%`,
     background: `linear-gradient(90deg, ${startColor} 0%, ${endColor} 100%)`,
   };
 };
+
+const getMarkerIconStyle = (item) => {
+  const maxValue = 10;
+  const rawProgress = item.value > 0 ? (item.value / maxValue) * 100 : 0;
+  const finalProgress = Math.max(rawProgress);
+
+  return {
+    left: `${finalProgress}%`,
+    top: '-12px',
+    transform: 'translateX(-50%)',
+  };
+};
+
 watch(
   () => props.ventData,
-  (newV, oldV) => {
-    console.log(props.ventData, '99900');
+  (newV) => {
+    console.log('ventData updated:', newV);
   },
   { immediate: true }
 );
@@ -50,45 +64,57 @@ watch(
 <style lang="less" scoped>
 .vent_warn {
   position: relative;
-  padding-top: 10px;
   height: 100%;
   .vent_warn_item {
     margin-left: 5px;
-    margin-top: 10px;
+    margin-top: 16px;
     padding: 10px 0 10px 20px;
     width: 94%;
-    height: 39px;
+    height: 30px;
     background: url('@/assets/images/home-warn/3-2.png') no-repeat;
     background-size: 100% 100%;
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .risk-label {
       flex: 1;
       font-size: 14px;
       color: #ffffff;
     }
+
     .risk-value {
       flex: 1;
       margin-right: 10px;
       color: #ffffff;
+      text-align: right;
     }
 
     .risk_progress_container {
+      position: relative;
       margin-left: 20px;
       flex: 3;
       height: 8px;
       margin: 0 10px;
       background: rgba(255, 255, 255, 0.1);
       border-radius: 4px;
-      overflow: hidden;
-      min-width: 0; /* 关键:允许容器收缩 */
+      min-width: 80px;
     }
     .risk_progress {
       height: 100%;
       border-radius: 4px;
       transition: width 0.6s cubic-bezier(0.22, 0.61, 0.36, 1);
     }
+    .progress_marker_icon {
+      position: absolute;
+      display: block;
+      width: 15px;
+      height: 15px;
+      background: url('@/assets/images/home-warn/3-3.png') no-repeat center;
+      background-size: 100% 100%;
+      z-index: 10;
+      pointer-events: none;
+    }
   }
 }
 </style>

+ 14 - 18
src/views/vent/home/configurable/blue/warnMonitor.vue

@@ -1,23 +1,20 @@
 <template>
-  <div class="fusion-home">
+  <div class="company-home">
     <div class="top-bg">
       <NewNav Title="预警监测管控系统" />
     </div>
     <template v-if="!route.query.deviceType">
-      <div class="main-container">
-        <ModuleDustNew
-          v-for="(cfg, index) in configs"
-          :key="cfg.deviceType + index"
-          :show-style="cfg.showStyle"
-          :module-data="cfg.moduleData"
-          :module-name="cfg.moduleName"
-          :device-type="cfg.deviceType"
-          :data="data"
-          :visible="true"
-        />
-      </div>
+      <ModuleDustNew
+        v-for="(cfg, index) in configs"
+        :key="cfg.deviceType + index"
+        :show-style="cfg.showStyle"
+        :module-data="cfg.moduleData"
+        :module-name="cfg.moduleName"
+        :device-type="cfg.deviceType"
+        :data="data"
+        :visible="true"
+      />
     </template>
-
     <div class="center-area">
       <CenterAreaWarn :echartData="paramData"></CenterAreaWarn>
     </div>
@@ -101,11 +98,12 @@ onUnmounted(() => {
   src: url('/@/assets/font/douyuFont.otf');
 }
 
-.fusion-home {
+.company-home {
   width: 100%;
   height: 100%;
+  color: @white;
   position: relative;
-
+  background: url('@/assets/images/vent/homeNew/bg.png') no-repeat center;
   .top-bg {
     width: 100%;
     height: 56px;
@@ -134,8 +132,6 @@ onUnmounted(() => {
   .main-container {
     width: 100%;
     height: 100%;
-    background: url('@/assets/images/home-warn/bg.png') no-repeat;
-    background-size: 100% 100%;
     .left-area {
       position: absolute;
       left: 0;

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

@@ -4327,11 +4327,11 @@ export const testConfigWarnMonitor: Config[] = [
         items: [
           {
             name: 'board',
-            basis: '20%',
+            basis: '25%',
           },
           {
             name: 'yj_ventWarn',
-            basis: '80%',
+            basis: '75%',
           },
         ],
       },

+ 3 - 7
src/views/vent/home/configurable/green/components/dz-card.vue

@@ -4,9 +4,7 @@
       <div class="gas-item">
         <div class="detail-box">
           <div class="detail-container">
-
-            <vue3-seamless-scroll hover-stop="true" :list="infoData.dataOn" :hover="true" :step="0.18"
-              class="seamless-warp">
+            <vue3-seamless-scroll hover-stop="true" :list="infoData.dataOn" :hover="true" :step="0.18" class="seamless-warp">
               <div class="detail-item" v-for="(item, index) in infoData.dataOn" :key="index">
                 <div class="item-box">
                   <div class="item-box-label">{{ titleLeft.address }}</div>
@@ -22,8 +20,6 @@
                 </div>
               </div>
             </vue3-seamless-scroll>
-
-
           </div>
         </div>
       </div>
@@ -157,7 +153,7 @@ watch(
             .item-box {
               width: 100%;
               padding: 0px 10px;
-              height: 60px;
+              height: 42px;
               display: flex;
               justify-content: space-between;
               align-items: center;
@@ -250,7 +246,7 @@ watch(
             .item-box {
               width: 100%;
               padding: 0px 10px;
-              height: 60px;
+              height: 42px;
               display: flex;
               justify-content: space-between;
               align-items: center;

+ 8 - 8
src/views/vent/home/configurable/green/components/dz-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="deviceType == 'deviceManageInfo' ? 'dz-list1' : 'dz-list'">
+  <div :class="deviceType == 'deviceManageInfo' ? 'yj-list1' : 'yj-list'">
     <div :class="deviceType == 'deviceManageInfo' ? 'icons-box1' : 'icons-box'" @mouseleave="resetScroll">
       <template v-for="(item, key) in listOption" :key="key">
         <div class="icon-item">
@@ -63,17 +63,17 @@ watch(
 @import '/@/design/theme.less';
 
 @{theme-deepblue} {
-  .dz-list {
+  .yj-list {
     --image-model_icon-item: url('@/assets/images/themify/deepblue/home-container/configurable/1600.png');
   }
 }
 
-.dz-list {
+.yj-list {
   --image-model_icon-item: url('@/assets/images/home-green/1600.png');
   width: 100%;
   height: 100%;
 }
-.dz-list1 {
+.yj-list1 {
   --image-model_icon-item1: url('@/assets/images/home-warn/8-6.png');
   width: 100%;
   height: 100%;
@@ -92,7 +92,7 @@ watch(
     width: 100%;
     height: 46px;
     background: var(--image-model_icon-item) no-repeat;
-    background-size: 100% 100%;
+    background-size: 85% 100%;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -108,7 +108,7 @@ watch(
       justify-content: space-around;
       position: absolute;
       top: 10px;
-      left: 76px;
+      left: 97;
       color: #ffffffe0;
       font-size: 14px;
       text-align: center;
@@ -159,7 +159,7 @@ watch(
   .icon-item {
     flex: 0 0 calc(50% - 5px);
     background: var(--image-model_icon-item1) no-repeat;
-    background-size: 100% 100%;
+    background-size: 94% 100%;
     height: 46px;
     position: relative;
     display: flex;
@@ -172,7 +172,7 @@ watch(
       justify-content: space-around;
       position: absolute;
       top: 10px;
-      left: 97px;
+      left: 78px;
       color: #ffffffe0;
       font-size: 14px;
       text-align: center;