guoxiaohuan 5 سال پیش
والد
کامیت
11fdbdf98a

+ 24 - 8
src/components/todayStrategy.vue

@@ -11,19 +11,19 @@
                 <template slot-scope='{row}'>{{row.executeTime?row.executeTime.slice(8,10)+":"+row.executeTime.slice(10,12):"--"}}</template>
             </el-table-column>
             <el-table-column prop label='冷水机组开启台数' min-width='85'>
-                <template slot-scope='{row}'>{{shutDown(row.chillerNumSetL,true,null)+shutDown(row.chillerNumSetS,true,null)}}</template>
+                <template slot-scope='{row}'>{{formatterRes(row.chillerNumSetL,true,0)+formatterRes(row.chillerNumSetS,true,0)}}</template>
             </el-table-column>
             <el-table-column prop='chillWaterOutTempSet' label='出水温度设定值' min-width='75'>
-                <template slot-scope='{row}'>{{shutDown(row.chillWaterOutTempSet,false,1)}}</template>
+                <template slot-scope='{row}'>{{formatterRes(row.chillWaterOutTempSet,false,1)}}</template>
             </el-table-column>
             <el-table-column prop label='冷冻泵开启台数' min-width='75'>
-                <template slot-scope='{row}'>{{shutDown(row.coolPumpNumSetL,true,null)+shutDown(row.coolPumpNumSetS,true,null)}}</template>
+                <template slot-scope='{row}'>{{formatterRes(row.coolPumpNumSetL,true,0)+formatterRes(row.coolPumpNumSetS,true,0)}}</template>
             </el-table-column>
             <el-table-column prop label='冷却泵开启台数' min-width='75'>
-                <template slot-scope='{row}'>{{shutDown(row.chillPumpNumSetL,true,null)+shutDown(row.chillPumpNumSetS,true,null)}}</template>
+                <template slot-scope='{row}'>{{formatterRes(row.chillPumpNumSetL,true,0)+formatterRes(row.chillPumpNumSetS,true,0)}}</template>
             </el-table-column>
             <el-table-column prop label='冷却塔开启组数' min-width='75'>
-                <template slot-scope='{row}'>{{shutDown(row.coolTowerNumSetL,true,null)+shutDown(row.coolTowerNumSetS,true,null)}}</template>
+                <template slot-scope='{row}'>{{formatterRes(row.coolTowerNumSetL,true,0)+formatterRes(row.coolTowerNumSetS,true,0)}}</template>
             </el-table-column>
             <el-table-column prop='zip' label='通风策略' width='80'>
                 <template slot-scope='{row}'>无</template>
@@ -62,7 +62,6 @@
 import { updateCommand } from '@/api/strategy/strategy.js'
 import { timestamp2String } from '@/utils/helper.js'
 import { queryWorkflow } from '@/api/appeal/appeal.js'
