diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue index 0a83494c2..43c807521 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuBar.vue @@ -36,9 +36,9 @@
- A级警报 - B级警报 - C级警报 + A级警报 + B级警报 + C级警报 记录 @@ -107,9 +107,9 @@
-
A
-
B
-
C
+
A
+
B
+
C
 @@ -136,6 +136,8 @@
+ + @@ -148,11 +150,15 @@ import { EventBus } from '@/scripts/event-bus'; import voiceOpen from '@/assets/voiceOpen.png'; import voiceClose from '@/assets/voiceClose.png'; import BuzzerAudio from '@/assets/buzzer.mp3'; +import AlarmTableHmi from './menuDialog/alarmTableHmi'; +import AlarmTableLow from './menuDialog/alarmTableLow'; export default { name: 'MenuBar', components: { - NoticeInfo + NoticeInfo, + AlarmTableLow, + AlarmTableHmi }, props: { selected: { @@ -181,7 +187,7 @@ export default { version: '', centralizedMap: {}, tipContent: [], - level: '', + levelList: [], sound: false, buzzerAudio: BuzzerAudio }; @@ -256,7 +262,9 @@ export default { }, methods: { handleAlarm(val) { - this.level = val.level; + if (!this.levelList.includes(val.level)) { + this.levelList.push(val.level); + } this.controlAudio(true); }, initMenu() { @@ -342,8 +350,19 @@ export default { } }); }, - clearLevel() { - this.level = ''; + showHimAlarm(level) { + const index = this.levelList.indexOf(level); + if (index > -1) { + this.levelList.splice(index, 1); + } + this.$refs.alarmTableHmi.doShow(level); + }, + showLowAlarm(level) { + const index = this.levelList.indexOf(level); + if (index > -1) { + this.levelList.splice(index, 1); + } + this.$refs.alarmTableLow.doShow(level); }, controlAudio(val) { const audio = document.getElementById('buzzer'); diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue index f9028246b..4c499bd83 100644 --- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue +++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue @@ -58,11 +58,9 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo' import CMD from '@/scripts/cmdPlugin/CommandEnum'; import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'; import { TrainingMode } from '@/scripts/ConstDic'; -import AlarmTable from './menuDialog/alarmTable'; export default { components: { - NoticeInfo, - AlarmTable + NoticeInfo }, props: { selected: { diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTable.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTable.vue deleted file mode 100644 index ea9f48b47..000000000 --- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTable.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue new file mode 100644 index 000000000..af83cd309 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue new file mode 100644 index 000000000..7c8bd8271 --- /dev/null +++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 8634bb6d2..925ba029a 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -141,6 +141,7 @@ function handle(state, data) { break; case 'Simulation_Alarm': state.simulationAlarmInfo = msg; + state.simulationAlarmInfoList.push(msg); break; } diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 1628a46bf..e459aa552 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,8 +2,8 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; - // BASE_API = 'http://192.168.8.107:9000'; // 袁琪 + // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'http://192.168.8.107:9000'; // 袁琪 // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.8.144:9000'; // 旭强 // BASE_API = 'http://192.168.3.175:9000'; // 张赛