治超分页

api/app/lib/controllers/data/overspeed.js

@@ -43,7 +43,7 @@ async function overspeedGet (ctx) {
         if (testTime) {
             findOption.where.testTime = testTime
         }
-        const overspeedRes = await models.Overspeed.findAll(findOption)
+        const overspeedRes = await models.Overspeed.findAndCountAll(findOption)
 
         ctx.status = 200;
         ctx.body = overspeedRes

api/app/lib/controllers/overview/conserve.js

@@ -10,7 +10,7 @@ async function statistic (ctx) {
             where: {
                 reportType: 'conserve',
             },
-            attributes: ['id', 'road', 'time', 'projectType', 'projectType'],
+            attributes: ['id', 'road', 'time', 'projectType', 'projectType', 'roadSectionStart', 'roadSectionEnd'],
             include: [{
                 model: models.User,
                 attributes: ['name']