From 8c610945469c4a4a0b0ff2b868e87f25fe01792d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 18 六月 2025 14:01:46 +0800
Subject: [PATCH] 1、设备日志页面列表及状态横向分布图新增故障状态颜色区分以及增加故障日志列表页签 2、设备日志页面历史记录弹窗中状态横向分布图新增故障状态颜色区分
---
src/views/mdc/base/modules/DeviceLog/AlarmLogList.vue | 63 ++++++++-----------------------
1 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceLog/AlarmLogList.vue b/src/views/mdc/base/modules/DeviceLog/AlarmLogList.vue
index 4aa3935..f510ee4 100644
--- a/src/views/mdc/base/modules/DeviceLog/AlarmLogList.vue
+++ b/src/views/mdc/base/modules/DeviceLog/AlarmLogList.vue
@@ -1,42 +1,27 @@
<template>
- <a-card :bordered="false">
- <!-- table鍖哄煙-begin -->
- <div class="table_alarmLogist">
- <a-table ref="table" bordered size="middle" :rowKey="(record,index)=>{return index}" :columns="columns"
- :dataSource="dataList" :pagination="false" :loading="loadingwarnStatus">
- <template slot="status" slot-scope="status">
- <div v-if="status == '3' || status == '23'" style="color: #00ee00;width: 100%; height: 100%;">杩愯</div>
- <div v-else-if="status == '1' || status == '2'" style="color: #ffea91;width: 100%; height: 100%;">寰呮満</div>
- <div v-else-if="status == '0'" style="color: #A8A8A8;width: 100%; height: 100%;">鍏虫満</div>
- <div v-else-if="status == '22'" style="color: red;width: 100%; height: 100%;">鎶ヨ</div>
- </template>
- </a-table>
- </div>
- </a-card>
+ <div class="table_alarmLogist">
+ <a-table ref="table" bordered size="middle" :rowKey="(record,index)=>{return index}" :columns="columns"
+ :dataSource="dataList" :pagination="false" :loading="loading">
+ <template slot="status" slot-scope="status">
+ <div v-if="status == '3' || status == '23'" style="color: #00ee00;width: 100%; height: 100%;">杩愯</div>
+ <div v-else-if="status == '1' || status == '2'" style="color: #ffea91;width: 100%; height: 100%;">寰呮満</div>
+ <div v-else-if="status == '0'" style="color: #A8A8A8;width: 100%; height: 100%;">鍏虫満</div>
+ <div v-else-if="status == '22'" style="color: red;width: 100%; height: 100%;">鎶ヨ</div>
+ </template>
+ </a-table>
+ </div>
</template>
<script>
- import JDictSelectTag from '@/components/dict/JDictSelectTag'
-
- import JInput from '@/components/jeecg/JInput'
- import JEllipsis from '@/components/jeecg/JEllipsis'
- import Tooltip from 'ant-design-vue/es/tooltip'
-
export default {
name: 'AlarmLogList',
- components: {
- Tooltip,
- JDictSelectTag,
- JInput,
- JEllipsis
- },
props: {
dataList: {
type: Array,
required: true,
default: []
},
- loadingwarnStatus:{
+ loading:{
type:Boolean,
default: false
}
@@ -55,22 +40,17 @@
title: '鎶ヨ鏃堕棿',
align: 'center',
dataIndex: 'startTime',
- // defaultSortOrder:'descend',
- // sorter: (a, b) => {return a.startTime>b.startTime?1:-1}
},
{
title: '缁撴潫鏃堕棿',
align: 'center',
dataIndex: 'endTime',
- // defaultSortOrder:'descend',
- // sorter: (a, b) => {return a.endTime>b.endTime?1:-1}
},
{
title: '鎸佺画鏃堕棿',
align: 'center',
dataIndex: 'duration',
customRender:(t,r,index) =>{
- // console.log(t)
var ss = parseInt(t)
if(ss>=3600){
// 鏍规嵁绉掓暟杞崲鎴愬搴旂殑鏃跺垎绉�
@@ -91,13 +71,6 @@
return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
}
}
- // if(sec == '00'){
- // return hour + '灏忔椂' + min + '鍒�'
- // }
- // if(min == '00' && sec == '00'){
- // return hour + '灏忔椂'
- // }
- // return hour + '灏忔椂' + min + '鍒�' + sec + '绉�'
}else if(60<ss && ss<3600){
const min1 = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
@@ -108,8 +81,6 @@
return sec2 + '绉�'
}
}
- // defaultSortOrder:'descend',
- // sorter: (a, b) => {return a.duration>b.duration?1:-1}
},
{
title: '鎶ヨ鍙�',
@@ -137,31 +108,31 @@
@media screen and (min-width: 1920px){
.table_alarmLogist{
height: 417px!important;
- overflow: scroll;
+ overflow: auto;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px){
.table_alarmLogist{
height: 417px!important;
- overflow: scroll;
+ overflow: auto;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px){
.table_alarmLogist{
height: 266px!important;
- overflow: scroll;
+ overflow: auto;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px){
.table_alarmLogist{
height: 360px!important;
- overflow: scroll;
+ overflow: auto;
}
}
@media screen and (max-width: 1280px){
.table_alarmLogist{
height: 170px!important;
- overflow: scroll;
+ overflow: auto;
}
}
</style>
--
Gitblit v1.9.3