From bb654cea7b1666d5b3c04dbd81a074a5a502cc67 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期五, 31 五月 2024 09:36:40 +0800 Subject: [PATCH] 1、登录页实现登录窗口响应式布局,同时限制最大最小宽高 2、除设备级看板其余看板中点击技术状态以及报修故障图表后打开对应弹窗,并实现与接口联动 3、设备级看板点击保养计划按钮后打开对应弹窗并实现与后端数据联调 4、优化设备级看板折线图样式,将Y轴移至左侧,删除右侧Y轴,设置数据值在图标上的显示 --- src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue | 44 ++++++++++++++++++++++++++++++-------------- 1 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue index 9b5a245..eac5e23 100644 --- a/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue +++ b/src/views/eam/modules/equipmentDisposal/EquipmentDisposalDetailList.vue @@ -42,15 +42,16 @@ size="middle" bordered rowKey="id" - :scroll="{x:true}" + :scroll="{ x: 'calc(1000px + 5%)', y: 900 }" :columns="columns" :dataSource="dataSource" :pagination="ipagination" :loading="loading" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" + :maxHeight="800" @change="handleTableChange"> <template slot="htmlSlot" slot-scope="text"> + <!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" --> <div v-html="text"></div> </template> <template slot="equipmentPhoto" slot-scope="text,record"> @@ -143,75 +144,90 @@ // dataIndex: 'equipmentId' // }, { - title:'璁惧缂栫爜', + title:'缁熶竴缂栫爜', align:"center", - dataIndex: 'equipmentNum' + dataIndex: 'equipmentNum', + width:200 }, { title:'璧勪骇缂栫爜', align:"center", - dataIndex: 'assetNumber' + dataIndex: 'assetNumber', + width:200 }, { title:'鐗圭璁惧', align:"center", dataIndex: 'specificEquipment_dictText', + width:200 }, { title:'璁惧鍚嶇О', align:"center", - dataIndex: 'equipmentName' + dataIndex: 'equipmentName', + width:200 }, { title:'璁惧鍨嬪彿', align:"center", - dataIndex: 'model' + dataIndex: 'model', + width:200 }, { title:'璁惧瑙勬牸', align:"center", - dataIndex: 'specification' + dataIndex: 'specification', + width:200 }, { title:'璁惧鐘舵��', align:"center", dataIndex: 'equipmentStatus_dictText', + width:200 }, { title:'鎶�鏈姸鎬�', align:"center", dataIndex: 'technologyStatus_dictText', + width:200 }, { title:'璁惧浣嶇疆', align:"center", - dataIndex: 'location' + dataIndex: 'location', + width:200 }, { title:'閲嶈搴�', align:"center", - dataIndex: 'equipmentImportanceId_dictText' + dataIndex: 'equipmentImportanceId_dictText', + width:200 + }, { title:'璁惧鍥剧墖', align:"center", dataIndex: 'equipmentPhoto', - scopedSlots: {customRender: "equipmentPhoto"} + scopedSlots: {customRender: "equipmentPhoto"}, + width:200 }, { title:'鍑忓皯鏂瑰紡', align:"center", - dataIndex: 'reduceMethod_dictText' + dataIndex: 'reduceMethod_dictText', + width:200 }, { title:'澶勭疆鍘熷洜', align:"center", - dataIndex: 'disposalReason' + dataIndex: 'disposalReason', + width:200 }, { title:'澶勭疆鏃ユ湡', align:"center", - dataIndex: 'disposalDate' + dataIndex: 'disposalDate', + width:200 }, // { // title: '鎿嶄綔', -- Gitblit v1.9.3