From 28189102d735bfc2c41720d1ef292bd9024b49f2 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期四, 18 四月 2024 11:21:01 +0800 Subject: [PATCH] 1、首页 (1)设备级看板单击设备效率统计仪表盘图标跳转至统计分析页面并根据唯一编号筛选页面对应数据 (2)设备级看板点击设备班次按钮跳转至工作日历页面并根据设备编号筛选页面对应数据 (3)增加所有层级看板图表数据加载动画 (4)公司级以及分厂级看板利用率胶囊以及上月OEE车间单柱图表轴线刻度最大值采用动态设置方式而非固定100% (5)工段级看板上月OEE单柱图表轴线刻度最大值采用动态设置方式而非固定100% (6)工段级看板单击前7天利用率图表跳转至统计分析页面并根据唯一编号筛选页面对应数据 (7)工段级看板单击上月OEE图表跳转至设备综合效率分析页面并根据唯一编号筛选页面对应数据 2、调整全局导航栏页签间距,以便能在不超出导航栏的情况下同时放置更多页面页签 --- src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue | 62 +++++++++++++++++++------------ 1 files changed, 38 insertions(+), 24 deletions(-) diff --git a/src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue b/src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue index 7716a81..18a7cbd 100644 --- a/src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue +++ b/src/views/eam/modules/equipmentNew/EquipmentProcessParametersList.vue @@ -24,7 +24,7 @@ <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'accountSons:add&edit&delete&submit'"> <a-menu slot="overlay"> <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item> - <a-menu-item key="1" @click="handleSubmitBatch"><a-icon type="to-top" />鎻愪氦</a-menu-item> + <!-- <a-menu-item key="1" @click="handleSubmitBatch"><a-icon type="to-top" />鎻愪氦</a-menu-item> --> </a-menu> <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button> </a-dropdown> @@ -48,7 +48,7 @@ :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> - <template + <!-- <template v-for="col in columns" :slot="col.dataIndex" slot-scope='text, record, index' @@ -65,16 +65,20 @@ v-if="col.dataIndex == 'parametersValue'" @change="(e)=>handleChange(e, record.key, col, index)" style="width: 100%" + :disabled="!isOpen" + title="寮�鍚伐鑹哄弬鏁扮鐞嗗悗鍙~鍐�" /> <span v-if="col.dataIndex == 'action'"> <a-button type="primary" @click="handleEdit(record)" v-has="'accountSons:add&edit&delete&submit'" + :disabled="!isOpen" + title="寮�鍚伐鑹哄弬鏁扮鐞嗗悗鍙偣鍑�" >鎻愪氦</a-button> </span> </div> - </template> + </template> --> <!-- <span slot="action" slot-scope="text, record"> <a @click="handleEdit(record)">缂栬緫</a> <a-divider type="vertical" /> @@ -102,6 +106,11 @@ mainId:{ type:String, default:'', + required:false + }, + isOpen:{ + type:Boolean, + default:true, required:false } }, @@ -138,47 +147,47 @@ title: '宸ヨ壓鍙傛暟缂栫爜', align: "center", dataIndex: 'processParametersNum', - width:350, + // width:350, }, { title: '宸ヨ壓鍙傛暟鍚嶇О', align: "center", dataIndex: 'processParametersName', - width:350, + // width:350, }, { title: '璁¢噺鍗曚綅', align: "center", dataIndex: 'processParametersUnitName', - width:350, + // width:350, }, { title: '鍙傛暟鍊�', align: "center", dataIndex: 'parametersValue', - scopedSlots: { - customRender: 'parametersValue' - }, - width:350, + // scopedSlots: { + // customRender: 'parametersValue' + // }, + // width:350, }, { title: '澶囨敞', align: "center", dataIndex: 'remark', - scopedSlots: { - customRender: 'remark' - }, + // scopedSlots: { + // customRender: 'remark' + // }, }, - { - title: '鎿嶄綔', - align: "center", - dataIndex: 'action', - scopedSlots: { - customRender: 'action' - }, - width:200, - fixed: 'right', - }, + // { + // title: '鎿嶄綔', + // align: "center", + // dataIndex: 'action', + // scopedSlots: { + // customRender: 'action' + // }, + // width:200, + // fixed: 'right', + // }, ], url: { list: "/eam/equipmentProcessParameters/list", @@ -272,8 +281,13 @@ this.selectedRowKeys = selectedRowKeys; this.selectionRows = selectionRows; }, - + + }, + mounted(){ + this.$bus.$on('loadData', (data) => { + this.loadData(); + }); } } </script> -- Gitblit v1.9.3