更新

src/App.vue

@@ -56,6 +56,7 @@ export default {
   transform-origin: 0 0;
   position:relative;
   width: 1920px;
+  // width: 100%;
   // height: 1080px;
   height: 100%;
   // top:50%;

src/components3/seHeader/index.vue

@@ -54,12 +54,12 @@ export default {
     position: absolute;
     z-index: 10;
     .time {
-      font-size: 24px;
+      font-size: 2.23vh;
       color: $white;
-      margin-left:6px;
+      margin-left:10px;
     }
     .title {
-      font-size: 40px;
+      font-size: 3.71vh;
       color: $white;
       letter-spacing: 2.22px;
       font-family: "MicrosoftYaHei-Bold";
@@ -68,12 +68,12 @@ export default {
     }
     .logo {
       position: absolute;
-      right:40px;
+      right:45px;
       width:100%;
       text-align: right;
 
       .el-image {
-        height: 65px;
+        height: 6.02vh;
         vertical-align: middle;
       }
     }

src/components4/bottomWrap/saveSpend/index.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="main">
-        <el-col id="index1" style="width:550px;height:28.33vh;"></el-col>
+        <span class="biao"></span>
+        <el-col id="index1" style="width:550px;height:30vh;"></el-col>
     </div>
 </template>
 <script>
@@ -45,7 +46,7 @@ export default {
                 legend: {
                     orient: 'horizontal',
                     x: 'center',
-                    y: 245,
+                    y: 230,
                     icon: "circle",
                     textStyle: {
                         fontSize: 14,
@@ -55,7 +56,7 @@ export default {
                 series: [
                     {
                         type: 'pie',
-                        radius: ['40%', '55%'],
+                        radius: ['30%', '45%'],
                         data: [
                             { value: this.num[0], name: this.leixing[0], percent: '71.43', itemStyle: { color: '#8082D6' } },
 
@@ -122,6 +123,15 @@ export default {
 .main {
     width: 550px;
     height: 28.34vh;
+    display: flex;
+    .biao {
+            width: 6px;
+            height: 24px;
+            margin-top: 16px;
+            background-color: #fff;
+            display: inline-block;
+            vertical-align: middle;
+        }
 
     .text1 {
         font-family: MicrosoftYaHei-Bold;

src/components4/middleWrap/equipment/index.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="main">
         <div class="topText">
-            <div class="topT">设备损耗减少明细</div>
+            <span class="biao"></span>
+            <span class="topT">设备损耗减少明细</span>
             <div class="bottomT">通过调配设备运转时长，合理使用设备，延长设备使用时长。</div>
         </div>
         <div class="bottom">
@@ -80,6 +81,15 @@ export default{
 .main {
     height: 28.33vh;
     .topText {
+        margin-top: 13px;
+        .biao {
+            width: 6px;
+            height: 24px;
+            margin-top: -3px;
+            background-color: #fff;
+            display: inline-block;
+            vertical-align: middle;
+        }
         .topT {
             margin-left: 20px;
             width: 192px;
@@ -92,7 +102,7 @@ export default{
             margin-top: 0.92vh;
         }
         .bottomT {
-            margin-left: 20px;
+            margin-left: 26px;
             width: 432px;
             font-family: MicrosoftYaHei;
             font-size: 16px;

src/components4/middleWrap/saveEnergy/index.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="main">
         <div class="topText">
-            <div class="topT">节能策略</div>
+            <span class="biao"></span>
+            <span class="topT">节能策略</span>
             <div class="bottomT">结合好能监控及楼内环境传感器数据，制定指定话节能策略，实现节能降耗。</div>
         </div>
         <div class="botm">
@@ -51,7 +52,7 @@
             <div class="imgX">
                 <img src="@/assets/images4/0fbbc08bd505fb71d67f385f149272a.png" alt="">
             </div>
-            <div id="botmRight" style='height:18.76vh;width:230px;'></div>
+            <div id="botmRight" style='height:20vh;width:230px;'></div>
         </div>
 
     </div>
@@ -60,18 +61,18 @@
 <script>
 import * as echarts from 'echarts';
 export default {
-    props:['s'],
-    data(){
+    props: ['s'],
+    data() {
         return {
-            pieNum:[]
+            pieNum: []
         }
     },
-    watch:{
-s(val,old){
-    // console.log(val);
-    this.pieNum = val.pieNum
-    this.getData()
-}
+    watch: {
+        s(val, old) {
+            // console.log(val);
+            this.pieNum = val.pieNum
+            this.getData()
+        }
     },
     methods: {
         getData() {
@@ -79,19 +80,19 @@ s(val,old){
             let option = {
                 title: {
                     text: '节能占比',
-                    x:'center',
+                    x: 'center',
                     textStyle: {
-                        color:'#E6EFFF',
+                        color: '#E6EFFF',
                     }
                 },
                 legend: {
                     // y:'bottom',
-                    y:165,
-                    x:'center',
-                    show:'true',
-                    icon:'circle',
-                    textStyle:{
-                        color:' #B9C4D8',
+                    y: 165,
+                    x: 'center',
+                    show: 'true',
+                    icon: 'circle',
+                    textStyle: {
+                        color: ' #B9C4D8',
                         fontFamily: 'MicrosoftYaHei',
                         fontSize: 14,
                     }
@@ -112,9 +113,9 @@ s(val,old){
                             show: false
                         },
                         data: [
-                            { value: this.pieNum[0],name:'制冷机组', itemStyle: { color: '#8082D6' } },
-                            { value: this.pieNum[1], name:'照明',itemStyle: { color: '#F6BD16' } },
-                            { value: this.pieNum[2], name:'其他',itemStyle: { color: '#4EBA60' } },
+                            { value: this.pieNum[0], name: '制冷机组', itemStyle: { color: '#8082D6' } },
+                            { value: this.pieNum[1], name: '照明', itemStyle: { color: '#F6BD16' } },
+                            { value: this.pieNum[2], name: '其他', itemStyle: { color: '#4EBA60' } },
                         ]
                     }
                 ]
@@ -131,7 +132,18 @@ s(val,old){
 <style lang="scss" scoped>
 .main {
     height: 28.33vh;
+
     .topText {
+        margin-top: 13px;
+        .biao {
+            width: 6px;
+            height: 24px;
+            margin-top: -3px;
+            background-color: #fff;
+            display: inline-block;
+            vertical-align: middle;
+        }
+
         .topT {
             margin-left: 20px;
             margin-top: 1.48vh;
@@ -144,7 +156,7 @@ s(val,old){
         }
 
         .bottomT {
-            margin-left: 20px;
+            margin-left: 26px;
             font-family: MicrosoftYaHei;
             font-size: 16px;
             color: #E6EFFF;
@@ -157,8 +169,10 @@ s(val,old){
     .botm {
         display: flex;
         margin-top: 0.96vh;
+
         .botmLeft {
             width: 488px;
+
             .time {
                 display: flex;
 
@@ -345,7 +359,8 @@ s(val,old){
                 }
             }
         }
-        .imgX{
+
+        .imgX {
             margin-left: 10px;
         }
 

src/components4/middleWrap/saveManPower/index.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="main">
+        <span class="biao"></span>
         <div>
             <div id="index3" style="width:350px;height:26vh;">
         </div>
@@ -184,6 +185,15 @@ export default {
 .main {
     width: 550px;
     display: flex;
+    margin-top: 10px;
+    .biao {
+            width: 6px;
+            height: 24px;
+            margin-top: 13px;
+            background-color: #fff;
+            display: inline-block;
+            vertical-align: middle;
+        }
 
     .right1 {
         // width: 200px;

src/views/index.vue

@@ -449,7 +449,7 @@ export default {
     width: 100%;
     overflow: hidden;
     padding: 0 !important;
-    height: 28.33vh;
+    height: 29.7vh;
     // margin-top: 16px;
     // background: rgba(77, 85, 101, 0.15);
 
@@ -458,20 +458,20 @@ export default {
       width: 550px;
       overflow: hidden;
       padding: 0 !important;
-      height: 28.33vh;
+      height: 29.7vh;
       margin-top: 1.48vh;
       background: rgba(77, 85, 101, 0.15);
     }
     .centerT{
       width: 748px;
-      margin-top: 1.48vh;
+      margin-top: 1.49vh;
       background: rgba(77, 85, 101, 0.15);
       margin-left: 16px;
     }
     .rightT{
       // height: 28.33vh;
       width: 550px;
-      margin-top: 1.48vh;
+      margin-top: 1.49vh;
       background: rgba(77, 85, 101, 0.15);
       margin-left: 16px;
     }
@@ -480,13 +480,13 @@ export default {
       width: 550px;
       overflow: hidden;
       padding: 0 !important;
-      height: 28.33vh;
+      height: 29.7vh;
       margin-top: 16px;
       background: rgba(77, 85, 101, 0.15);
     }
     .right1T{
       width: 1314px;
-      margin-top: 1.48vh;
+      margin-top: 1.49vh;
       background: rgba(77, 85, 101, 0.15);
       margin-left: 16px;
     }
@@ -497,8 +497,8 @@ export default {
     width: 100%;
     overflow: hidden;
     padding: 0 !important;
-    height: 28.33vh;
-    margin-top: 9.25vh;
+    height: 29.7vh;
+    margin-top: 9.26vh;
     background: rgba(77, 85, 101, 0.15);
     .topWrap {
       display: inline-block;