From 20de76047bb36d8a35acaa744c49b2f1bb5716d8 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Tue, 25 Apr 2023 17:41:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E6=9C=80=E9=95=BF=E7=A7=92=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/newChat/chatContent.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/newMap/display/newChat/chatContent.vue b/src/views/newMap/display/newChat/chatContent.vue
index ef69211bb..5af1a18ac 100644
--- a/src/views/newMap/display/newChat/chatContent.vue
+++ b/src/views/newMap/display/newChat/chatContent.vue
@@ -29,7 +29,7 @@
         <el-input v-model="textContent" size="small" placeholder="请输入会话文字，点击T发送" style="flex: 1; margin-left: 5px;" :rows="1" />
         <el-button :id="sendTextId" size="mini" class="chat-box-footer-create" :disabled="contentSend || !id" @click="sendText">T</el-button>
         <el-button :id="recordVoice" class="chat-box-footer-create chat-box-footer-send" :class="{'active': recordSending}" :disabled="audioPlay || (trainingDesign && !trainingSwitch) || !id" size="mini" type="primary" @click="startRecording()">
-          <el-progress id="voice_progress_bar" type="circle" :show-text="false" :percentage="100/60*seconds" :width="40" :stroke-width="2" status="success" />
+          <el-progress id="voice_progress_bar" type="circle" :show-text="false" :percentage="100/maxSeconds*seconds" :width="40" :stroke-width="2" status="success" />
           <i v-if="recordSending" class="el-icon-close close_icon" @click.stop="cancelRecording()" />
           <span class="iconfont icon-yuyin">&#xe62b;</span>
         </el-button>
