Merge branch 'master' of http://git.picaiba.com/g7hoo/dezhou-screen
This commit is contained in:
commit
3a1f2f5cf6
@ -71,7 +71,7 @@ export default {
|
|||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
unit: {
|
unit: {
|
||||||
type: "String",
|
type: String,
|
||||||
default: "单位/m³",
|
default: "单位/m³",
|
||||||
},
|
},
|
||||||
legend: {
|
legend: {
|
||||||
|
@ -31,7 +31,7 @@ export default {
|
|||||||
computed: {
|
computed: {
|
||||||
...mapState(["fireDirection", "lastFireChangeTime", "fireChangeTime"]),
|
...mapState(["fireDirection", "lastFireChangeTime", "fireChangeTime"]),
|
||||||
rdata() {
|
rdata() {
|
||||||
let [_, min, sec] = /(\d+)分(\d+)秒/.exec(this.lastFireChangeTime)
|
let [_, min, sec] = /(\d+)分(\d+)秒/.exec(this.lastFireChangeTime || '0分0秒')
|
||||||
min = +min
|
min = +min
|
||||||
sec = +sec
|
sec = +sec
|
||||||
let timer = setInterval(() => {
|
let timer = setInterval(() => {
|
||||||
|
@ -22,7 +22,7 @@ export default new Vuex.Store({
|
|||||||
fireDirection: "南火",
|
fireDirection: "南火",
|
||||||
kilnPressure: '00',
|
kilnPressure: '00',
|
||||||
fireChangeTime: '00:00:00',
|
fireChangeTime: '00:00:00',
|
||||||
lastFireChangeTime: '/',
|
lastFireChangeTime: '0分0秒',
|
||||||
waterInTemp: '000',
|
waterInTemp: '000',
|
||||||
waterOutTemp: '000'
|
waterOutTemp: '000'
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user