样式修改

src/assets/circleEnergy.svg

@@ -0,0 +1,3 @@
+<svg width="606" height="383" viewBox="0 0 606 383" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M580.221 378C591.567 335.57 593.062 291.099 584.59 248C576.119 204.901 557.905 164.319 531.349 129.369C504.792 94.4193 470.597 66.0297 431.389 46.3791C392.18 26.7284 349 16.339 305.162 16.0082C261.323 15.6773 217.992 25.4137 178.492 44.4703C138.993 63.5269 104.375 91.3971 77.2961 125.942C50.2169 160.488 31.3959 200.79 22.2771 243.756C13.1584 286.722 13.9844 331.21 24.6918 373.807" stroke="#23CCF9" stroke-width="32" stroke-dasharray="1 6"/>
+</svg>

src/assets/css/common.less

@@ -1,11 +1,11 @@
 @font-face {
     font-family: "PersagyBold";
-    src: url("./font/PersagyBold.ttf");
+    src: url("./font/PersagyBold2.ttf");
   }
   
   @font-face {
     font-family: "Persagy";
-    src: url("./font/PersagyRegular.ttf");
+    src: url("./font/PersagyRegular2.ttf");
   }
 
 .verticalClass {

src/assets/horImg/changeHor.svg

@@ -0,0 +1,7 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.625" y="4.375" width="13.125" height="20.125" rx="1.75" stroke="#575271" stroke-width="1.6"/>
+<rect x="7" y="20.125" width="4.375" height="1.6" rx="0.8" fill="#575271"/>
+<path d="M18.375 14H23.625C24.5915 14 25.375 14.7835 25.375 15.75V22.75C25.375 23.7165 24.5915 24.5 23.625 24.5H18.375" stroke="#575271" stroke-width="1.6" stroke-linecap="round"/>
+<path d="M23.625 10.625C23.625 8.20875 21.6662 6.25 19.25 6.25" stroke="#575271" stroke-width="1.6" stroke-linecap="round"/>
+<path d="M23.2277 12.2474C23.3123 12.3207 23.4377 12.3207 23.5223 12.2474L25.8416 10.2388C25.9991 10.1025 25.9027 9.84375 25.6943 9.84375H21.0557C20.8473 9.84375 20.7509 10.1025 20.9084 10.2388L23.2277 12.2474Z" fill="#575271"/>
+</svg>

src/assets/horImg/changeVer.svg

@@ -0,0 +1,7 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.625" y="4.375" width="13.125" height="20.125" rx="1.75" stroke="#575271" stroke-width="1.6"/>
+<rect x="7" y="20.125" width="4.375" height="1.6" rx="0.8" fill="#575271"/>
+<path d="M18.375 14H23.625C24.5915 14 25.375 14.7835 25.375 15.75V22.75C25.375 23.7165 24.5915 24.5 23.625 24.5H18.375" stroke="#575271" stroke-width="1.6" stroke-linecap="round"/>
+<path d="M24.625 10.625C24.625 8.20875 22.6662 6.25 20.25 6.25" stroke="#575271" stroke-width="1.6" stroke-linecap="round"/>
+<path d="M18.1276 6.2277C18.0543 6.31225 18.0543 6.43775 18.1276 6.5223L20.1362 8.84163C20.2725 8.99911 20.5312 8.90266 20.5312 8.69434L20.5312 4.05566C20.5312 3.84734 20.2725 3.75089 20.1362 3.90837L18.1276 6.2277Z" fill="#575271"/>
+</svg>

src/views/horizontalScreen.vue

@@ -98,15 +98,13 @@ export default {
     },
     mounted() {
         this.nowPage = 1;
-       // debugger;
-        
         this.timePageShow();
     },
     methods: {
         doneTowPage() {
             //第二屏刷新结束 通知
             //debugger;
-            this.nowPage = 3;
+            this.nowPage = 1;
             this.timePageShow();
         },
         timePageShow() {

src/views/valueDelivery/AirSwitchVer.vue

@@ -94,11 +94,13 @@ export default {
     .air-cont {
         display: flex;
         flex-direction: row;
+        padding-top:35px;
         .air-left {
             flex: 3;
             display: flex;
-            justify-content: center;
+            // justify-content: center;
             flex-direction: column;
+            padding-top:20px;
             .bar-box {
                 width: 88%;
                 height: 10px;
@@ -131,7 +133,6 @@ export default {
         }
         .air-bg {
             flex: 1;
-            padding-top: 6px;
             img {
                 width: 240px;
             }

src/views/valueDelivery/FloorSpace.vue

@@ -79,7 +79,7 @@ export default {
                 {
                     id: "temp",
                     name: "温度",
-                    img: require("../../assets/verwendu.png"),
+                    img: require("../../assets/wendu.svg"),
                     unit: "℃",
                     code: "Tdb",
                     fixed: 1,
@@ -88,7 +88,7 @@ export default {
                     id: "humidity",
                     code: "RH",
                     name: "湿度",
-                    img: require("../../assets/vershidu.png"),
+                    img: require("../../assets/shidu.svg"),
                     unit: "%",
                     fixed: 0,
                 },
@@ -96,7 +96,7 @@ export default {
                     id: "co2",
                     code: "CO2",
                     name: "CO₂",
-                    img: require("../../assets/verco2.png"),
+                    img: require("../../assets/co2.svg"),
                     unit: "ppm",
                     fixed: 0,
                 },
@@ -104,7 +104,7 @@ export default {
                     id: "methanal",
                     code: "HCHO",
                     name: "甲醛",
-                    img: require("../../assets/verjiaquan.png"),
+                    img: require("../../assets/jiaquan.svg"),
                     unit: "mg/m³",
                     fixed: 2,
                 },
@@ -112,7 +112,7 @@ export default {
                     id: "pm25",
                     code: "PM2d5",
                     name: "PM2.5",
-                    img: require("../../assets/verpm25.png"),
+                    img: require("../../assets/pm25.svg"),
                     unit: "ug/m³",
                     fixed: 0,
                 },
@@ -354,6 +354,7 @@ export default {
         .eachItem {
             cursor: pointer;
             font-size: 24px;
+            font-weight: 600;
             color: #9b98ad;
             margin-right: 60px;
             display: flex;
@@ -393,14 +394,13 @@ export default {
     // width: 1000px;
     margin: 0 auto;
     background: #ffffff;
-    padding-right: 16px;
     box-sizing: border-box;
     .floor-item {
         display: flex;
-        padding: 18px 0;
+        padding: 18px 16px 18px 0;
         box-sizing: border-box;
         background: linear-gradient(
-            161.44deg,
+            186deg,
             rgba(50, 129, 246, 0.1) 6.16%,
             rgba(50, 129, 246, 0) 81.03%
         );
@@ -435,6 +435,8 @@ export default {
                 border-radius: 8px;
                 background: #d9f5d6;
                 text-align: center;
+                padding:0 8px;
+                box-sizing: border-box;
             }
         }
     }

src/views/valueDelivery/HorFloorSpace.vue

@@ -64,28 +64,28 @@ export default {
                 id: 'temp',
                 code:'Tdb',
                 name: '温度',
-                img: require('../../assets/horImg/wendu.png'),
+                img: require('../../assets/horImg/wendu.svg'),
                 unit: '℃',
                 fixed:1
             }, {
                 id: 'humidity',
                 code:'RH',
                 name: '湿度',
-                img: require('../../assets/horImg/shidu.png'),
+                img: require('../../assets/horImg/shidu.svg'),
                 unit: '%',
                 fixed:0
             }, {
                 id: 'co2',
                 code:'CO2',
                 name: 'CO₂',
-                img: require('../../assets/horImg/co2.png'),
+                img: require('../../assets/horImg/co2.svg'),
                 unit: 'ppm',
                 fixed:0
             }, {
                 id: 'methanal',
                 code:'HCHO',
                 name: '甲醛',
-                img: require('../../assets/horImg/jiaquan.png'),
+                img: require('../../assets/horImg/jiaquan.svg'),
                 unit: 'mg/m³',
                 fixed:2
 
@@ -93,7 +93,7 @@ export default {
                 id: 'pm25',
                 code:'PM2d5',
                 name: 'PM2.5',
-                img: require('../../assets/horImg/pm25.png'),
+                img: require('../../assets/horImg/pm25.svg'),
                 unit: 'ug/m³',
                 fixed:0
             }],
@@ -340,8 +340,9 @@ export default {
     display: flex;
     //min-height: 730px;
     background: #ffffff;
-     border-top-left-radius: 16px;
-    border-bottom-left-radius: 16px;
+     border-radius: 16px;
+     overflow: hidden;
+  
 }
 .leftChange {
     height: 100%;
@@ -446,14 +447,14 @@ export default {
     background: #ffffff;
     border-top-right-radius: 16px;
     border-bottom-right-radius: 16px;
-    padding-right:20px;
+    // padding-right:20px;
     box-sizing: border-box;
     .floor-item {
         display: flex;
-        padding: 18px 0;
+        padding: 18px 20px 18px 0;
         box-sizing: border-box;
         background: linear-gradient(
-            161.44deg,
+            186deg,
             rgba(50, 129, 246, 0.1) 6.16%,
             rgba(50, 129, 246, 0) 81.03%
         );

src/views/valueDelivery/lastEnergyChart.vue

@@ -78,7 +78,7 @@ export default {
     },
     watch: {
         showPing(newv, oldv) {
-            // debugger; 当前是第三屏时渲染
+            // debugger; 当前是第三屏时请求数据 渲染chart
             if (newv == 3) {
                 if (!this.lastChart) {
                     this.queryLastDayEnergy();

src/views/valueDelivery/pageHead.vue

@@ -34,10 +34,10 @@ import Vue from "vue";
 
 declare function require(img: string): string;
 
-const persagyLogo = require("@/assets/horImg/persagyLogo.png");
+const persagyLogo = require("@/assets/horImg/persagyLogo.svg");
 const title = require("@/assets/horImg/hor_title.png");
-const changeVer = require("@/assets/horImg/changeVer.png");
-const changeHor = require("@/assets/horImg/changeHor.png");
+const changeVer = require("@/assets/horImg/changeVer.svg");
+const changeHor = require("@/assets/horImg/changeHor.svg");
 import { mapState } from "vuex";
 import moment from "moment";
 export default Vue.extend({

src/views/verticalScreen.vue

@@ -19,7 +19,7 @@
                 </div>
                 <div class="subhead-title">低能耗亲自然</div>
                 <div class="bottomCont">
-                    <img src="@/assets/circleEnergy.png" />
+                    <img src="@/assets/circleEnergy.svg" />
                     <div class="showData">
                         <div class="title">比基准能耗</div>
                         <div class="energySave">
@@ -70,7 +70,7 @@ export default {
     },
     mounted() {
         this.nowPage = 1;
-        this.timePageShow();
+        //this.timePageShow();
     },
     destroyed() {
         clearInterval(this.verticalInterval);