From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
src/views/eam/EquipmentMaintenancePlanDetailList.vue | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/src/views/eam/EquipmentMaintenancePlanDetailList.vue b/src/views/eam/EquipmentMaintenancePlanDetailList.vue
index 69df8aa..4b92518 100644
--- a/src/views/eam/EquipmentMaintenancePlanDetailList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanDetailList.vue
@@ -61,27 +61,44 @@
</template>
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
- <a-divider type="vertical" />
+ <!-- <a-divider type="vertical" />
<a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
<a>鍒犻櫎</a>
- </a-popconfirm>
+ </a-popconfirm> -->
+ <a @click="handleEdit(record)" :disabled="mainStatus!=='distributed'">璁″垝鍙樻洿</a>
</span>
-
+ <span
+ slot="num"
+ slot-scope="text, record"
+ >
+ <a
+ class="lot"
+ @click="handleShowDetail(record)"
+ >{{record.standardNum}}</a>
+ </span>
</a-table>
</div>
+ <standard-detail-model :mainId="standardId" ref="standardDetail"></standard-detail-model>
+ <maintenance-plan-change-model ref="modalForm" @ok="modalFormOk"></maintenance-plan-change-model>
</a-card>
</template>
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import StandardDetailModel from './modules/maintenancePlan/StandardDetailModel'
+ import MaintenancePlanChangeModel from './modules/maintenancePlan/MaintenancePlanChangeModel.vue'
export default {
name: "EquipmentMaintenancePlanDetailList",
mixins:[JeecgListMixin],
- components: {},
+ components: {StandardDetailModel, MaintenancePlanChangeModel},
props:{
mainId:{
+ type:String,
+ default:'',
+ required:false
+ },
+ mainStatus:{
type:String,
default:'',
required:false
@@ -120,38 +137,47 @@
title:'淇濆吇鏍囧噯',
align:"center",
dataIndex: 'standardNum',
- width:300,
+ width:250,
+ scopedSlots: { customRender: 'num' }
},
{
title:'璁惧缁熶竴缂栫爜',
align:"center",
dataIndex: 'equipmentNum',
- width:300,
+ width:250,
},
{
title:'璁惧鍚嶇О',
align:"center",
dataIndex: 'equipmentName',
- width:300,
+ width:250,
},
{
title:'璁惧鍨嬪彿',
align:"center",
dataIndex: 'model',
- width:300,
+ width:250,
},
{
title:'璁″垝寮�濮嬫椂闂�',
align:"center",
dataIndex: 'planStartTime',
- width:300,
+ width:280,
},
{
title:'璁″垝缁撴潫鏃堕棿',
align:"center",
dataIndex: 'planEndTime',
- width:300,
+ width:280,
},
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:200,
+ scopedSlots: { customRender: 'action' },
+ }
],
url: {
list: "/eam/equipmentMaintenancePlan/listEquipmentMaintenancePlanDetailByMainId",
@@ -161,7 +187,8 @@
importUrl: "/eam/equipmentMaintenancePlan/importEquipmentMaintenancePlanDetail",
},
dictOptions:{
- }
+ },
+ standardId:''
}
},
created() {
@@ -176,8 +203,11 @@
this.dataSource=[]
this.selectedRowKeys=[]
this.ipagination.current = 1
+ },
+ handleShowDetail(record){
+ this.standardId = record.standardId
+ this.$refs.standardDetail.visible = true;
}
-
}
}
</script>
--
Gitblit v1.9.3