diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
index 3d4d0d68..05721f3b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
@@ -4,8 +4,8 @@
-
-
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
index 775dc18d..dfb336c4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
@@ -98,11 +98,11 @@ export const gjSearchFormList = [
options: [
{
key: "1",
- label: "上行",
+ label: "菏泽方向",
},
{
key: "3",
- label: "下行",
+ label: "济南方向",
},
],
},
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 3fe4e4c2..90ae56fd 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
@@ -84,11 +84,6 @@ const warningSourceMapping = {
6: '非机预警',
7: '气象监测器'
}
-const directionMapping = {
- '1': '上行',
- '2': '中',
- '3': '下行'
-}
const gzDirectionMapping = {
'1': '菏泽方向',
'2': '双向',
@@ -195,7 +190,7 @@ export default {
if (result.code != 200) return Message.error(result?.msg);
result.rows.forEach(it => {
it.stringEventSource = it?.warningSource ? warningSourceMapping[it?.warningSource] : '';
- it.stringDirection = directionMapping[it.direction] || it.direction;
+ it.stringDirection = gzDirectionMapping[it.direction] || it.direction;
it.startTime = it.warningTime;
if (it.otherConfig) {
@@ -309,7 +304,7 @@ export default {
let data = result.data;
data.stringEventSource = data?.warningSource ? warningSourceMapping[data.warningSource] : '';
- data.direction = directionMapping[data.direction] || data.direction;
+ data.direction = gzDirectionMapping[data.direction] || data.direction;
data.startTime = data.warningTime;
data.stringEventState = warningStateMapping[data.warningState];
data.stringEventType = warningTypeMapping[data.warningType];
@@ -330,7 +325,7 @@ export default {
}).then((result) => {
if (result.code != 200) return Message.error(result?.msg);
let data = result.data;
- data.stringDirection = directionMapping[data.direction] || data.direction;
+ data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
this.detailDialogFormData = data;
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 248c4ea9..61dd3fc2 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
@@ -142,10 +142,10 @@ export default {
context.lineWidth = 1; // 设置线段宽度
// 绘制圆角矩形
- drawRoundRect(context, 230, 36, 180, 24, 12, gr);
+ drawRoundRect(context, 230, 35, 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);
+ drawRoundRect(context, 230, 91, 180, 24, 12, gr);
+ drawRoundRect(context, 230, 119, 180, 24, 12, gr);
});
});
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js
index 59bddcab..5a3ff46e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js
@@ -39,7 +39,7 @@ let options = {
},
},
axisLabel: {
- interval: 0,
+ interval: 'auto',
align: "center",
rotate: "1",
margin: "20",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
index 732221aa..565ad9d8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
@@ -451,7 +451,7 @@ export default {
this.chart3List = res.data;
let data = res.data;
const maxObject = data
- .filter((it) => it.sectionNumber > 0)
+ .filter((it) => it.sectionNumber >= 0)
.reduce((prev, current) =>
current.sectionNumber > prev.sectionNumber ? current : prev
);
@@ -460,7 +460,7 @@ export default {
let values2 = [];
data.forEach((it) => {
- if (it.sectionNumber > 0) {
+ if (it.sectionNumber >= 0) {
values2.push(it.sectionNumber);
zhs.push(it.stakeMarkId);
@@ -530,14 +530,14 @@ export default {
id: it.id,
});
});
+ //最后一项取结束点
+ if (rows.length > 1) {
+ this.dataList.push({
+ title: rows[rows.length - 1].sectionName.split("-")[1],
+ id: rows[rows.length - 1].id,
+ });
+ }
console.log("dataList", this.dataList);
- // if (rows.length > 0) {
- // let lastRoad = rows[rows.length - 1].sectionName.split("-")[1];
- // this.dataList.push({
- // title: lastRoad,
- // id: rows[rows.length - 1].id,
- // });
- // }
}
this.searchQuery();
});
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
index 5de3c418..9e44877c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
@@ -216,13 +216,13 @@ export default {
let gr = context.createLinearGradient(230, 0, 360, 0);
gr.addColorStop(1, "rgba(92,197,255,0)");
gr.addColorStop(0, "rgba(92,197,255,0.3)");
- drawRoundRect(context, 206, 16, 134, 18, 12, gr);
- drawRoundRect(context, 206, 39, 134, 18, 12, gr);
- drawRoundRect(context, 206, 61, 134, 18, 12, gr);
- drawRoundRect(context, 206, 83, 134, 18, 12, gr);
- drawRoundRect(context, 206, 105, 134, 18, 12, gr);
- drawRoundRect(context, 206, 127, 134, 18, 12, gr);
- drawRoundRect(context, 206, 149, 134, 18, 12, gr);
+ drawRoundRect(context, 202, 16, 134, 18, 10, gr);
+ drawRoundRect(context, 202, 39, 134, 18, 10, gr);
+ drawRoundRect(context, 202, 61, 134, 18, 10, gr);
+ drawRoundRect(context, 202, 83, 134, 18, 10, gr);
+ drawRoundRect(context, 202, 105, 134, 18, 10, gr);
+ drawRoundRect(context, 202, 127, 134, 18, 10, gr);
+ drawRoundRect(context, 202, 149, 134, 18, 10, gr);
context.lineWidth = 1; // 设置线段宽度
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
index 41faa5fd..3ffd99c5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
@@ -49,7 +49,7 @@ export default {
data() {
return {};
},
- created() {},
+ created() { },
methods: {},
mounted() {
setTimeout(() => {
@@ -176,11 +176,11 @@ export default {
context.lineWidth = 1; // 设置线段宽度
// 绘制圆角矩形
- drawRoundRect(context, 260, 6, 120, 24, 12, gr);
- drawRoundRect(context, 260, 36, 120, 24, 12, gr);
- drawRoundRect(context, 260, 64, 120, 24, 12, gr);
- drawRoundRect(context, 260, 92, 120, 24, 12, gr);
- drawRoundRect(context, 260, 120, 120, 24, 12, gr);
+ drawRoundRect(context, 258, 8, 120, 24, 12, gr);
+ drawRoundRect(context, 258, 36, 120, 24, 12, gr);
+ drawRoundRect(context, 258, 64, 120, 24, 12, gr);
+ drawRoundRect(context, 258, 92, 120, 24, 12, gr);
+ drawRoundRect(context, 258, 120, 120, 24, 12, gr);
});
});
},
@@ -195,20 +195,15 @@ export default {
height: 200px;
width: 100%;
padding: 0px 20px;
- background: linear-gradient(
- 180deg,
- rgba(6, 66, 88, 0.2) 0%,
- #06425888 100%
- );
+ background: linear-gradient(180deg,
+ rgba(6, 66, 88, 0.2) 0%,
+ #06425888 100%);
border-radius: 5px 5px 5px 5px;
opacity: 1;
border: 1px solid;
- border-image: linear-gradient(
- 360deg,
+ border-image: linear-gradient(360deg,
rgba(55, 231, 255, 0.1),
- rgba(55, 231, 255, 0)
- )
- 1 1;
+ rgba(55, 231, 255, 0)) 1 1;
display: flex;
justify-content: space-between;
align-items: center;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
index 9fc6cb10..8ae7a4b2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
@@ -57,6 +57,12 @@ let options = {
yAxis: [
{
min: 0,
+ name: '(指标)',
+ nameTextStyle: {
+ color: "#fff",
+ fontSize: 10,
+ align: "right",
+ },
axisLine: {
lineStyle: {
color: "#27B5D7",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js
index c87b28ff..f92ef076 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js
@@ -5,7 +5,7 @@ var options = {
left: "0%",
right: "8%",
bottom: "0%",
- top: "10%",
+ top: "20%",
containLabel: true,
},
tooltip: {
@@ -44,10 +44,11 @@ var options = {
},
yAxis: {
type: "value",
+ name: '(指标)',
nameTextStyle: {
- fontSize: 10,
color: "#fff",
- align: "center",
+ fontSize: 10,
+ align: "right",
},
splitLine: {
lineStyle: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js
index 4582c487..c553ff0e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js
@@ -5,7 +5,7 @@ var options = {
left: "0%",
right: "0%",
bottom: "0%",
- top: "10%",
+ top: "20%",
containLabel: true,
},
tooltip: {
@@ -44,10 +44,11 @@ var options = {
},
yAxis: {
type: "value",
+ name: '(指标)',
nameTextStyle: {
- fontSize: 10,
color: "#fff",
- align: "center",
+ fontSize: 10,
+ align: "right",
},
splitLine: {
lineStyle: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js
index 9e02403e..d305bda1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js
@@ -9,7 +9,7 @@ var options = {
left: "0%",
right: "0%",
bottom: "0%",
- top: "10%",
+ top: "20%",
containLabel: true,
},
@@ -45,6 +45,12 @@ var options = {
},
yAxis: {
type: "value",
+ name: '(指标)',
+ nameTextStyle: {
+ color: "#fff",
+ fontSize: 10,
+ align: "right",
+ },
splitLine: {
lineStyle: {
color: "#32BB8A",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts.js
index 6e1e4103..316af6d6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts.js
@@ -101,12 +101,12 @@ var options = {
yAxis: [
{
type: "value",
- name: "",
+ name: "(指标)",
nameTextStyle: {
color: "#fff",
fontSize: 10,
fontFamily: "Source Han Sans CN-Regular",
- align: "left",
+ align: "right",
verticalAlign: "center",
},
axisLabel: {