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/LogList.vue | 78 +++++++++++----------------------------
1 files changed, 22 insertions(+), 56 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceLog/LogList.vue b/src/views/mdc/base/modules/DeviceLog/LogList.vue
index 4888611..6a5292b 100644
--- a/src/views/mdc/base/modules/DeviceLog/LogList.vue
+++ b/src/views/mdc/base/modules/DeviceLog/LogList.vue
@@ -1,52 +1,31 @@
<template>
- <a-card :bordered="false">
- <!-- table鍖哄煙-begin -->
- <div class="table_logList">
- <a-table ref="table" bordered size="middle" :rowKey="(record,index)=>{return index}" :columns="columns"
- :dataSource="dataList" :pagination="ipagination" :loading="loadingequip" @change="handleTableChange"
- :customRow="rowClick">
- <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_logList">
+ <a-table ref="table" bordered :rowKey="(record,index)=>{return index}" :columns="columns"
+ :dataSource="dataList" :pagination="ipagination" :loading="loading" @change="handleTableChange"
+ :customRow="rowClick">
+ <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>
+ <div v-else-if="status == '25'" style="color: #C11900;width: 100%; height: 100%;">鏁呴殰</div>
+ </template>
+ </a-table>
+ </div>
</template>
<script>
- import JDictSelectTag from '@/components/dict/JDictSelectTag'
- import {
- requestPut,
- deleteAction
- } from '@/api/manage'
-
- import JInput from '@/components/jeecg/JInput'
- import JEllipsis from '@/components/jeecg/JEllipsis'
- import Tooltip from 'ant-design-vue/es/tooltip'
- import {
- JeecgListMixin
- } from '@/mixins/JeecgListMixin'
import moment from 'moment'
export default {
name: 'LogList',
- mixins: [JeecgListMixin],
- components: {
- Tooltip,
- JDictSelectTag,
- JInput,
- JEllipsis
- },
props: {
dataList: {
type: Array,
required: true,
default: []
},
- loadingequip: {
+ loading: {
type: Boolean,
default: false
}
@@ -54,10 +33,6 @@
watch: {},
data() {
return {
- statusName: '',
- disabled: true,
- disableMixinCreated: true,
- loading: false,
ipagination: {
current: 1,
pageSize: 100,
@@ -116,14 +91,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)
const sec1 = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
@@ -153,7 +120,6 @@
this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
}
this.ipagination = pagination
- // this.loadData();
},
/**
* 缁欒澶囨棩蹇楄〃鏍间腑鐨勮娣诲姞鐐瑰嚮浜嬩欢
@@ -162,6 +128,9 @@
*/
rowClick(record) {
return {
+ style: {
+ cursor: 'pointer'
+ },
on: {
click: () => {
// 鍏虫満鐘舵�佽澶囨棩蹇椾笉寮瑰嚭宸ヤ綔鏇茬嚎
@@ -175,10 +144,7 @@
}
}
}
- },
- created() {
}
-
}
</script>
@@ -188,35 +154,35 @@
@media screen and (min-width: 1920px) {
.table_logList {
height: 417px !important;
- overflow: scroll;
+ overflow: auto;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px) {
.table_logList {
height: 417px !important;
- overflow: scroll;
+ overflow: auto;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px) {
.table_logList {
height: 266px !important;
- overflow: scroll;
+ overflow: auto;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px) {
.table_logList {
height: 360px !important;
- overflow: scroll;
+ overflow: auto;
}
}
@media screen and (max-width: 1280px) {
.table_logList {
height: 170px !important;
- overflow: scroll;
+ overflow: auto;
}
}
</style>
--
Gitblit v1.9.3