diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/chart.js
new file mode 100644
index 00000000..b8fb844a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/chart.js
@@ -0,0 +1,102 @@
+import * as echarts from "echarts";
+
+export const lineChartOption = {
+ color: ["#2AD9FD"],
+ xAxis: {
+ name: "日",
+ type: "category",
+ // boundaryGap: ["15%", "15%"],
+ nameTextStyle: {
+ color: "#2AD9FD",
+ align: "right",
+ fontSize: 15,
+ padding: [0, -15, 0, 0],
+ },
+ boundaryGap: false,
+ data: ["1", "5", "10", "15", "20", "25", "30"],
+ axisTick: {
+ show: false,
+ },
+ axisLabel: {
+ color: "#fff",
+ fontSize: 12,
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#668598",
+ },
+ },
+ },
+ grid: {
+ left: 51,
+ top: 15,
+ bottom: 24,
+ right: 36,
+ },
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0,0,0,0.36)",
+ borderWidth: 0,
+ textStyle: {
+ color: "#fff",
+ },
+ formatter: "{b}:{c}",
+ // formatter: function([axisData]) {
+ // console.log(axisData)
+ // let str = axisData.name + ' ' + axisData.data + '辆';
+ // // params.forEach(item => {
+ // // if (item.seriesName === '供温' || item.seriesName === '回温') {
+ // // str += item.marker + item.seriesName + ' : ' + item.data.value + ' ℃' + '';
+ // // } else if (item.seriesName === '压力值(Mpa)') {
+ // // // 柱状图渐变时设置marker
+ // // item.marker = '';
+ // // str += item.marker + item.seriesName + ' : ' + item.data.value + ' m';
+ // // }
+ // // });
+ // return str;
+ // }
+ },
+ yAxis: {
+ max: 100,
+ type: "value",
+ // nameGap: 24,
+ splitLine: {
+ lineStyle: {
+ type: [6, 9],
+ color: "rgba(255,255,255, .3)",
+ // dashOffset: [10, 10],
+ // cap: 21,
+ // width: 2
+ },
+ },
+ axisLabel: {
+ color: "#fff",
+ fontSize: 12,
+ formatter: "{value} %",
+ },
+ },
+ series: [
+ {
+ data: [0, 90, 65, 90, 45, 36, 27],
+ type: "line",
+ showSymbol: false,
+ smooth: true,
+ lineStyle: {
+ color: "#2AD9FD",
+ },
+ areaStyle: {
+ opacity: 0.8,
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: "rgb(90, 227, 255, .9)",
+ },
+ {
+ offset: 1,
+ color: "rgba(42,217,253,0)",
+ },
+ ]),
+ },
+ },
+ ],
+};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/index.vue
new file mode 100644
index 00000000..31d73d94
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/index.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js
new file mode 100644
index 00000000..a9c61988
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js
@@ -0,0 +1,110 @@
+import * as echarts from "echarts";
+
+export const lineChartOption = {
+ color: ["#2AD9FD"],
+ xAxis: {
+ name: "时",
+ type: "category",
+ // boundaryGap: ["15%", "15%"],
+ nameTextStyle: {
+ color: "#2AD9FD",
+ align: "right",
+ fontSize: 15,
+ padding: [0, -15, 0, 0],
+ },
+ boundaryGap: false,
+ data: ["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22"],
+ axisTick: {
+ show: false,
+ },
+ axisLabel: {
+ color: "#fff",
+ fontSize: 12,
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#668598",
+ },
+ },
+ },
+
+ yAxis: {
+ max: 1,
+ name: "辆",
+ type: "value",
+ nameTextStyle: {
+ color: "#2AD9FD",
+ // align: "right",
+ fontSize: 15,
+ // padding: [0, -15, 0, 0],
+ },
+ // nameGap: 24,
+ splitLine: {
+ lineStyle: {
+ type: [6, 9],
+ color: "rgba(255,255,255, .3)",
+ // dashOffset: [10, 10],
+ // cap: 21,
+ // width: 2
+ },
+ },
+ axisLabel: {
+ color: "#fff",
+ fontSize: 12,
+ formatter: "{value}",
+ },
+ },
+ grid: {
+ left: 51,
+ top: 33,
+ bottom: 24,
+ right: 36,
+ },
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0,0,0,0.36)",
+ borderWidth: 0,
+ textStyle: {
+ color: "#fff",
+ },
+ formatter: "{b}:{c}",
+ // formatter: function([axisData]) {
+ // console.log(axisData)
+ // let str = axisData.name + ' ' + axisData.data + '辆';
+ // // params.forEach(item => {
+ // // if (item.seriesName === '供温' || item.seriesName === '回温') {
+ // // str += item.marker + item.seriesName + ' : ' + item.data.value + ' ℃' + '';
+ // // } else if (item.seriesName === '压力值(Mpa)') {
+ // // // 柱状图渐变时设置marker
+ // // item.marker = '';
+ // // str += item.marker + item.seriesName + ' : ' + item.data.value + ' m';
+ // // }
+ // // });
+ // return str;
+ // }
+ },
+ series: [
+ {
+ data: [0, 0.3, 0.6, 0.24, 0.15, 0.66, 0.9, 0, 0.36, 0.51, 0.72, 0.6, 0.3],
+ type: "line",
+ showSymbol: false,
+ smooth: true,
+ lineStyle: {
+ color: "#2AD9FD",
+ },
+ areaStyle: {
+ opacity: 0.8,
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: "rgb(90, 227, 255, .9)",
+ },
+ {
+ offset: 1,
+ color: "rgba(42,217,253,0)",
+ },
+ ]),
+ },
+ },
+ ],
+};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/index.vue
new file mode 100644
index 00000000..31d73d94
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/index.vue
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
new file mode 100644
index 00000000..057d3960
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
index f406e4d2..3f395ffc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
@@ -97,15 +97,14 @@ export default {
options: []
},
},
-
- {
- label: "车辆类型:",
- key: "vehicleType",
- type: "select",
- options: {
- options: vehicleTypeList
- },
- },
+ // {
+ // label: "车辆类型:",
+ // key: "vehicleType",
+ // type: "select",
+ // options: {
+ // options: vehicleTypeList
+ // },
+ // },
{
label: "事件描述:",
key: "remark",
@@ -239,7 +238,7 @@ export default {
id: this.dialogData.id,
warningType: this.data.warningType,
warningSubclass: this.data.warningSubclass,
- vehicleType: this.data.vehicleType,
+ // vehicleType: this.data.vehicleType,
remark: this.data.remark,
lane: this.data.lane.join(",")
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 2e3e528d..7b02fefb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -46,6 +46,7 @@ import Broadcast from "./../Dialogs/Broadcast/index.vue";
import TrafficIncidents from "./../Dialogs/TrafficIncidents/index.vue";
import PerceiveEvent from "./../Dialogs/PerceiveEvent/index.vue";
import SmartDevice from "./../Dialogs/SmartDevice/index.vue";
+import Intermodulation from "./../Dialogs/Intermodulation/index.vue";
export default {
name: 'RoadAndEvents',
@@ -59,6 +60,7 @@ export default {
TrafficIncidents,
PerceiveEvent,
SmartDevice,
+ Intermodulation
},
data() {
return {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index af0471fb..a1ce3709 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -52,6 +52,7 @@ export const DeviceForMap = {
},
交调: {
deviceType: "11",
+ dialog: "Intermodulation",
},
合流区: {
deviceType: "8",