diff --git a/src/assets/icons/svg/fullScreenView.svg b/src/assets/icons/svg/fullScreenView.svg new file mode 100644 index 00000000..8b1bceb6 --- /dev/null +++ b/src/assets/icons/svg/fullScreenView.svg @@ -0,0 +1,12 @@ + + + 编组 54 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/fullscreen.svg b/src/assets/icons/svg/fullscreen.svg deleted file mode 100644 index 0e86b6fa..00000000 --- a/src/assets/icons/svg/fullscreen.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/icons/svg/unFullScreenView.svg b/src/assets/icons/svg/unFullScreenView.svg new file mode 100644 index 00000000..5454a880 --- /dev/null +++ b/src/assets/icons/svg/unFullScreenView.svg @@ -0,0 +1,10 @@ + + + 编组 54备份 + + + + + + + \ No newline at end of file diff --git a/src/store/getters.js b/src/store/getters.js index 16103f89..1f08b7bd 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -19,6 +19,9 @@ const getters = { sidebarRouters:state => state.permission.sidebarRouters, choicepart: state => state.app.choicepart, // 数据字典 - dict_datas: state => state.dict.dictDatas + dict_datas: state => state.dict.dictDatas, + //ws + fanFrequencyInfo: state => state.websocket.FanFrequencyInfo, + kilnInfo: state => state.websocket.kilnInfo, } export default getters diff --git a/src/store/index.js b/src/store/index.js index 116d6d68..7f8369bb 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -6,6 +6,7 @@ import tagsView from './modules/tagsView' import permission from './modules/permission' import settings from './modules/settings' import dict from './modules/dict' +import websocket from './modules/websocket' import getters from './getters' Vue.use(Vuex) @@ -17,7 +18,8 @@ const store = new Vuex.Store({ tagsView, permission, settings, - dict + dict, + websocket }, getters }) diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js new file mode 100644 index 00000000..3191b86e --- /dev/null +++ b/src/store/modules/websocket.js @@ -0,0 +1,26 @@ +const state = { + fanFrequencyInfo:{}, + kilnInfo:{} +}; +const mutations = { + SET_FANFREQUENCYINFO: (state, fanFrequencyInfo) => { + state.fanFrequencyInfo = fanFrequencyInfo + }, + SET_KILNINFO: (state, kilnInfo) => { + state.kilnInfo = kilnInfo + } +}; +const actions = { + setFanFrequencyInfo({ commit }, fanFrequencyInfo) { + commit('SET_FANFREQUENCYINFO', fanFrequencyInfo.payload) + }, + setKilnInfo({ commit }, kilnInfo) { + commit('SET_KILNINFO', kilnInfo.payload) + } +}; +export default { + namespaced: true, + state, + mutations, + actions, +} diff --git a/src/views/databoard/assets/check.png b/src/views/databoard/assets/check.png new file mode 100644 index 00000000..8793b99a Binary files /dev/null and b/src/views/databoard/assets/check.png differ diff --git a/src/views/databoard/assets/energeCost.png b/src/views/databoard/assets/energeCost.png new file mode 100644 index 00000000..ce6b5ac6 Binary files /dev/null and b/src/views/databoard/assets/energeCost.png differ diff --git a/src/views/databoard/assets/msg.png b/src/views/databoard/assets/msg.png new file mode 100644 index 00000000..2100324a Binary files /dev/null and b/src/views/databoard/assets/msg.png differ diff --git a/src/views/databoard/components/Container.vue b/src/views/databoard/components/Container.vue index e7985f05..36a8742e 100644 --- a/src/views/databoard/components/Container.vue +++ b/src/views/databoard/components/Container.vue @@ -11,12 +11,12 @@ - + -

+

窑炉生产运行驾驶舱

+ class="firm"> 单位: 河南汇融科技服务有限公司
- + class="datetime"> + {{ new Date().toLocaleString() }}
+ + + + diff --git a/src/views/databoard/components/ISRAChart.vue b/src/views/databoard/components/ISRAChart.vue index f57f84de..2f8baf7c 100644 --- a/src/views/databoard/components/ISRAChart.vue +++ b/src/views/databoard/components/ISRAChart.vue @@ -11,9 +11,11 @@ diff --git a/src/views/databoard/kiln/GasHandle.vue b/src/views/databoard/kiln/GasHandle.vue index 7de6c616..c719f9a2 100644 --- a/src/views/databoard/kiln/GasHandle.vue +++ b/src/views/databoard/kiln/GasHandle.vue @@ -21,7 +21,7 @@ 氧气含量 - 82% + 82%
一氧化氮

排放浓度

- 82% + 82%
二氧化硫

排放浓度

- 82% + 59mg/m³
二氧化氮

排放浓度

- 82% + 82%
-

+ style="margin-bottom: 10px; display: flex; align-items: center"> +

烟气趋势图

- +
- 总量 - 白班 - 夜班 + +
+ :options="['氧气含量', '二氧化硫', '一氧化氮', '二氧化氮']" />
-
+
@@ -118,7 +118,7 @@ import Container from '../components/Container.vue'; import ShadowRect from '../components/ShadowRect.vue'; import KilnLine from '../components/line'; -import Switcher from '../components/Switcher.vue'; +import Switcher from '../components/Switcher'; import SelectorBtnGroup from '../components/SelectorBtnGroup.vue'; import GasChart from '../components/GasChart.vue'; diff --git a/src/views/databoard/kiln/IsraCheck.vue b/src/views/databoard/kiln/IsraCheck.vue index 271c3fdd..a583f2f9 100644 --- a/src/views/databoard/kiln/IsraCheck.vue +++ b/src/views/databoard/kiln/IsraCheck.vue @@ -7,9 +7,10 @@ diff --git a/src/views/databoard/kiln/KilnInfo.vue b/src/views/databoard/kiln/KilnInfo.vue index c4341541..503c9dc8 100644 --- a/src/views/databoard/kiln/KilnInfo.vue +++ b/src/views/databoard/kiln/KilnInfo.vue @@ -17,22 +17,37 @@ grid-auto-rows: auto; gap: 8px; "> - - - {{ info.name }} - - - {{ info.value }} - - + + 窑炉压力: + {{ kilnInfoMsg?.kilnPressure }} + + + 循环水温度: + {{ kilnInfoMsg?.waterTemp }} + + + 循环水流量: + {{ kilnInfoMsg?.waterFlow }} + + + 循环水压力: + {{ kilnInfoMsg?.waterPressure }} + + + 助燃风压力: + {{ kilnInfoMsg?.combustionAirPressure }} + + + 碹顶加权温度: + {{ kilnInfoMsg?.topTemp }} + + + 压缩气压力: + {{ kilnInfoMsg?.compressedAirPressure }} + + + 熔化加权温度: + {{ kilnInfoMsg?.meltTemp }}
@@ -48,24 +63,26 @@ export default { props: {}, data() { return { - kilnInfo: [ - { name: '窑炉压力', value: '83Kpa' }, - { name: '循环水温度', value: '53℃' }, - { name: '循环水流量', value: '23m³/h' }, - { name: '循环水压力', value: '33Kpa' }, - { name: '助燃风压力', value: '12Kpa' }, - { name: '碹顶加权温度', value: '32℃' }, - { name: '压缩气压力', value: '83Kpa' }, - { name: '融化加权温度', value: '123℃' }, - ], }; }, - computed: {}, + computed: { + kilnInfoMsg() { + return this.$store.state.websocket.kilnInfo + } + }, methods: {}, }; diff --git a/src/views/databoard/kiln/LeftFour.vue b/src/views/databoard/kiln/LeftFour.vue index 14028e92..8ce225ff 100644 --- a/src/views/databoard/kiln/LeftFour.vue +++ b/src/views/databoard/kiln/LeftFour.vue @@ -12,7 +12,7 @@ display: grid; gap: 16px; grid-template-columns: 1fr 1fr; - grid-template-rows: 1fr 1fr; + grid-template-rows: 462px 462px; "> diff --git a/src/views/databoard/kiln/MaterialCost.vue b/src/views/databoard/kiln/MaterialCost.vue index 319dab01..e6aa548a 100644 --- a/src/views/databoard/kiln/MaterialCost.vue +++ b/src/views/databoard/kiln/MaterialCost.vue @@ -21,7 +21,7 @@ class="material" style=" flex: 1; - padding: 6px; + padding: 12px 6px 20px; display: flex; flex-direction: column; gap: 4px; @@ -31,7 +31,7 @@ 234 - + - 原料1/吨 - diff --git a/src/views/databoard/kiln/RightTwo.vue b/src/views/databoard/kiln/RightTwo.vue index 001e7116..7f628b19 100644 --- a/src/views/databoard/kiln/RightTwo.vue +++ b/src/views/databoard/kiln/RightTwo.vue @@ -8,7 +8,11 @@