From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue | 104 +++++++++++++++++-----------------------------------
1 files changed, 34 insertions(+), 70 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue b/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
index 66b8770..935def3 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentPrecisionParametersList.vue
@@ -143,7 +143,7 @@
if(!this.mainId){
this.clearList()
}else{
- this.queryParam['equipmentId'] = val
+ this.queryParam['precisionParametersTemplateId'] = val
this.loadData(1);
}
}
@@ -156,78 +156,42 @@
// 琛ㄥご
columns: [
{
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: "center",
- customRender: function (t, r, index) {
- return parseInt(index) + 1;
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:100,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
},
- },
- {
- title: '绮惧害鍙傛暟缂栫爜',
- dataIndex: 'precisionParametersNum',
- align: "center",
- width:250,
- },
- {
- title: '绮惧害鍙傛暟鍚嶇О',
- dataIndex: 'precisionParametersName',
- align: "center",
- width:250,
- },
- {
- title: '璁￠噺鍗曚綅',
- dataIndex: 'precisionParametersUnitName',
- align: "center",
- width:250,
- },
- {
- title: '涓婇檺鍊�',
- dataIndex: 'upperLimit',
- align: "center",
- // scopedSlots: {
- // customRender: 'upperLimit'
- // },
- width:250,
- },
- {
- title: '涓嬮檺鍊�',
- dataIndex: 'lowerLimit',
- align: "center",
- // scopedSlots: {
- // customRender: 'lowerLimit'
- // },
- width:250,
- },
- {
- title: '瀹為檯绮惧害鍊�',
- dataIndex: 'actualValue',
- align: "center",
- // scopedSlots: {
- // customRender: 'actualValue'
- // },
- width:250,
- },
- {
- title: '澶囨敞',
- dataIndex: 'remark',
- align: "center",
- },
- // {
- // title: '鎿嶄綔',
- // dataIndex: 'action',
- // width: 160,
- // align: "center",
- // // scopedSlots: {
- // // customRender: 'action'
- // // },
- // fixed: 'right',
- // },
+ {
+ title:'妫�楠岄」鐩悕绉�',
+ align:"center",
+ dataIndex: 'precisionParametersName',
+ width:400
+ },
+ {
+ title:'浣嶇疆',
+ align:"center",
+ dataIndex: 'precisionParametersUda1',
+ width:400
+ },
+ {
+ title:'鍏佸樊锛坢m锛�',
+ align:"center",
+ dataIndex: 'tolerance',
+ width:400
+ },
+ {
+ title:'瀹炴祴鍊�',
+ align:"center",
+ dataIndex: 'actualValue',
+ width:400
+ },
],
url: {
- list: "/eam/equipmentPrecisionParameters/list",
+ list: '/eam/precisionParametersTemplateDetail/listByPrecisionParametersTemplateId',
edit: "/eam/equipmentPrecisionParameters/edit",
submitBatch:"/eam/equipmentPrecisionParameters/submitBatch",
// delete: "/new/equipment/deleteEquipmentPrecisionParameters",
--
Gitblit v1.9.3