diff --git a/ruoyi-ui/src/api/manualWarning/index.js b/ruoyi-ui/src/api/manualWarning/index.js
index 59e8dc4c..89864030 100644
--- a/ruoyi-ui/src/api/manualWarning/index.js
+++ b/ruoyi-ui/src/api/manualWarning/index.js
@@ -1,9 +1,13 @@
import request from "@/utils/request";
// 查询非机预警列表
-export function perceivedEventsList(data) {
+export function perceivedEventsList(data, pageNum, pageSize) {
return request({
- url: "/perceivedEvents/warning/perceivedEventsList",
+ url:
+ "/perceivedEvents/warning/nonAutomaticWarningList?pageNum=" +
+ pageNum +
+ "&pageSize=" +
+ pageSize,
method: "post",
data,
});
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/index.vue
index 6932bc15..1fa4b120 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/index.vue
@@ -89,7 +89,7 @@ export default {
type: Array,
default: () => [
{
- key: "warningType",
+ key: "warningTypeName",
label: "类型",
},
// {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
index 1c85889a..a2f7bcb6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
@@ -8,7 +8,7 @@
- 设备参数
+
- 设备参数
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -300,11 +300,17 @@ export default {
this.onWorkStatus2 = item.value;
} else if (item.property == 'MD') {
} else {
- let data = JSON.parse(item.value || {});
+ let data = JSON.parse(item.formatValue || {});
+
tData.push({ ...data, ds: item.property })
}
})
this.tableData = tData;
+ } else {
+ //查询时间
+ let resultTime = await this.requestURL('ASKTM');
+ this.formData.onWorkStatus = resultTime.data || 0;
+ this.activeName = 'first';
}
},
async handleSubmit() {
@@ -368,8 +374,9 @@ export default {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsCharts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsCharts.js
new file mode 100644
index 00000000..f8c4fe7f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsCharts.js
@@ -0,0 +1,95 @@
+var options = {
+ title: {
+ // text: '单位/%',
+ top: "0%",
+ left: "0%",
+ textStyle: {
+ fontSize: "10px",
+ fontWeight: 300,
+ color: "#B5C5D4",
+ opacity: 0.8,
+ },
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
+ },
+ grid: {
+ left: "50px",
+ right: "0%",
+ top: "50px",
+ bottom: "5%",
+ containLabel: true,
+ },
+ xAxis: {
+ type: "category",
+ data: [],
+ axisLine: {
+ lineStyle: {
+ color: "rgba(49, 217, 255, 0.8)",
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ axisLabel: {
+ color: "#fff",
+ fontSize: "18px",
+ },
+ },
+ yAxis: [
+ {
+ // type: 'value',
+ // min: function (value) {
+ // return value.min*0.9;
+ // },
+ name: "交通事件（起）",
+ nameTextStyle: {
+ color: "#fff",
+ fontSize: 18,
+ align: "center",
+ },
+ type: "value",
+ axisLine: {
+ show: false,
+ lineStyle: {
+ width: 1,
+ color: "#545454",
+ },
+ },
+ splitLine: {
+ lineStyle: {
+ color: "rgba(49, 217, 255, 0.5)",
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ axisLabel: {
+ color: "#fff",
+ fontSize: "18px",
+ formatter: (value) => {
+ return value;
+ },
+ },
+ },
+ ],
+ series: [
+ {
+ // name: '审限内结案率',
+ data: [5, 10, 20, 30],
+ type: "pictorialBar",
+ symbol: "roundRect",
+ symbolRepeat: true,
+ symbolSize: [13, 4],
+ // symbolOffset: symbolOffset,
+ // barWidth:'40%',
+ itemStyle: {
+ color: "#20E7FF",
+ },
+ },
+ ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js
new file mode 100644
index 00000000..43a2118d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsChartsPie.js
@@ -0,0 +1,232 @@
+let colors = [
+ "#4278F8",
+ "#5372C4",
+ "#0046FF",
+ "#FB9434",
+ "#854101",
+ "#05E599",
+ "#219F73",
+ "#7CEDD5",
+ "#854101",
+ "#05E599",
+ "#219F73",
+ "#7CEDD5",
+];
+var legendData = [];
+
+var options = {
+ title: [
+ {
+ text: "999",
+ top: "36%",
+ textAlign: "center",
+ left: "29%",
+ textStyle: {
+ color: "#ffffff",
+ fontSize: 30,
+ fontFamily: "SourceHanSansCN",
+ },
+ },
+ {
+ text: "总数",
+ top: "32%",
+ textAlign: "center",
+ left: "29%",
+ textStyle: {
+ color: "rgba(242, 252, 253, 0.84)",
+ fontSize: 16,
+ fontFamily: "SourceHanSansCN",
+ },
+ },
+ ],
+ grid: {
+ top: "38%",
+ left: "6%",
+ right: "6%",
+ bottom: "3%",
+ containLabel: true,
+ },
+ tooltip: {
+ show: true,
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
+ },
+ legend: {
+ show: true,
+ width: "300px",
+ height: "520px",
+ orient: "vertical",
+ icon: "circle",
+ top: "15%",
+ left: "70%",
+ itemWidth: 10,
+ itemHeight: 10,
+ textStyle: {
+ color: "#ffffff",
+ fontSize: 14,
+ lineHeight: 24,
+ rich: {
+ text: {
+ width: 100,
+ marginLeft: 32,
+ fontSize: 14,
+ },
+ number: {
+ fontSize: 14,
+ color: "#37E7FF",
+ marginLeft: 32,
+ fontWeight: "bold",
+ },
+ unit: {
+ fontSize: 14,
+ },
+ },
+ },
+ data: legendData,
+ // pageIconColor: "#fff",
+ // pageIconSize: 10,
+ // pageTextStyle: {
+ // color: "#fff",
+ // },
+ // type: "scroll",
+ // pageButtonPosition: "end",
+ },
+ series: [
+ /** 饼图上刻度 */
+ {
+ type: "gauge",
+ center: ["30%", "35%"],
+ radius: "43%", // 错位调整此处
+ startAngle: 0,
+ endAngle: 360,
+ splitNumber: 52,
+ axisLine: { show: false },
+ splitLine: {
+ // length: 39,
+ length: "2",
+ lineStyle: {
+ width: 5,
+ color: "#5CC5FF",
+ },
+ },
+ axisTick: { show: false },
+ axisLabel: { show: false },
+ },
+ {
+ name: "总数",
+ tooltip: false,
+ type: "gauge",
+ radius: "30%",
+ center: ["30%", "35%"],
+ startAngle: 0,
+ endAngle: 360,
+ axisLine: {
+ lineStyle: {
+ color: [[1, "#0AFFE950"]],
+ width: 1,
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ splitLine: {
+ show: false,
+ },
+ axisLabel: {
+ show: false,
+ },
+ detail: {
+ show: false,
+ },
+ pointer: {
+ show: false,
+ },
+ progress: {
+ show: true,
+ width: 80,
+ itemStyle: {
+ color: {
+ type: "radial",
+ x: 0.5,
+ y: 0.5,
+ r: 0.5,
+ colorStops: [
+ {
+ offset: 0,
+ color: "rgb(0, 224, 205, 0)",
+ },
+ {
+ offset: 0.7,
+ color: "rgba(0, 224, 205, 0)",
+ },
+ {
+ offset: 1,
+ color: "rgba(10, 255, 233, 0.5)",
+ },
+ ],
+ },
+ },
+ },
+ data: [
+ {
+ value: 100,
+ },
+ ],
+ tooltip: {
+ backgroundColor: "rgba(50,50,50,0)",
+ formatter: " ",
+ borderWidth: 0,
+ textStyle: {
+ textShadowColor: "rgba(50,50,50,0)",
+ },
+ },
+ },
+ {
+ type: "pie",
+ radius: ["40%", "50%"],
+ center: ["30%", "35%"],
+ z: 10,
+ label: {
+ show: false,
+ },
+ data: [],
+ labelLine: {
+ show: false,
+ },
+ itemStyle: {
+ normal: {
+ borderRadius: "5",
+ borderWidth: 2,
+ borderType: "solid",
+ borderCap: "round",
+ borderJoin: "round",
+ borderColor: "#064258",
+ borderMiterLimit: "20",
+ color: function (params) {
+ return {
+ type: "linear",
+ x: 0,
+ y: 0,
+ x2: 1,
+ y2: 1,
+ colorStops: [
+ {
+ offset: 0,
+ color: colors[params.dataIndex], // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: colors[params.dataIndex], // 100% 处的颜色
+ },
+ ],
+ globalCoord: false, // 缺省为 false
+ };
+ },
+ },
+ },
+ },
+ ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
index 0a48f804..9c44505e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
@@ -1,46 +1,203 @@
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/trafficIncidentsCharts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/trafficIncidentsCharts.js
new file mode 100644
index 00000000..f8c4fe7f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/trafficIncidentsCharts.js
@@ -0,0 +1,95 @@
+var options = {
+ title: {
+ // text: '单位/%',
+ top: "0%",
+ left: "0%",
+ textStyle: {
+ fontSize: "10px",
+ fontWeight: 300,
+ color: "#B5C5D4",
+ opacity: 0.8,
+ },
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
+ },
+ grid: {
+ left: "50px",
+ right: "0%",
+ top: "50px",
+ bottom: "5%",
+ containLabel: true,
+ },
+ xAxis: {
+ type: "category",
+ data: [],
+ axisLine: {
+ lineStyle: {
+ color: "rgba(49, 217, 255, 0.8)",
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ axisLabel: {
+ color: "#fff",
+ fontSize: "18px",
+ },
+ },
+ yAxis: [
+ {
+ // type: 'value',
+ // min: function (value) {
+ // return value.min*0.9;
+ // },
+ name: "交通事件（起）",
+ nameTextStyle: {
+ color: "#fff",
+ fontSize: 18,
+ align: "center",
+ },
+ type: "value",
+ axisLine: {
+ show: false,
+ lineStyle: {
+ width: 1,
+ color: "#545454",
+ },
+ },
+ splitLine: {
+ lineStyle: {
+ color: "rgba(49, 217, 255, 0.5)",
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ axisLabel: {
+ color: "#fff",
+ fontSize: "18px",
+ formatter: (value) => {
+ return value;
+ },
+ },
+ },
+ ],
+ series: [
+ {
+ // name: '审限内结案率',
+ data: [5, 10, 20, 30],
+ type: "pictorialBar",
+ symbol: "roundRect",
+ symbolRepeat: true,
+ symbolSize: [13, 4],
+ // symbolOffset: symbolOffset,
+ // barWidth:'40%',
+ itemStyle: {
+ color: "#20E7FF",
+ },
+ },
+ ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/index.vue
index 6ac52b5e..371b7c72 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/index.vue
@@ -1,14 +1,14 @@
-
@@ -38,10 +38,9 @@ export default {
},
},
methods: {
- // changeTabs(tab, event) {
- // console.log(tab, event);
- // // this.activeName = value;
- // },
+ handleClick(value) {
+ this.activeName = value.name;
+ },
},
mounted() {},
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 3175d5c8..c96bd6bb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -920,6 +920,17 @@ export const planDeviceOptions = [
},
];
+// 非机预警事件主类
+export const warningType = {
+ 1: "交通拥堵",
+ 2: "行人",
+ 4: "停车",
+ 5: "违规驾驶",
+ 6: "路障",
+ 7: "道路施工",
+ 99: "其他",
+};
+
export const WarningSubclassList = Object.keys(WarningSubclass).reduce(
(prev, key) => {
prev[key] = Object.keys(WarningSubclass[key]).map((subKey) => {
@@ -1012,3 +1023,51 @@ export const gzztMap = {
"03": "闪烁",
"04": "关闭",
};
+
+// 非机预警事件
+export const manualEarlyWarning = [
+ {
+ value: "1",
+ label: "拥堵",
+ },
+ {
+ value: "2",
+ label: "行人",
+ },
+ {
+ value: "6",
+ label: "抛洒物",
+ },
+ {
+ value: "5",
+ label: "变道",
+ },
+ {
+ value: "99",
+ label: "机占非",
+ },
+ {
+ value: "6",
+ label: "路障",
+ },
+ {
+ value: "1",
+ label: "施工",
+ },
+ {
+ value: "2",
+ label: "停车",
+ },
+ {
+ value: "6",
+ label: "压线",
+ },
+ {
+ value: "1",
+ label: "掉头",
+ },
+ {
+ value: "2",
+ label: "逆行",
+ },
+];