diff --git a/api/app/lib/controllers/file/index.js b/api/app/lib/controllers/file/index.js index 8870da3e..d0b5b3a3 100644 --- a/api/app/lib/controllers/file/index.js +++ b/api/app/lib/controllers/file/index.js @@ -167,6 +167,10 @@ async function getFileList(ctx, next) { queryOptions.roadId = roadId } + rslt.road = await models.FileRoad.findOne({ + where: { rId: roadId } + }) + rslt.type = await models.FileType.findOne({ where: { fId } }) @@ -179,6 +183,9 @@ async function getFileList(ctx, next) { ['id', 'DESC'] ] }) + + + rslt.counter = await models.Files.count({ where: queryOptions }) diff --git a/web/client/src/sections/fillion/components/fileTable.js b/web/client/src/sections/fillion/components/fileTable.js index a58840f3..0c89863a 100644 --- a/web/client/src/sections/fillion/components/fileTable.js +++ b/web/client/src/sections/fillion/components/fileTable.js @@ -80,15 +80,15 @@ const DetailList = (props) => { dataIndex: 'road', align: 'center', render: (text, record) => { - return ''; + return fileList?.road?.roadName; } }, { title: '资料类型', - key: 'address', - dataIndex: 'address', + key: 'fileType', + dataIndex: 'fileType', align: 'center', render: (text, record) => { - return ''; + return fileList?.type?.fileType; } }, {