切换项目不再重新刷新整个页面\修复首页折线图没数据默认状态\共用的颜色变化\修复折线图tooltip属性展示

package-lock.json

@@ -1,160 +0,0 @@
-{
-  "name": "sagacloud-cwc-pages",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "ajv": {
-      "version": "5.5.2",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "dev": true,
-      "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.1.0",
-        "fast-json-stable-stringify": "2.1.0",
-        "json-schema-traverse": "0.3.1"
-      }
-    },
-    "async": {
-      "version": "2.6.3",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dev": true,
-      "requires": {
-        "lodash": "4.17.15"
-      }
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "dev": true
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
-    },
-    "emojis-list": {
-      "version": "3.0.0",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "dev": true
-    },
-    "extract-text-webpack-plugin": {
-      "version": "3.0.2",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",
-      "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
-      "dev": true,
-      "requires": {
-        "async": "2.6.3",
-        "loader-utils": "1.4.0",
-        "schema-utils": "0.3.0",
-        "webpack-sources": "1.4.3"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-      "dev": true
-    },
-    "json5": {
-      "version": "1.0.1",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-      "dev": true,
-      "requires": {
-        "minimist": "1.2.5"
-      }
-    },
-    "loader-utils": {
-      "version": "1.4.0",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/loader-utils/-/loader-utils-1.4.0.tgz",
-      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-      "dev": true,
-      "requires": {
-        "big.js": "5.2.2",
-        "emojis-list": "3.0.0",
-        "json5": "1.0.1"
-      }
-    },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
-    },
-    "mkdirp": {
-      "version": "1.0.3",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/mkdirp/-/mkdirp-1.0.3.tgz",
-      "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="
-    },
-    "node-releases": {
-      "version": "1.1.52",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/node-releases/-/node-releases-1.1.52.tgz",
-      "integrity": "sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ==",
-      "requires": {
-        "semver": "6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
-    "schema-utils": {
-      "version": "0.3.0",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/schema-utils/-/schema-utils-0.3.0.tgz",
-      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-      "dev": true,
-      "requires": {
-        "ajv": "5.5.2"
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
-    },
-    "webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "http://dev.dp.sagacloud.cn:8082/repository/npm-saga/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "2.0.1",
-        "source-map": "0.6.1"
-      }
-    }
-  }
-}

src/App.vue

@@ -1,15 +1,32 @@
 <template>
-  <div id="app">
-    <router-view/>
-  </div>
+    <div id='app'>
+        <router-view v-if='isRouterAlive'></router-view>
+    </div>
 </template>
 
 <script>
 export default {
-  name: 'App'
+    name: 'App',
+    provide() {
+        return {
+            reload: this.reload
+        }
+    },
+    data() {
+        return {
+            isRouterAlive: true
+        }
+    },
+    methods: {
+        reload() {
+            this.isRouterAlive = false
+            this.$nextTick(function() {
+                this.isRouterAlive = true
+            })
+        }
+    }
 }
 </script>
 
 <style>
-
 </style>

src/assets/css/global.css

@@ -1,29 +1,56 @@
-#app, body, html {
-    height: 100%;
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-style: normal
+#app,
+body,
+html {
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-style: normal
 }
 
 a {
-    color: #000;
-    text-decoration: none
+  color: #000;
+  text-decoration: none
 }
 
