From ec68cffd70d2a2788f7c74af55a11563aaf611d1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 15:47:38 +0800
Subject: [PATCH] 1、登录页面优化首次登录会出现404字样，需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置 2、驱动参数管理页面新增或修改控制系统中英文名称规则限制字符数最少6位调整为2位 3、效率段管理页面效率段颜色可自定义 4、设备利用率、设备开动率、班次利用率页面增加可按照设备类型筛选查询 5、对比分析页面增加通过选择设备来对比 6、设备日利用率和设备日利用率对比页面优化选择树节点后查询区域的设备名称字段不会更新问题
---
src/views/mdc/base/modules/deviceLog/LogList.vue | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceLog/LogList.vue b/src/views/mdc/base/modules/deviceLog/LogList.vue
index d58caea..440c9af 100644
--- a/src/views/mdc/base/modules/deviceLog/LogList.vue
+++ b/src/views/mdc/base/modules/deviceLog/LogList.vue
@@ -3,7 +3,7 @@
<!-- 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 +28,7 @@
import {
JeecgListMixin
} from '@/mixins/JeecgListMixin'
+ import moment from 'moment'
export default {
name: 'LogList',
mixins: [JeecgListMixin],
@@ -101,7 +102,27 @@
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)
- return hour + '鏃�' + min + '鍒�' + sec + '绉�'
+ 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)
@@ -118,7 +139,7 @@
{
title: '绋嬪簭鍙�',
align: 'center',
- dataIndex: 'sequencenumber'
+ dataIndex: 'sequenceNumber'
}
]
}
@@ -134,6 +155,24 @@
this.ipagination = pagination;
// this.loadData();
},
+ /**
+ * 缁欒澶囨棩蹇楄〃鏍间腑鐨勮娣诲姞鐐瑰嚮浜嬩欢
+ * @param record 鐐瑰嚮鐨勫綋鍓嶈鏁版嵁
+ * @returns {{on: {click: on.click}}} 娣诲姞浜嬩欢瀵硅薄
+ */
+ rowClick(record){
+ return {
+ on:{
+ click:()=>{
+ const timeObj={
+ start:moment(record.startTime),
+ end:moment(record.endTime)
+ }
+ this.$bus.$emit('tableRowRecord',timeObj)
+ }
+ }
+ }
+ }
},
created() {
}
--
Gitblit v1.9.3