From 8a4d90d80c6ae8472bf11a1c1f148ca49c90f0a7 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 29 五月 2025 15:42:59 +0800
Subject: [PATCH] 1、设备TEEP、设备开动率以及班次利用率页面时间选择器新增用户选择时对时间范围的限制功能并测试大数据导出功能 2、生产设备自主维护点检表设备编号的输入方式由手动输入调整为弹窗选择输入 3、生产设备自主维护点检表页面调整周保执行记录渲染逻辑（日期对应到周）
---
src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue | 87 +++++++++++++++++--------------------------
1 files changed, 35 insertions(+), 52 deletions(-)
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
index be79edf..a89ad24 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
@@ -8,7 +8,7 @@
@cancel="close"
style="top:50px"
cancelText="鍏抽棴"
- :width="1200"
+ :width="1400"
>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
@@ -21,9 +21,9 @@
:md="8"
:sm="6"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="缁熶竴缂栫爜">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.num"
/>
</a-form-item>
@@ -32,10 +32,10 @@
:md="8"
:sm="6"
>
- <a-form-item label="璁惧缂栫爜">
+ <a-form-item label="璁惧鍚嶇О">
<a-input
- placeholder="璇疯緭鍏ヨ澶囩紪鐮�"
- v-model="queryParam.num"
+ placeholder="璁惧鍚嶇О"
+ v-model="queryParam.name"
/>
</a-form-item>
</a-col>
@@ -106,71 +106,53 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
- dataIndex: 'num'
- },
- {
- title: '璧勪骇缂栫爜',
- align: 'center',
- dataIndex: 'assetNumber'
- },
-
- {
- title: '鐗圭璁惧',
- align: 'center',
- dataIndex: 'specificEquipment_dictText'
+ dataIndex: 'num',
+ width:200
},
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'name'
+ dataIndex: 'name',
+ width:200
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- dataIndex: 'model'
+ dataIndex: 'model',
+ width:200
},
{
title: '璁惧瑙勬牸',
align: 'center',
- dataIndex: 'specification'
+ dataIndex: 'specification',
+ width:200
+ },
+ {
+ title: 'ABC鏍囪瘑',
+ align: "center",
+ dataIndex: 'equipmentImportanceId',
+ width:100
+ },
+ {
+ title: '鍏抽敭璁惧鏍囪瘑',
+ align: "center",
+ dataIndex: 'specificEquipment_dictText',
+ width:100
},
{
title: '璁惧鐘舵��',
align: 'center',
- dataIndex: 'equipmentStatus_dictText'
+ dataIndex: 'equipmentStatus_dictText',
+ width:100
},
{
title: '鎶�鏈姸鎬�',
align: 'center',
- dataIndex: 'technologyStatus_dictText'
+ dataIndex: 'technologyStatus_dictText',
+ width:100
},
-
- {
- title: '璁惧鍥剧墖',
- align: 'center',
- dataIndex: 'equipmentPhoto',
- scopedSlots: { customRender: 'equipmentPhoto' }
- },
- // {
- // title:'璁惧鍥剧墖',
- // align:"center",
- // dataIndex: 'equipmentPhoto',
- // scopedSlots: {customRender: 'imgSlot'}
- // },
- {
- title: '浣嶇疆',
- align: 'center',
- dataIndex: 'location'
- },
-
- {
- title: '閲嶈搴�',
- align: 'center',
- dataIndex: 'equipmentImportanceId_dictText'
- }
-
],
selectedRowKeys: [],
oldSelectRows: [],
@@ -196,7 +178,7 @@
visible: false,
loading: false,
url: {
- list: '/eam/equipment/list'
+ list: '/eam/equipment/getEquipmentList'
}
}
},
@@ -226,8 +208,9 @@
}
let that = this
this.loading = true
+ this.queryParam.isLine = 'no'
let params = this.getQueryParams()//鏌ヨ鏉′欢
- params.equipmentStatus = '1'
+ // params.equipmentStatus = '1'
await getAction(this.url.list, params).then((res) => {
if (res.success) {
for (let i = 0; i < res.result.records.length; i++) {
@@ -291,7 +274,7 @@
this.loadData()
},
handleSubmit() {
- this.$bus.$emit('selectionRows', this.selectionRows)
+ this.$emit('selectionRows', this.selectionRows)
this.searchReset(0)
this.close()
},
--
Gitblit v1.9.3