From 3d23cc006e5cc905c29441d970eb6bd4ab5af880 Mon Sep 17 00:00:00 2001 From: luobisheng <727299681@qq.com> Date: 星期四, 08 十二月 2022 11:33:04 +0800 Subject: [PATCH] 更新报警持续时间 --- src/views/intelligentPatrol/studyJudge/index.vue | 13 +++++++++++-- src/views/layout/components/Header/index.vue | 9 ++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue index d9e3205..f3960a0 100644 --- a/src/views/intelligentPatrol/studyJudge/index.vue +++ b/src/views/intelligentPatrol/studyJudge/index.vue @@ -39,10 +39,10 @@ <span>{{ currentEvent.grade }}</span> </el-form-item> <el-form-item label="棣栨鎶ヨ鏃堕棿:"> - <span>{{ currentEvent.firstTime }}</span> + <span>{{ currentEvent.alarmTime }}</span> </el-form-item> <el-form-item label="鏈�杩戞姤璀︽椂闂�:"> - <span>{{ currentEvent.recentTime }}</span> + <span>{{ currentEvent.currentAlarmTime }}</span> </el-form-item> <el-form-item label="鎸佺画鏃堕棿:"> <span>{{ currentEvent.conntinueTime }}</span> @@ -99,6 +99,7 @@ import { FILE_ORIGINAL_URL } from "@/utils"; import { validateCarNum } from "@/utils/validate"; import MyDispatch from '@/components/dispatch'; +import { formatDate } from "@/utils/date"; export default { components: { MyDispatch }, @@ -213,6 +214,14 @@ if (this.currentEvent?.picData) { this.imageList = this.currentEvent.picData.split(',').map(item => `${FILE_ORIGINAL_URL}${item}`); } + if (this.currentEvent?.alarmTime || this.currentEvent?.currentAlarmTime) { + const { alarmTime, currentAlarmTime } = this.currentEvent; + const continueAlarmTime = new Date().getTime() - + (currentAlarmTime ? new Date(currentAlarmTime).getTime() : new Date(alarmTime).getTime()); + const CONTINUE_DAY = continueAlarmTime / 1000 / 60 / 60 / 24; + const CONTINUE_HOURS = (CONTINUE_DAY - parseInt(CONTINUE_DAY)) * 24; + this.currentEvent.conntinueTime = `${parseInt(CONTINUE_DAY)}澶�${parseInt(CONTINUE_HOURS)}灏忔椂`; + } }) .catch(err => this.$message.error(err)) }, diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue index 015a5b4..dde7c97 100644 --- a/src/views/layout/components/Header/index.vue +++ b/src/views/layout/components/Header/index.vue @@ -4,7 +4,7 @@ <!-- 宸︿晶鑿滃崟 --> <div class="header-left"> <div class="menu-left__item" v-for="(item, index) in menuLeftList" :key="item.id" @click="changeActive(index)"> - <span :class="item.checked ? 'my-active' : ''">{{ item.label }}</span> + <span :class="item.checked ? 'my-active' : ''" @click="menuChange(item)">{{ item.label }}</span> </div> </div> <!-- 鍙充晶鑿滃崟 --> @@ -210,6 +210,11 @@ }) }) .catch(err => this.$message.error(`${err}`)) + }, + menuChange(data) { + if (data.id === '1f') { + window.open('http://121.37.167.200:28081/cockpit-pub/pc-board?boardId=zfu0LsJ9', '_blank'); + } } } }; @@ -226,14 +231,12 @@ .el-header { background-color: #071a38; - color: #333; text-align: center; line-height: 60px; display: flex; align-items: center; justify-content: space-between; padding: 0 20px; - // width: 100%; color: #4b9bb7; .header-left { -- Gitblit v1.8.0