From 45cfd53d53c4bd0a50fa8c460838bc0e2b8538a5 Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 23 Feb 2024 09:24:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=BD=AE?= =?UTF-8?q?=E5=8D=A0=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/control/event/event/index.vue | 12 ++++++++++++ .../components/dailyDisposal/assets/charts.js | 4 ++-- .../components/dailyDisposal/index.vue | 9 +++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index e60d42f8..a576320e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -87,6 +87,11 @@ const directionMapping = { '2': '中', '3': '下行' } +const gzDirectionMapping = { + '1': '菏泽方向', + '2': '双向', + '3': '济南方向' +} const warningStateMapping = { 1: '上报', 2: '已完成', @@ -205,6 +210,13 @@ export default { params: this.searchData, }).then((result) => { if (result.code != 200) return Message.error(result?.msg); + result.rows.forEach(it => { + it.stringDirection = gzDirectionMapping[it.direction] || it.direction; + // if (it.otherConfig) { + // let otherConfig = JSON.parse(it.otherConfig); + // it.pictures = otherConfig.pictures || []; + // } + }) this.data = result.rows; this.total = result.total; }); diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js index d942d30c..c935e8b8 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js @@ -66,7 +66,7 @@ var options = { { name: "", type: "pie", - radius: "120px", + radius: "60px", width: "200px", center: ["130px", "50%"], roseType: "radius", @@ -111,7 +111,7 @@ var options = { { name: "", type: "pie", - radius: "130px", + radius: "70px", hoverAnimation: false, emphasis: { scale: false }, center: ["130px", "50%"], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue index bef82428..96e1de1c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue @@ -66,6 +66,7 @@ export default { for (let i = 0; i < data.length; i++) { let it = data[i]; if (it.warningState == 1) { + // it.number = 86; echartsData.push({ name: "上报", value: it.number @@ -141,10 +142,10 @@ export default { context.lineWidth = 1; // 设置线段宽度 // 绘制圆角矩形 - drawRoundRect(context, 242, 36, 180, 24, 12, gr) - drawRoundRect(context, 242, 63, 180, 24, 12, gr) - drawRoundRect(context, 242, 90, 180, 24, 12, gr) - drawRoundRect(context, 242, 117, 180, 24, 12, gr) + drawRoundRect(context, 230, 36, 180, 24, 12, gr) + drawRoundRect(context, 230, 63, 180, 24, 12, gr) + drawRoundRect(context, 230, 90, 180, 24, 12, gr) + drawRoundRect(context, 230, 117, 180, 24, 12, gr) }); }); },