update

src/views/appeal/appealDetail.vue

@@ -243,7 +243,7 @@ export default {
     align-items: center;
 }
 .detailContainer {
-    max-width: 762px;
+    min-width: 762px;
     width: 60%;
     margin: 0 auto;
     padding-top: 36px;

src/views/appeal/appealDetails.vue

@@ -207,7 +207,7 @@ export default {
     align-items: center;
 }
 .detailContainer {
-    max-width: 762px;
+    min-width: 762px;
     width: 60%;
     margin: 0 auto;
     padding-top: 36px;

src/views/audit/auditTable.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class='detailTable' style='width: 767px'>
-        <el-table :data='tableList' border>
-            <el-table-column prop='title' label width='95'></el-table-column>
+    <div class='detailTable'>
+        <!-- <el-table :data='tableList' border>
+            <el-table-column prop='title' label width='92'></el-table-column>
             <el-table-column prop label='冷机开启台数' align='center' width>
                 <template slot-scope='{row}'>
                     <font :class='row.chillerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(row.chillerNumSetLOrg,true,0)}}</font>
@@ -78,7 +78,104 @@
                     HZ
                 </template>
             </el-table-column>
-        </el-table>
+        </el-table>-->
+        <div class='detail-box'>
+            <div class='detail-box-top'>
+                <div style='width:100px;diplay:inline-block;'></div>
+                <span style='width:75px;text-align:center'>
+                    冷机
+                    <br />开启台数
+                </span>
+                <span style='width:75px;text-align:center'>
+                    冷机
+                    <br />出水温度
+                </span>
+                <span style='width:70px;text-align:center'>
+                    冷冻泵
+                    <br />台数
+                </span>
+                <span style='width:60px;text-align:center'>
+                    冷冻泵
+                    <br />频率
+                </span>
+                <span style='width:70px;text-align:center'>
+                    冷却泵
+                    <br />台数
+                </span>
+                <span style='width:60px;text-align:center'>
+                    冷却泵
+                    <br />频率
+                </span>
+                <span style='width:70px;text-align:center'>
+                    冷却塔
+                    <br />台数
+                </span>
+                <span style='width:60px;text-align:center'>
+                    冷却塔
+                    <br />频率
+                </span>
+                <span style='width:75px;text-align:center'>
+                    室内
+                    <br />平均温度
+                </span>
+                <span style='width:75px;text-align:center'>
+                    室内
+                    <br />最高温度
+                </span>
+                <span style='width:60px;text-align:center'>
+                    冷机
+                    <br />负载率
+                </span>
+            </div>
+            <div class='detail-box-bottom' Î>
+                <div class='detail-box-bottom-box' v-for='(item,index) in tableList' :key='index'>
+                    <span
+                        style='width:100px;font-size:12px;background:rgba(248,249,250,1);color:rgba(100,106,115,1);diplay:inline-block;text-align: center;'
+                    >{{item.title}}</span>
+                    <span style='width:75px;text-align:center'>
+                        <font :class='item.chillerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(item.chillerNumSetLOrg,true,0)}}</font>大
+                        <font :class='item.chillerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(item.chillerNumSetSOrg,true,0)}}</font>小
+                    </span>
+                    <span style='width:75px;text-align:center'>
+                        <font
+                            :class='item.chillWaterOutTempSetOrg=="-9999"?"reds":""'
+                        >{{formatterRes(parseInt(item.chillWaterOutTempSetOrg),false,1)}}</font>℃
+                    </span>
+                    <span style='width:70px;text-align:center'>
+                        <font :class='item.coolPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(item.coolPumpNumSetLOrg,true,1)}}</font>大
+                        <font :class='item.coolPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(item.coolPumpNumSetSOrg,true,0)}}</font>小
+                    </span>
+                    <span style='width:60px;text-align:center'>
+                        <font :class='item.coolPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.coolPumpFreqSetOrg,false,0)}}</font>HZ
+                    </span>
+                    <span style='width:70px;text-align:center'>
+                        <font :class='item.chillPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(item.chillPumpNumSetLOrg,true,0)}}</font>大
+                        <font :class='item.chillPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(item.chillPumpNumSetSOrg,true,0)}}</font>小
+                    </span>
+                    <span style='width:60px;text-align:center'>
+                        <font :class='item.chillPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.chillPumpFreqSetOrg,false,0)}}</font>HZ
+                    </span>
+                    <span style='width:70px;text-align:center'>
+                        <font :class='item.coolTowerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(item.coolTowerNumSetSOrg,true,0)}}</font>大
+                        <font :class='item.coolTowerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(item.coolTowerNumSetLOrg,true,0)}}</font>小
+                    </span>
+                    <span style='width:60px;text-align:center'>
+                        <font :class='item.coolTowerFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(item.coolTowerFreqSetOrg,false,0)}}</font>HZ
+                    </span>
+                    <span style='width:75px;text-align:center'>
+                        <font :class='item.meanTindoor=="-9999"?"reds":""'>{{formatterRes(item.meanTindoor,false,1)}}</font>℃
+                    </span>
+                    <span style='width:75px;text-align:center'>
+                        <font :class='item.maxTindoor=="-9999"?"reds":""'>{{formatterRes(item.maxTindoor,false,1)}}</font>℃
+                    </span>
+                    <span style='width:60px;text-align:center'>
+                        <font
+                            :class='parseInt(item.plrAllOrg)=="-9999"?"reds":""'
+                        >{{(item.plrAllOrg==undefined)?'--':(parseInt(item.plrAllOrg)=='-9999'?'x':(parseInt(item.plrAllOrg)=='-9998'?'--':parseInt(item.plrAllOrg)))}}</font>HZ
+                    </span>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 
@@ -135,6 +232,40 @@ export default {
         padding-right: 2px;
         padding-left: 2px;
     }
+    .detail-box {
+        // width: 100%;
+        .detail-box-top {
+            // width: 762px;
+            height: 48px;
+            background: rgba(248, 249, 250, 1);
+            display: flex;
+            border-bottom: 1px solid #eee;
+            span {
+                display: inline-block;
+                font-size: 12px;
+                font-family: MicrosoftYaHei;
+                color: rgba(100, 106, 115, 1);
+                line-height: 16px;
+                padding: 8px 5px;
+            }
+        }
+        .detail-box-bottom {
+            // width:92px;
+            height: 123px;
+            background: rgba(255, 255, 255, 1);
+            font-size: 12px;
+            font-family: MicrosoftYaHei;
+            color: rgba(31, 36, 41, 1);
+            .detail-box-bottom-box {
+                display: flex;
+                border-bottom: 1px solid #eee;
+                span {
+                    padding: 12px 5px;
+                    display: inline-block;
+                }
+            }
+        }
+    }
 }
 </style>
 <style lang="scss">

src/views/evaluate/evSnapshotsDialog.vue

@@ -296,9 +296,9 @@ export default {
                 this.dataY1.push(el.tout == '-9999' ? undefined : el.tout)
                 this.dataY2.push(el.meanTindoor == '-9999' ? undefined : el.meanTindoor)
                 this.dataY3.push(el.maxTindoor == '-9999' ? undefined : el.maxTindoor)
-                this.loadY1.push(el.nowPlantLoad ? (el.nowPlantLoad == '-9999' ? undefined : el.nowPlantLoad) : undefined)
-                this.loadY2.push(el.predictedLoadUpLimit ? (el.predictedLoadUpLimit == '-9999' ? undefined : el.predictedLoadUpLimit) : undefined)
-                this.loadY3.push(el.redictedLoadDownLimit ? (el.redictedLoadDownLimit == '-9999' ? undefined : el.redictedLoadDownLimit) : undefined)
+                this.loadY1.push(el.nowPlantLoad == '-9999' && el.nowPlantLoad == '-9998' ? undefined : el.nowPlantLoad)
+                this.loadY2.push(el.predictedLoadUpLimit != '-9999' && el.predictedLoadUpLimit != '-9998' ? el.predictedLoadUpLimit : undefined)
+                this.loadY3.push(el.redictedLoadDownLimit != '-9999' && el.redictedLoadDownLimit != '-9998' ? el.redictedLoadDownLimit : undefined)
             })
             let arr = []
             arr = arr
