|
@@ -216,13 +216,13 @@
|
|
|
<template v-slot:durationInMillis="{ row }">
|
|
<template v-slot:durationInMillis="{ row }">
|
|
|
{{ getDateTime(row.durationInMillis) }}
|
|
{{ getDateTime(row.durationInMillis) }}
|
|
|
</template>
|
|
</template>
|
|
|
- <template v-slot:name="{ row }">
|
|
|
|
|
|
|
+ <template v-slot:listName="{ row }">
|
|
|
<el-link
|
|
<el-link
|
|
|
type="primary"
|
|
type="primary"
|
|
|
:underline="false"
|
|
:underline="false"
|
|
|
@click="handleDetail(row)"
|
|
@click="handleDetail(row)"
|
|
|
>
|
|
>
|
|
|
- {{ row.name }}
|
|
|
|
|
|
|
+ {{ row.listName }}
|
|
|
</el-link>
|
|
</el-link>
|
|
|
</template>
|
|
</template>
|
|
|
<template v-slot:remark="{ row }">
|
|
<template v-slot:remark="{ row }">
|
|
@@ -477,10 +477,10 @@
|
|
|
minWidth: 300
|
|
minWidth: 300
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: 'name',
|
|
|
|
|
|
|
+ prop: 'listName',
|
|
|
label: '名称',
|
|
label: '名称',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
- slot: 'name',
|
|
|
|
|
|
|
+ slot: 'listName',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 80
|
|
minWidth: 80
|
|
|
},
|
|
},
|
|
@@ -575,10 +575,10 @@
|
|
|
minWidth: 120
|
|
minWidth: 120
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- prop: 'name',
|
|
|
|
|
|
|
+ prop: 'listName',
|
|
|
label: '名称',
|
|
label: '名称',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
- slot: 'name',
|
|
|
|
|
|
|
+ slot: 'listName',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 150
|
|
minWidth: 150
|
|
|
},
|
|
},
|
|
@@ -795,11 +795,14 @@
|
|
|
createTimeBegin,
|
|
createTimeBegin,
|
|
|
createTimeEnd
|
|
createTimeEnd
|
|
|
);
|
|
);
|
|
|
|
|
+
|
|
|
|
|
+ console.log(data.list, 'data~~~');
|
|
|
return {
|
|
return {
|
|
|
count: data.count,
|
|
count: data.count,
|
|
|
list: data.list.map((item) => {
|
|
list: data.list.map((item) => {
|
|
|
return {
|
|
return {
|
|
|
...item,
|
|
...item,
|
|
|
|
|
+ listName: item.name,
|
|
|
...item.valueJson
|
|
...item.valueJson
|
|
|
};
|
|
};
|
|
|
})
|
|
})
|