From 26558c05ac35d0dc42e44991d5b5eaf82bfa4775 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Wed, 9 Aug 2023 09:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=87=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/report/index.js       |  1 -
 api/app/lib/schedule/zhidiao.js               | 21 ++++++++++++++++---
 .../containers/footer/operation/right.js      |  3 +--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/api/app/lib/controllers/report/index.js b/api/app/lib/controllers/report/index.js
index 492a414d..d14c28c3 100644
--- a/api/app/lib/controllers/report/index.js
+++ b/api/app/lib/controllers/report/index.js
@@ -451,7 +451,6 @@ async function spotCheck (ctx) {
 }
 async function spotCheckDetail (ctx) {
     const { models } = ctx.fs.dc
-    console.log('txc1', ctx.query)
     const { startTime, endTime } = ctx.query
     try {
         const res = await models.ReportSpotCheck.findAll({
diff --git a/api/app/lib/schedule/zhidiao.js b/api/app/lib/schedule/zhidiao.js
index 1245e3fe..67d6b6db 100644
--- a/api/app/lib/schedule/zhidiao.js
+++ b/api/app/lib/schedule/zhidiao.js
@@ -22,15 +22,30 @@ module.exports = function (app, opts) {
                         Authorization: Authorization
                     }
                 })
+
+                if (busRunRes && busRunRes.length) {
+                    if (app.fs.zhidiaoData) {
+                        app.fs.zhidiaoData.busRun = busRunRes
+                    } else {
+                        app.fs.zhidiaoData = {
+                            busRun: busRunRes
+                        }
+                    }
+                }
                 const busLineRes = await app.fs.zhidiaoRequest.get(`getLinePointList`, {
                     header: {
                         Authorization: Authorization
                     }
                 })
                 console.log(`定时获取BUS路线信息`);
-                app.fs.zhidiaoData = {
-                    busLine: busLineRes,
-                    busRun: busRunRes
+                if (busLineRes && busLineRes.length) {
+                    if (app.fs.zhidiaoData) {
+                        app.fs.zhidiaoData.busLine = busLineRes
+                    } else {
+                        app.fs.zhidiaoData = {
+                            busLine: busLineRes
+                        }
+                    }
                 }
             } catch (error) {
                 console.error(error);
diff --git a/web/client/src/sections/quanju/containers/footer/operation/right.js b/web/client/src/sections/quanju/containers/footer/operation/right.js
index 2a91fbc5..7ba7f25a 100644
--- a/web/client/src/sections/quanju/containers/footer/operation/right.js
+++ b/web/client/src/sections/quanju/containers/footer/operation/right.js
@@ -49,14 +49,13 @@ const Right = ({ busRunTime }) => {
                     return true
                 }
             })
-        console.log(nextBusRunList);
         setBusRunTimeList(nextBusRunList)
     }, [queryStr, busRunTime])
 
     const style = { height: "97%", marginTop: "3%" }
     const carouselContent = busRunTimeList.map((d, index) => {
         return (
-            <div key={index} style={{ width: '100%', height: '40%' }} className='carCard'>
+            <div key={index} style={{ width: '100%', }} className='carCard'>
                 <div className='busInformation'>
                     <img src='/assets/images/quanju/theBus.png' style={{ width: '15%', display: 'block', float: 'left' }} />
                     <span>