Merge branch 'dev_230517' of https://git.qdhtt.cn/shuai16.wang/smart-screen-demo-web into dev_230517

src/view/timing/timing-select-device.vue

@@ -32,8 +32,8 @@
             <div class="tem-btm">
               <span v-if="item.state" class="tem-openText">{{ item.tem }}</span>
               <span v-if="!item.state" class="tem-closeText">{{
-                item.tem
+                  item.tem
-              }}</span>
+                }}</span>
               <span v-if="item.state" class="tem-open">℃</span>
               <span v-if="!item.state" class="tem-close">℃</span>
             </div>
@@ -94,43 +94,43 @@ onMounted(() => {
       state: true,
       tem: "25",
       selectState: false,
-      imgState: [0],
+      imgState: [0]
     },
     {
       name: "客房空调",
       state: false,
       tem: "23",
       selectState: false,
-      imgState: [0],
+      imgState: [0]
     },
     {
       name: "厨房空调",
       state: true,
       tem: "27",
       selectState: false,
-      imgState: [1],
+      imgState: [1]
     },
     {
       name: "书房空调",
       state: true,
       tem: "26",
       selectState: true,
-      imgState: [1, 2],
+      imgState: [1, 2]
     },
     {
       name: "次卧空调",
       state: true,
       tem: "28",
       selectState: true,
-      imgState: [2],
+      imgState: [2]
     },
     {
       name: "主卫空调",
       state: false,
       tem: "25",
       selectState: false,
-      imgState: [0],
+      imgState: [0]
-    },
+    }
   ];
 });
 </script>
@@ -145,6 +145,7 @@ onMounted(() => {
   flex-wrap: wrap;
 
   .item-card {
+    position: relative;
     margin-bottom: 20px;
     width: 326px;
     height: 145px;
@@ -195,9 +196,10 @@ onMounted(() => {
   }
 
   .layout-btm {
+    position: absolute;
     display: flex;
     justify-content: space-between;
-    margin-top: 23px;
+    bottom: 10px;
   }
 
   .tem-btm {

src/view/ui/env-select.vue

@@ -17,7 +17,7 @@
             <div
               v-show="item.hum != 0"
               class="tem-text"
-              style="margin-left: 25px"
+              style="margin-left: 17px"
             >
               {{ item.hum }}
             </div>