From 36e8795b59c7f7393758ca96e0c2438eddaee8be Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:14:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/MaintenanceCycleList.vue | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/MaintenanceCycleList.vue b/src/views/eam/MaintenanceCycleList.vue
index 9889158..02a1e8d 100644
--- a/src/views/eam/MaintenanceCycleList.vue
+++ b/src/views/eam/MaintenanceCycleList.vue
@@ -1,6 +1,6 @@
<template>
<a-card
- title="淇濆吇鍛ㄦ湡瑙勫垯"
+ title=""
:bordered="false"
>
<!-- 鏌ヨ鍖哄煙 -->
@@ -78,7 +78,7 @@
icon="search"
>鏌ヨ</a-button>
<a-button
- type="primary"
+ type="info"
@click="searchReset"
icon="reload"
style="margin-left: 8px"
@@ -111,7 +111,7 @@
<a-table
ref="table"
size="middle"
- :scroll="{ x: 'calc(1500px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(2000px + 50%)', y: 900 }"
bordered
rowKey="id"
:columns="columns"
@@ -191,26 +191,17 @@
return parseInt(index) + 1
},
},
- {
- title: '鐗堟湰',
- align: 'center',
- dataIndex: 'version',
- },
- {
- title: '鐗堟湰鐘舵��',
- align: 'center',
- dataIndex: 'versionStatusName',
- },
+
{
title: '鍛ㄦ湡缂栫爜',
align: 'center',
dataIndex: 'code',
},
- {
- title: '鍛ㄦ湡鍚嶇О',
- align: 'center',
- dataIndex: 'name',
- },
+ // {
+ // title: '鍛ㄦ湡鍚嶇О',
+ // align: 'center',
+ // dataIndex: 'name',
+ // },
{
title: '鍛ㄦ湡',
align: 'center',
@@ -252,20 +243,50 @@
align: 'center',
dataIndex: 'unitName',
},
+ // {
+ // title: '璋冩暣鏂瑰紡',
+ // align: 'center',
+ // dataIndex: 'arrangeWayName',
+ // },
+ // {
+ // title: '閫炬湡澶勭悊鏂瑰紡',
+ // align: 'center',
+ // dataIndex: 'overdueDisposeModeName',
+ // },
+ // {
+ // title: '渚濇嵁鏃ュ巻',
+ // align: 'center',
+ // dataIndex: 'accordingCalendarName',
+ // },
+ // {
+ // title: '鐢熸晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'takeEffectTime',
+ // },
+ // {
+ // title: '澶辨晥鏃堕棿',
+ // align: 'center',
+ // dataIndex: 'loseEfficacyTime',
+ // },
{
- title: '璋冩暣鏂瑰紡',
+ title: '鐗堟湰',
align: 'center',
- dataIndex: 'arrangeWayName',
+ dataIndex: 'version',
},
{
- title: '閫炬湡澶勭悊鏂瑰紡',
+ title: '鐗堟湰鐘舵��',
align: 'center',
- dataIndex: 'overdueDisposeModeName',
+ dataIndex: 'versionStatusName',
},
{
- title: '渚濇嵁鏃ュ巻',
+ title: '鍒涘缓浜�',
align: 'center',
- dataIndex: 'accordingCalendarName',
+ dataIndex: 'createBy',
+ },
+ {
+ title: '鍒涘缓鏃ユ湡',
+ align: 'center',
+ dataIndex: 'createTime',
},
{
title: '鎿嶄綔',
--
Gitblit v1.9.3