From 20f77a55f8eeaceb026d1c5ad96de75d6edb712a Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 29 五月 2025 14:18:14 +0800
Subject: [PATCH] 1、报警分析页面报警页面调整比例饼图颜色 2、维修看板页面设备平均故障率柱状图Y轴去除%号以及去除柱子注释含义 3、设备管理页面新增弹窗添加禁止手输设备编号，新增安装位置字段（同时将MDC模块内所有设备名称显示调整为安装位置） 4、设备级看板页面的设备选择框新增安装位置显示 5、首页添加法士特沃克背景图 6、对比分析页面解决时间段查询选择框无法选择问题以及柱状图组件重置按钮关联设备树选择 7、OEE页面列表取消展示合格零件数量和加工零件数量字段，仅展示合格率字段
---
src/views/eam/repair/EamReportRepairList.vue | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/src/views/eam/repair/EamReportRepairList.vue b/src/views/eam/repair/EamReportRepairList.vue
index 8e41d23..1c73ccd 100644
--- a/src/views/eam/repair/EamReportRepairList.vue
+++ b/src/views/eam/repair/EamReportRepairList.vue
@@ -58,15 +58,15 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator" v-if="isDisplayOperation">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+ <a-button @click="handleAdd" type="primary" icon="plus" v-if="isShowAuth('eam:reportRepair:add')">鏂板</a-button>
<!--<a-button type="primary" icon="download" @click="handleExportXls('鏁呴殰鎶ヤ慨')">瀵煎嚭</a-button>-->
<!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
- <!--@change="handleImportExcel">-->
- <!--<a-button type="primary" icon="import">瀵煎叆</a-button>-->
+ <!--@change="handleImportExcel">-->
+ <!--<a-button type="primary" icon="import">瀵煎叆</a-button>-->
<!--</a-upload>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel">
+ <a-menu-item key="1" @click="batchDel" v-if="isShowAuth('eam:reportRepair:abolish')">
<a-icon type="delete"/>
浣滃簾
</a-menu-item>
@@ -95,6 +95,7 @@
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
+ :scroll="{ x: 'max-content' }"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:isDisplayOperation?'checkbox':'radio',getCheckboxProps:getCheckboxProps}"
@change="handleTableChange">
@@ -103,11 +104,15 @@
</template>
<span slot="action" slot-scope="text, record" v-if="record.reportStatus=='WAIT_REPAIR'">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <a @click="handleEdit(record)" v-if="isShowAuth('eam:reportRepair:edit')">缂栬緫</a>
- <a-divider type="vertical"/>
+ <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:edit')"/>
- <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleDelete(record.id)">
+ <a @click="handleAssign(record)" v-if="isShowAuth('eam:reportRepair:assign')">鎸囨淳</a>
+
+ <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:assign')"/>
+
+ <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleDelete(record.id)" v-if="isShowAuth('eam:reportRepair:abolish')">
<a>浣滃簾</a>
</a-popconfirm>
</span>
@@ -121,6 +126,8 @@
@ok="modalFormOk"/>
<!-- 鍥剧墖棰勮寮圭獥 -->
<images-preview-modal ref="imagesPreviewModalRef" :imageListUrl="currentImageListUrl"/>
+ <!--鎸囨淳鎶ヤ慨寮圭獥-->
+ <assign-repair-report-modal ref="assignRepairReportModalRef" @ok="modalFormOk"/>
</a-card>
</template>
@@ -132,12 +139,14 @@
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
import ImagesPreviewModal from '@views/eam/repair/modules/ImagesPreviewModal.vue'
import { getAction } from '@/api/manage'
+ import AssignRepairReportModal from './modules/EamReportRepairList/AssignRepairReportModal'
export default {
name: 'EamReportRepairList',
mixins: [JeecgListMixin],
components: {
+ AssignRepairReportModal,
ImagesPreviewModal,
LxSearchEquipmentSelect,
EamReportRepairModal
@@ -165,13 +174,25 @@
align: 'center',
customRender: function(t, r, index) {
return parseInt(index) + 1
- }
+ },
+ fixed: 'left',
},
{
title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentId_dictText',
- width: 200
+ dataIndex: 'equipmentCode',
+ fixed: 'left',
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ fixed: 'left',
+ },
+ {
+ title: '瀹夎浣嶇疆',
+ align: 'center',
+ dataIndex: 'installationPosition',
},
{
title: '鎶ヤ慨鐘舵��',
@@ -252,7 +273,8 @@
dataIndex: 'action',
align: 'center',
scopedSlots: { customRender: 'action' },
- width: 150
+ width: 200,
+ fixed: 'right',
}
this.columns = [...this.columns, operationColumn]
this.getFaultReasonListByApi()
@@ -307,6 +329,15 @@
this.$refs.imagesPreviewModalRef.visible = true
},
+ /**
+ * 鎸囨淳鎶ヤ慨鍗�
+ * @param record 琛ㄦ牸琛屼俊鎭�
+ */
+ handleAssign(record) {
+ this.$refs.assignRepairReportModalRef.visible = true
+ this.$refs.assignRepairReportModalRef.model = Object.assign({}, { id: record.id })
+ },
+
getCheckboxProps(record) {
return {
props: {
--
Gitblit v1.9.3