xiaohuan 5 лет назад
Родитель
Сommit
3194f722fa

+ 4 - 4
src/components/strategyLine.vue

@@ -7,7 +7,7 @@
                 <i class='innerMax'></i> 室内最高温度
             </div>
 
-            <div style='width:100%;height:350px;margin-right:24px;'>
+            <div style='width:100%;height:100%;'>
                 <div id='leftLine' style='width:100%;height:100%;'></div>
             </div>
         </div>
@@ -18,7 +18,7 @@
                 预测冷量
             </div>
 
-            <div style='width:90%;height:350px;margin-right:24px;'>
+            <div style='width:100%;height:100%;'>
                 <div id='RightLine' style='width:100%;height:100%;'></div>
             </div>
         </div>
@@ -288,7 +288,7 @@ export default {
     height: 100%;
     display: flex;
     .leftL {
-        width: 50%;
+        width: 45%;
         flex: 1;
         .leftLengend {
             text-align: center;
@@ -314,7 +314,7 @@ export default {
     }
     .rightL {
         flex: 1;
-        width: 50%;
+        width: 45%;
         .rightLengend {
             text-align: center;
             margin-bottom: 10px;

+ 4 - 1
src/views/appeal/index.vue

@@ -166,7 +166,7 @@ export default {
             day1: '',
             yesterday: '',
             today: '',
-            appDate:''
+            appDate: ''
         }
     },
     components: {
@@ -873,6 +873,9 @@ export default {
 </style>
 <style lang="scss">
 .view-dialog {
+    .el-dialog__wrapper {
+        top: -60px;
+    }
     .el-dialog__header {
         padding: 16px 28px 0 32px;
         .el-dialog__title {

+ 5 - 2
src/views/evaluate/evSnapshotsDialog.vue

@@ -302,7 +302,7 @@ export default {
     }
     .snapshotss-center2 {
         padding: 0 20px;
-        margin-bottom: 44px;
+        margin-bottom: 30px;
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -314,9 +314,10 @@ export default {
             display: flex;
             align-items: center;
             padding-left: 24px;
+            flex: 1;
         }
         .snapshotss-cont2-box1 {
-            padding-right: 120px;
+            margin-right: 12px;
             span:nth-of-type(1) {
                 height: 22px;
                 font-size: 14px;
@@ -372,6 +373,8 @@ export default {
         }
     }
     .snapshotss-foot {
+        padding-bottom: 20px;
+        height: 280px;
         display: flex;
         justify-content: space-between;
     }

+ 12 - 11
src/views/strategy/animationBox.vue

@@ -76,15 +76,15 @@ export default {
         }
     },
     components: { bomBox, strategyLine },
-    computed:{
-
-    },
-    methods:{
-        isShowDraw(){
-            if((Object.keys(this.chillerCommandQ).length>0 && this.chillerCommandQ.isNew) || (Object.keys(this.chillerCommandQ).length>0 && !this.chillerCommandQ.isExecuted)){
+    methods: {
+        isShowDraw() {
+            if (
+                (Object.keys(this.chillerCommandQ).length > 0 && this.chillerCommandQ.isNew) ||
+                (Object.keys(this.chillerCommandQ).length > 0 && !this.chillerCommandQ.isExecuted)
+            ) {
                 this.showDraw = true
-            }else{
-                 this.showDraw = false
+            } else {
+                this.showDraw = false
             }
         }
     },
@@ -155,7 +155,7 @@ export default {
             span:nth-of-type(2),
             span:nth-of-type(4) {
                 height: 32px;
-                font-size: 24px;
+                font-size: 18px;
                 font-family: Persagy;
                 color: rgba(31, 36, 41, 1);
                 line-height: 29px;
@@ -176,7 +176,7 @@ export default {
         width: 8px;
         border-radius: 8px 0 0 8px;
         cursor: pointer;
-        height: 357px;
+        height: 288px;
         .float-r {
             width: 8px;
             display: flex;
@@ -185,7 +185,7 @@ export default {
             cursor: pointer;
             .float-line {
                 width: 8px;
-                height: 357px;
+                height: 288px;
                 border-radius: 8px 0 0 8px;
             }
             img {
@@ -217,6 +217,7 @@ export default {
         }
     }
     .an-bottom {
+        height: 350px;
         margin-top: 45px;
         display: flex;
     }

+ 31 - 33
src/views/strategy/bomBox.vue

@@ -5,7 +5,10 @@
             <img src='../../assets/close.png' alt />
         </div>
         <div class='bomb-left'>
-            <div class='bomb-left1'>当前策略 <span v-if="data.isExecuted" class="excute">已执行</span></div>
+            <div class='bomb-left1'>
+                当前策略
+                <span v-if='data.isExecuted' class='excute'>已执行</span>
+            </div>
             <div class='bomb-left2'>
                 应执行时间
                 <span v-if='data.onTime'>{{data.onTime?data.onTime.slice(0,2)+":"+data.onTime.slice(2,4):"--"}}</span>
@@ -54,7 +57,7 @@
                 </div>
             </div>
             <div class='bomb-right-bottom'>
-                <el-input placeholder='你可以在此处填写备注信息' v-model='remarks' @blur='saveRemarks'  prefix-icon='el-icon-edit'></el-input>
+                <el-input placeholder='你可以在此处填写备注信息' v-model='remarks' @blur='saveRemarks' prefix-icon='el-icon-edit'></el-input>
             </div>
         </div>
     </div>
@@ -99,21 +102,21 @@ export default {
             let option = {
                 color: ['#E1F2FF', '#0091FF'],
                 graphic: [
-                {
-                    type: 'text', 
-                    left: 'center',
-                    top: '45%',
-                    style: {
-                        text: this.circle2 + '%',
-                        textAlign: 'center',
-                        fill: '#000', //文字的颜色
-                        width: 30,
-                        height: 30,
-                        fontSize: 18,
-                        color: '#4d4f5c',
-                        fontFamily: 'Microsoft YaHei'
+                    {
+                        type: 'text',
+                        left: 'center',
+                        top: '45%',
+                        style: {
+                            text: this.circle2 + '%',
+                            textAlign: 'center',
+                            fill: '#000', //文字的颜色
+                            width: 30,
+                            height: 30,
+                            fontSize: 18,
+                            color: '#4d4f5c',
+                            fontFamily: 'Microsoft YaHei'
+                        }
                     }
-                }
                 ],
                 series: [
                     {
@@ -125,7 +128,7 @@ export default {
                         label: {
                             normal: {
                                 show: true,
-                                position: 'center',
+                                position: 'center'
                             }
                         },
                         labelLine: {
@@ -177,15 +180,15 @@ export default {
         .bomb-left1 {
             padding-left: 30px;
             font-size: 16px;
-            margin: 0px 0 20px 0;
-            .excute{
-                width:58px;
-                height:24px;
-                background:rgba(217,245,214,1);
-                border-radius:2px;
-                font-size:14px;
-                font-family:MicrosoftYaHei;
-                color:rgba(35,123,25,1);
+            margin: 10px 0 20px 0;
+            .excute {
+                width: 58px;
+                height: 24px;
+                background: rgba(217, 245, 214, 1);
+                border-radius: 2px;
+                font-size: 14px;
+                font-family: MicrosoftYaHei;
+                color: rgba(35, 123, 25, 1);
                 padding: 2px 8px;
                 margin-left: 6px;
             }
@@ -200,7 +203,6 @@ export default {
             padding-left: 30px;
             color: #646c73;
             font-size: 14px;
-           
         }
     }
     .bomb-right {
@@ -215,12 +217,8 @@ export default {
             .snapshotss-cont2-box1,
             .snapshotss-cont2-box2 {
                 flex: 1;
-                height: 80px;
-                background: url('../../assets/copy.png');
-                background-size: 100% 100%;
                 display: flex;
                 align-items: center;
-                padding-left: 24px;
             }
             .snapshotss-cont2-box1 {
                 margin-right: 12px;
@@ -232,7 +230,7 @@ export default {
                     margin-right: 20px;
                 }
                 span:not(:first-child) {
-                    height: 28px;
+                    height: 26px;
                     background: rgba(255, 255, 255, 1);
                     border-radius: 16px;
                     font-size: 14px;
@@ -278,7 +276,7 @@ export default {
                 }
             }
         }
-        .bomb-right-bottom{
+        .bomb-right-bottom {
             margin-bottom: 10px;
         }
     }