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/eam/modules/equipmentNew/SecondMaintenanceList.vue | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/SecondMaintenanceList.vue b/src/views/eam/modules/equipmentNew/SecondMaintenanceList.vue
index 4fd9cb2..9a9dad8 100644
--- a/src/views/eam/modules/equipmentNew/SecondMaintenanceList.vue
+++ b/src/views/eam/modules/equipmentNew/SecondMaintenanceList.vue
@@ -90,7 +90,7 @@
},
data () {
return {
- description: '鏉愭枡鍑哄簱鍗曠鐞嗛〉闈�',
+ description: '浜屼繚椤甸潰',
disableMixinCreated:true,
// 琛ㄥご
columns: [
@@ -105,25 +105,25 @@
}
},
{
+ title: '淇濆吇瑙掕壊',
+ align: 'center',
+ dataIndex: 'maintenanceRole_dictText',
+ width: 250,
+ },
+ {
title: '淇濆吇椤圭洰',
align: 'center',
dataIndex: 'projectName',
width: 250,
},
- {
- title: '淇濆吇鏍囧噯',
- align: 'center',
- dataIndex: 'standard',
- width: 250,
-
- },
- {
- title: '淇濆吇鍛ㄦ湡',
- align: "center",
- dataIndex: 'cycleName',
- width: 250,
- }
+
+ // {
+ // title: '淇濆吇鍛ㄦ湡',
+ // align: "center",
+ // dataIndex: 'cycleName',
+ // width: 250,
+ // }
],
url: {
list: "/eam/equipment/getEquipmentStansdardList",
--
Gitblit v1.9.3