-import { shutDown } from '@/utils/query.js'
 
 export default {
     data() {
@@ -71,12 +70,29 @@ export default {
             dialogVisible: false,
             remarks: '',
             row: '',
-            newData: [],
-            shutDown: shutDown
+            newData: []
         }
     },
     props: ['data', 'idArr'],
     methods: {
+        formatterRes(res, type, num) {
+            if (res == '-9999') {
+                return 'x'
+            } else if (res == '-9998') {
+                if (type) {
+                    return 0
+                } else {
+                    return '--'
+                }
+            } else {
+                if (res != undefined) {
+                    res = res.toFixed(num)
+                } else {
+                    return '--'
+                }
+                return res
+            }
+        },
         isShow(data) {
             let isShow = false
             if (this.newData.length) {

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

@@ -144,7 +144,6 @@ import Head from '../main/index'
 import { queryWorkflow, queryChillerExecuteInfo } from '@/api/appeal/appeal.js'
 import EvSnapshotsDialog from '../evaluate/evSnapshotsDialog'
 import { updateWorkflow } from '@/api/audit/audit.js'
-import { shutDown } from '@/utils/query.js'
 import moment from 'moment'
 
 export default {
@@ -166,8 +165,7 @@ export default {
             day: '',
             day1: '',
             yesterday: '',
-            today: '',
-            shutDown: shutDown
+            today: ''
         }
     },
     components: {

+ 1 - 5
src/views/audit/auditTable.vue

@@ -83,13 +83,9 @@
 </template>
 
 <script>
-import { shutDown } from '@/utils/query.js'
-
 export default {
     data() {
-        return {
-            shutDown: shutDown
-        }
+        return {}
     },
     props: ['tableList'],
     mounted() {

+ 1 - 3
src/views/evaluate/evSnapshotsDialog.vue

@@ -177,13 +177,11 @@
 </template>
 <script>
 import echarts from 'echarts'
-import { shutDown } from '@/utils/query.js'
 import { queryQuickData } from '@/api/strategy/strategy.js'
 export default {
     props: ['appealsDate', 'time'],
     data() {
         return {
-            shutDown: shutDown,
             imgFinish: true,
             imgFinishList: [
                 {
@@ -321,7 +319,7 @@ export default {
             if (maxG > 5) {
                 this.dataY1Max = String(maxS + 1) + '0'
             } else if (maxG <= 5) {
-                this.dataY1Max = String(maxS) + '0'
+                this.dataY1Max = String(maxS) + '5'
             }
             this.drawSnapshotssLeft()
             this.drawSnapshotssRight()

+ 16 - 17
src/views/evaluate/evTwoTable.vue

@@ -12,10 +12,10 @@
     >
         <el-table-column type='expand'>
             <template slot-scope='props'>
-                <el-table :ref='`table${props.row.id}`' :data='props.row.children' @selection-change='handleSelectionChange' style='width: 100%;'>
+                <el-table :ref='`table${props.row.id}`' :data='props.row.children' @selection-change='handleSelectionChange' style='width:100%;'>
                     <el-table-column prop label align='right' min-width='100'></el-table-column>
                     <el-table-column type='selection' width='50'></el-table-column>
-                    <el-table-column prop label align='center' width='300'>
+                    <el-table-column prop label align='center' width='250'>
                         <template slot-scope='{row}'>
                             <div>
                                 <!-- <div style='display:flex;border:1px solid green;text-align:center'> -->
@@ -24,7 +24,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop label min-width='150' align='center'>
+                    <el-table-column prop label min-width='130' align='center'>
                         <template slot-scope='{row}'>
                             <span>{{row.temperatureMin}}-{{row.temperatureMax}}</span>
                         </template>
@@ -32,25 +32,25 @@
                     <el-table-column prop='meanTindoor' label min-width='130' align='center'>
                         <template slot-scope='{row}'>{{(row.meanTindoor).toFixed(1)}}</template>
                     </el-table-column>
-                    <el-table-column prop='tindoorOverrunDuration' label min-width='150' align='center'></el-table-column>
-                    <el-table-column prop='tindoorOverrunDegree' label min-width='150' align='center'>
+                    <el-table-column prop='tindoorOverrunDuration' label min-width='130' align='center'></el-table-column>
+                    <el-table-column prop='tindoorOverrunDegree' label min-width='130' align='center'>
                         <template slot-scope='{row}'>{{(row.tindoorOverrunDegree).toFixed(1)}}</template>
                     </el-table-column>
                     <el-table-column prop='longestTindoorOverrunDuration' label min-width='180' align='center'></el-table-column>
-                    <el-table-column prop='temperatureDifferenceMax' label min-width='150' align='center'>
+                    <el-table-column prop='temperatureDifferenceMax' label min-width='130' align='center'>
                         <template slot-scope='{row}'>{{(row.temperatureDifferenceMax).toFixed(1)}}</template>
                     </el-table-column>
                 </el-table>
             </template>
         </el-table-column>
         <el-table-column prop='name' label min-width='100'></el-table-column>
-        <el-table-column prop label='位置详情' width='300' align='center'></el-table-column>
-        <el-table-column prop label='温度要求范围(℃)' min-width='150' align='center'></el-table-column>
+        <el-table-column prop label='位置详情' width='250' align='center'></el-table-column>
+        <el-table-column prop label='温度要求范围(℃)' min-width='130' align='center'></el-table-column>
         <el-table-column prop label='平均温度(℃)' min-width='130' align='center'></el-table-column>
-        <el-table-column prop label='累计超限时长(分钟)' min-width='150' align='center'></el-table-column>
-        <el-table-column prop label='平均超限温度(℃)' min-width='150' align='center'></el-table-column>
+        <el-table-column prop label='累计超限时长(分钟)' min-width='130' align='center'></el-table-column>
+        <el-table-column prop label='平均超限温度(℃)' min-width='130' align='center'></el-table-column>
         <el-table-column prop label='连续超限最大时长(分钟)' min-width='180' align='center'></el-table-column>
-        <el-table-column prop label='最大超限程度(℃)' min-width='150' align='center'></el-table-column>
+        <el-table-column prop label='最大超限程度(℃)' min-width='130' align='center'></el-table-column>
     </el-table>
 </template>
 <script>
@@ -91,10 +91,9 @@ export default {
             this.dataList.forEach(i => {
                 i.children.forEach(row => {
                     if (!row.isSatisfy) {
-                        if(this.$refs[`table${i.id}`]){
-                              this.$refs[`table${i.id}`].toggleRowSelection(row, true)
+                        if (this.$refs[`table${i.id}`]) {
+                            this.$refs[`table${i.id}`].toggleRowSelection(row, true)
                         }
-                      
                     }
                 })
             })
@@ -103,13 +102,13 @@ export default {
             this.selected = []
             this.dataList.forEach(i => {
                 i.children.forEach(row => {
-                    if(this.$refs[`table${i.id}`]){
-                         this.selected = this.selected.concat(this.$refs[`table${i.id}`].selection)
+                    if (this.$refs[`table${i.id}`]) {
+                        this.selected = this.selected.concat(this.$refs[`table${i.id}`].selection)
                     }
                     //this.selected = this.selected.concat(this.$refs[`table${i.id}`].selection)
                 })
             })
-            
+
             let obj = {}
             let peon = this.selected.reduce((cur, next) => {
                 obj[next.id] ? '' : (obj[next.id] = true && cur.push(next))

+ 3 - 4
src/views/strategy/animationBox.vue

@@ -67,7 +67,6 @@
 <script>
 import echarts from 'echarts'
 import bomBox from './bomBox'
-import { shutDown } from '@/utils/query.js'
 
 export default {
     data() {
@@ -82,8 +81,7 @@ export default {
             loadY2: [],
             loadY3: [],
             dataY1Min: '',
-            dataY1Max: '',
-            shutDown: shutDown
+            dataY1Max: ''
         }
     },
     components: { bomBox },
@@ -150,8 +148,9 @@ export default {
                 if (maxG >= 5) {
                     this.dataY1Max = String(maxS + 1) + '0'
                 } else if (maxG < 5) {
-                    this.dataY1Max = String(maxS) + '0'
+                    this.dataY1Max = String(maxS) + '5'
                 }
+                console.log(arr)
             })
         },
         drawLeft() {

+ 0 - 2
src/views/strategy/bomBox.vue

@@ -60,12 +60,10 @@ import echarts from 'echarts'
 import waterUnit from './waterUnit'
 import { updateCommand } from '@/api/strategy/strategy.js'
 import { timestamp2String } from '@/utils/helper.js'
-import { shutDown } from '@/utils/query.js'
 
 export default {
     data() {
         return {
-            shutDown: shutDown,
             timestamp2String,
             circle1: 0,
             circle2: 0,

+ 1 - 5
src/views/strategy/waterUnit.vue

@@ -80,13 +80,9 @@
 </template>
 
 <script>
-import { shutDown } from '@/utils/query.js'
-
 export default {
     data() {
-        return {
-            shutDown: shutDown
-        }
+        return {}
     },
     props: ['data', 'type'],
     methods: {