diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
index 43f8977b..9363f005 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
@@ -288,14 +288,30 @@ export default {
accelerationZ: "Z轴加速度",
precipitation: "降雨量",
}
- res.data.forEach(e => {
- cdata.push((moment(e.measureTime).format('YYYY-MM-DD')))
- if (title === '') {
- title = enum_title[e.data[0].type]
+
+ // 排序
+ res.data.sort((a, b) => new Date(a.measureTime) - new Date(b.measureTime));
+ // 处理返回的数据
+ if (res.data.length > 0) {
+ res.data.forEach(e => {
+ cdata.push(moment(e.measureTime).format('YYYY-MM-DD HH:mm'));
+ if (title === '') {
+ title = enum_title[e.data[0].type];
+ }
+ cseries1.push(e.data[0].value);
+ cseries2.push(e.data[0].cum);
+ });
+ } else {
+ // 如果数据为空,生成时间段内的日期
+ const startDate = moment(this.dateRange[0]);
+ const endDate = moment(this.dateRange[1]);
+ for (let m = moment(startDate); m.diff(endDate, 'days') <= 0; m.add(1, 'days')) {
+ cdata.push(m.format('YYYY-MM-DD HH:mm'));
+ cseries1.push(0);
+ cseries2.push(0);
}
- cseries1.push(e.data[0].value)
- cseries2.push(e.data[0].cum)
- });
+
+ }
chartOption.xAxis.data = cdata;
chartOption.series[0].name = title + '日计';
@@ -303,17 +319,15 @@ export default {
chartOption.series[0].data = cseries1;
chartOption.series[1].data = cseries2;
-// 假设 chartOption 已经初始化
+
chartOption.tooltip = {
trigger: 'axis',
axisPointer: {
type: 'cross'
},
formatter: function (params) {
- console.log('Params:', params); // 调试信息
let tooltipText = `
${params[0].name}
`; // 显示日期
params.forEach(function (item) {
- console.log('Item:', item); // 调试信息
if (item.seriesName === (title + '日计')) {
tooltipText += `${item.seriesName}: ${item.value}
`;
} else if (item.seriesName === (title + '累计')) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/data.js
index 96ef3f3a..8b16be22 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/data.js
@@ -170,6 +170,12 @@ export const canvasList = [
distance: 35.876,
},
{ name: "平阴南收费站", code: "K126+223", distance: 86.2 },
+ {
+ name: "魏雪枢纽",
+ code: "K133+588",
+ line: "G22青兰高速",
+ distance: 35.876,
+ },
{ name: "东平服务区", code: "K139+817", distance: 140.42 },
{ name: "东平收费站", code: "K145+933", distance: 63 },
{
@@ -181,6 +187,12 @@ export const canvasList = [
{ name: "沙河停车区", code: "K159+156", distance: 70 },
{ name: "梁山东收费站", code: "K173+950", distance: 70 },
{ name: "梁山收费站", code: "K179+396", distance: 70 },
+ {
+ name: "信楼枢纽",
+ code: "K182+987",
+ line: "G22青兰高速",
+ distance: 35.876,
+ },
{ name: "梁山服务区", code: "K186+061", distance: 70 },
{ name: "嘉祥西收费站", code: "K190+495", distance: 70 },
{
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/chartRecord.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/chartRecord.js
index 25fbab53..747f5a3c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/chartRecord.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/chartRecord.js
@@ -107,6 +107,18 @@ var options = {
width: 2,
},
data: []
+ },{
+ name: "在线率",
+ type: "line",
+ symbol: "circle",
+ yAxisIndex: 1, // 与第二个 y 轴关联
+ itemStyle: {
+ color: "#F4FA58",
+ },
+ lineStyle: {
+ width: 2,
+ },
+ data: []
}
],
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue
index bed6cace..54123f93 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/dialogRecord.vue
@@ -21,7 +21,7 @@
-
+
可达
@@ -116,6 +116,7 @@ export default {
_chartsOption.xAxis.data = res.data.time;
_chartsOption.series[0].data = res.data.lostRate;
_chartsOption.series[1].data = res.data.rttAvg;
+ _chartsOption.series[2].data = res.data.onlineRateList;
queryChart.setOption(_chartsOption);
})
request({
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
index 7d7f05dd..80a5d392 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
@@ -262,7 +262,16 @@ export const searchFormList = [
type: "datetimerange",
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
+ pickerOptions:{
+ disabledDate(time) {
+ return time.getTime() > Date.now() || time.getTime()