From f4eeb572411dff19d7a1b37026111e7fc7d62ea9 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 28 八月 2025 09:24:39 +0800
Subject: [PATCH] 设备日志页面调整
---
/dev/null | 125 -----------------------------------------
src/views/mdc/base/modules/DeviceLog/LogInfo.vue | 5 -
2 files changed, 0 insertions(+), 130 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceLog/FaultLogList.vue b/src/views/mdc/base/modules/DeviceLog/FaultLogList.vue
deleted file mode 100644
index 68657a4..0000000
--- a/src/views/mdc/base/modules/DeviceLog/FaultLogList.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
- <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 == '25'" style="color: #C11900;width: 100%; height: 100%;">鏁呴殰</div>
- </template>
- </a-table>
- </div>
-</template>
-
-<script>
- export default {
- name: 'FaultLogList',
- props: {
- dataList: {
- type: Array,
- required: true,
- default: []
- },
- loading: {
- type: Boolean,
- default: false
- }
- },
- data() {
- return {
- disabled: true,
- columns: [
- {
- title: '鐘舵��',
- align: 'center',
- dataIndex: 'status',
- scopedSlots: { customRender: 'status' }
- },
- {
- title: '鏁呴殰鏃堕棿',
- align: 'center',
- dataIndex: 'startTime'
- },
- {
- title: '缁撴潫鏃堕棿',
- align: 'center',
- dataIndex: 'endTime'
- },
- {
- title: '鎸佺画鏃堕棿',
- align: 'center',
- dataIndex: 'duration',
- customRender: (t, r, index) => {
- var ss = parseInt(t)
- if (ss >= 3600) {
- // 鏍规嵁绉掓暟杞崲鎴愬搴旂殑鏃跺垎绉�
- const hour = parseInt(ss / 3600) < 10 ? '0' + parseInt(ss / 3600) : parseInt(ss / 3600)
- const min = parseInt(ss % 3600 / 60) < 10 ? '0' + parseInt(ss % 3600 / 60) : parseInt(ss % 3600 / 60)
- const sec = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
- if (min == '00') {
- if (sec == '00') {
- return hour + '灏忔椂'
- } else {
- return hour + '灏忔椂' + sec + '绉�'
- }
-
- } else {
- if (sec == '00') {
- return hour + '灏忔椂' + min + '鍒�'
- } else {
- 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)
- return min1 + '鍒�' + sec1 + '绉�'
- } else {
- const sec2 = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
- return sec2 + '绉�'
- }
- }
- },
- ]
- }
- }
- }
-</script>
-
-<style lang="less" scoped>
- @import '~@assets/less/common.less';
-
- @media screen and (min-width: 1920px) {
- .table_alarmLogist {
- height: 417px !important;
- overflow: auto;
- }
- }
-
- @media screen and (min-width: 1680px) and (max-width: 1920px) {
- .table_alarmLogist {
- height: 417px !important;
- overflow: auto;
- }
- }
-
- @media screen and (min-width: 1400px) and (max-width: 1680px) {
- .table_alarmLogist {
- height: 266px !important;
- overflow: auto;
- }
- }
-
- @media screen and (min-width: 1280px) and (max-width: 1400px) {
- .table_alarmLogist {
- height: 360px !important;
- overflow: auto;
- }
- }
-
- @media screen and (max-width: 1280px) {
- .table_alarmLogist {
- height: 170px !important;
- overflow: auto;
- }
- }
-</style>
diff --git a/src/views/mdc/base/modules/DeviceLog/LogInfo.vue b/src/views/mdc/base/modules/DeviceLog/LogInfo.vue
index 051eadd..5ea36a8 100644
--- a/src/views/mdc/base/modules/DeviceLog/LogInfo.vue
+++ b/src/views/mdc/base/modules/DeviceLog/LogInfo.vue
@@ -106,9 +106,6 @@
<a-tab-pane key="3" tab="鎶ヨ鏃ュ織">
<alarm-log-list :dataList='warningList' :loading="loading"/>
</a-tab-pane>
- <a-tab-pane key="4" tab="鏁呴殰鏃ュ織">
- <fault-log-list :dataList='faultList' :loading="loading"/>
- </a-tab-pane>
</a-tabs>
</div>
</div>
@@ -126,14 +123,12 @@
import LogList from './LogList'
import WorkLogList from './WorkLogList'
import AlarmLogList from './AlarmLogList'
- import FaultLogList from './FaultLogList'
import WorkChartModel from './WorkChartModel'
import WorkHistoryModel from './WorkHistoryModel'
import { getAction } from '@/api/manage'
export default {
components: {
- FaultLogList,
LogList,
WorkLogList,
AlarmLogList,
--
Gitblit v1.9.3