- 
- 
+
+
@@ -49,6 +54,7 @@ export default {
},
data() {
return {
+ uploadUrl: process.env.VUE_APP_BASE_API ,
data: [],
startTime: "",
endTime: "",
@@ -66,6 +72,9 @@ export default {
},
},
methods: {
+ print(){
+ window.print();
+ },
initData() {
request({
url: `/system/process/eventProcessById/${this.eventId}`,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
index 879b7b23..aa8f2e14 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
@@ -1,7 +1,7 @@
-
+
+
-
-
+
+
@@ -50,8 +50,13 @@ export default {
watch:{
list:{
handler(newVal, oldVal) {
- this.total = newVal.length;
- this.pageNum = 1
+ this.isLoading = false;
+ setTimeout(() => {
+ this.total = newVal.length;
+ this.pageNum = 1
+ this.isLoading = true;
+ }, 100);
+
},
immediate:true
}
@@ -61,7 +66,7 @@ export default {
return {
total: 0,
pageNum: 1,
-
+ isLoading: false,
carouselItems: [],
settings: {
infinite: true,
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 dd873efd..18145be1 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
@@ -307,7 +307,7 @@ export default {
data.windSpeed = otherConfig.windSpeed;
data.visibility = otherConfig.visibility;
data.pictures = otherConfig.pictures || otherConfig.imgUrl ||[];
- data.videoList = otherConfig.videoList || otherConfig.videoUrl|| [];
+ data.videoList = otherConfig.videoList|| otherConfig.videoUrl|| [];
// data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4',
// 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
index 3b7e0d51..59be7b80 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
@@ -32,10 +32,10 @@
header-align="center" />
-
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
index ddd62272..14e047d3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/manage/index.vue
@@ -55,11 +55,11 @@
异常
-
+
'; + params.forEach(p => { + if(p.data > 0){ + result += ''+ p.seriesName +''+'：'+(p.value)+ (p.seriesName==='平均'?'分钟':'起')+'
' + } + }); + return result; + }, + }, + xAxis: { + type: "category", + data: nameList, + axisTick: { + show: false, //隐藏X轴刻度 + }, + axisLine: { + lineStyle: { + color: "rgba(49, 217, 255, 0.8)", + }, + }, + axisLabel: { + show: true, + color: "#fff", + fontSize: 10, + }, + }, + yAxis: [ + { + type: "value", + name: "起", + nameTextStyle: { + color: "#fff", + fontSize: 10, + align: "right", + }, + axisLabel: { + fontSize: 10, + color: "#fff" + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + splitLine: { + lineStyle: { + color: "rgba(49, 217, 255, 0.5)", + }, + }, + }, + { + type: "value", + name: "分钟", + nameTextStyle: { + color: "#fff", + fontSize: 10, + align: "left", + }, + axisLabel: { + fontSize: 10, + color: "#fff" + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + splitLine: { + show: false, + }, + }, + ], + series: [ + { + name: "上报", + type: "pictorialBar", + stack:"总量", + symbol: "rect", + symbolMargin: 2, + symbolRepeat: "fixed", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList1[0], + }, { + name: "已完成", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + stack:"总量", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList1[1], + },{ + name: "已终止", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList1[2], + },{ + name: "自动结束", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList1[3], + }, + { + name: "去年同期", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList2, + }, + { + name: "平均", + type: "line", + symbol: 'none', + smooth: true, + yAxisIndex: 1, + lineStyle: { + type:'dashed', + width: 1 + }, + data: valueList3, + }, + ], +}; + +export default options; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue index 29a605b9..0163157c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue @@ -206,9 +206,9 @@ export default { data.windSpeed = otherConfig.windSpeed; data.visibility = otherConfig.visibility; - //[...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures] // - data.pictures =otherConfig.pictures || []; - data.videoList = otherConfig.videoList || []; + data.pictures = otherConfig.pictures || otherConfig.imgUrl ||[]; + data.videoList = otherConfig.videoList || otherConfig.videoUrl || []; + // data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4', // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js index 317045ae..7472bb07 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js @@ -126,32 +126,20 @@ var options = { series: [ { name: "客车", - type: "pictorialBar", - symbolRepeat: "fixed", - symbolMargin: 2, - symbol: "rect", - symbolClip: true, - symbolSize: [18, 6], + type: "bar", + stack: 'total', barWidth: 10, data: valueList1[0], }, { name: "货车", - type: "pictorialBar", - symbolRepeat: "fixed", - symbolMargin: 2, - symbol: "rect", - symbolClip: true, - symbolSize: [18, 6], + type: "bar", + stack: 'total', barWidth: 10, data: valueList1[1], },{ name: "专项车", - type: "pictorialBar", - symbolRepeat: "fixed", - symbolMargin: 2, - symbol: "rect", - symbolClip: true, - symbolSize: [18, 6], + type: "bar", + stack: 'total', barWidth: 10, data: valueList1[2], }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/chartsv1.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/chartsv1.js new file mode 100644 index 00000000..317045ae --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/chartsv1.js @@ -0,0 +1,172 @@ +import { param } from "jquery"; + +/* 数据 */ +let nameList = [ + "殷家林-大学城", + "大学城-孝里", + "孝里-安城", + "安城-平阴北", + "平阴北-平阴南", + "平阴南-东平", + "东平-梁山东", + "梁山东-嘉祥西" +]; // 类别 +let valueList1 = [[50,30, 52,20, 65,30, 45,10], [42,30,60,23, 45,34,55,16], [3, 5,1,0,5,2,5,4], [5,2,5,4,3, 5,1,0]]; +let valueList2 = [100, 40, 60, 90, 40, 60, 45, 72]; +let valueList3 = [40, 60, 45, 72, 50, 40, 60, 90]; +var options = { + color:['#21ffff','#1FA5F2','#F67826','#1CB50B'], + grid: { + left: "1%", + right: "0", + top: "60px", + bottom: "0px", + containLabel: true, + }, + + legend: { + top: "0%", + right: "0", + textStyle: { + color: "#fff", + }, + itemHeight: 5, + itemWidth: 10, + data: [ + { + name: "客车", + }, + { + name: "货车" + }, + { + name: "专项车" + }, + { + name: "去年同期" + }, + ], + }, + tooltip: { + show: true, + trigger: "axis", + formatter: function (params) { + let result = ''+params[0].axisValue +'
'; + params.forEach(p => { + result += ''+ p.seriesName +''+'：'+(p.value)+ '辆
' + }); + return result; + }, + }, + xAxis: { + type: "category", + data: nameList, + axisTick: { + show: false, //隐藏X轴刻度 + }, + axisLine: { + lineStyle: { + color: "rgba(49, 217, 255, 0.8)", + }, + }, + axisLabel: { + show: true, + color: "#fff", + fontSize: 10, + formatter:function(value) + { + var ret = "";//拼接加\n返回的类目项 + var maxLength = 4;//每项显示文字个数 + var valLength = value.length;//X轴类目项的文字个数 + var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数 + if (rowN > 1)//如果类目项的文字大于3, + { + for (var i = 0; i < rowN; i++) { + var temp = "";//每次截取的字符串 + var start = i * maxLength;//开始截取的位置 + var end = start + maxLength;//结束截取的位置 + //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧 + temp = value.substring(start, end) + "\n"; + ret += temp; //凭借最终的字符串 + } + return ret; + } + else { + return value; + } + } + }, + }, + yAxis: [ + { + type: "value", + name: "辆", + nameTextStyle: { + color: "#fff", + fontSize: 10, + align: "right", + }, + axisLabel: { + fontSize: 10, + color: "#fff" + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + splitLine: { + lineStyle: { + color: "rgba(49, 217, 255, 0.5)", + }, + }, + }, + ], + series: [ + { + name: "客车", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + data: valueList1[0], + }, { + name: "货车", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + data: valueList1[1], + },{ + name: "专项车", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + data: valueList1[2], + }, + { + name: "去年同期", + type: "line", + symbol: 'none', + smooth: true, + lineStyle: { + type:'dashed', + width: 1 + }, + data: valueList3, + }, + ], +}; + +export default options; diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js index df418703..070300ec 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js @@ -831,9 +831,13 @@ export const locationMode = { const { data, formList } = args.slice(-1)[0]; if (data.dcEventAccident) { data.dcEventAccident.facilityId = null; + data.dcEventAccident.location = null; + data.dcEventAccident.rampId = null; } if (data.dcEventVehicleAccident) { data.dcEventVehicleAccident.facilityId = null; + data.dcEventVehicleAccident.location = null; + data.dcEventVehicleAccident.rampId = null; } let facilityType = 1; @@ -1257,40 +1261,43 @@ export const congestionCause = { }, ons: { input(value, ...args) { - const { formList } = args.slice(-1)[0]; + const { data, formList } = args.slice(-1)[0]; + if(data.dcEventTrafficCongestion.detailedReasons){ + data.dcEventTrafficCongestion.detailedReasons = null; + } const config = formList.find((it) => (it.key == "detailedReasons"||it.key === 'dcEventTrafficCongestion.detailedReasons')); let ad = { 1: [ { - key: 1, + key:3, label: "收费站广场拥堵导致出口压车", }, { - key: 2, + key: 4, label: "收费站设备故障", }, { - key: 3, + key: 5, label: "地方道路原因", }, { - key: 4, + key: 6, label: "省内非集团所辖高速原因", }, { - key: 5, + key: 7, label: "集团所辖道路拥堵", }, { - key: 6, + key: 8, label: "集团所辖枢纽立交异常导致主线压车", }, { - key: 7, + key: 9, label: "路侧起火", }, { - key: 8, + key: 10, label: "备注项添加", }, ], @@ -1318,49 +1325,95 @@ export const congestionCause = { }; +export const locationSelectStr = [ + { + value: '1', + label: "入口车道", + }, + { + value: '2', + label: "入口匝道", + }, + { + value: '3', + label: "入口", + }, + { + value: '4', + label: "入口内广场", + }, + { + value: '5', + label: "出口车道", + }, + { + value: '6', + label: "出口匝道", + }, + { + value: '7', + label: "外广场", + }, + { + value: '8', + label: "出口", + }, + { + value: '9', + label: "(站外)入口匝道", + }, + { + value: '10', + label: "(站外)出口匝道", + }, + { + value: '11', + label: "出口内广场", + }, +]; export const locationSelect = [ { - value: "1", + value: 1, label: "入口车道", }, { - value: "2", + value: 2, label: "入口匝道", }, { - value: "3", + value: 3, label: "入口", }, { - value: "4", + value: 4, label: "入口内广场", }, { - value: "5", + value: 5, label: "出口车道", }, { - value: "6", + value: 6, label: "出口匝道", }, { - value: "7", + value: 7, label: "外广场", }, { - value: "8", + value: 8, label: "出口", }, { - value: "9", + value: 9, label: "(站外)入口匝道", }, { - value: "10", + value: 10, label: "(站外)出口匝道", }, { - value: "11", + value: 11, label: "出口内广场", }, ]; \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js index f9da4bbf..81bc7ab7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js @@ -41,10 +41,6 @@ export const configList = { required: true, options: { options: [ - { - value: "选项1", - label: "黄金糕", - }, ], }, visible: (data) => { @@ -86,8 +82,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventAccident.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, @@ -153,7 +149,7 @@ export const configList = { required: true, options: { placeholder: "收费站地点", - options: PresetFormItems.locationSelect, + options: PresetFormItems.locationSelectStr, }, visible: (data) => { if (data?.dcEventAccident?.locationType == 4) { @@ -281,8 +277,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventVehicleAccident.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, @@ -555,33 +551,33 @@ export const configList = { let cs = { 1: [ { - value: "1", + value: 1, label: "临时关闭", }, ], 2: [ { - value: "2", + value: 2, label: "限行车辆", }, { - value: "3", + value: 3, label: "限行车道", }, { - value: "4", + value: 4, label: "限行车道且限行车辆", }, { - value: "5", + value: 5, label: "间隔放行", }, { - value: "6", + value: 6, label: "并道行驶", }, { - value: "7", + value: 7, label: "限速", }, ], @@ -789,8 +785,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventTrafficControl.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, @@ -1057,6 +1053,9 @@ export const configList = { if (data.dcEventTrafficCongestion) { data.dcEventTrafficCongestion.facilityId = null; } + if(data.dcEventTrafficCongestion.rampId){ + data.dcEventTrafficCongestion.rampId = null; + } let facilityType = 1; if (value == "4-2") { facilityType = 4; @@ -1087,35 +1086,35 @@ export const configList = { activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key:1, + key:3, label: "收费站广场拥堵导致出口压车", }, { - key: 2, + key: 4, label: "收费站设备故障", }, { - key: 3, + key: 5, label: "地方道路原因", }, { - key: 4, + key: 6, label: "省内非集团所辖高速原因", }, { - key: 5, + key: 7, label: "集团所辖道路拥堵", }, { - key: 6, + key: 8, label: "集团所辖枢纽立交异常导致主线压车", }, { - key: 7, + key: 9, label: "路侧起火", }, { - key: 8, + key: 10, label: "备注项添加", }, ], @@ -1123,14 +1122,13 @@ export const configList = { ons: { input(value, ...args) { const { data, formList } = args.slice(-1)[0]; - if (data.dcEventTrafficCongestion) { - data.dcEventTrafficCongestion.facilityId = null; - } + // if (data.dcEventTrafficCongestion) { + // data.dcEventTrafficCongestion.facilityId = null; + // } if ( data.dcEventTrafficCongestion.congestionCause == 1 && value == 2 ) { - console.log("value2", value); //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 request({ url: `/business/facility/query?facilityType=1`, @@ -1185,11 +1183,7 @@ export const configList = { required: true, options: { options: [ - { - value: "选项1", - label: "黄金糕", - }, - ], + ], }, visible: (data) => { if ( @@ -1258,7 +1252,7 @@ export const configList = { }, { label: "地点类型:", - key: "locationType", + key: "dcEventTrafficCongestion.locationType", type: "RadioGroup", isAlone: true, required: true, @@ -1318,7 +1312,7 @@ export const configList = { ], }, visible: (data) => { - if (data?.eventSubclass == "4-1" && data?.locationType == 1) { + if (data?.eventSubclass !== "4-1" || (data?.eventSubclass == "4-1" && data?.dcEventTrafficCongestion.locationType == 1)) { return true; } return false; @@ -1385,7 +1379,7 @@ export const configList = { ], }, visible: (data) => { - if (data?.eventSubclass == "4-1" && data?.locationType == 2) { + if (data?.eventSubclass == "4-1" && data?.dcEventTrafficCongestion.locationType == 2) { return true; } return false; @@ -1398,12 +1392,7 @@ export const configList = { isAlone: false, required: true, options: { - options: [ - { - value: "选项1", - label: "黄金糕", - }, - ], + options: [ ], }, visible: (data) => { if (data?.eventSubclass == "4-2") { @@ -1413,8 +1402,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventTrafficCongestion.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, @@ -1926,8 +1915,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventConstruction.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index f2502a58..0476f29c 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -36,13 +36,13 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://127.0.0.1:8087`, + // target: `http://127.0.0.1:8087`, // target: `http://10.168.66.196:8087`, //刘文阁 // target: `http://10.168.68.42:8087`, //王思祥 // target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟凡峰 // target: `http://10.168.79.46:8089`, //王家宝 - // target: `http://10.168.77.128:8087`, //王兴琳 + target: `http://10.168.77.128:8087`, //王兴琳 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",
'; + params.forEach(p => { + if(p.data > 0){ + result += ''+ p.seriesName +''+'：'+(p.value)+ (p.seriesName==='平均'?'分钟':'起')+'
' + } + }); + return result; + }, + }, + xAxis: { + type: "category", + data: nameList, + axisTick: { + show: false, //隐藏X轴刻度 + }, + axisLine: { + lineStyle: { + color: "rgba(49, 217, 255, 0.8)", + }, + }, + axisLabel: { + show: true, + color: "#fff", + fontSize: 10, + }, + }, + yAxis: [ + { + type: "value", + name: "起", + nameTextStyle: { + color: "#fff", + fontSize: 10, + align: "right", + }, + axisLabel: { + fontSize: 10, + color: "#fff" + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + splitLine: { + lineStyle: { + color: "rgba(49, 217, 255, 0.5)", + }, + }, + }, + { + type: "value", + name: "分钟", + nameTextStyle: { + color: "#fff", + fontSize: 10, + align: "left", + }, + axisLabel: { + fontSize: 10, + color: "#fff" + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + splitLine: { + show: false, + }, + }, + ], + series: [ + { + name: "上报", + type: "pictorialBar", + stack:"总量", + symbol: "rect", + symbolMargin: 2, + symbolRepeat: "fixed", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList1[0], + }, { + name: "已完成", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + stack:"总量", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList1[1], + },{ + name: "已终止", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList1[2], + },{ + name: "自动结束", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList1[3], + }, + { + name: "去年同期", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + barGap: "40%", + data: valueList2, + }, + { + name: "平均", + type: "line", + symbol: 'none', + smooth: true, + yAxisIndex: 1, + lineStyle: { + type:'dashed', + width: 1 + }, + data: valueList3, + }, + ], +}; + +export default options; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue index 29a605b9..0163157c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue @@ -206,9 +206,9 @@ export default { data.windSpeed = otherConfig.windSpeed; data.visibility = otherConfig.visibility; - //[...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures,...otherConfig.pictures] // - data.pictures =otherConfig.pictures || []; - data.videoList = otherConfig.videoList || []; + data.pictures = otherConfig.pictures || otherConfig.imgUrl ||[]; + data.videoList = otherConfig.videoList || otherConfig.videoUrl || []; + // data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4', // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js index 317045ae..7472bb07 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/charts.js @@ -126,32 +126,20 @@ var options = { series: [ { name: "客车", - type: "pictorialBar", - symbolRepeat: "fixed", - symbolMargin: 2, - symbol: "rect", - symbolClip: true, - symbolSize: [18, 6], + type: "bar", + stack: 'total', barWidth: 10, data: valueList1[0], }, { name: "货车", - type: "pictorialBar", - symbolRepeat: "fixed", - symbolMargin: 2, - symbol: "rect", - symbolClip: true, - symbolSize: [18, 6], + type: "bar", + stack: 'total', barWidth: 10, data: valueList1[1], },{ name: "专项车", - type: "pictorialBar", - symbolRepeat: "fixed", - symbolMargin: 2, - symbol: "rect", - symbolClip: true, - symbolSize: [18, 6], + type: "bar", + stack: 'total', barWidth: 10, data: valueList1[2], }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/chartsv1.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/chartsv1.js new file mode 100644 index 00000000..317045ae --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/flow/chartsv1.js @@ -0,0 +1,172 @@ +import { param } from "jquery"; + +/* 数据 */ +let nameList = [ + "殷家林-大学城", + "大学城-孝里", + "孝里-安城", + "安城-平阴北", + "平阴北-平阴南", + "平阴南-东平", + "东平-梁山东", + "梁山东-嘉祥西" +]; // 类别 +let valueList1 = [[50,30, 52,20, 65,30, 45,10], [42,30,60,23, 45,34,55,16], [3, 5,1,0,5,2,5,4], [5,2,5,4,3, 5,1,0]]; +let valueList2 = [100, 40, 60, 90, 40, 60, 45, 72]; +let valueList3 = [40, 60, 45, 72, 50, 40, 60, 90]; +var options = { + color:['#21ffff','#1FA5F2','#F67826','#1CB50B'], + grid: { + left: "1%", + right: "0", + top: "60px", + bottom: "0px", + containLabel: true, + }, + + legend: { + top: "0%", + right: "0", + textStyle: { + color: "#fff", + }, + itemHeight: 5, + itemWidth: 10, + data: [ + { + name: "客车", + }, + { + name: "货车" + }, + { + name: "专项车" + }, + { + name: "去年同期" + }, + ], + }, + tooltip: { + show: true, + trigger: "axis", + formatter: function (params) { + let result = ''+params[0].axisValue +'
'; + params.forEach(p => { + result += ''+ p.seriesName +''+'：'+(p.value)+ '辆
' + }); + return result; + }, + }, + xAxis: { + type: "category", + data: nameList, + axisTick: { + show: false, //隐藏X轴刻度 + }, + axisLine: { + lineStyle: { + color: "rgba(49, 217, 255, 0.8)", + }, + }, + axisLabel: { + show: true, + color: "#fff", + fontSize: 10, + formatter:function(value) + { + var ret = "";//拼接加\n返回的类目项 + var maxLength = 4;//每项显示文字个数 + var valLength = value.length;//X轴类目项的文字个数 + var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数 + if (rowN > 1)//如果类目项的文字大于3, + { + for (var i = 0; i < rowN; i++) { + var temp = "";//每次截取的字符串 + var start = i * maxLength;//开始截取的位置 + var end = start + maxLength;//结束截取的位置 + //这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧 + temp = value.substring(start, end) + "\n"; + ret += temp; //凭借最终的字符串 + } + return ret; + } + else { + return value; + } + } + }, + }, + yAxis: [ + { + type: "value", + name: "辆", + nameTextStyle: { + color: "#fff", + fontSize: 10, + align: "right", + }, + axisLabel: { + fontSize: 10, + color: "#fff" + }, + axisLine: { + show: false, + }, + axisTick: { + show: false, + }, + splitLine: { + lineStyle: { + color: "rgba(49, 217, 255, 0.5)", + }, + }, + }, + ], + series: [ + { + name: "客车", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + data: valueList1[0], + }, { + name: "货车", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + data: valueList1[1], + },{ + name: "专项车", + type: "pictorialBar", + symbolRepeat: "fixed", + symbolMargin: 2, + symbol: "rect", + symbolClip: true, + symbolSize: [18, 6], + barWidth: 10, + data: valueList1[2], + }, + { + name: "去年同期", + type: "line", + symbol: 'none', + smooth: true, + lineStyle: { + type:'dashed', + width: 1 + }, + data: valueList3, + }, + ], +}; + +export default options; diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js index df418703..070300ec 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js @@ -831,9 +831,13 @@ export const locationMode = { const { data, formList } = args.slice(-1)[0]; if (data.dcEventAccident) { data.dcEventAccident.facilityId = null; + data.dcEventAccident.location = null; + data.dcEventAccident.rampId = null; } if (data.dcEventVehicleAccident) { data.dcEventVehicleAccident.facilityId = null; + data.dcEventVehicleAccident.location = null; + data.dcEventVehicleAccident.rampId = null; } let facilityType = 1; @@ -1257,40 +1261,43 @@ export const congestionCause = { }, ons: { input(value, ...args) { - const { formList } = args.slice(-1)[0]; + const { data, formList } = args.slice(-1)[0]; + if(data.dcEventTrafficCongestion.detailedReasons){ + data.dcEventTrafficCongestion.detailedReasons = null; + } const config = formList.find((it) => (it.key == "detailedReasons"||it.key === 'dcEventTrafficCongestion.detailedReasons')); let ad = { 1: [ { - key: 1, + key:3, label: "收费站广场拥堵导致出口压车", }, { - key: 2, + key: 4, label: "收费站设备故障", }, { - key: 3, + key: 5, label: "地方道路原因", }, { - key: 4, + key: 6, label: "省内非集团所辖高速原因", }, { - key: 5, + key: 7, label: "集团所辖道路拥堵", }, { - key: 6, + key: 8, label: "集团所辖枢纽立交异常导致主线压车", }, { - key: 7, + key: 9, label: "路侧起火", }, { - key: 8, + key: 10, label: "备注项添加", }, ], @@ -1318,49 +1325,95 @@ export const congestionCause = { }; +export const locationSelectStr = [ + { + value: '1', + label: "入口车道", + }, + { + value: '2', + label: "入口匝道", + }, + { + value: '3', + label: "入口", + }, + { + value: '4', + label: "入口内广场", + }, + { + value: '5', + label: "出口车道", + }, + { + value: '6', + label: "出口匝道", + }, + { + value: '7', + label: "外广场", + }, + { + value: '8', + label: "出口", + }, + { + value: '9', + label: "(站外)入口匝道", + }, + { + value: '10', + label: "(站外)出口匝道", + }, + { + value: '11', + label: "出口内广场", + }, +]; export const locationSelect = [ { - value: "1", + value: 1, label: "入口车道", }, { - value: "2", + value: 2, label: "入口匝道", }, { - value: "3", + value: 3, label: "入口", }, { - value: "4", + value: 4, label: "入口内广场", }, { - value: "5", + value: 5, label: "出口车道", }, { - value: "6", + value: 6, label: "出口匝道", }, { - value: "7", + value: 7, label: "外广场", }, { - value: "8", + value: 8, label: "出口", }, { - value: "9", + value: 9, label: "(站外)入口匝道", }, { - value: "10", + value: 10, label: "(站外)出口匝道", }, { - value: "11", + value: 11, label: "出口内广场", }, ]; \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js index f9da4bbf..81bc7ab7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js @@ -41,10 +41,6 @@ export const configList = { required: true, options: { options: [ - { - value: "选项1", - label: "黄金糕", - }, ], }, visible: (data) => { @@ -86,8 +82,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventAccident.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, @@ -153,7 +149,7 @@ export const configList = { required: true, options: { placeholder: "收费站地点", - options: PresetFormItems.locationSelect, + options: PresetFormItems.locationSelectStr, }, visible: (data) => { if (data?.dcEventAccident?.locationType == 4) { @@ -281,8 +277,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventVehicleAccident.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, @@ -555,33 +551,33 @@ export const configList = { let cs = { 1: [ { - value: "1", + value: 1, label: "临时关闭", }, ], 2: [ { - value: "2", + value: 2, label: "限行车辆", }, { - value: "3", + value: 3, label: "限行车道", }, { - value: "4", + value: 4, label: "限行车道且限行车辆", }, { - value: "5", + value: 5, label: "间隔放行", }, { - value: "6", + value: 6, label: "并道行驶", }, { - value: "7", + value: 7, label: "限速", }, ], @@ -789,8 +785,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventTrafficControl.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, @@ -1057,6 +1053,9 @@ export const configList = { if (data.dcEventTrafficCongestion) { data.dcEventTrafficCongestion.facilityId = null; } + if(data.dcEventTrafficCongestion.rampId){ + data.dcEventTrafficCongestion.rampId = null; + } let facilityType = 1; if (value == "4-2") { facilityType = 4; @@ -1087,35 +1086,35 @@ export const configList = { activeColor: "linear-gradient(180deg, #37E7FF 0%, #009BCC 100%)", options: [ { - key:1, + key:3, label: "收费站广场拥堵导致出口压车", }, { - key: 2, + key: 4, label: "收费站设备故障", }, { - key: 3, + key: 5, label: "地方道路原因", }, { - key: 4, + key: 6, label: "省内非集团所辖高速原因", }, { - key: 5, + key: 7, label: "集团所辖道路拥堵", }, { - key: 6, + key: 8, label: "集团所辖枢纽立交异常导致主线压车", }, { - key: 7, + key: 9, label: "路侧起火", }, { - key: 8, + key: 10, label: "备注项添加", }, ], @@ -1123,14 +1122,13 @@ export const configList = { ons: { input(value, ...args) { const { data, formList } = args.slice(-1)[0]; - if (data.dcEventTrafficCongestion) { - data.dcEventTrafficCongestion.facilityId = null; - } + // if (data.dcEventTrafficCongestion) { + // data.dcEventTrafficCongestion.facilityId = null; + // } if ( data.dcEventTrafficCongestion.congestionCause == 1 && value == 2 ) { - console.log("value2", value); //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区 request({ url: `/business/facility/query?facilityType=1`, @@ -1185,11 +1183,7 @@ export const configList = { required: true, options: { options: [ - { - value: "选项1", - label: "黄金糕", - }, - ], + ], }, visible: (data) => { if ( @@ -1258,7 +1252,7 @@ export const configList = { }, { label: "地点类型:", - key: "locationType", + key: "dcEventTrafficCongestion.locationType", type: "RadioGroup", isAlone: true, required: true, @@ -1318,7 +1312,7 @@ export const configList = { ], }, visible: (data) => { - if (data?.eventSubclass == "4-1" && data?.locationType == 1) { + if (data?.eventSubclass !== "4-1" || (data?.eventSubclass == "4-1" && data?.dcEventTrafficCongestion.locationType == 1)) { return true; } return false; @@ -1385,7 +1379,7 @@ export const configList = { ], }, visible: (data) => { - if (data?.eventSubclass == "4-1" && data?.locationType == 2) { + if (data?.eventSubclass == "4-1" && data?.dcEventTrafficCongestion.locationType == 2) { return true; } return false; @@ -1398,12 +1392,7 @@ export const configList = { isAlone: false, required: true, options: { - options: [ - { - value: "选项1", - label: "黄金糕", - }, - ], + options: [ ], }, visible: (data) => { if (data?.eventSubclass == "4-2") { @@ -1413,8 +1402,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventTrafficCongestion.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, @@ -1926,8 +1915,8 @@ export const configList = { }, ons: { change(value, ...args) { - const { formList } = args.slice(-1)[0]; - + const { data, formList } = args.slice(-1)[0]; + data.dcEventConstruction.rampId = null; //匝道 request({ url: `/system/ramp/listAll?facilityId=${value}`, diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index f2502a58..0476f29c 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -36,13 +36,13 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://127.0.0.1:8087`, + // target: `http://127.0.0.1:8087`, // target: `http://10.168.66.196:8087`, //刘文阁 // target: `http://10.168.68.42:8087`, //王思祥 // target: `http://10.168.72.174:8087`, //赵祥龙 // target: `http://10.168.65.156:8097`, //孟凡峰 // target: `http://10.168.79.46:8089`, //王家宝 - // target: `http://10.168.77.128:8087`, //王兴琳 + target: `http://10.168.77.128:8087`, //王兴琳 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",