@@ -426,10 +426,10 @@ export default {
                     data: this.loadX
                 },
                 yAxis: {
-                    splitNumber: 3,
-                    splitLine: {
-                        show: false
-                    },
+                    // splitNumber: 3,
+                    // splitLine: {
+                    //     show: false
+                    // },
                     axisLabel: { formatter: '{value}  KW' }
                 },
                 series: [
@@ -574,9 +574,10 @@ export default {
                     data: this.loadX
                 },
                 yAxis: {
-                    splitNumber: 3,
                     splitLine: {
-                        show: false
+                        lineStyle: {
+                            type: 'dotted'
+                        }
                     },
                     axisLabel: { formatter: '{value}  KW' }
                 },
@@ -824,7 +825,7 @@ export default {
                     vertical-align: middle;
                 }
                 .reactCool {
-                    background: rgba(0, 214, 185, 1);
+                    background: rgba(0, 145, 255, 1);
                 }
                 .preCool {
                     background: rgba(0, 145, 255, 1);

src/views/strategy/animationBox.vue

@@ -126,9 +126,9 @@ export default {
                 this.dataY1.push(el.tout == '-9999' ? undefined : el.tout)
                 this.dataY2.push(el.meanTindoor == '-9999' ? undefined : el.meanTindoor)
                 this.dataY3.push(el.maxTindoor == '-9999' ? undefined : el.maxTindoor)
-                this.loadY1.push(el.nowPlantLoad == '-9999' ? undefined : el.nowPlantLoad)
-                this.loadY2.push(el.predictedLoadUpLimit != '-9999' ? el.predictedLoadUpLimit : undefined)
-                this.loadY3.push(el.redictedLoadDownLimit != '-9999' ? el.redictedLoadDownLimit : undefined)
+                this.loadY1.push(el.nowPlantLoad == '-9999' && el.nowPlantLoad == '-9998' ? undefined : el.nowPlantLoad)
+                this.loadY2.push(el.predictedLoadUpLimit != '-9999' && el.predictedLoadUpLimit != '-9998' ? el.predictedLoadUpLimit : undefined)
+                this.loadY3.push(el.redictedLoadDownLimit != '-9999' && el.redictedLoadDownLimit != '-9998' ? el.redictedLoadDownLimit : undefined)
                 let arr = []
                 arr = arr
                     .concat(this.dataY1)
@@ -150,7 +150,6 @@ export default {
                 } else if (maxG < 5) {
                     this.dataY1Max = String(maxS) + '5'
                 }
-                // console.log(arr)
             })
         },
         drawLeft() {
@@ -159,7 +158,6 @@ export default {
                 tooltip: {
                     trigger: 'axis',
                     formatter: function(data) {
-                        console.log(data)
                         return `${data[0].name}<br/>${data[0].seriesName}  ：${data[0].value ? data[0].value.toFixed(1) : ''}<br/>${
                             data[1].seriesName
                         }  ：${data[1].value ? data[1].value.toFixed(1) : ''} <br/> ${data[2].seriesName}  ：${
@@ -256,10 +254,25 @@ export default {
                     data: this.loadX
                 },
                 yAxis: {
-                    splitNumber: 3,
+                    // splitNumber: 3,
+                    // splitLine: {
+                    //     show: false
+                    // },
                     splitLine: {
-                        show: false
+                        lineStyle: {
+                            type: 'dotted'
+                        }
                     },
+                    // minorTick: {
+                    //     show: true
+                    // },
+
+                    // minorSplitLine: {
+                    //     show: true,
+                    //     lineStyle: {
+                    //         color: '#ddd'
+                    //     }
+                    // },
                     axisLabel: { formatter: '{value}  KW' }
                 },
                 series: [
@@ -483,10 +496,10 @@ export default {
                     vertical-align: middle;
                 }
                 .reactCool {
-                    background: rgba(0, 214, 185, 1);
+                    background: #0091ff;
                 }
                 .preCool {
-                    background: rgba(0, 145, 255, 1);
+                    background: #0091ff;
                     opacity: 0.29;
                     margin-left: 20px;
                 }