From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/deviceLog/LogList.vue | 120 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 94 insertions(+), 26 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogList.vue b/src/views/mdc/base/modules/deviceLog/LogList.vue
index 69a3f5e..4888611 100644
--- a/src/views/mdc/base/modules/deviceLog/LogList.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogList.vue
@@ -3,7 +3,8 @@
<!-- 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">
+ :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>
@@ -28,6 +29,8 @@
import {
JeecgListMixin
} from '@/mixins/JeecgListMixin'
+ import moment from 'moment'
+
export default {
name: 'LogList',
mixins: [JeecgListMixin],
@@ -43,23 +46,24 @@
required: true,
default: []
},
- loadingequip:{
- type:Boolean,
+ loadingequip: {
+ type: Boolean,
default: false
}
},
+ watch: {},
data() {
return {
statusName: '',
disabled: true,
disableMixinCreated: true,
loading: false,
- ipagination:{
+ ipagination: {
current: 1,
pageSize: 100,
pageSizeOptions: ['100', '500', '1000'],
showTotal: (total, range) => {
- return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
},
showQuickJumper: true,
showSizeChanger: true,
@@ -75,14 +79,14 @@
{
title: '寮�濮嬫椂闂�',
align: 'center',
- dataIndex: 'startTime',
+ dataIndex: 'startTime'
// defaultSortOrder:'descend',
// sorter: (a, b) => {return a.startTime>b.startTime?1:-1}
},
{
title: '缁撴潫鏃堕棿',
align: 'center',
- dataIndex: 'endTime',
+ dataIndex: 'endTime'
// defaultSortOrder:'descend',
// sorter: (a, b) => {return a.endTime>b.endTime?1:-1}
},
@@ -90,13 +94,52 @@
title: '鎸佺画鏃堕棿',
align: 'center',
dataIndex: 'duration',
+ customRender: (t, r, index) => {
+ // console.log(t)
+ 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 + '绉�'
+ }
+ }
+ // 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)
+ return min1 + '鍒�' + sec1 + '绉�'
+ } else {
+ const sec2 = parseInt(ss % 3600 % 60) < 10 ? '0' + parseInt(ss % 3600 % 60) : parseInt(ss % 3600 % 60)
+ return sec2 + '绉�'
+ }
+ }
// defaultSortOrder:'descend',
// sorter: (a, b) => {return a.duration>b.duration?1:-1}
},
{
title: '绋嬪簭鍙�',
align: 'center',
- dataIndex: 'sequencenumber'
+ dataIndex: 'sequenceNumber'
}
]
}
@@ -106,12 +149,32 @@
//鍒嗛〉銆佹帓搴忋�佺瓫閫夊彉鍖栨椂瑙﹀彂
//TODO 绛涢��
if (Object.keys(sorter).length > 0) {
- this.isorter.column = sorter.field;
- this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+ this.isorter.column = sorter.field
+ this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
}
- this.ipagination = pagination;
+ this.ipagination = pagination
// this.loadData();
},
+ /**
+ * 缁欒澶囨棩蹇楄〃鏍间腑鐨勮娣诲姞鐐瑰嚮浜嬩欢
+ * @param record 鐐瑰嚮鐨勫綋鍓嶈鏁版嵁
+ * @returns {{on: {click: on.click}}} 娣诲姞浜嬩欢瀵硅薄
+ */
+ rowClick(record) {
+ return {
+ on: {
+ click: () => {
+ // 鍏虫満鐘舵�佽澶囨棩蹇椾笉寮瑰嚭宸ヤ綔鏇茬嚎
+ if (record.status === 0) return
+ const timeObj = {
+ start: moment(record.startTime),
+ end: moment(record.endTime)
+ }
+ this.$bus.$emit('tableRowRecord', timeObj)
+ }
+ }
+ }
+ }
},
created() {
}
@@ -121,33 +184,38 @@
<style lang="less" scoped>
@import '~@assets/less/common.less';
- @media screen and (min-width: 1920px){
- .table_logList{
- height: 417px!important;
+
+ @media screen and (min-width: 1920px) {
+ .table_logList {
+ height: 417px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1680px) and (max-width: 1920px){
- .table_logList{
- height: 417px!important;
+
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ .table_logList {
+ height: 417px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1400px) and (max-width: 1680px){
- .table_logList{
- height: 266px!important;
+
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ .table_logList {
+ height: 266px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1280px) and (max-width: 1400px){
- .table_logList{
- height: 360px!important;
+
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ .table_logList {
+ height: 360px !important;
overflow: scroll;
}
}
- @media screen and (max-width: 1280px){
- .table_logList{
- height: 170px!important;
+
+ @media screen and (max-width: 1280px) {
+ .table_logList {
+ height: 170px !important;
overflow: scroll;
}
}
--
Gitblit v1.9.3