@@ -60,6 +60,7 @@ export default {
         return {
             recordSending:false,
             seconds:0,
+            maxSeconds:59,
             inter:null,
             recorders: null,
             microphone:null,
@@ -295,7 +296,7 @@ export default {
             this.recordSending = true;
             this.audioPlay = false;
             this.inter = setInterval(() => {
-                if (this.seconds < 60) {
+                if (this.seconds < this.maxSeconds) {
                     this.seconds++;
                 } else {
                     clearInterval(this.inter);

From 071bfa90f7ddea0b5b25db6c0557ecfd859c874c Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue, 25 Apr 2023 18:08:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E5=88=9D=E6=8F=90=E4=BA=A4=E5=A4=87=E7=94=A8=EF=BC=8C=E5=BE=85?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/errrorMessageBox.vue | 326 ++++++++++++++++++
 src/views/newMap/display/index.vue            |   5 +-
 2 files changed, 330 insertions(+), 1 deletion(-)
 create mode 100644 src/views/newMap/display/errrorMessageBox.vue

diff --git a/src/views/newMap/display/errrorMessageBox.vue b/src/views/newMap/display/errrorMessageBox.vue
new file mode 100644
index 000000000..f19c50fc5
--- /dev/null
+++ b/src/views/newMap/display/errrorMessageBox.vue
@@ -0,0 +1,326 @@
+<template>
+  <div>
+    <div class="alarm-button">
+      <el-button type="warning" icon="el-icon-message-solid" circle @click="showAlarm" />
+      <div v-if="finishDealAlarmMessage>0" class="alarm-counter">{{ finishDealAlarmMessage }}</div>
+      <audio ref="audio" />
+    </div>
+    <!--     <el-dialog
+      v-dialogDrag
+      :modal="false"
+      :visible.sync="showAlarmMessageList"
+      width="900px"
+      title="设备故障！！！"
+    >
+      <el-table
+        :data="tableData"
+        border
+        :cell-style="{'text-align':'center'}"
+        :header-cell-style="{'text-align':'center'}"
+        style="width: 100%"
+        @selection-change="handleSelectionChange"
+        @select-all="handleSelectionAll"
+      >
+        <el-table-column
+          type="selection"
+          width="40"
+        />
+        <el-table-column
+          prop="date"
+          label="时间"
+          width="110"
+        />
+        <el-table-column
+          prop="name"
+          label="故障设备"
+          width="110"
+        />
+        <el-table-column
+          prop="id"
+          label="故障编号"
+          width="90"
+        />
+        <el-table-column
+          prop="message"
+          label="故障信息"
+        />
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="goToDetail(scope.$index,scope.row)"
+            >详情</el-button>
+            <el-button
+              size="mini"
+              :type="dealAlarmMessage[scope.$index] ? 'success' : 'danger'"
+              @click="handleAlarmMessage(scope.$index,scope.row)"
+            >{{ dealAlarmMessage[scope.$index] ? '故障信息已处理' : '故障信息未处理' }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="tag"
+          label="标签"
+          width="100"
+          :filters="[{ text: '一般故障', value: '一般故障' }, { text: '中等故障', value: '中等故障' }, { text: '重大故障', value: '重大故障' }]"
+          :filter-method="filterTag"
+          filter-placement="bottom-end"
+        >
+          <template slot-scope="scope">
+            <el-tag
+              :type="scope.row.tag === '一般故障' ? 'warning' : 'danger'"
+              disable-transitions
+            >{{ scope.row.tag }}</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog
+      v-dialogDrag
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+    >
+      <span>进行全选操作</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog> -->
+    <el-dialog
+      v-dialogDrag
+      title="设备故障"
+      :modal="false"
+      :visible.sync="showAlarmMessage"
+      width="40%"
+      class="dialog-alarm-message-detail"
+    >
+      <div class="alarm-message-detail">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>故障信息</span>
+            <el-button style="float: right; padding: 3px 0" type="text" @click="goToAlarmDetail">详情</el-button>
+          </div>
+          <div class="text item">
+            时间：{{ showAlarmInfo.time }}
+          </div>
+          <div class="text item">
+            级别：{{ showAlarmInfo.level }}
+          </div>
+          <div class="text item">
+            设备：{{ showAlarmInfo.deviceCode }}
+          </div>
+          <div class="text item">
+            类型：{{ showAlarmInfo.type }}
+          </div>
+          <div class="text item">
+            信息：{{ showAlarmInfo.description }}
+          </div>
+        </el-card>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>辅助决策信息</span>
+          </div>
+          <div class="text item">
+            （1）信息报送人员/群组：{{ showDecisionMessage.personGroup }}
+          </div>
+          <div class="text item">
+            （2）电话通报：{{ showDecisionMessage.telephoneNotified }}
+          </div></el-card>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'ErrrorMessageBox',
+    data() {
+        return {
+            dialogVisible: false,
+            dealAlarmMessage:[true, false],
+            showAlarmMessage:false,
+            showAlarmMessageList:false,
+            tableData: [{
+                date: '2023-04-17',
+                name: '车厢编号10',
+                id: '001',
+                message:'电路信号故障,车辆二次设备无法运行',
+                tag: '一般故障'
+            }, {
+                date: '2023-04-21',
+                name: '车厢编号8',
+                id: '005',
+                message:'新的故障信息',
+                tag: '重大故障'
+            }],
+            showAlarmInfo:{
+                time:'',
+                level:'',
+                deviceCode:'',
+                type:'',
+                description:''
+            },
+            decisionMessage:[{
+                personGroup:'主要领导、应急管理部负责人、应急管理室负责人报送，并发党群信息群；故障群/应急群发布。',
+                telephoneNotified:'如故障属于I类信息，分公司值班领导、主要领导、党群工作部、线网管控中心负责人、分管领导、应急管理部负责人、应急管理室负责人。'
+            }, {
+                personGroup:'故障群/应急群、党群信息群',
+                telephoneNotified:'分公司值班领导、主要领导、党群工作部、线网管控中心负责人、分管领导、应急管理部负责人、应急管理室负责人。视情况经领导同意报集团公司。'
+            }],
+            showDecisionMessage:{}
+
+        };
+    },
+    computed: {
+        alarmDetailMessage() {
+            return this.$store.state.socket.simulationAlarmInfo;
+        },
+        finishDealAlarmMessage() {
+            return this.dealAlarmMessage.reduce((prev, curr)=> curr === false ? prev + 1 : prev, 0);
+        }
+    },
+    watch: {
+        alarmDetailMessage() {
+            if (this.alarmDetailMessage.length == 1) { this.showAlarm(); } else { console.log(555555); }
+        }
+    },
+    beforeDestroy() {
+        this.$store.dispatch('socket/setSimulationAlarmInfo', []);
+        document.getElementsByTagName('body')[0].style.setProperty('--bg-color', 'yellow');
+    },
+
+    methods: {
+        playAlarmMusic() {
+            let alarmMusic = new Audio();
+            alarmMusic = require('@/assets/buzzer.mp3');
+            this.$refs.audio.src = alarmMusic;
+            this.$refs.audio.play();
+        },
+        showAlarm() {
+            this.playAlarmMusic();
+            this.showDecisionMessage = this.decisionMessage[0];
+            if (this.alarmDetailMessage.length > 0) {
+                this.showAlarmInfo = this.alarmDetailMessage[0];
+                const description = this.showAlarmInfo.description.substring(this.showAlarmInfo.description.indexOf('晚点') + 2);
+                const index = description.indexOf('分');
+                const minuteData = description.substring(0, index);
+                console.log(minuteData, 222);
+                if (minuteData >= 10 && minuteData < 30) {
+                    document.getElementsByTagName('body')[0].style.setProperty('--bg-color', 'orange');
+                    this.showDecisionMessage = this.decisionMessage[1];
+                } else if (minuteData >= 30) {
+                    document.getElementsByTagName('body')[0].style.setProperty('--bg-color', 'red');
+                    this.showDecisionMessage = this.decisionMessage[1];
+                }
+            }
+
+            this.showAlarmMessage = !this.showAlarmMessage;
+        },
+        handleSelectionChange(val) {
+            if (val.length === this.tableData.length) {
+                this.dialogVisible = true;
+            }
+        },
+        handleSelectionAll(val) {
+            if (val.length > 0) {
+                this.dialogVisible = true;
+            }
+        },
+        handleAlarmMessage(index, row) {
+            console.log(row, '故障所在行信息');
+            this.$confirm('此操作将处理故障信息, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.dealAlarmMessage.splice(index, 1, !this.dealAlarmMessage[index]);
+                this.$message({
+                    type: 'success',
+                    message: '处理成功!'
+                });
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消处理'
+                });
+            });
+        },
+        goToDetail(index, row) {
+            console.log(row);
+            /* const routeUrl = this.$router.resolve({
+                path: '/thirdLogin'
+                // query: { id: 96 }
+            });
+            window.open(routeUrl.href, '_blank'); */
+            if (index == 0) {
+                window.open('https://www.baidu.com', 'baidu');
+            } else {
+                window.open('http://localhost:9000/tmms/traindispatch/7', 'dispatch');
+            }
+            //
+
+        },
+        filterTag(value, row) {
+            return row.tag === value;
+        },
+        goToAlarmDetail() {
+            window.open('https://www.baidu.com', 'baidu');
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+$themeBgColor: var(--bg-color, yellow);
+.alarm-button{
+	position: absolute;
+	left: 20px;
+	bottom: 58%;
+	z-index: 2000;
+	.alarm-counter{
+	position: absolute;
+	left: 20px;
+	bottom: 62%;
+	width: 20px;
+	height: 20px;
+	border-radius: 50%;
+	background-color: red;
+	text-align: center;
+	color: #fff;
+	font-size: 14px;
+    }
+}
+
+.alarm-message-detail {
+	display: flex;
+	justify-content: space-between;
+	.box-card {
+    width: 48%;
+	padding: 0 5px;
+	.clearfix:before,
+	.clearfix:after {
+		display: table;
+		content: "";
+	}
+	.clearfix:after {
+		clear: both
+	}
+	.text {
+		font-size: 14px;
+	}
+	.item {
+		margin-bottom: 14px;
+	}
+  }
+}
+.dialog-alarm-message-detail{
+	/deep/ .el-dialog__body{
+	padding: 0 10px 10px;
+	background-color:$themeBgColor;
+	}
+	/deep/ .el-dialog__header{
+		background-color: $themeBgColor;
+	}
+}
+
+</style>
diff --git a/src/views/newMap/display/index.vue b/src/views/newMap/display/index.vue
index 1f807ceda..7484bdcbe 100644
--- a/src/views/newMap/display/index.vue
+++ b/src/views/newMap/display/index.vue
@@ -13,6 +13,7 @@
     <training-left-slider ref="trainingLeftSlider" @overallTranslation="overallTranslation" />
     <lineBoard ref="lineBoard" />
     <bottomTable ref="bottomTable" />
+    <errrorMessageBoxVue />
   </div>
 </template>
 <script>
@@ -33,6 +34,7 @@ import ChatBox from './newChat/index.vue';
 import TrainingLeftSlider from './trainingList/trainingLeftSlider';
 import LineBoard from './lineBoard';
 import BottomTable from './bottomTable';
+import errrorMessageBoxVue from './errrorMessageBox.vue';
 export default {
     name: 'DisplayDraft',
     components: {
@@ -46,7 +48,8 @@ export default {
         ChatBox,
         TrainingLeftSlider,
         LineBoard,
-        BottomTable
+        BottomTable,
+        errrorMessageBoxVue
     },
     data() {
         return {

From d73dea42ec0cc67c3eaccf009f95ba1afe1cdba5 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed, 26 Apr 2023 15:02:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/display/errrorMessageBox.vue | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/newMap/display/errrorMessageBox.vue b/src/views/newMap/display/errrorMessageBox.vue
index f19c50fc5..dc8ebf581 100644
--- a/src/views/newMap/display/errrorMessageBox.vue
+++ b/src/views/newMap/display/errrorMessageBox.vue
@@ -132,6 +132,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex';
 export default {
     name: 'ErrrorMessageBox',
     data() {
@@ -167,11 +168,20 @@ export default {
                 personGroup:'故障群/应急群、党群信息群',
                 telephoneNotified:'分公司值班领导、主要领导、党群工作部、线网管控中心负责人、分管领导、应急管理部负责人、应急管理室负责人。视情况经领导同意报集团公司。'
             }],
+            mapAlarmMessage: new Map([
+                ['I', 'I类信息'],
+                ['II', 'II类信息'],
+                ['III', 'III类信息'],
+                ['IV', 'IV类信息'],
+                ['TRAIN_DELAY', '列车延误']
+            ]),
             showDecisionMessage:{}
-
         };
     },
     computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
         alarmDetailMessage() {
             return this.$store.state.socket.simulationAlarmInfo;
         },
@@ -181,7 +191,7 @@ export default {
     },
     watch: {
         alarmDetailMessage() {
-            if (this.alarmDetailMessage.length == 1) { this.showAlarm(); } else { console.log(555555); }
+            if (this.alarmDetailMessage.length == 1) { this.showAlarm(); } else { console.log(this.alarmDetailMessage, 555555); }
         }
     },
     beforeDestroy() {
@@ -200,20 +210,21 @@ export default {
             this.playAlarmMusic();
             this.showDecisionMessage = this.decisionMessage[0];
             if (this.alarmDetailMessage.length > 0) {
-                this.showAlarmInfo = this.alarmDetailMessage[0];
-                const description = this.showAlarmInfo.description.substring(this.showAlarmInfo.description.indexOf('晚点') + 2);
-                const index = description.indexOf('分');
-                const minuteData = description.substring(0, index);
-                console.log(minuteData, 222);
-                if (minuteData >= 10 && minuteData < 30) {
+                const station = this.$store.getters['map/getDeviceByCode'](this.alarmDetailMessage[0].deviceCode);
+                this.showAlarmInfo.time = this.alarmDetailMessage[0].time;
+                this.showAlarmInfo.level = this.mapAlarmMessage.get(this.alarmDetailMessage[0].level);
+                this.showAlarmInfo.deviceCode = '列车' + station.serviceNumber + station.tripNumber;
+                this.showAlarmInfo.type = this.mapAlarmMessage.get(this.alarmDetailMessage[0].type);
+                const index = this.alarmDetailMessage[0].description.indexOf('列车');
+                this.showAlarmInfo.description = this.alarmDetailMessage[0].description.slice(0, index) + this.showAlarmInfo.deviceCode + this.alarmDetailMessage[0].description.substring(index + 7);
+                if (this.alarmDetailMessage[0].color === 'O') {
                     document.getElementsByTagName('body')[0].style.setProperty('--bg-color', 'orange');
                     this.showDecisionMessage = this.decisionMessage[1];
-                } else if (minuteData >= 30) {
+                } else if (this.alarmDetailMessage[0].color === 'R') {
                     document.getElementsByTagName('body')[0].style.setProperty('--bg-color', 'red');
                     this.showDecisionMessage = this.decisionMessage[1];
                 }
             }
-
             this.showAlarmMessage = !this.showAlarmMessage;
         },
         handleSelectionChange(val) {