Переглянути джерело

fix:设备时间表bug解决

chenzhen2 1 рік тому
батько
коміт
d8dfd3a9d5

+ 10 - 0
src/styles/comMedia.scss

@@ -81,4 +81,14 @@
   .popup-content {
     padding: 2.33vh 15px !important;
   }
+}
+
+@media screen and (min-width: 860px) {
+  .main-left {
+    width: calc(100% - 330px) !important;
+  }
+
+  .main-right {
+    width: 330px !important;
+  }
 }

+ 10 - 1
src/styles/index.scss

@@ -170,6 +170,7 @@ div:focus {
 
 .main-right {
   width: 375px;
+  // width: 330px;
 }
 
 .popup-content {
@@ -191,10 +192,18 @@ div:focus {
   .van-switch__node {
     width: 24px !important;
     height: 24px !important;
+
   }
-  
 }
 
+.van-switch--on.switch-btn {
+  .van-switch__node {
+    transform: translate(calc(48px - 24px)) !important;
+  }
+}
+
+
+
 
 .com-search {
   position: relative;

+ 14 - 6
src/views/envmonitor/components/FloorHeating/index.vue

@@ -39,7 +39,6 @@
         <div v-else></div>
         <Switch
           class="switch-btn"
-          :size="23"
           :loading="loadingFlag"
           :disabled="loadingFlag"
           :model-value="isOpen"
@@ -508,15 +507,17 @@ export default defineComponent({
 
 .floor-top {
   padding: 20px;
+  padding-bottom: 16px;
   .top-box {
     display: flex;
     justify-content: space-between;
-    padding-bottom: 20px;
+    padding-bottom: 25px;
     .top-left {
       span {
         display: block;
         &:nth-child(1) {
           font-family: "PingFang SC";
+          padding-top: 4px;
           font-style: normal;
           font-weight: 600;
           font-size: 16px;
@@ -524,6 +525,7 @@ export default defineComponent({
           color: #4d5262;
         }
         &:nth-child(2) {
+          position: relative;
           padding-top: 4px;
           font-family: "Persagy";
           font-style: normal;
@@ -532,6 +534,9 @@ export default defineComponent({
           line-height: 39px;
           color: #1b2129;
           sup {
+            position: absolute;
+            right: -12px;
+            top: 0;
             font-family: "Mulish";
             font-style: normal;
             font-weight: 400;
@@ -545,6 +550,7 @@ export default defineComponent({
     .top-right {
       width: 106px;
       height: 62px;
+      margin-right: 17px;
       img {
         width: 106px;
         height: 62px;
@@ -655,8 +661,9 @@ export default defineComponent({
   }
   .temp-slider {
     position: relative;
+    top: 31px;
     display: flex;
-    height: 28px;
+    height: 22px;
     flex: 1;
     padding: 0 24px;
     background: linear-gradient(
@@ -694,13 +701,13 @@ export default defineComponent({
       position: absolute;
       width: 32px;
       left: 0;
-      bottom: -2px;
+      bottom: -4px;
       z-index: 333;
       .bar-temp {
         display: block;
         text-align: center;
         // width: 50px;
-        padding-bottom: 6px;
+        padding-bottom: 4px;
         font-family: "Persagy";
         font-style: normal;
         font-weight: 400;
@@ -732,7 +739,8 @@ export default defineComponent({
 
 .floor-control-padding {
   padding: 30px 20px;
-  // padding-top: 40px;
+  padding-top: 0px;
+  height: 82px;
 }
 
 .line {

+ 2 - 2
vue.config.js

@@ -55,10 +55,10 @@ module.exports = {
       postcss: {
         plugins: [
           require('postcss-pxtorem')({ // 把px单位换算成rem单位
-            rootValue: 98, // vant官方使用的是37.5
+            rootValue: 96, // vant官方使用的是37.5
             minPixelValue: 4,
             unitPrecision: 3,
-            // selectorBlackList: ['vant', 'mu'], // 忽略转换正则匹配项
+            selectorBlackList: ['mu'], // 忽略转换正则匹配项
             propList: ['*']
           })
         ]