diff --git a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue index 99cd3bd..dc9cf46 100644 --- a/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue +++ b/src/views/systemOverview/equipmentManagement/EquipmentManagement.vue @@ -46,7 +46,7 @@ bordered :rowKey="(row, index) => row.id || index" :loading="deviceData.loading" - :scroll="{x: true,y:206}" + :scroll="{x: 500,y:206}" :columns="deviceData.columns" :dataSource="deviceData.dataSource" :pagination="deviceData.ipagination" @@ -248,28 +248,28 @@ export default { dataIndex: 'deviceStatus_dictText', title: '设备状态', align: 'center', - width: '20%', + width: 100, scopedSlots: { customRender: 'text' } }, { dataIndex: 'deviceName', title: '设备名称', align: 'center', - width: '20%', + width: 100, scopedSlots: { customRender: 'text' } }, { dataIndex: 'deviceSn', title: '设备SN码', align: 'center', - width: '20%', + width: 100, scopedSlots: { customRender: 'text' } }, { dataIndex: 'wellheadId_dictText', title: '所属井口', align: 'center', - width: '20%', + width: 100, scopedSlots: { customRender: 'text' } }, { @@ -277,7 +277,7 @@ export default { dataIndex: 'action', scopedSlots: { customRender: 'action' }, align: 'center', - width: 120 + width: 100 } ], dataSource: [], diff --git a/src/views/systemOverview/systemSettings/SystemSettings.vue b/src/views/systemOverview/systemSettings/SystemSettings.vue index 027f791..90addc3 100644 --- a/src/views/systemOverview/systemSettings/SystemSettings.vue +++ b/src/views/systemOverview/systemSettings/SystemSettings.vue @@ -51,7 +51,7 @@ bordered rowKey="id" :loading="userInfo.loading" - :scroll="{x: true,y:286}" + :scroll="{x: 500,y:286}" :columns="userInfo.columns" :dataSource="userInfo.dataSource" :pagination="userInfo.ipagination" @@ -147,7 +147,7 @@ size="middle" bordered rowKey="id" - :scroll="{x: true,y:286}" + :scroll="{x: 300,y:286}" :columns="communicationLog.columns" :dataSource="communicationLog.dataSource" :pagination="communicationLog.ipagination" @@ -227,28 +227,28 @@ export default { dataIndex: 'username', title: '用户名', align: 'center', - width: '20%', + width: 100, scopedSlots: { customRender: 'text' } }, { dataIndex: 'phone', title: '联系方式', align: 'center', - width: '20%', + width: 100, scopedSlots: { customRender: 'text' } }, { dataIndex: 'userType_dictText', title: '用户类别', align: 'center', - width: '20%', + width: 100, scopedSlots: { customRender: 'userType' } }, { dataIndex: 'orgCodeTxt', title: '所属单位', align: 'center', - width: '20%', + width: 100, scopedSlots: { customRender: 'text' } }, { @@ -256,7 +256,7 @@ export default { dataIndex: 'action', scopedSlots: { customRender: 'action' }, align: 'center', - width: '20%' + width: 100 } ], dataSource: [], @@ -285,21 +285,21 @@ export default { dataIndex: 'time', title: '时间', align: 'center', - width: '30%', + width: 90, scopedSlots: { customRender: 'text' } }, { dataIndex: 'msgType', title: '消息类型', align: 'center', - width: '30%', + width: 90, scopedSlots: { customRender: 'msgType' } }, { dataIndex: 'msgContent', title: '消息内容', align: 'center', - width: '40%', + width: 120, scopedSlots: { customRender: 'text' } } ],