-li, ol, ul {
-    list-style: none
+li,
+ol,
+ul {
+  list-style: none
 }
 
 .Micbold {
-    font-family: MicrosoftYaHeiSemibold
+  font-family: MicrosoftYaHeiSemibold
 }
+
 .MicrYaHei {
-    font-family: MicrosoftYaHei
+  font-family: MicrosoftYaHei
 }
+
 .ArialMT {
-    font-family: ArialMT
+  font-family: ArialMT
 }
+
 .PingFangSC {
-    font-family: PingFangSC-Regular
+  font-family: PingFangSC-Regular
+}
+
+.red {
+  color: #f54e45;
+}
+
+.green {
+  color: #34c724;
+}
+
+.red-bg {
+  background: #f54e45;
+}
+
+.green-bg {
+  background: #34c724;
+}
+
+.blue-bg {
+  background: #0091ff;
 }

src/views/audit/auditTable.vue

@@ -1,128 +1,49 @@
 <template>
-    <div class='detailTable' style='width: 767px'>
-        <!-- <el-table :data='tableList' border>
-            <el-table-column prop='title' label width='95'></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>
-                    大
-                    <font :class='row.chillerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(row.chillerNumSetSOrg,true,0)}}</font>
-                    小
-                </template>
-            </el-table-column>
-            <el-table-column prop label='冷机出水温度' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.chillWaterOutTempSetOrg=="-9999"?"reds":""'>{{formatterRes(parseInt(row.chillWaterOutTempSetOrg),false,1)}}</font>
-                    ℃
-                </template>
-            </el-table-column>
-            <el-table-column prop label='冷冻泵台数' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.coolPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(row.coolPumpNumSetLOrg,true,1)}}</font>
-                    大
-                    <font :class='row.coolPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(row.coolPumpNumSetSOrg,true,0)}}</font>
-                    小
-                </template>
-            </el-table-column>
-            <el-table-column prop label='冷冻泵频率' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.coolPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(row.coolPumpFreqSetOrg,false,0)}}</font>
-                    HZ
-                </template>
-            </el-table-column>
-            <el-table-column prop label='冷却泵台数' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.chillPumpNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(row.chillPumpNumSetLOrg,true,0)}}</font>
-                    大
-                    <font :class='row.chillPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(row.chillPumpNumSetSOrg,true,0)}}</font>
-                    小
-                </template>
-            </el-table-column>
-            <el-table-column prop label='冷却泵频率' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.chillPumpFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(row.chillPumpFreqSetOrg,false,0)}}</font>
-                    HZ
-                </template>
-            </el-table-column>
-            <el-table-column prop label='冷却塔台数' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.coolTowerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(row.coolTowerNumSetSOrg,true,0)}}</font>
-                    大
-                    <font :class='row.coolTowerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(row.coolTowerNumSetLOrg,true,0)}}</font>
-                    小
-                </template>
-            </el-table-column>
-            <el-table-column prop='zip' label='冷却塔频率' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.coolTowerFreqSetOrg=="-9999"?"reds":""'>{{formatterRes(row.coolTowerFreqSetOrg,false,0)}}</font>
-                    HZ
-                </template>
-            </el-table-column>
-            <el-table-column prop label='室内平均温度' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.meanTindoor=="-9999"?"reds":""'>{{formatterRes(row.meanTindoor,false,1)}}</font>
-                    ℃
-                </template>
-            </el-table-column>
-            <el-table-column prop label='室内最高温度' align='center' width>
-                <template slot-scope='{row}'>
-                    <font :class='row.maxTindoor=="-9999"?"reds":""'>{{formatterRes(row.maxTindoor,false,1)}}</font>
-                    ℃
-                </template>
-            </el-table-column>
-            <el-table-column prop label='冷机负载率' align='center' width>
-                <template slot-scope='{row}'>
-                    <font
-                        :class='parseInt(row.plrAllOrg)=="-9999"?"reds":""'
-                    >{{(row.plrAllOrg==undefined)?'--':(parseInt(row.plrAllOrg)=='-9999'?'x':(parseInt(row.plrAllOrg)=='-9998'?'--':parseInt(row.plrAllOrg)))}}</font>
-                    HZ
-                </template>
-            </el-table-column>
-        </el-table>-->
+    <div class='detailTable' style='width:767px'>
         <div class='detail-box'>
             <div class='detail-box-top'>
                 <div style='width:100px;diplay:inline-block;'></div>
-                <span style='width:75px;text-align:center'>
+                <span class='span1'>
                     冷机
                     <br />开启台数
                 </span>
-                <span style='width:75px;text-align:center'>
+                <span class='span1'>
                     冷机
                     <br />出水温度
                 </span>
-                <span style='width:70px;text-align:center'>
+                <span class='span2'>
                     冷冻泵
                     <br />台数
                 </span>
-                <span style='width:60px;text-align:center'>
+                <span class='span3'>
                     冷冻泵
                     <br />频率
                 </span>
-                <span style='width:70px;text-align:center'>
+                <span class='span2'>
                     冷却泵
                     <br />台数
                 </span>
-                <span style='width:60px;text-align:center'>
+                <span class='span3'>
                     冷却泵
                     <br />频率
                 </span>
-                <span style='width:70px;text-align:center'>
+                <span class='span2'>
                     冷却塔
                     <br />台数
                 </span>
-                <span style='width:60px;text-align:center'>
+                <span class='span3'>
                     冷却塔
                     <br />频率
                 </span>
-                <span style='width:75px;text-align:center'>
+                <span class='span1'>
                     室内
                     <br />平均温度
                 </span>
-                <span style='width:75px;text-align:center'>
+                <span class='span1'>
                     室内
                     <br />最高温度
                 </span>
-                <span style='width:60px;text-align:center'>
+                <span class='span3'>
                     冷机
                     <br />负载率
                 </span>
@@ -132,45 +53,43 @@
                     <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 class='span1'>
