From 1e1e70da5288f47d8770ba2e7f22f3362e5b577c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 08 十二月 2023 17:16:35 +0800
Subject: [PATCH] 1、全局修改密码弹窗中的新密码校验长度与数据字典password_length设置保持一致 2、报警分析页面优化过快点击多次表格行时图表内容出现数据残留以及加载图表应设置加载中动画，若不设置用户在查询时短时间内不清楚有无数据 3、车间看板以及设备监控页面设备详情弹窗右上角增加关闭按钮、设备详情弹窗透明度加深、设备详情弹窗图表表盘指针对比色加强、调整设备详情弹窗中描述列表子项标题对齐方式由左对齐改为右对齐，锁定运行数据描述列表子项数值宽度，超出部分隐藏出现省略号，悬浮出现气泡卡片 4、设备利用率、设备开动率、班次利用率页面表格前三列增加表头，依次为公司、车间、工段以及表格有关时间值调整为若小时或分钟为0则不显示 5、设备综合效率分析页面表格数据默认每页最多显示10条改为20条 6、设备加工工件报表页面完成布局及功能实现
---
src/views/eam/Daily3MaintenanceOrderList.vue | 161 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 102 insertions(+), 59 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index c08a5cc..532592d 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -53,24 +53,24 @@
@click="handleAdd"
type="primary"
icon="plus"
- v-has="'dailyMaintenanceOrder:add'"
+ v-has="'daily3MaintenanceOrder:add'"
>鏂板</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintPrecision(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绮惧害妫�楠屽崟鎵撳嵃
</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintCheck(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>楠屾敹鍗曟墦鍗�
</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
@@ -147,12 +147,12 @@
<a-popconfirm
title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
- v-has="'dailyMaintenanceOrder:issue'"
+ v-has="'daily3MaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">鎺ユ敹</a>
+ <a v-show="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '1'"
+ v-show="record.status == '1'"
type="vertical"
/>
<!-- <a
@@ -166,15 +166,15 @@
<a-popconfirm
title="纭畾鎾ゅ洖宸ュ崟鍚�?"
@confirm="() => handleOrderReset(record)"
- v-has="'dailyMaintenanceOrder:issue'"
+ v-has="'daily3MaintenanceOrder:issue'"
>
- <a v-if="record.status == '2'">鎾ゅ洖</a>
+ <a v-show="record.status == '2'">鎾ゅ洖</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
- <a-popconfirm
+ <!-- <a-popconfirm
title="纭畾鎭㈠宸ュ崟鍚�?"
@confirm="() => handleOrderRecover(record)"
v-has="'dailyMaintenanceOrder:recover'"
@@ -184,8 +184,8 @@
<a-divider
v-if="record.status == '7'"
type="vertical"
- />
- <a-popconfirm
+ /> -->
+ <!-- <a-popconfirm
title="纭畾浣滃簾宸ュ崟鍚�?"
@confirm="() => handleOrderCancel(record)"
v-has="'dailyMaintenanceOrder:recover'"
@@ -195,15 +195,15 @@
<a-divider
v-if="record.status == '2'"
type="vertical"
- />
+ /> -->
<a-popconfirm
title="纭畾棰嗗彇宸ュ崟鍚�?"
@confirm="() => handleOrderGet(record)"
- v-has="'dailyMaintenanceOrder:get'"
+ v-has="'daily3MaintenanceOrder:get'"
>
- <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
+ <a v-show="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
- <a
+ <!-- <a
v-if="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
@@ -212,35 +212,35 @@
v-if="record.status == '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
- >鏀规淳</a>
+ >鏀规淳</a> -->
<!-- <a
v-if="record.status == '3'"
@click="handleAssignOrder(record)"
>鏀规淳</a> -->
- <a-divider
+ <!-- <a-divider
v-if="record.status == '2'"
type="vertical"
- />
+ />-->
<a-divider
- v-if="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
+ v-show="record.status === '2'"
type="vertical"
/>
<a
- v-if="record.status === '3' || record.status === '4' "
+ v-show="record.status === '3' || record.status === '4' "
@click="handleOrderExe(record)"
- v-has="'dailyMaintenanceOrder:exe'"
+ v-has="'daily3MaintenanceOrder:exe'"
>鎵ц</a>
<a-divider
v-if="record.status === '3' || record.status === '4' "
type="vertical"
/>
<a
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
@click="handleEdit(record)"
- v-has="'dailyMaintenanceOrder:edit'"
+ v-has="'daily3MaintenanceOrder:edit'"
>缂栬緫</a>
<a-divider
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
type="vertical"
/>
<!-- <a
@@ -251,36 +251,76 @@
v-if="record.status === '5'"
type="vertical"
/> -->
+ <!-- 绮惧害妫�楠岃�呮搷浣滅簿搴︽楠屽崟 -->
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:precisionInspectionUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 缁翠慨瀹や富浠绘搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '1' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:repairDirectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 璁惧妫�楠屽憳鎿嶄綔绮惧害妫�楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '2' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:equipmentInspectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 浣跨敤鍗曚綅鎶�鏈富绠℃搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '3' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:useUnitDirectorUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 璁惧妫�楠屽憳绛惧瓧 鎿嶄綔绮惧害妫�楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '4')"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:equipmentInspectorSignUser'"
+ >绮惧害妫�楠�</a>
+ <!-- 绮惧害妫�楠屽崟 鏌ョ湅 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '5')"
@click="handlePrecisionCheckOrder(record)"
>绮惧害妫�楠�</a>
+ <!--绠＄悊鍛樻搷浣滅簿搴︽楠屽崟 -->
+ <a
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4' )"
+ @click="handlePrecisionCheckOrder(record)"
+ v-has="'daily3MaintenanceOrder:admin'"
+ >绮惧害妫�楠�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' && (record.precisionInspectionStatus == '0' ||record.precisionInspectionStatus == '1' ||record.precisionInspectionStatus == '2' ||record.precisionInspectionStatus == '3' ||record.precisionInspectionStatus == '4')"
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '1' "
type="vertical"
/>
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
@click="handleStoveDetection(record)"
+ v-has="'daily3MaintenanceOrder:StoveCategory'"
>鐐夌被妫�娴�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
type="vertical"
/>
<a
- v-if="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == false && record.precisionParameters == '0'"
@click="handleTechnologyStatus(record)"
+ v-has="'daily3MaintenanceOrder:TechnologyStatus'"
>鎶�鏈姸鎬侀壌瀹�</a>
<a-divider
- v-if="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' "
+ v-show="record.status === '5'&& record.isNotStoveCategoryFlag == false && record.precisionParameters == '0' "
type="vertical"
/>
<a
- v-if="record.status === '5' "
+ v-show="record.status === '5' "
@click="handleMaintenance3Receipt(record)"
+ v-has="'daily3MaintenanceOrder:Receipt'"
>楠屾敹鍗�</a>
<a-divider
- v-if="record.status === '5' "
+ v-show="record.status === '5' "
type="vertical"
/>
<a-dropdown>
@@ -293,9 +333,9 @@
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
- v-has="'dailyMaintenanceOrder:delete'"
+ v-has="'daily3MaintenanceOrder:delete'"
>
- <a v-if="record.status === '1'">鍒犻櫎</a>
+ <a v-show="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
@@ -423,18 +463,21 @@
{
title: '鐘舵��',
align: "center",
- dataIndex: 'statusName'
+ dataIndex: 'statusName',
+ width: 100,
},
{
title: '淇濆吇鍛ㄦ湡',
align: "center",
dataIndex: 'maintenanceCycleName',
+ width: 100,
},
- {
- title: '娲惧伐鏂瑰紡',
- align: "center",
- dataIndex: 'assignModeName'
- },
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'assignModeName',
+ // width: 100,
+ // },
{
title: '缁熶竴缂栫爜',
align: "center",
@@ -456,7 +499,7 @@
dataIndex: 'checkStatusName',
},
{
- title: '鏈�氳繃鍘熷洜',
+ title: '楠屾敹鏈�氳繃鍘熷洜',
align: "center",
dataIndex: 'notPassReason',
scopedSlots: { customRender: 'notPassReason' }
@@ -477,23 +520,23 @@
align: "center",
dataIndex: 'teamName'
},
- {
- title: '宸ユ椂瀹氶',
- align: "center",
- dataIndex: 'workingHourQuota'
- },
+ // {
+ // title: '宸ユ椂瀹氶',
+ // align: "center",
+ // dataIndex: 'workingHourQuota'
+ // },
{
title: '璁″垝寮�濮嬫椂闂�',
align: "center",
dataIndex: 'planStartTime',
//width: '120px',
},
- {
- title: '璁″垝缁撴潫鏃堕棿',
- align: "center",
- dataIndex: 'planEndTime',
- //width: '120px',
- },
+ // {
+ // title: '璁″垝缁撴潫鏃堕棿',
+ // align: "center",
+ // dataIndex: 'planEndTime',
+ // //width: '120px',
+ // },
{
title: '瀹為檯寮�濮嬫椂闂�',
align: "center",
@@ -506,11 +549,11 @@
dataIndex: 'actualEndTime',
//width: '120px',
},
- {
- title: '瀹為檯鐢ㄦ椂',
- align: "center",
- dataIndex: 'actualWorkingHourQuota',
- },
+ // {
+ // title: '瀹為檯鐢ㄦ椂',
+ // align: "center",
+ // dataIndex: 'actualWorkingHourQuota',
+ // },
{
title: '鎵ц浜�',
align: "center",
--
Gitblit v1.9.3