diff --git a/src/components/homeComp/dataTableCH4.vue b/src/components/homeComp/dataTableCH4.vue index 879ff9e..2bdd788 100644 --- a/src/components/homeComp/dataTableCH4.vue +++ b/src/components/homeComp/dataTableCH4.vue @@ -127,10 +127,11 @@ alarmTableColumns: [ { value: 'id', text: '编号', width: '80' }, { value: 'devcode', text: '设备编号' }, + { value: 'dataValue', text: '报警值',width: 80 }, { value: 'alarmTime', text: '时间', width: 180 } ], dataTableColumns: [ - { value: 'devcode', text: '设备编号',width: 170 }, + { value: 'devcode', text: '设备编号', width: 195 }, { value: 'dataValue', text: '历史数值' }, { value: 'uptime', text: '时间', width: 180 } ], diff --git a/src/components/homeComp/dataTableCH4.vue b/src/components/homeComp/dataTableCH4.vue index 879ff9e..2bdd788 100644 --- a/src/components/homeComp/dataTableCH4.vue +++ b/src/components/homeComp/dataTableCH4.vue @@ -127,10 +127,11 @@ alarmTableColumns: [ { value: 'id', text: '编号', width: '80' }, { value: 'devcode', text: '设备编号' }, + { value: 'dataValue', text: '报警值',width: 80 }, { value: 'alarmTime', text: '时间', width: 180 } ], dataTableColumns: [ - { value: 'devcode', text: '设备编号',width: 170 }, + { value: 'devcode', text: '设备编号', width: 195 }, { value: 'dataValue', text: '历史数值' }, { value: 'uptime', text: '时间', width: 180 } ], diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 151c811..ee137ab 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -36,7 +36,7 @@ name="甲烷浓度" unit="%LEL" device-type="23" - devcode="312022070026" + devcode="312022070035" :current-vls="curveCH4.line[0]" :config-info="config23" @refreshConfig="changeShow" @@ -55,7 +55,7 @@ { - console.log(msg) - const message = JSON.parse(msg) + debugger + console.log(msg.data) + const message = JSON.parse(msg.data) this.$notify({ title: '警告', message: message.message, @@ -266,9 +267,9 @@ }, refreshCurve() { - this.fetchCurve('23', '20', '312022070026', 'curveCH4') + this.fetchCurve('23', '20', '312022070035', 'curveCH4') this.fetchCurve('22', '20', '3C2022000002', 'curveH2S') - this.fetchCurve('24', '20', '89860423192180035458', 'curveAtmo') + this.fetchCurve('24', '20', '89860321472000648836', 'curveAtmo') }, // 获取曲线 fetchCurve(deviceType, recentNum, devcode, obj) {