|
|
@@ -263,9 +263,11 @@
|
|
|
:status="DictCache.COLOR.SB_MEASURE_STATUS[text]"
|
|
|
:text="yesNoMap[text]" />
|
|
|
</span>
|
|
|
- <div slot="expandedRowRender" slot-scope="record" style="width:100%;">
|
|
|
+ <div slot="expandedRowRender" slot-scope="record" style="width:100%;padding-right:120px;">
|
|
|
<a-card :bordered="false" style="width:100%;position: relative; z-inde:9999">
|
|
|
- <a slot="extra" @click="addLogBySb(record)">新增</a>
|
|
|
+ <div slot="title">
|
|
|
+ <a-button type="primary" icon="plus" @click="addLogBySb(record)">新增</a-button>
|
|
|
+ </div>
|
|
|
<a-table :columns="childColumns1" :data-source="childMap">
|
|
|
</a-table>
|
|
|
</a-card>
|
|
|
@@ -614,6 +616,7 @@ export default {
|
|
|
title: '操作',
|
|
|
key: 'action',
|
|
|
checked: true,
|
|
|
+ fixed: 'right',
|
|
|
align: 'center',
|
|
|
width: '120',
|
|
|
scopedSlots: { customRender: 'action' }
|
|
|
@@ -645,22 +648,16 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- title: '设备位号',
|
|
|
+ title: '操作人',
|
|
|
checked: true,
|
|
|
width: 200,
|
|
|
- dataIndex: 'positionNo'
|
|
|
+ dataIndex: 'createdUserName'
|
|
|
},
|
|
|
{
|
|
|
- title: '设备位置',
|
|
|
- checked: true,
|
|
|
- width: 200,
|
|
|
- dataIndex: 'positionName'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '规格型号',
|
|
|
+ title: '操作内容',
|
|
|
checked: true,
|
|
|
width: 200,
|
|
|
- dataIndex: 'sbModel'
|
|
|
+ dataIndex: 'content'
|
|
|
},
|
|
|
{
|
|
|
title: '操作时间',
|
