|
|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<a-modal
|
|
|
:title="modalTitle"
|
|
|
- :width="1000"
|
|
|
+ :width="1300"
|
|
|
:visible="visible"
|
|
|
:confirmLoading="confirmLoading"
|
|
|
class="ant-modal2"
|
|
|
@@ -44,11 +44,11 @@
|
|
|
:rowSelection="options.rowSelection"
|
|
|
showPagination="auto"
|
|
|
>
|
|
|
- <span slot="action" slot-scope="record1">
|
|
|
+ <!-- <span slot="action" slot-scope="record1">
|
|
|
<template>
|
|
|
<a @click="handleView(record1)">查看</a>
|
|
|
</template>
|
|
|
- </span>
|
|
|
+ </span> -->
|
|
|
</s-table>
|
|
|
<detail ref="detailModal" />
|
|
|
</a-card>
|
|
|
@@ -109,10 +109,6 @@ export default {
|
|
|
return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
|
|
|
}
|
|
|
},
|
|
|
- {
|
|
|
- title: '设备id',
|
|
|
- dataIndex: 'sbId'
|
|
|
- },
|
|
|
{
|
|
|
title: '设备名称',
|
|
|
dataIndex: 'sbName'
|
|
|
@@ -131,14 +127,15 @@ export default {
|
|
|
return this.BaseTool.Object.getField(this.map, text)
|
|
|
}
|
|
|
},
|
|
|
- {
|
|
|
- title: '描述',
|
|
|
- dataIndex: 'description'
|
|
|
- },
|
|
|
+
|
|
|
{
|
|
|
title: '实时数值',
|
|
|
dataIndex: 'result'
|
|
|
},
|
|
|
+ {
|
|
|
+ title: '单位',
|
|
|
+ dataIndex: 'unit'
|
|
|
+ },
|
|
|
{
|
|
|
title: '系数',
|
|
|
dataIndex: 'ratio',
|
|
|
@@ -147,24 +144,20 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- title: '单位',
|
|
|
- dataIndex: 'unit'
|
|
|
+ title: '描述',
|
|
|
+ dataIndex: 'description'
|
|
|
},
|
|
|
{
|
|
|
title: '备注',
|
|
|
dataIndex: 'remark'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '创建日期',
|
|
|
- dataIndex: 'createdTime'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '操作',
|
|
|
- key: 'action',
|
|
|
- width: '200px',
|
|
|
- align: 'center',
|
|
|
- scopedSlots: { customRender: 'action' }
|
|
|
}
|
|
|
+ // {
|
|
|
+ // title: '操作',
|
|
|
+ // key: 'action',
|
|
|
+ // width: '200px',
|
|
|
+ // align: 'center',
|
|
|
+ // scopedSlots: { customRender: 'action' }
|
|
|
+ // }
|
|
|
],
|
|
|
// 下拉框map
|
|
|
// 加载数据方法 必须为 Promise 对象
|
