From 12f60de079fefef9bbf15faabbe6675d023555d4 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 31 一月 2024 16:21:16 +0800
Subject: [PATCH] 增加报表
---
src/views/mdc/base/EquipmentList.vue | 77 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/src/views/mdc/base/EquipmentList.vue b/src/views/mdc/base/EquipmentList.vue
index 92f802e..c2b147a 100644
--- a/src/views/mdc/base/EquipmentList.vue
+++ b/src/views/mdc/base/EquipmentList.vue
@@ -19,6 +19,14 @@
<a-input placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-model="queryParam.equipmentName"></a-input>
</a-form-item>
</a-col>
+
+ <a-col :md="6" :sm="8">
+ <a-form-item label="杞﹂棿鍚嶇О">
+ <!--<a-input placeholder="璇疯緭鍏ヨ处鍙锋煡璇�" v-model="queryParam.username"></a-input>-->
+ <a-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.productionName"></a-input>
+ </a-form-item>
+ </a-col>
+
<a-col :md="6" :sm="8">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
@@ -56,6 +64,7 @@
bordered
size="middle"
rowKey="id"
+ :scroll="{x:'max-content',y:465}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -172,25 +181,25 @@
title: '璁惧缂栧彿',
align: "center",
dataIndex: 'equipmentId',
- width: 120,
+ width: 200,
// sorter: true
},
{
title: '璁惧鍚嶇О',
align: "center",
- width: 150,
+ width: 200,
dataIndex: 'equipmentName',
},
{
title: '杞﹂棿',
align: "center",
- width: 180,
+ width: 200,
dataIndex: 'productionName'
},
{
title: '璁惧绫诲瀷',
align: "center",
- width: 120,
+ width: 200,
dataIndex: 'equipmentType',
// scopedSlots: {customRender: "avatarslot"}
},
@@ -198,33 +207,33 @@
{
title: '椹卞姩绫诲瀷',
align: "center",
- width: 80,
+ width: 200,
dataIndex: 'driveType',
// sorter: true
},
{
title: '鏈哄簥IP',
align: "center",
- width: 100,
+ width: 200,
dataIndex: 'equipmentIp'
},
{
title: '璁惧鍔熺巼',
align: "center",
- width: 100,
+ width: 200,
dataIndex: 'devicePower'
},
{
title: '閮ㄩ棬',
align: "center",
- width: 180,
+ width: 200,
dataIndex: 'orgCodeTxt'
},
{
title: '绯荤粺鐗堟湰',
align: "center",
- width: 80,
+ width: 200,
dataIndex: 'systemVersion'
},
{
@@ -232,7 +241,8 @@
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
- width: 120
+ width: 150,
+ fixed:'right'
}
],
@@ -282,25 +292,25 @@
title: '璁惧缂栧彿',
align: "center",
dataIndex: 'equipmentId',
- width: 120,
+ width: 200,
// sorter: true
},
{
title: '璁惧鍚嶇О',
align: "center",
- width: 150,
+ width: 200,
dataIndex: 'equipmentName',
},
{
title: '杞﹂棿',
align: "center",
- width: 180,
+ width: 200,
dataIndex: 'productionName'
},
{
title: '璁惧绫诲瀷',
align: "center",
- width: 120,
+ width: 200,
dataIndex: 'equipmentType',
// scopedSlots: {customRender: "avatarslot"}
},
@@ -308,33 +318,33 @@
{
title: '椹卞姩绫诲瀷',
align: "center",
- width: 80,
+ width: 200,
dataIndex: 'driveType',
// sorter: true
},
{
title: '鏈哄簥IP',
align: "center",
- width: 100,
+ width: 200,
dataIndex: 'equipmentIp'
},
{
title: '璁惧鍔熺巼',
align: "center",
- width: 100,
+ width: 200,
dataIndex: 'devicePower'
},
// {
// title: '閮ㄩ棬',
// align: "center",
- // width: 180,
+ // width: 200,
// dataIndex: 'orgCodeTxt'
// },
{
title: '绯荤粺鐗堟湰',
align: "center",
- width: 80,
+ width: 200,
dataIndex: 'systemVersion'
},
{
@@ -342,7 +352,8 @@
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
- width: 120
+ width: 150,
+ fixed:'right'
}
]
@@ -362,25 +373,25 @@
title: '璁惧缂栧彿',
align: "center",
dataIndex: 'equipmentId',
- width: 120,
+ width: 200,
// sorter: true
},
{
title: '璁惧鍚嶇О',
align: "center",
- width: 150,
+ width: 200,
dataIndex: 'equipmentName',
},
{
title: '杞﹂棿',
align: "center",
- width: 180,
+ width: 200,
dataIndex: 'productionName'
},
{
title: '璁惧绫诲瀷',
align: "center",
- width: 120,
+ width: 200,
dataIndex: 'equipmentType',
// scopedSlots: {customRender: "avatarslot"}
},
@@ -388,33 +399,33 @@
{
title: '椹卞姩绫诲瀷',
align: "center",
- width: 80,
+ width: 200,
dataIndex: 'driveType',
// sorter: true
},
{
title: '鏈哄簥IP',
align: "center",
- width: 100,
+ width: 200,
dataIndex: 'equipmentIp'
},
{
title: '璁惧鍔熺巼',
align: "center",
- width: 100,
+ width: 200,
dataIndex: 'devicePower'
},
{
title: '閮ㄩ棬',
align: "center",
- width: 180,
+ width: 200,
dataIndex: 'orgCodeTxt'
},
{
title: '绯荤粺鐗堟湰',
align: "center",
- width: 80,
+ width: 200,
dataIndex: 'systemVersion'
},
{
@@ -422,7 +433,8 @@
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
- width: 120
+ width: 150,
+ fixed:'right'
}
]
@@ -443,6 +455,8 @@
this.$refs.modalForm.title = "缂栬緫";
this.$refs.modalForm.disableSubmit = false;
this.$refs.modalForm.disSeach = true;
+ // 璋冪敤鎶藉眽琛ㄥ崟缁勪欢涓殑娓呴櫎琛ㄥ崟楠岃瘉鏂规硶
+ this.$refs.modalForm.removeValidate()
},
handleAdd: function () {
this.$refs.modalForm.add();
@@ -453,7 +467,6 @@
getAvatarView: function (avatar) {
return getFileAccessHttpUrl(avatar)
},
-
batchFrozen: function (status) {
if (this.selectedRowKeys.length <= 0) {
// this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
@@ -485,7 +498,7 @@
frozenBatch({ids: ids, status: status}).then((res) => {
if (res.success) {
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
--
Gitblit v1.9.3