فهرست منبع

‘解决合并报错’

bobo04052021@163.com 4 روز پیش
والد
کامیت
2a52fe3b06
1فایلهای تغییر یافته به همراه23 افزوده شده و 17 حذف شده
  1. 23 17
      src/views/vent/home/configurable/components/detail/CustomList.vue

+ 23 - 17
src/views/vent/home/configurable/components/detail/CustomList.vue

@@ -60,20 +60,27 @@ withDefaults(
   }
 }
 
-.list_A {
-  padding-left: 5px;
-}
-.list-item__content_A {
-  background-repeat: no-repeat;
-  background-image: @vent-gas-list-item-bg-img;
-  // padding: 5px 10px;
-  display: flex;
-}
-.list-item__icon_A {
+.list {
+  --image-list_bg_default: url(/@/assets/images/home-container/configurable/list_bg_default.png);
+  --image-triangle_icon: url(/@/assets/images/home-container/configurable/triangle_icon.png);
+  --image-list_bg_b: url(/@/assets/images/home-container/configurable/list_bg_b.png);
+  --image-deco_1: url(/@/assets/images/home-container/configurable/deco_1.png);
+  --image-list_bg_c: url(/@/assets/images/home-container/configurable/list_bg_c.png);
+  --image-list_bg_defflip: url(/@/assets/images/home-container/configurable/list_bg_defflip.png);
+  --image-list_bg_d: url(/@/assets/images/home-container/configurable/list_bg_d.png);
+  --image-list_bg_e: url(/@/assets/images/home-container/configurable/list_bg_e.png);
+  --image-list: url(/@/assets/images/home-container/configurable/firehome/list.png);
+  --image-list_bg_h: url(/@/assets/images/home-container/configurable/list_bg_h.png);
+  --image-list_bg_i: url('/@/assets/images/home-container/configurable/list_bg_i.png');
+  --image-list_bg_j: url('/@/assets/images/home-container/configurable/list_bg_j.png');
+  --image-linear-gradient-3: linear-gradient(to right, #39deff15, #3977e500);
+  padding: 5px 20px;
+  position: relative;
   background-repeat: no-repeat;
-  width: 25px;
-  height: 29px;
-  background-image: var(--image-triangle_icon);
+  width: 100%;
+  height: 100%;
+  background-size: 100% 100%;
+  background-image: var(--image-list_bg_default);
 }
 
 .list_A {
@@ -82,7 +89,7 @@ withDefaults(
 .list-item__content_A {
   background-repeat: no-repeat;
   background-image: @vent-gas-list-item-bg-img;
-  padding: 5px 10px;
+  // padding: 5px 10px;
   display: flex;
 }
 .list-item__icon_A {
@@ -279,11 +286,10 @@ withDefaults(
   display: flex;
   flex-wrap: wrap;
   justify-content: flex-start;
-  margin-left: 73px;
 }
 .list-item_I {
-  width: 155px;
-  height: 57px;
+  width: 160px;
+  height: 63px;
   align-items: center;
   text-align: center;
   background-image: var(--image-list_bg_i);