diff --git a/web/public/config/columnList.js b/web/public/config/columnList.js index fac1d4a..63af75d 100644 --- a/web/public/config/columnList.js +++ b/web/public/config/columnList.js @@ -250,14 +250,10 @@ export const columnList = [ ellipsis: true, fixed: 'left' }, - { - title: '设备编号', - dataIndex: 'code' - }, { title: '所属场站', - dataIndex: 'station_id', - key: 'station_id' + dataIndex: 'station_name', + key: 'station_name' // filterable: true }, { @@ -271,7 +267,10 @@ export const columnList = [ title: '设备名称', dataIndex: 'name' }, - + { + title: '设备编号', + dataIndex: 'code' + }, { title: '厂家信息', dataIndex: 'factory' diff --git a/web/src/components/Home/Alarm.vue b/web/src/components/Home/Alarm.vue index 6b8da47..5f16390 100644 --- a/web/src/components/Home/Alarm.vue +++ b/web/src/components/Home/Alarm.vue @@ -170,6 +170,8 @@ export default { } }, yAxis: { + name: '次数', + nameTextStyle: { color: '#fff' }, type: 'value', splitLine: { lineStyle: { type: 'dashed', color: '#435463' } diff --git a/web/src/components/Home/Energy.vue b/web/src/components/Home/Energy.vue index 3eb861d..366ce2a 100644 --- a/web/src/components/Home/Energy.vue +++ b/web/src/components/Home/Energy.vue @@ -161,6 +161,8 @@ export default { } }, yAxis: { + name: '电量(kW·h)', + nameTextStyle: { color: '#fff' }, type: 'value', splitLine: { lineStyle: { type: 'dashed', color: '#435463' } diff --git a/web/src/components/Home/Pv.vue b/web/src/components/Home/Pv.vue index c698aca..22fce7e 100644 --- a/web/src/components/Home/Pv.vue +++ b/web/src/components/Home/Pv.vue @@ -161,6 +161,8 @@ export default { } }, yAxis: { + name: '电量(kW·h)', + nameTextStyle: { color: '#fff' }, type: 'value', splitLine: { lineStyle: { type: 'dashed', color: '#435463' } diff --git a/web/src/views/monitor.vue b/web/src/views/monitor.vue index f28bd98..cd27a81 100644 --- a/web/src/views/monitor.vue +++ b/web/src/views/monitor.vue @@ -9,12 +9,12 @@ >{{ station.name }} - 查看预制舱参数 + 查看预制舱参数 + 模式设置 + 参数设置 -
+
@@ -66,6 +69,24 @@ >
+ + + +
+ 取消 + 确认下发 +
+