From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 18 三月 2024 16:08:49 +0800
Subject: [PATCH] 1、mdc菜单下除特殊要求外，页面表格最少条数由10条调整为30条，每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮，实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题
---
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