|
|
@@ -56,6 +56,7 @@
|
|
|
</a-tag>
|
|
|
</span>
|
|
|
</template>
|
|
|
+
|
|
|
<template v-if="column.dataIndex === 'action'">
|
|
|
<a-button type="link" size="small" @click="formRef.onOpen(record)">编辑</a-button>
|
|
|
<a-popconfirm title="确定要删除吗？" @confirm="deleteData(record)">
|
|
|
@@ -168,9 +169,21 @@
|
|
|
|
|
|
const loadData = (parameter) => {
|
|
|
return memApi.memPage(Object.assign(parameter, searchFormState.value)).then((res) => {
|
|
|
+ if (res.records.length) {
|
|
|
+ const promises = res.records.map((element) => {
|
|
|
+ return memApi.getRegionByDeviceIdData({ deviceId: element.id }).then((response) => {
|
|
|
+ const list = response.map((ele) => ele.sensorRoute + '路').join(',')
|
|
|
+ element.sensorRoute = list
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+ // 等待所有异步操作完成后再返回结果
|
|
|
+ return Promise.all(promises).then(() => res)
|
|
|
+ }
|
|
|
return res
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
// 重置
|
|
|
const reset = () => {
|
|
|
searchFormRef.value.resetFields()
|
like