Merge branch 'master' of http://git.picaiba.com/g7hoo/dezhou-screen

src/components/charts/LineChart.vue

@@ -71,7 +71,7 @@ export default {
       }),
     },
     unit: {
-      type: "String",
+      type: String,
       default: "单位/m³",
     },
     legend: {

src/components/isolate-area-1/Area.vue

@@ -31,7 +31,7 @@ export default {
   computed: {
     ...mapState(["fireDirection", "lastFireChangeTime", "fireChangeTime"]),
     rdata() {
-      let [_, min, sec] = /(\d+)分(\d+)秒/.exec(this.lastFireChangeTime)
+      let [_, min, sec] = /(\d+)分(\d+)秒/.exec(this.lastFireChangeTime || '0分0秒')
       min = +min 
       sec = +sec 
       let timer = setInterval(() => {

src/store/index.js

@@ -22,7 +22,7 @@ export default new Vuex.Store({
     fireDirection: "南火",
     kilnPressure: '00',
     fireChangeTime: '00:00:00',
-    lastFireChangeTime: '/',
+    lastFireChangeTime: '0分0秒',
     waterInTemp: '000',
     waterOutTemp: '000'
   },