+                        <font :class='item.chillerNumSetLOrg=="-9999"?"red":""'>{{formatterRes(item.chillerNumSetLOrg,true,0)}}</font>大
+                        <font :class='item.chillerNumSetSOrg=="-9999"?"red":""'>{{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 class='span1'>
+                        <font :class='item.chillWaterOutTempSetOrg=="-9999"?"red":""'>{{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 class='span2'>
+                        <font :class='item.coolPumpNumSetLOrg=="-9999"?"red":""'>{{formatterRes(item.coolPumpNumSetLOrg,true,1)}}</font>大
+                        <font :class='item.coolPumpNumSetSOrg=="-9999"?"red":""'>{{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 class='span3'>
+                        <font :class='item.coolPumpFreqSetOrg=="-9999"?"red":""'>{{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 class='span2'>
+                        <font :class='item.chillPumpNumSetLOrg=="-9999"?"red":""'>{{formatterRes(item.chillPumpNumSetLOrg,true,0)}}</font>大
+                        <font :class='item.chillPumpNumSetSOrg=="-9999"?"red":""'>{{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 class='span3'>
+                        <font :class='item.chillPumpFreqSetOrg=="-9999"?"red":""'>{{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 class='span2'>
+                        <font :class='item.coolTowerNumSetSOrg=="-9999"?"red":""'>{{formatterRes(item.coolTowerNumSetSOrg,true,0)}}</font>大
+                        <font :class='item.coolTowerNumSetLOrg=="-9999"?"red":""'>{{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 class='span3'>
+                        <font :class='item.coolTowerFreqSetOrg=="-9999"?"red":""'>{{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 class='span1'>
+                        <font :class='item.meanTindoor=="-9999"?"red":""'>{{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 class='span1'>
+                        <font :class='item.maxTindoor=="-9999"?"red":""'>{{formatterRes(item.maxTindoor,false,1)}}</font>℃
                     </span>
-                    <span style='width:60px;text-align:center'>
+                    <span class='span3'>
                         <font
-                            :class='parseInt(item.plrAllOrg)=="-9999"?"reds":""'
+                            :class='parseInt(item.plrAllOrg)=="-9999"?"red":""'
                         >{{(item.plrAllOrg==undefined)?'--':(parseInt(item.plrAllOrg)=='-9999'?'x':(parseInt(item.plrAllOrg)=='-9998'?'--':parseInt(item.plrAllOrg)))}}</font>Hz
                     </span>
                 </div>
@@ -214,9 +133,6 @@ export default {
 
  <style lang="scss" scoped>
 .detailTable {
-    .reds {
-        color: #f54e45;
-    }
     margin: 0 auto;
     .el-table {
         font-size: 12px;
@@ -233,9 +149,7 @@ export default {
         padding-left: 2px;
     }
     .detail-box {
-        // width: 100%;
         .detail-box-top {
-            // width: 762px;
             height: 48px;
             background: rgba(248, 249, 250, 1);
             display: flex;
@@ -247,10 +161,19 @@ export default {
                 color: rgba(100, 106, 115, 1);
                 line-height: 16px;
                 padding: 8px 5px;
+                text-align: center;
+            }
+            .span1 {
+                width: 75px;
+            }
+            .span2 {
+                width: 70px;
+            }
+            .span3 {
+                width: 60px;
             }
         }
         .detail-box-bottom {
-            // width:92px;
             height: 123px;
             background: rgba(255, 255, 255, 1);
             font-size: 12px;
@@ -262,6 +185,16 @@ export default {
                 span {
                     padding: 12px 5px;
                     display: inline-block;
+                    text-align: center;
+                }
+                .span1 {
+                    width: 75px;
+                }
+                .span2 {
+                    width: 70px;
+                }
+                .span3 {
+                    width: 60px;
                 }
             }
         }

src/views/doBusiness/index.vue

@@ -21,11 +21,11 @@
                             format='HH:mm'
                             value-format='timestamp'
                             @change='setHours'
-                            @focus="onFocus(item)"
+                            @focus='onFocus(item)'
                             placeholder='选择时间范围'
-                            :picker-options="{
+                            :picker-options='{
                             selectableRange: '07:00-19:00',                       
-                            }"
+                            }'
                         ></el-time-picker>
                     </div>
                 </template>
@@ -84,17 +84,20 @@ export default {
         },
         onFocus(item) {
             const isToday = item.date == Number(timestamp2String(+new Date()).substr(0, 8))
-            if(!isToday) return
+            if (!isToday) return
             const nowHours = new Date().getHours()
-            if(nowHours >= 7) this.disablePick('start')
-            if(nowHours >= 19) this.disablePick('end')
+            if (nowHours >= 7) this.disablePick('start')
+            if (nowHours >= 19) this.disablePick('end')
         },
         disablePick(p) {
-            const s = p === 'start' ? '.el-time-range-picker .el-time-range-picker__cell:nth-child(1) .el-time-range-picker__body' : '.el-time-range-picker .el-time-range-picker__cell:nth-child(2) .el-time-range-picker__body'
+            const s =
+                p === 'start'
+                    ? '.el-time-range-picker .el-time-range-picker__cell:nth-child(1) .el-time-range-picker__body'
+                    : '.el-time-range-picker .el-time-range-picker__cell:nth-child(2) .el-time-range-picker__body'
             this.$nextTick(() => {
                 const el = document.querySelector(s)
-                console.log(el);
-                
+                console.log(el)
+
                 el.style['pointer-events'] = 'none'
                 el.style['background-color'] = '#f5f6f7'
             })
@@ -199,9 +202,6 @@ export default {
         line-height: 20px;
         padding-right: 15px;
     }
-    // .el-calendar__header {
-    //   display: none;
-    // }
     .el-range-editor--mini .el-range-input {
         background: #f5f6f7;
     }

src/views/doBusiness/monthTemp.vue

@@ -29,23 +29,9 @@ export default {
             this.$emit('pickerVal', this.pickerVal1)
         },
         changeVal(val) {
-            console.log(val)
             this.$emit('pickerVal', val)
         },
         pickerChangeRight() {
-            if (this.pickerVal1) {
-                console.log(this.pickerVal1)
-                // let dateTime = new Date(this.pickerVal1);
-                // let newData = this.formatter(
-                //   new Date(dateTime.setMonth(dateTime.getMonth() + 1))
-                // );
-                // this.pickerVal1 =
-                //   newData.slice(0, 4) +
-                //   "." +
-                //   newData.slice(4, 6) +
-                //   "." +
-                //   newData.slice(6, 8);
-            }
             this.$emit('pickerVal', this.pickerVal1)
         }
     },

src/views/evaluate/evCard.vue

@@ -289,9 +289,6 @@ export default {
             color: rgba(0, 145, 255, 1);
             background: rgba(225, 242, 255, 1);
         }
-        .red {
-            color: rgba(245, 78, 69, 1);
-        }
     }
 }
 .no-data {

src/views/evaluate/evHistory.vue

@@ -112,9 +112,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.red {
-    color: #f54e45;
-}
 p {
     margin: 0;
     margin-top: 20px;

src/views/evaluate/evIndoorTemperature.vue

@@ -83,16 +83,16 @@ export default {
                             energySavingText = ''
                         params.forEach(i => {
                             if (i.value == 2 && i.seriesName != '室内温度满足率' && i.seriesName != '节能率') {
-                                strategyText = i.seriesName
+                                strategyText = `<br/>${i.seriesName}`
                             }
                             if (i.seriesName == '室内温度满足率') {
-                                tindoorText = `室内温度满足率：${i.value ? Number(i.value).toFixed(1) : 'x'}%`
+                                tindoorText = `<br/>室内温度满足率：${i.value ? Number(i.value).toFixed(1) : 'x'}%`
                             }
                             if (i.seriesName == '节能率') {
-                                energySavingText = `节能率：${i.value ? Number(i.value).toFixed(1) : 'x'}%`
+                                energySavingText = `<br/>节能率：${i.value ? Number(i.value).toFixed(1) : 'x'}%`
                             }
                         })
-                        return `${time}<br/>${strategyText}<br/>${tindoorText}<br/>${energySavingText}`
+                        return `${time}${strategyText}${tindoorText}${energySavingText}`
                     }
                 },
                 grid: {

src/views/evaluate/evRateTitle.vue

@@ -88,8 +88,5 @@ export default {
             height: 20px;
         }
     }
-    .red {
-        color: #f54e45;
-    }
 }
 </style>

src/views/evaluate/evSnapshotsDialog.vue

@@ -23,14 +23,14 @@
                     <div class='snapshotss-cont-bottom'>
                         <div class='snapshotss-cont-bot-1'>
                             <span>
-                                <font :class='chillerOrg.chillerNumSetLOrg=="-9999"?"reds":""'>{{formatterRes(chillerOrg.chillerNumSetLOrg,true,0)}}</font>
+                                <font :class='chillerOrg.chillerNumSetLOrg=="-9999"?"red":""'>{{formatterRes(chillerOrg.chillerNumSetLOrg,true,0)}}</font>
                             </span>
                             <span>
-                                <font :class='chillerOrg.chillerNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(chillerOrg.chillerNumSetSOrg,true,0)}}</font>
+                                <font :class='chillerOrg.chillerNumSetSOrg=="-9999"?"red":""'>{{formatterRes(chillerOrg.chillerNumSetSOrg,true,0)}}</font>
                             </span>
                             <span>
                                 <font
-                                    :class='chillerOrg.chillWaterOutTempSetOrg=="-9999"?"reds":""'
+                                    :class='chillerOrg.chillWaterOutTempSetOrg=="-9999"?"red":""'
                                 >{{formatterRes(chillerOrg.chillWaterOutTempSetOrg,false,1)}}</font>
                                 <font style='font-size:12px;'>°C</font>
                             </span>
@@ -47,17 +47,13 @@
                     <div class='snapshotss-cont-bottom'>
                         <div class='snapshotss-cont-bot-1'>
                             <span>
-                                <font
-                                    :class='chillerOrg.coolPumpNumSetLOrg=="-9999"?"reds":""'
-                                >{{formatterRes(chillerOrg.coolPumpNumSetLOrg ,true,0)}}</font>
+                                <font :class='chillerOrg.coolPumpNumSetLOrg=="-9999"?"red":""'>{{formatterRes(chillerOrg.coolPumpNumSetLOrg ,true,0)}}</font>
                             </span>
                             <span>
-                                <font :class='chillerOrg.coolPumpNumSetSOrg=="-9999"?"reds":""'>{{formatterRes(chillerOrg.coolPumpNumSetSOrg,true,0)}}</font>
+                                <font :class='chillerOrg.coolPumpNumSetSOrg=="-9999"?"red":""'>{{formatterRes(chillerOrg.coolPumpNumSetSOrg,true,0)}}</font>
                             </span>
                             <span>
-                                <font
-                                    :class='chillerOrg.coolPumpFreqSetOrg=="-9999"?"reds":""'
-                                >{{formatterRes(chillerOrg.coolPumpFreqSetOrg,false,0)}}</font>
+                                <font :class='chillerOrg.coolPumpFreqSetOrg=="-9999"?"red":""'>{{formatterRes(chillerOrg.coolPumpFreqSetOrg,false,0)}}</font>
                                 <font style='font-size:12px;'>Hz</font>
                             </span>
                         </div>
@@ -74,17 +70,17 @@
                         <div class='snapshotss-cont-bot-1'>
                             <span>
                                 <font
-                                    :class='chillerOrg.chillPumpNumSetLOrg=="-9999"?"reds":""'
+                                    :class='chillerOrg.chillPumpNumSetLOrg=="-9999"?"red":""'
                                 >{{formatterRes(chillerOrg.chillPumpNumSetLOrg,true,0)}}</font>
                             </span>
                             <span>
                                 <font
-                                    :class='chillerOrg.chillPumpNumSetSOrg=="-9999"?"reds":""'
+                                    :class='chillerOrg.chillPumpNumSetSOrg=="-9999"?"red":""'
                                 >{{formatterRes(chillerOrg.chillPumpNumSetSOrg,true,0)}}</font>
                             </span>
                             <span>
                                 <font
-                                    :class='chillerOrg.chillPumpFreqSetOrg=="-9999"?"reds":""'
+                                    :class='chillerOrg.chillPumpFreqSetOrg=="-9999"?"red":""'
                                 >{{formatterRes(chillerOrg.chillPumpFreqSetOrg,false,0)}}</font>
                                 <font style='font-size:12px;'>Hz</font>
                             </span>
@@ -102,17 +98,17 @@
                         <div class='snapshotss-cont-bot-1'>
                             <span>
                                 <font
-                                    :class='chillerOrg.coolTowerNumSetLOrg=="-9999"?"reds":""'
+                                    :class='chillerOrg.coolTowerNumSetLOrg=="-9999"?"red":""'
                                 >{{formatterRes(chillerOrg.coolTowerNumSetLOrg,true,0)}}</font>
                             </span>
                             <span>
                                 <font
-                                    :class='chillerOrg.coolTowerNumSetSOrg=="-9999"?"reds":""'
+                                    :class='chillerOrg.coolTowerNumSetSOrg=="-9999"?"red":""'
                                 >{{formatterRes(chillerOrg.coolTowerNumSetSOrg,true,0)}}</font>
                             </span>
                             <span>
                                 <font
-                                    :class='chillerOrg.coolTowerFreqSetOrg=="-9999"?"reds":""'
+                                    :class='chillerOrg.coolTowerFreqSetOrg=="-9999"?"red":""'
                                 >{{formatterRes(chillerOrg.coolTowerFreqSetOrg,false,0)}}</font>
                                 <font style='font-size:12px;'>Hz</font>
                             </span>
@@ -149,14 +145,14 @@
                 <span>实际冷量</span>
                 <span>
                     <font
-                        :class='parseInt(chillerCommand.nowPlantLoad)=="-9999"?"reds":""'
+                        :class='parseInt(chillerCommand.nowPlantLoad)=="-9999"?"red":""'
                     >{{(chillerCommand.nowPlantLoad==undefined)?'--':(parseInt(chillerCommand.nowPlantLoad)=='-9999'?'x':(parseInt(chillerCommand.nowPlantLoad)=='-9998'?'--':parseInt(chillerCommand.nowPlantLoad)))}}</font>
                     <font style='font-size:12px;'>kW</font>
                 </span>
                 <span>未来1小时预测冷量</span>
                 <span>
                     <font
-                        :class='parseInt(chillerCommand.predictedLoad1h)=="-9999"?"reds":""'
+                        :class='parseInt(chillerCommand.predictedLoad1h)=="-9999"?"red":""'
                     >{{(chillerCommand.predictedLoad1h==undefined)?'--':(parseInt(chillerCommand.predictedLoad1h)=='-9999'?'x':(parseInt(chillerCommand.predictedLoad1h)=='-9998'?'--':parseInt(chillerCommand.predictedLoad1h)))}}</font>
                     <font style='font-size:12px;'>kW</font>
                 </span>
@@ -173,7 +169,7 @@
             </div>
             <div class='rightL'>
                 <div class='rightLengend'>
-                    <i class='reactCool'></i> 实际供冷量
+                    <i class='blue-bg'></i> 实际供冷量
                     <i class='preCool'></i> 预测冷量
                 </div>
                 <div id='snapshotssRight' style='width:100%;height:250px;'></div>
@@ -634,9 +630,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .snapshotss-box {
-    .reds {
-        color: #f54e45;
-    }
     .snapshotss-top {
         padding: 0 20px;
         display: flex;
@@ -850,9 +843,6 @@ export default {
                     border-radius: 3px;
                     vertical-align: middle;
                 }
-                .reactCool {
-                    background: #0091ff;
-                }
                 .preCool {
                     background: #0091ff;
                     opacity: 0.29;

src/views/evaluate/evTwoTable.vue

@@ -155,11 +155,4 @@ export default {
         padding: 0;
     }
 }
-</style>
-<style lang="scss">
-.expandTable {
-    .el-table-column--selection .cell {
-        // margin-left: 100px;
-    }
-}
 </style>

src/views/main/index.vue

@@ -83,6 +83,7 @@ import store from '../../store'
 import moment from 'moment'
 import { queryWeather } from '@/api/main/main.js'
 export default {
+    inject: ['reload'],
     data() {
         return {
             menuShow: false,
@@ -117,12 +118,12 @@ export default {
         }
     },
     props: ['headText'],
-    computed: {},
     methods: {
         changeProjectId(val) {
             console.log(val)
-             localStorage.setItem('projectId', val)
-            location.reload()
+            localStorage.setItem('projectId', val)
+            this.$store.state.projectId = val
+            this.reload()
         },
         navNone() {
             this.menuShow = false
@@ -141,22 +142,25 @@ export default {
                     this.temperatureOut = res.temperatureOut || '--'
                 }
             })
+        },
+        init() {
+            let projects = this.$store.state.projects.projects
+            projects.forEach(el => {
+                this.options.push({
+                    label: el.localName,
+                    value: el.id
+                })
+            })
+            setInterval(() => {
+                this.dateNow = moment()
+                    .locale('zh-cn')
+                    .format('YYYY.MM.DD HH:mm')
+            }, 1000)
+            this.query()
         }
     },
     mounted() {
-        let projects = this.$store.state.projects.projects
-        projects.forEach(el => {
-            this.options.push({
-                label: el.localName,
-                value: el.id
-            })
-        })
-        setInterval(() => {
-            this.dateNow = moment()
-                .locale('zh-cn')
-                .format('YYYY.MM.DD HH:mm')
-        }, 1000)
-        this.query()
+        this.init()
     }
 }
 </script>

src/views/strategy/animationBox.vue

@@ -23,14 +23,14 @@
                 <span>实际冷量</span>
                 <span>
                     <font
-                        :class='parseInt(data.nowPlantLoad)=="-9999"?"reds":""'
+                        :class='parseInt(data.nowPlantLoad)=="-9999"?"red":""'
                     >{{(data.nowPlantLoad==undefined)?'--':(parseInt(data.nowPlantLoad)=='-9999'?'x':(parseInt(data.nowPlantLoad)=='-9998'?'--':parseInt(data.nowPlantLoad)))}}</font>
                     <font style='font-size:12px;'>kW</font>
                 </span>
                 <span>未来1小时预测冷量</span>
                 <span>
                     <font
-                        :class='parseInt(data.predictedLoad1h)=="-9999"?"reds":""'
+                        :class='parseInt(data.predictedLoad1h)=="-9999"?"red":""'
                     >{{(data.predictedLoad1h==undefined)?'--':(parseInt(data.predictedLoad1h)=='-9999'?'x':(parseInt(data.predictedLoad1h)=='-9998'?'--':parseInt(data.predictedLoad1h)))}}</font>
                     <font style='font-size:12px;'>kW</font>
                 </span>
@@ -47,7 +47,7 @@
             </div>
             <div class='rightL'>
                 <div class='rightLengend'>
-                    <i class='reactCool'></i> 实际供冷量
+                    <i class='blue-bg'></i> 实际供冷量
                     <i class='preCool'></i>
                     预测冷量
                 </div>
@@ -55,9 +55,12 @@
             </div>
         </div>
 
-        <div class='side-r' :class='chillerCommandQ.hasOwnProperty("isExecuted")?(chillerCommandQ.isExecuted?"green":"red"):"gray"'>
+        <div class='side-r' :class='chillerCommandQ.hasOwnProperty("isExecuted")?(chillerCommandQ.isExecuted?"green-bg":"red-bg"):"blue-bg"'>
             <div v-if='!showDraw' class='float-r' @click='showDraw = true'>
-                <div class='float-line' :class='chillerCommandQ.hasOwnProperty("isExecuted")?(chillerCommandQ.isExecuted?"green":"red"):"gray"'></div>
+                <div
+                    class='float-line'
+                    :class='chillerCommandQ.hasOwnProperty("isExecuted")?(chillerCommandQ.isExecuted?"green-bg":"red-bg"):"blue-bg"'
+                ></div>
                 <img src='../../assets/open.png' alt />
                 <p>当前策略</p>
             </div>
@@ -122,6 +125,9 @@ export default {
             return min
         },
         getData() {
+            this.dataY1 = []
+            this.dataY2 = []
+            this.dataY3 = []
             this.chillerHourList.forEach(el => {
                 el.value = el.time.slice(0, 2) + ':' + el.time.slice(2, 4)
                 this.dataX.push(el.value)
@@ -162,11 +168,29 @@ export default {
                 tooltip: {
                     trigger: 'axis',
                     formatter: function(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}  ：${
-                            data[2].value ? data[2].value.toFixed(1) : ''
-                        }`
+                        let val1 = '',
+                            val2 = '',
+                            val3 = ''
+                        data.forEach(i => {
+                            console.log(i)
+                            if (i.seriesName == '室外温度') {
+                                val1 = `<br/>室外温度：${i.value ? i.value.toFixed(1) : ''}`
+                                console.log(val1)
+                            }
+                            if (i.seriesName == ' 室内平均温度') {
+                                val2 = `<br/>室内平均温度：${i.value ? i.value.toFixed(1) : ''}`
+                            }
+                            if (i.seriesName == '室内最高温度') {
+                                val3 = `<br/>室内最高温度：${i.value ? i.value.toFixed(1) : ''}`
+                            }
+                        })
+                        return `${data[0].name}${val1}${val2}${val3}`
+                        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}  ：${
+                        //     data[2].value ? data[2].value.toFixed(1) : ''
+                        // }`
                     }
                 },
                 title: {
@@ -317,9 +341,6 @@ export default {
 
 <style lang='scss' scoped>
 .an-content {
-    .reds {
-        color: #f54e45;
-    }
     .snapshotss-center2 {
         padding: 20px 0;
         margin-bottom: 20px;
@@ -423,15 +444,6 @@ export default {
             }
         }
     }
-    .red {
-        background: #f54e45ff;
-    }
-    .green {
-        background: #34c724ff;
-    }
-    .gray {
-        background: #0091ff;
-    }
     .side-r:hover {
         width: 68px;
         background: #fff;
@@ -490,9 +502,6 @@ export default {
                     border-radius: 3px;
                     vertical-align: middle;
                 }
-                .reactCool {
-                    background: #0091ff;
-                }
                 .preCool {
                     background: #0091ff;
                     opacity: 0.29;

src/views/strategy/bomBox.vue

@@ -1,6 +1,6 @@
 <template>
     <div class='bomb'>
-        <div class='bomb-line' :class='data.hasOwnProperty("isExecuted")?(data.isExecuted?"green":"red"):"gray"'></div>
+        <div class='bomb-line' :class='data.hasOwnProperty("isExecuted")?(data.isExecuted?"green-bg":"red-bg"):"blue-bg"'></div>
         <div class='close' @click='$emit("close")'>
             <img src='../../assets/close.png' alt />
         </div>
@@ -40,14 +40,14 @@
                     <span>实际冷量</span>
                     <span>
                         <font
-                            :class='parseInt(data.nowPlantLoad)=="-9999"?"reds":""'
+                            :class='parseInt(data.nowPlantLoad)=="-9999"?"red":""'
                         >{{(data.nowPlantLoad==undefined)?'--':(parseInt(data.nowPlantLoad)=='-9999'?'x':(parseInt(data.nowPlantLoad)=='-9998'?'--':parseInt(data.nowPlantLoad)))}}</font>
                         <font style='font-size:12px;'>kW</font>
                     </span>
                     <span>未来1小时预测冷量</span>
                     <span>
                         <font
-                            :class='parseInt(data.predictedLoad1h)=="-9999"?"reds":""'
+                            :class='parseInt(data.predictedLoad1h)=="-9999"?"red":""'
                         >{{(data.predictedLoad1h==undefined)?'--':(parseInt(data.predictedLoad1h)=='-9999'?'x':(parseInt(data.predictedLoad1h)=='-9998'?'--':parseInt(data.predictedLoad1h)))}}</font>
                         <font style='font-size:12px;'>kW</font>
                     </span>
@@ -112,7 +112,7 @@ export default {
                                 formatter: function(formatter) {
                                     return formatter.percent + '%'
                                 }
-                            },
+                            }
                         },
                         labelLine: {
                             normal: {
@@ -137,9 +137,6 @@ export default {
 
 <style lang='scss' scoped>
 .bomb {
-    .reds {
-        color: #f54e45;
-    }
     background: #cccccc;
     width: 98%;
     display: flex;
@@ -156,15 +153,6 @@ export default {
         height: 100%;
         border-radius: 8px 0 0 8px;
     }
-    .red {
-        background: #f54e45ff;
-    }
-    .green {
-        background: #34c724ff;
-    }
-    .gray {
-        background: #0091ff;
-    }
     .close {
         cursor: pointer;
         margin-left: 10px;
@@ -262,8 +250,6 @@ export default {
                 }
             }
         }
-        .bomb-right-bottom {
-        }
     }
 }
 </style>

src/views/strategy/index.vue

@@ -29,7 +29,7 @@
                 <p class='strate-right-title'>当前状态</p>
                 <water-unit :data='chillerOrg ' :type='1'></water-unit>
                 <animation-box
-                    v-if='Object.keys(chillerCommand).length>0||chillerHourList.length>0'
+                    v-if='Object.keys(chillerCommand).length>=0||chillerHourList.length>=0'
                     :data='chillerOrg'
                     :chillerHourList='chillerHourList'
                     :chillerCommandQ='chillerCommand'
@@ -94,13 +94,16 @@ export default {
             let params = {
                 getParams: {}
             }
+            this.chillerHourList = []
+            this.chillerCommand = {}
+            this.chillerOrg = {}
             queryCommand(params).then(res => {
                 console.log(res)
                 this.chillerCount = res.chillerCount || 0
                 this.chillerIsNotExecutedCount = res.chillerIsNotExecutedCount ? res.chillerIsNotExecutedCount : 0
                 this.chillerOrg = res.chillerOrg || {}
                 this.chillerCommand = res.chillerCommand || {}
-                this.chillerHourList = res.chillerHourList
+                this.chillerHourList = res.chillerHourList || []
             })
         },
         getData() {

src/views/strategy/test.vue

@@ -1,222 +0,0 @@
-<template>
- <div class='demo'>
-    <div class='box'></div>
-    <div id='testEcharts' style='width;400px;height:400px'></div>
-    <div id='pieEcharts' style='width:400px;height:400px;'></div>
- </div>
-</template>
-<script>
-import echarts from 'echarts'
-    export default{
-        data(){
-            return{
-
-            }
-        },
-        methods:{
-            draw(){
-                var pieEcharts = echarts.init(document.getElementById('pieEcharts'))
-                pieEcharts.setOption({
-                tooltip: {
-                    trigger: 'axis',
-                    axisPointer: {
-                        type: 'cross',
-                        animation: false,
-                        label: {
-                            backgroundColor: '#ccc',
-                            borderColor: '#aaa',
-                            borderWidth: 1,
-                            shadowBlur: 0,
-                            shadowOffsetX: 0,
-                            shadowOffsetY: 0,
-                            color: '#222'
-                        }
-                    },
-                    formatter: function (params) {
-                        return params[2].name + '<br />' + params[2].value;
-                    }
-                },
-                grid: {
-                    left: '3%',
-                    right: '4%',
-                    bottom: '3%',
-                    containLabel: true
-                },
-                xAxis: {
-                    type: 'category',
-                    data: ['00:00','03:00','06:00','09:00','12:00','15:00','18:00','21:00','24:00'],
-                    
-                },
-                yAxis: {
-                    
-                   
-                    splitNumber: 3,
-                    splitLine: {
-                        show: false
-                    }
-                },
-                series: [{
-                    name: 'L',
-                    type: 'line',
-                    data: [20,30,40,50,60,50,40,30,20],
-                    lineStyle: {
-                        opacity: 0
-                    },
-                    stack: 'confidence-band',
-                    symbol: 'none'
-                }, {
-                    name: 'U',
-                    type: 'line',
-                    data: [20,30,50,60,50,40,30,20,40],
-                    lineStyle: {
-                        opacity: 0
-                    },
-                    areaStyle: {
-                        color: '#ccc'
-                    },
-                    stack: 'confidence-band',
-                    symbol: 'none'
-                }, {
-                    type: 'line',
-                    data: [20,30,40,50,60,40,30,20,50],
-                    hoverAnimation: false,
-                    symbolSize: 6,
-                    itemStyle: {
-                        color: '#c23531'
-                    },
-                    showSymbol: false
-                }]
-            });
-            },
-            drawIt(){        
-                var testEcharts = echarts.init(document.getElementById('testEcharts'))
-                var colors = ['#5793f3', '#d14a61', '#675bba'];
-                let option = {
-                    color: colors,
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'cross'
-                        }
-                    },
-                    grid: {
-                        right: '20%'
-                    },
-                    toolbox: {
-                        feature: {
-                            dataView: {show: true, readOnly: false},
-                            restore: {show: true},
-                            saveAsImage: {show: true}
-                        }
-                    },
-                    
-                    xAxis: [
-                        {
-                            type: 'category',
-                            axisTick: {
-                                alignWithLabel: true
-                            },
-                            data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
-                        }
-                    ],
-                    yAxis: [
-                        {
-                            type: 'value',
-                            name: '蒸发量',
-                            min: 0,
-                            max: 25,
-                            position: 'right',
-                            axisLabel: {
-                                formatter: '{value} ml'
-                            }
-                        },
-                        {
-                            type: 'value',
-                            name: '',
-                            min: 0,
-                            max: 25,
-                            position: 'right',
-                            offset: 80,
-                            axisLine:{
-                                show:false,
-                            },
-                            axisTick:{
-                                show:false,
-                            },
-                               axisLabel : {
-                                    formatter: function(){
-                                        return "";
-                                    }
-
-                                }
-                            
-                        },
-                        {
-                            type: 'value',
-                            name: '温度',
-                            min: 0,
-                            max: 25,
-                            position: 'left',
-                            axisLine: {
-                                lineStyle: {
-                                    color: colors[2]
-                                }
-                            },
-                            axisLabel: {
-                                formatter: '{value} °C'
-                            }
-                        },    
-                    ],
-                    series: [
-                        {
-                            name: '蒸发量',
-                            type: 'bar',                        
-                            data: [2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6]
-                        },
-                        {
-                            name: '降水量',
-                            type: 'bar',                            
-                            data: [2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6]
-                        },
-                        {
-                            name: '降雨量',
-                            type: 'bar',
-                            data: [2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6]
-                        },
-                        {
-                            name: '平均温度',
-                            type: 'line',
-                            yAxisIndex: 2,
-                            data: [2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2]
-                        },
-                        {
-                            name: '平均co2',
-                            type: 'line',
-                            yAxisIndex: 2,
-                            data: [2.2, 3.0, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2, 14.0]
-                        }
-                    ]
-                };
-                testEcharts.setOption(option)
-            }
-        },
-        mounted(){
-            this.drawIt();
-            this.draw();
-        }
-    }
-</script>
-<style lang="scss" scoped>
-.demo{
-    position:relative;
-    .box{
-        position:absolute;
-        left:20px;
-        width:700px;
-        height:400px;
-        background:#0091FF;
-        border-radius:6px 6px 0 0;
-
-    }
-}
-</style>