From ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 07 八月 2025 10:30:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/modules/DeviceLog/WorkLogList.vue | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 165 insertions(+), 0 deletions(-)
diff --git a/src/views/mdc/base/modules/DeviceLog/WorkLogList.vue b/src/views/mdc/base/modules/DeviceLog/WorkLogList.vue
new file mode 100644
index 0000000..badd7f4
--- /dev/null
+++ b/src/views/mdc/base/modules/DeviceLog/WorkLogList.vue
@@ -0,0 +1,165 @@
+<template>
+ <a-card :bordered="false">
+ <!-- table鍖哄煙-begin -->
+ <div class="table_workLogist">
+ <a-table ref="table" bordered size="middle" :rowKey="(record,index)=>{return index}" :columns="columns"
+ :dataSource="dataList" :pagination="false" :loading="loadingrunStatus">
+ <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>
+</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'
+
+ export default {
+ name: 'WorkLogList',
+ components: {
+ Tooltip,
+ JDictSelectTag,
+ JInput,
+ JEllipsis
+ },
+ props: {
+ dataList: {
+ type: Array,
+ required: true,
+ default: []
+ },
+ loadingrunStatus:{
+ type:Boolean,
+ default: false
+ }
+ },
+ data() {
+ return {
+ disabled: true,
+ disableMixinCreated: true,
+ columns: [
+ {
+ title: '鐘舵��',
+ align: 'center',
+ dataIndex: 'status',
+ scopedSlots: { customRender: 'status' }
+ },
+ {
+ 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){
+ // 鏍规嵁绉掓暟杞崲鎴愬搴旂殑鏃跺垎绉�
+ 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'
+ }
+ ]
+ }
+ },
+ methods: {},
+ created() {
+ }
+
+ }
+</script>
+
+<style lang="less" scoped>
+ @import '~@assets/less/common.less';
+ @media screen and (min-width: 1920px){
+ .table_workLogist{
+ height: 417px!important;
+ overflow: scroll;
+ }
+ }
+ @media screen and (min-width: 1680px) and (max-width: 1920px){
+ .table_workLogist{
+ height: 417px!important;
+ overflow: scroll;
+ }
+ }
+ @media screen and (min-width: 1400px) and (max-width: 1680px){
+ .table_workLogist{
+ height: 266px!important;
+ overflow: scroll;
+ }
+ }
+ @media screen and (min-width: 1280px) and (max-width: 1400px){
+ .table_workLogist{
+ height: 360px!important;
+ overflow: scroll;
+ }
+ }
+ @media screen and (max-width: 1280px){
+ .table_workLogist{
+ height: 170px!important;
+ overflow: scroll;
+ }
+ }
+</style>
--
Gitblit v1.9.3