From 49a74a67140e814bb70efcde61b37d4750448e6a Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 14 五月 2024 16:39:01 +0800
Subject: [PATCH] 1、设备加工工件报表页面调整表格唯一标识字段由equipmentId调整为id以试图解决项目服务器上表格数据混乱问题 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析页面调整设备类型、驱动类型、设备级别以及设备种类页面组件为多选下拉菜单
---
src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
index 6f83625..07795c1 100644
--- a/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
+++ b/src/views/mdc/base/modules/deviceBaseInfo/EquipmentList.vue
@@ -57,11 +57,25 @@
<a-table ref="table" bordered size="middle" rowKey="equipmentId" :columns="columns" :dataSource="dataSource"
:pagination="false" :loading="loading" :scroll="{x:'max-content',y:scrollY}">
+ <template slot="equipmentId" slot-scope="text, record">
+ <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
+ </template>
+ <template slot="equipmentName" slot-scope="text, record">
+ <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
+ </template>
+ <template slot="oporationDict" slot-scope="text, record">
+ <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
+ </template>
<template slot="equipmentStatus" slot-scope="text">
- {{text===0?'姝ｅ父':'寮傚父'}}
+ <div :style="{color:text!==0?'#f00':null}">{{text===0?'姝ｅ父':'寮傚父'}}</div>
+ </template>
+ <template slot="collecttime" slot-scope="text, record">
+ <div :style="{color:record.equipmentStatus!==0?'#f00':null}">{{text}}</div>
</template>
<template slot="action" slot-scope="text, record">
- <a @click="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">鐘舵�佸弽棣�</a>
+ <a-popconfirm title="纭畾鍙嶉鍚�?" @confirm="$emit('editEquipmentStatus',record)" v-has="'deiveBaseInfo:responseStatus'">
+ <a>鐘舵�佸弽棣�</a>
+ </a-popconfirm>
</template>
</a-table>
@@ -86,18 +100,21 @@
title: '璁惧ID',
align: "center",
dataIndex: 'equipmentId',
+ scopedSlots: {customRender: 'equipmentId'},
width:210
},
{
title: '璁惧鍚嶇О',
align: "center",
dataIndex: 'equipmentName',
+ scopedSlots: {customRender: 'equipmentName'},
width:300
},
{
title: '鐘舵��',
align: "center",
dataIndex: 'oporationDict',
+ scopedSlots: {customRender: 'oporationDict'},
width:200
},
{
@@ -113,6 +130,7 @@
dataIndex: 'collecttime',
defaultSortOrder:'descend',
sorter: (a, b) => {return a.collecttime>b.collecttime?1:-1},
+ scopedSlots: {customRender: 'collecttime'},
width:350
},
{
--
Gitblit v1.9.3