From b929e95108f219b571b35edf3b4b13115f7b49c6 Mon Sep 17 00:00:00 2001 From: wenlele Date: Thu, 24 Aug 2023 17:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E8=BE=B9=E8=B7=AF=E5=86=B5=E6=83=85?= =?UTF-8?q?=E5=86=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/superScreen/fire.js | 11 +- api/config.js | 12 +- .../assets/images/homepage/bigscreen/road.png | Bin 0 -> 7944 bytes .../fire-control/components/Right-top2.js | 182 +++++++++++++----- 4 files changed, 146 insertions(+), 59 deletions(-) create mode 100644 super-screen/client/assets/images/homepage/bigscreen/road.png diff --git a/api/app/lib/controllers/superScreen/fire.js b/api/app/lib/controllers/superScreen/fire.js index 9a11675..5bfdfa5 100644 --- a/api/app/lib/controllers/superScreen/fire.js +++ b/api/app/lib/controllers/superScreen/fire.js @@ -169,10 +169,11 @@ function videoList (opts) { function getDetails (opts) { return async function (ctx) { try { - const res = await request.get('https://jiaotong.baidu.com/trafficindex/city/details/?cityCode=163') + const { app, yingshiTokenRes } = ctx + const res = await app.fs.baiDuJiaotong.get('trafficindex/city/details/?cityCode=163') ctx.status = 200 - ctx.body = res.body || {} + ctx.body = res || {} } catch (error) { ctx.fs.logger.error(`path: ${ctx.path}, error: error`); @@ -235,16 +236,16 @@ function getSurroundingConditions (opts) { const { app, yingshiTokenRes } = ctx const { center } = ctx.query; - const res = await app.fs.baiDu.get('/traffic/v1/around', { ak: opts.baiduAK, radius: 1000, center: center }) + const res = await app.fs.baiDu.get(`traffic/v1/around?ak=${opts.baiduAK}¢er=${center}&radius=1000`) ctx.status = 200 - ctx.body = res.body || {} + ctx.body = res && JSON.parse(res) || {} } catch (error) { ctx.fs.logger.error(`path: ${ctx.path}, error: error`); ctx.status = 400; ctx.body = { - message: '获取南昌市道路数据失败' + message: '获取周边路况数据失败' } } } diff --git a/api/config.js b/api/config.js index 714d054..2520c03 100644 --- a/api/config.js +++ b/api/config.js @@ -46,6 +46,7 @@ const YINGSHI_SECRET = process.env.YINGSHI_SECRET || flags.yingshiSecret; // 萤石服务的地址 const YINGSHI_URL = process.env.YINGSHI_URL || flags.yingshiUrl || 'https://open.ys7.com/api'; +const BAIDU_JIAOTONG_API = process.env.BAIDU_JIAOTONG_API || flags.baiDuJiaotong || 'https://jiaotong.baidu.com'; const BAIDU_API = process.env.BAIDU_API || flags.baiDu || 'https://api.map.baidu.com'; const BAIDU_AK = process.env.BAIDU_AK || flags.baiDuAk || 'AeSOcqC282tdSUVOfYxe68nEcNF1CTj7'; @@ -76,7 +77,7 @@ const product = { dev, yingshiKey: YINGSHI_KEY, yingshiSecret: YINGSHI_SECRET, - baiduAK: BAIDU_AK, + baiduAK: BAIDU_AK, exclude: [ // "*" ], // 不做认证的路由，也可以使用 exclude: ["*"] 跳过所有路由 @@ -111,7 +112,14 @@ const product = { { name: 'baiDu', root: BAIDU_API, - params: {} + params: {}, + dataWord: 'text' + }, + { + name: 'baiDuJiaotong', + root: BAIDU_JIAOTONG_API, + params: {}, + dataWord: '' },], } }, { diff --git a/super-screen/client/assets/images/homepage/bigscreen/road.png b/super-screen/client/assets/images/homepage/bigscreen/road.png new file mode 100644 index 0000000000000000000000000000000000000000..04e4896dbffed610460971888fdf517c4dba160a GIT binary patch literal 7944 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 { const [videoList, setVideoList] = useState([]) - const [options, setOptions] = useState([]) + const [roadData, setRoadData] = useState({}) const [traffic, setTraffic] = useState({}) let weeks = { 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六', 7: '周日' } @@ -18,17 +20,65 @@ const DataTop5 = ({ dispatch, actions, longitudeLatitude }) => { setTraffic(res.payload.data?.data?.detail || {}); } }) + const dom1 = document.getElementById("road"); + if (dom1) { + roadScrollbar = new PerfectScrollbar("#road", { + suppressScrollX: true, + }); + } + const dom2 = document.getElementById("describe"); + if (dom2) { + describeScrollbar = new PerfectScrollbar("#describe", { + suppressScrollX: true, + }); + } }, []) useEffect(() => { - dispatch(actions.firecontrol.getSurroundingConditions({ center: `${longitudeLatitude?.longitude},${longitudeLatitude?.latitude}` })).then(res => { - if (res.success) { - // setTraffic(res.payload.data?.data?.detail || {}); - } - }) + const dom1 = document.getElementById("road"); + if (dom1) { + roadScrollbar = new PerfectScrollbar("#road", { + suppressScrollX: true, + }); + } + const dom2 = document.getElementById("describe"); + if (dom2) { + describeScrollbar = new PerfectScrollbar("#describe", { + suppressScrollX: true, + }); + } + }, [roadData]) + + useEffect(() => { + + const dom1 = document.getElementById("road"); + if (dom1 && roadScrollbar) { + roadScrollbar.update(); + } + const dom2 = document.getElementById("describe"); + if (dom2 && describeScrollbar) { + describeScrollbar.update(); + } + }) + + useEffect(() => { + if (longitudeLatitude?.latitude && longitudeLatitude?.longitude) { + dispatch(actions.firecontrol.getSurroundingConditions({ + // center: `30.576279,104.071216` + center: `${longitudeLatitude?.latitude},${longitudeLatitude?.longitude}` + })).then(res => { + if (res.success) { + setRoadData(res.payload.data || {}) + } + }) + } + }, [longitudeLatitude]) - console.log(longitudeLatitude); + let evaluation = { 0: '未知路况', 1: '畅通', 2: '缓行', 3: '拥堵', 4: '严重拥堵' } + let evaluationColor = { 0: 'rgb(151 175 164)', 1: '#00FF87', 2: '#FFCC00', 3: '#DE0102', 4: '#8E0E0B' } + + let trend = { SAME: '持平', BETTER: '缓解', WORSE: '加重' } return
{
周边路况实时数据
-
+
{longitudeLatitude?.longitude ? <> - {/*
-
-
= 1 && traffic?.index < 1.5) ? - "#00FF87" : (traffic?.index >= 1.5 && traffic?.index < 1.8) ? - "#FFCC00;" : (traffic?.index >= 1.8 && traffic?.index < 2) ? - "#DE0102;" : (traffic?.index >= 2) ? "#8E0E0B;" : "" - }}>畅通
-
路况整体评价
-
-
-
-
平均通行速度
-
{traffic?.road_network_speed || '--'}
km/h
-
-
-
拥堵距离
-
{traffic?.yongdu_length_4 || '--'}
km
-
-
-
-
-
较10分钟前拥堵趋势：
-
-
-
- 持平 + { + (roadData?.description || roadData?.road_traffic?.length > 0 || roadData?.evaluation?.status_desc) ? <> +
+
+ + 路况描述：
+
+
路况整体评价
+
{evaluation[roadData?.evaluation?.status] || '--'}
-
-
与1设法厕任务v
- -
-
-
-
路况描述：
-
dewbfdhuihseacf dsjhcf ewdcjaiopsdc op sadc jwe dcfp weopdcf ujew fdc
- -
*/} +
+ {roadData?.description || '暂无描述'} +
+
+ {roadData.road_traffic?.find(f => f.congestion_sections?.length > 0) ? + roadData?.road_traffic?.map(v => (v.congestion_sections?.length > 0) ? + <> +
+ + {v.road_name}：
+ { + v.congestion_sections?.map(s => <> +
{s.section_desc || "暂无路段拥堵语义化描述"}
+
+
+
= 1 && traffic?.index < 1.5) ? + "#00FF87" : (traffic?.index >= 1.5 && traffic?.index < 1.8) ? + "#FFCC00;" : (traffic?.index >= 1.8 && traffic?.index < 2) ? + "#DE0102;" : (traffic?.index >= 2) ? "#8E0E0B;" : "" + }}>{trend[s.congestion_trend] || "--"}
+
+ { + s.congestion_trend == "SAME" ? '与10分钟前变化不大' + : s.congestion_trend == 'BETTER' ? '较10分钟前拥堵有所缓解' + : s.congestion_trend == 'WORSE' ? '较10分钟前拥堵加重' : '--' + } +
+
+
+
+
平均通行速度
+
{s.speed || '--'}
km/h
+
+
+
拥堵距离
+
{s.congestion_distance || '--'}
m
+
+
+
+ ) + } + + : <>) + : +
+ 暂无具体道路信息 +
+ } +
+ + : +
+ 暂无数据 +
} : <>