@@ -147,7 +149,6 @@ export default {
},
handleSearch(data) {
let _search = {};
- console.log(3333,data,333)
if(data.time && data.time.length === 2){
_search['startDate'] = (typeof data.time[0] === 'string')?data.time[0] :data.time[0].format('yyyy-MM-dd')
_search['endDate'] = (typeof data.time[1] === 'string')?data.time[1] :data.time[1].format('yyyy-MM-dd')
@@ -300,6 +301,7 @@ export default {
.buttonbar {
display: inline-flex;
flex-direction: row;
+ justify-content: space-between;
padding-top: 15px;
margin-bottom: 20px;
>.button {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
index 0394cd67..6e7cc306 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/InformationReleaseManagement/Cards/AuditDetails/index.vue
@@ -41,7 +41,7 @@ export default {
if(e.publishChannels === 4 || e.publishChannels === 7){
const contentDetailsInfo = JSON.parse(e.contentDetails)
if(e.publishChannels === 4){ //情报板
- let msg = '情报板数据异常' + e.contentDetails
+ let msg = '情报板数据异常' //+ e.contentDetails
// 检查是否一键恢复
if(contentDetailsInfo.length > 0){
if(contentDetailsInfo[0].functions.length > 1){
@@ -59,7 +59,7 @@ export default {
}
e.contentDetails = msg
} else if(e.publishChannels === 7){
- let msg = '语音广播数据异常'+e.contentDetails
+ let msg = '语音广播数据异常' //+e.contentDetails
if(contentDetailsInfo.length > 0){
if(contentDetailsInfo[0].functions.length > 0){
msg = contentDetailsInfo[0].functions[0].params.text
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts.js
new file mode 100644
index 00000000..d4a07e27
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts.js
@@ -0,0 +1,150 @@
+import * as echarts from "echarts";
+
+let options = {
+ color:['#00A3FF'],
+ tooltip: {
+ show: true,
+ trigger: "axis",
+ formatter: function (params) {
+ let mark = ''
+ params.forEach((e,index) => {
+ mark += e.marker + e.seriesName + '：'+e.value+'起
'
+ });
+ return `
${params[0].name}
${mark}`;
+ },
+ },
+ grid: {
+ left: "10px",
+ right: "20px",
+ top: "70px",
+ bottom: "0px",
+ containLabel: true,
+ },
+ xAxis: {
+ data: [],
+ show: true,
+ axisTick: {
+ show: false,
+ lineStyle: {
+ color: "#fff",
+ },
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#2A6278",
+ },
+ },
+ axisLabel: {
+ align: "center",
+ rotate: "1",
+ margin: 20,
+ textStyle: {
+ fontSize: 10,
+ color: "#E5E7E8",
+ },
+ },
+ },
+ yAxis: [
+ {
+ name: "(起)",
+ nameTextStyle: {
+ color: "#E5E7E8",
+ fomtSize: 10,
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#1C82C5",
+ },
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "#2A6278",
+ type: "solid",
+ },
+ },
+ axisLabel: {
+ show: true,
+ color: "#E5E7E8",
+ textStyle: {
+ fontSize: 10,
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ },
+ ],
+ legend: {
+ itemHeight: 8,
+ itemWidth: 8,
+ top: "0",
+ right: "2%",
+ textStyle: {
+ color: "#fff",
+ },
+ },
+ series: [
+ {
+ name: "事件数量",
+ type: "bar",
+ barWidth: "10px",
+ selectedMode: false,
+ select: {
+ itemStyle: {
+ opacity: 1,
+ color: function (params) {
+ var a = params;
+
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#1AC5FD", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#003B4E", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ },
+ itemStyle: {
+ barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+ // lenged文本
+ opacity: 1,
+ color: function (params) {
+ var a = params.name;
+ // console.log("==========a=============", a);
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#00A3FF", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#00A3FF00", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ data: [],
+ }
+ ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts3.js
new file mode 100644
index 00000000..6222589d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts3.js
@@ -0,0 +1,266 @@
+import * as echarts from "echarts";
+
+let options = {
+ color:['#00A3FF','#0c8c52','#c7d61d'],
+ tooltip: {
+ show: true,
+ trigger: "axis",
+ formatter: function (params) {
+ let mark = ''
+ params.forEach((e,index) => {
+ mark += e.marker + e.seriesName + '：'+e.value+'起
'
+ });
+ return `
${params[0].name}
${mark}`;
+ },
+ },
+ grid: {
+ left: "10px",
+ right: "20px",
+ top: "70px",
+ bottom: "0px",
+ containLabel: true,
+ },
+ xAxis: {
+ data: [],
+ show: true,
+ axisTick: {
+ show: false,
+ lineStyle: {
+ color: "#fff",
+ },
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#2A6278",
+ },
+ },
+ axisLabel: {
+ align: "center",
+ rotate: "1",
+ margin: 20,
+ textStyle: {
+ fontSize: 10,
+ color: "#E5E7E8",
+ },
+ },
+ },
+ yAxis: [
+ {
+ name: "(起)",
+ nameTextStyle: {
+ color: "#E5E7E8",
+ fomtSize: 10,
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#1C82C5",
+ },
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "#2A6278",
+ type: "solid",
+ },
+ },
+ axisLabel: {
+ show: true,
+ color: "#E5E7E8",
+ textStyle: {
+ fontSize: 10,
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ },
+ ],
+ legend: {
+ itemHeight: 8,
+ itemWidth: 8,
+ top: "0",
+ right: "2%",
+ textStyle: {
+ color: "#fff",
+ },
+ },
+ series: [
+ {
+ name: "货车",
+ type: "bar",
+ barWidth: "10px",
+ selectedMode: false,
+ select: {
+ itemStyle: {
+ opacity: 1,
+ color: function (params) {
+ var a = params;
+
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#0c8c52", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#003B4E", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ },
+ itemStyle: {
+ barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+ // lenged文本
+ opacity: 1,
+ color: function (params) {
+ var a = params.name;
+ // console.log("==========a=============", a);
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#00A3FF", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#00A3FF00", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ data: [],
+ }, {
+ name: "小型车",
+ type: "bar",
+ barWidth: "10px",
+ selectedMode: false,
+ select: {
+ itemStyle: {
+ opacity: 1,
+ color: function (params) {
+ var a = params;
+
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#0c8c52", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#003B4E", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ },
+ itemStyle: {
+ barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+ // lenged文本
+ opacity: 1,
+ color: function (params) {
+ var a = params.name;
+ // console.log("==========a=============", a);
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#0c8c52", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#0c8c5200", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ data: [],
+ }, {
+ name: "客车",
+ type: "bar",
+ barWidth: "10px",
+ selectedMode: false,
+ select: {
+ itemStyle: {
+ opacity: 1,
+ color: function (params) {
+ var a = params;
+
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#c7d61d", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#003B4E", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ },
+ itemStyle: {
+ barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+ // lenged文本
+ opacity: 1,
+ color: function (params) {
+ var a = params.name;
+ // console.log("==========a=============", a);
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#c7d61d", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#c7d61d00", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ data: [],
+ }
+ ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts4.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts4.js
new file mode 100644
index 00000000..e2aae96f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts4.js
@@ -0,0 +1,105 @@
+import * as echarts from "echarts";
+
+let options = {
+ color:['#00A3FF','#c7d61d'],
+ tooltip: {
+ show: true,
+ trigger: "axis",
+ formatter: function (params) {
+ let mark = ''
+ params.forEach((e,index) => {
+ mark += e.marker + e.seriesName + '：'+e.value+'起
'
+ });
+ return `
${params[0].name}
${mark}`;
+ },
+ },
+ grid: {
+ left: "10px",
+ right: "20px",
+ top: "70px",
+ bottom: "0px",
+ containLabel: true,
+ },
+ xAxis: {
+ data: [],
+ show: true,
+ axisTick: {
+ show: false,
+ lineStyle: {
+ color: "#fff",
+ },
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#2A6278",
+ },
+ },
+ axisLabel: {
+ align: "center",
+ rotate: "1",
+ margin: 20,
+ textStyle: {
+ fontSize: 10,
+ color: "#E5E7E8",
+ },
+ },
+ },
+ yAxis: [
+ {
+ name: "(起)",
+ nameTextStyle: {
+ color: "#E5E7E8",
+ fomtSize: 10,
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#1C82C5",
+ },
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "#2A6278",
+ type: "solid",
+ },
+ },
+ axisLabel: {
+ show: true,
+ color: "#E5E7E8",
+ textStyle: {
+ fontSize: 10,
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ },
+ ],
+ legend: {
+ itemHeight: 8,
+ itemWidth: 8,
+ top: "0",
+ right: "2%",
+ textStyle: {
+ color: "#fff",
+ },
+ },
+ series: [
+ {
+ name: "当前事故总量",
+ type: "line",
+ barWidth: "10px",
+ selectedMode: false,
+ data: [],
+ },
+ {
+ name: "去年事故总量",
+ type: "line",
+ barWidth: "10px",
+ selectedMode: false,
+ data: [],
+ }
+ ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts6.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts6.js
new file mode 100644
index 00000000..788d677d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts6.js
@@ -0,0 +1,208 @@
+import * as echarts from "echarts";
+
+let options = {
+ color:['#00A3FF','#0c8c52'],
+ tooltip: {
+ show: true,
+ trigger: "axis",
+ formatter: function (params) {
+ let mark = ''
+ params.forEach((e,index) => {
+ mark += e.marker + e.seriesName + '：'+e.value+'起
'
+ });
+ return `
${params[0].name}
${mark}`;
+ },
+ },
+ grid: {
+ left: "10px",
+ right: "20px",
+ top: "70px",
+ bottom: "0px",
+ containLabel: true,
+ },
+ xAxis: {
+ data: [],
+ show: true,
+ axisTick: {
+ show: false,
+ lineStyle: {
+ color: "#fff",
+ },
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#2A6278",
+ },
+ },
+ axisLabel: {
+ align: "center",
+ rotate: "1",
+ margin: 20,
+ textStyle: {
+ fontSize: 10,
+ color: "#E5E7E8",
+ },
+ },
+ },
+ yAxis: [
+ {
+ name: "(起)",
+ nameTextStyle: {
+ color: "#E5E7E8",
+ fomtSize: 10,
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#1C82C5",
+ },
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "#2A6278",
+ type: "solid",
+ },
+ },
+ axisLabel: {
+ show: true,
+ color: "#E5E7E8",
+ textStyle: {
+ fontSize: 10,
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ },
+ ],
+ legend: {
+ itemHeight: 8,
+ itemWidth: 8,
+ top: "0",
+ right: "2%",
+ textStyle: {
+ color: "#fff",
+ },
+ },
+ series: [
+ {
+ name: "封闭",
+ type: "bar",
+ barWidth: "10px",
+ selectedMode: false,
+ select: {
+ itemStyle: {
+ opacity: 1,
+ color: function (params) {
+ var a = params;
+
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#0c8c52", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#003B4E", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ },
+ itemStyle: {
+ barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+ // lenged文本
+ opacity: 1,
+ color: function (params) {
+ var a = params.name;
+ // console.log("==========a=============", a);
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#00A3FF", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#00A3FF00", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ data: [],
+ }, {
+ name: "限行",
+ type: "bar",
+ barWidth: "10px",
+ selectedMode: false,
+ select: {
+ itemStyle: {
+ opacity: 1,
+ color: function (params) {
+ var a = params;
+
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#0c8c52", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#003B4E", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ },
+ itemStyle: {
+ barBorderRadius: [10, 10, 10, 10], // 圆角（左上、右上、右下、左下）
+ // lenged文本
+ opacity: 1,
+ color: function (params) {
+ var a = params.name;
+ // console.log("==========a=============", a);
+ return new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#0c8c52", // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: "#0c8c5200", // 100% 处的颜色
+ },
+ ],
+ false
+ );
+ },
+ },
+ data: [],
+ }
+ ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts8.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts8.js
new file mode 100644
index 00000000..97d713cb
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts8.js
@@ -0,0 +1,247 @@
+import * as echarts from "echarts";
+var options = {
+ tooltip: {
+ show: true,
+ trigger: "axis",
+ formatter: (params) => {
+
+ let name = params[0].name.replace(/-/g, "")
+ let name1 = name+'-济南'
+ let name2 = name+'-菏泽'
+ if(params[0].axisIndex === 1){
+ name1 = name+'-菏泽'
+ name2 = name+'-济南'
+ }
+ return `${name1}
+
+ ${params[0].marker}${params[0].seriesName}:
${params[0].value} 辆
+
+ ${name2}
+
+ ${params[1].marker}${params[1].seriesName}:
${params[1].value} 辆`;
+ },
+ },
+ axisPointer: {
+ link: [
+ {
+ xAxisIndex: "all",
+ },
+ ],
+ },
+ legend: {
+ top: 0,
+ right: 0,
+ icon:'rect',
+ textStyle: {
+ color: "#fff",
+ },
+ itemHeight: 5,
+ itemWidth: 10,
+ data: [
+ {
+ name: "本期车流量",
+ itemStyle: {
+ color: '#6DBBFB'
+ }
+
+ },{
+ name: "去年同期",
+ itemStyle: {
+ color: '#5FA52B'
+ }
+
+ },
+ ],
+ },
+ grid: [
+ {
+ left: 40,
+ top: '25%',
+ right: 10,
+ height: "35%",
+ },
+ {
+ left: 40,
+
+ right: 10,
+ top: "60%",
+ height: "35%",
+ },
+ ],
+ xAxis: [
+ {
+ type: "category",
+ data: [
+ "殷家林-枢纽",
+ "大学城-立交",
+ "长清-立交",
+ "松竹-枢纽",
+ "孝里-立交",
+ "平阴北-立交",
+ "平阴-立交",
+ "孔村-枢纽",
+ "平阴南-立交",
+ "东平-立交",
+ "东平湖-枢纽",
+ "梁山东-立交",
+ "梁山-立交",
+ "嘉祥西-立交",
+ "王官屯-枢纽",
+ ],
+ axisLabel: {
+ show:false
+ },
+ z: 10,
+ splitLine: {
+ show: false,
+ },
+ axisTick: {
+ show: false,
+ },
+ },
+ {
+ onZero: true,
+ axisLine: { show: false },
+ gridIndex: 1,
+ type: "category",
+ z: 10,
+ data: [
+ "殷家林-枢纽",
+ "大学城-立交",
+ "长清-立交",
+ "松竹-枢纽",
+ "孝里-立交",
+ "平阴北-立交",
+ "平阴-立交",
+ "孔村-枢纽",
+ "平阴南-立交",
+ "东平-立交",
+ "东平湖-枢纽",
+ "梁山东-立交",
+ "梁山-立交",
+ "嘉祥西-立交",
+ "王官屯-枢纽",
+ ],
+ position: "top",
+ axisLabel: {
+ color: "#fff",
+ margin: -20,
+ formatter: function (params) {
+ return `${params.substr(0,params.length-2)}\n\n${params.substr(params.length-2)}`;
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ },
+ ],
+ yAxis: [
+ {
+ name: "车流量 ",
+ type: "value",
+ axisLabel: {
+ color: "#FFF",
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: "#00D1FF",
+ },
+ },
+ splitLine: {
+ show: false,
+ },
+ },
+ {
+ gridIndex: 1,
+ name: "",
+ type: "value",
+ inverse: true,
+ axisLabel: {
+ color: "#FFF",
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: "#06AED3",
+ },
+ },
+ splitLine: {
+ show: false,
+ },
+ },
+ ],
+ series: [
+ {
+ name: "本期车流量",
+ type: "line",
+ symbolSize: 0,
+ lineStyle: {
+ color: "#06AED3",
+ },
+ smooth: true,
+ areaStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 1,
+ color: "#06AED300",
+ },
+ {
+ offset: 0,
+ color: "#06AED3",
+ },
+ ],
+ false
+ ),
+ },
+ },
+ data: [
+ 57, 36, 56, 95, 125, 194, 94, 94, 74, 34, 125, 194, 94, 94, 74, 34,
+ ],
+ },
+ {
+ name: "本期车流量",
+ type: "line",
+ symbol: "circle",
+ symbolSize: 0,
+ xAxisIndex: 1,
+ yAxisIndex: 1,
+ smooth: true,
+ lineStyle: {
+ color: "#06AED3",
+ },
+ areaStyle: {
+ normal: {
+ color: new echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "#06AED300",
+ },
+ {
+ offset: 1,
+ color: "#06AED3",
+ },
+ ],
+ false
+ ),
+ },
+ },
+ data: [
+ 67, 36, 56, 195, 25, 194, 94, 94, 74, 21, 195, 25, 194, 94, 94, 74, 21,
+ ],
+ },
+ ],
+};
+
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue
new file mode 100644
index 00000000..911fd106
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue
@@ -0,0 +1,650 @@
+
+
+
+ 全选/全不选
+
+
+
+
+
+
+
方向：济南←
+
→方向：菏泽
+
方向：出口←
+
→方向：入口
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/index.vue
new file mode 100644
index 00000000..80b7ec74
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/search/index.vue
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+
+
+
+
查询
+
重置
+
+ 导入
+
+
导出
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/charts.js
index 93d6bfc2..65262ef6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/channelAnalytics/charts.js
@@ -46,7 +46,7 @@ var options = {
left: "49%",
textStyle: {
color: "#ffffff",
- fontSize: 30,
+ fontSize: 20,
fontFamily: "PangMenZhengDao",
},
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
index f6e044a3..25f91674 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/postTrendsMonth/assets/charts.js
@@ -91,7 +91,7 @@ var options = {
grid: {
top: "80px", //上边距
right: "0", //右边距
- left: "3px", //左边距
+ left: "13px", //左边距
bottom: "20px", //下边距
containLabel: true,
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
index 1f1346d1..64ab3e6c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/components/record/index.vue
@@ -141,7 +141,6 @@ export default {
method: "DELETE",
data: {},
}).then((result) => {
- console.log(result)
if (result.code != 200) return self.$message.error(result?.msg);
self.$message.success('删除成功');
self.initData();
@@ -226,7 +225,7 @@ export default {
if(e.publishChannels === 4 || e.publishChannels === 7){
const contentDetailsInfo = JSON.parse(e.contentDetails)
if(e.publishChannels === 4){ //情报板
- let msg = '情报板数据异常' + e.contentDetails
+ let msg = '情报板数据异常' // + e.contentDetails
// 检查是否一键恢复
if(contentDetailsInfo.length > 0){
if(contentDetailsInfo[0].functions.length > 1){
@@ -244,7 +243,7 @@ export default {
}
e.contentDetails = msg
} else if(e.publishChannels === 7){
- let msg = '语音广播数据异常'+e.contentDetails
+ let msg = '语音广播数据异常' //+e.contentDetails
console.log(contentDetailsInfo)
if(contentDetailsInfo.length > 0){
if(contentDetailsInfo[0].functions.length > 0){
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/charts.js
index 86b30243..ea80eb0f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/eventTypeAnalysis/charts.js
@@ -67,7 +67,7 @@ var options = {
left: "49%",
textStyle: {
color: "#ffffff",
- fontSize: 30,
+ fontSize: 20,
fontFamily: "PangMenZhengDao",
},
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/charts.js
index 1015a838..75afa8cb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsDay/charts.js
@@ -92,7 +92,7 @@ var options = {
grid: {
top: "75px", //上边距
right: "0", //右边距
- left: "3px", //左边距
+ left: "18px", //左边距
bottom: "20px", //下边距
containLabel: true,
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/charts.js
index ed55eb27..e288c84b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/publicService/postTrendsMonth/charts.js
@@ -91,7 +91,7 @@ var options = {
grid: {
top: "50px", //上边距
right: "0", //右边距
- left: "3px", //左边距
+ left: "18px", //左边距
bottom: "20px", //下边距
containLabel: true,
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/common.js b/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
index f134847d..d8f1c1be 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
@@ -229,7 +229,7 @@ export function uploadFile(
Message.success("上传成功");
- resolve(res);
+ resolve(res,file);
})
.catch((err) => {
reject(err);
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 81bc7ab7..b1d3cebd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/data.js
@@ -1792,7 +1792,11 @@ export const configList = {
{
...PresetFormItems.station,
visible: (data) => {
- if (
+ if(data.eventSubclass == "7-2" || data.eventSubclass == "7-3" || data.eventSubclass == "7-4" ||
+ data.eventSubclass == "7-7" || data.eventSubclass == "7-8" || data.eventSubclass == "7-9"
+ ){
+ return false;
+ } else if (
(data.eventSubclass == "7-1" || data.eventSubclass == "7-6") &&
data?.dcEventConstruction.locationType == "2"
) {
diff --git a/ruoyi-ui/src/views/event/reservePlan/index.vue b/ruoyi-ui/src/views/event/reservePlan/index.vue
index a0eeafb3..dc7dee58 100644
--- a/ruoyi-ui/src/views/event/reservePlan/index.vue
+++ b/ruoyi-ui/src/views/event/reservePlan/index.vue
@@ -1632,7 +1632,6 @@
this.getAudioFileListData(brr.equipments, i, j);
}
this.getDicts("sd_device_retrieval_rule").then((response) => {
- console.log(response.data);
var retrievalRuleList = response.data;
if (brr.eqTypeId == 30) {
console.log(retrievalRuleList);
diff --git a/ruoyi-ui/src/views/event/strategy/components/manualControl.vue b/ruoyi-ui/src/views/event/strategy/components/manualControl.vue
index 50d1788b..c88a653c 100644
--- a/ruoyi-ui/src/views/event/strategy/components/manualControl.vue
+++ b/ruoyi-ui/src/views/event/strategy/components/manualControl.vue
@@ -666,7 +666,6 @@ export default {
item.disposalName != null && item.equipmentTypeId != null && item.state != null && item.value != null
);
});
- console.log(result);
if (!result) {
return this.$modal.msgError("请填写完整策略信息！");
}
diff --git a/ruoyi-ui/src/views/event/strategy/components/timingControl.vue b/ruoyi-ui/src/views/event/strategy/components/timingControl.vue
index 6c2d0f59..54f6850a 100644
--- a/ruoyi-ui/src/views/event/strategy/components/timingControl.vue
+++ b/ruoyi-ui/src/views/event/strategy/components/timingControl.vue
@@ -676,7 +676,6 @@
return item.equipmentTypeId != "" && item.state != "" && item.equipments != "" &&
item.equipmentTypeId != null && item.state != null && item.equipments != null
});
- console.log(result);
if (!result) {
return this.$modal.msgError("请填写完整策略信息！");
}
diff --git a/ruoyi-ui/src/views/event/strategy/event/autoControl.vue b/ruoyi-ui/src/views/event/strategy/event/autoControl.vue
index d4916074..435afb9a 100644
--- a/ruoyi-ui/src/views/event/strategy/event/autoControl.vue
+++ b/ruoyi-ui/src/views/event/strategy/event/autoControl.vue
@@ -934,7 +934,6 @@ export default {
let result = response.every(function (item) {
return item.equipmentTypeId && item.state && item.equipments;
});
- // console.log(result);
if (!result) {
return this.$modal.msgError("请填写完整");
}
diff --git a/ruoyi-ui/src/views/event/strategy/event/manualControl.vue b/ruoyi-ui/src/views/event/strategy/event/manualControl.vue
index 557863d8..c93c393b 100644
--- a/ruoyi-ui/src/views/event/strategy/event/manualControl.vue
+++ b/ruoyi-ui/src/views/event/strategy/event/manualControl.vue
@@ -518,7 +518,6 @@ export default {
console.log(item.state,item.value);
return item.equipmentTypeId && item.state && item.value && item.disposalName
});
- console.log(result);
if(!result){
return this.$modal.msgError("请填写完整");
}
diff --git a/ruoyi-ui/src/views/websocket.vue b/ruoyi-ui/src/views/websocket.vue
index f049cf6c..a9095d01 100644
--- a/ruoyi-ui/src/views/websocket.vue
+++ b/ruoyi-ui/src/views/websocket.vue
@@ -104,6 +104,7 @@ export default {
break;
case "0":
case "1":
+ case "2":
case "3":
case "trafficFlowDataEarlyWarning":
this.$emit("newEvent", params);
@@ -116,6 +117,9 @@ export default {
case "eventCount":
this.$root.$emit('update-warning', content);
break;
+ case "eventProcess":
+ this.$root.$emit('update-eventProcess', content);
+ break;
//
default:
}
@@ -128,49 +132,20 @@ export default {
let _this = this;
if (process.env.NODE_ENV == "development") {
//测试websocket用的
- return
+ return;
let deviceState = "0";
document.onkeydown = function (e) {
deviceState == "0" ? deviceState = "1" : deviceState = "0";
if (e.code == 'Space') {
+ let params = {"subEvent":"eventProcess","content":{"id":3598,"eventId":"a026a03962d94089b67858d6c7e6cd42","operationTime":"2024-08-27 11:39:11","operator":"1","operatorName":"管理员","source":1,"processName":"","context":"这是处置记录","type":"text","remark":""}}
+
+ _this.$root.$emit('update-eventProcess', params.content);
// 消息数字
// _this.$root.$emit('update-warning', Math.floor(Math.random() * 20));
// 事件弹窗
- let params = {
- "subEvent": "1",
- "content": {
- "event": {
- "id": "8f92fe09450f4c58868821a8173b797c",
- "deptId": 103,
- "stakeMark": "K059+289",
- "endStakeMark": "",
- "direction": "1",
- "userId": 1,
- "estimatedEndTime": "2024-04-11 00:00:00",
- "eventType": 3,
- "eventSubclass": "3-2",
- "eventState": 0,
- "eventSource": 1,
- "inTunnel": 0,
- "roadId": 1,
- "occurrenceTime": "2024-04-10 16:56:02",
- "lang": "",
- "dcEventTrafficControl": {
- "controlType": 1,
- "controlCause": 1,
- "exitsInlets": 2,
- "facilityId": 11,
- "measure": 1,
- "classify": 1,
- "facilityIds": [
- 11
- ]
- },
- "createTime": "2024-05-08 18:02:40"
- },
- "content": "菏泽方向 K059+289 发生收费站封闭和限行事件"
- }
- };
+ // let params = {
+ // "subEvent":"2","content":{"event":{"id":"ad84780896584c4ab67d034c0ab9b853","stakeMark":"K078+300","direction":"1","warningState":1,"warningTime":"2024-08-20 10:43:23","warningSource":5,"warningType":6,"warningSubclass":"6-3","warningTitle":"菏泽方向 发生障碍物(障碍物)事件","otherConfig":"","lane":"0","number":0,"longitude":"116.699758","latitude":"36.435038","duration":0,"endTime":"2024-08-20 12:00:43","createTime":"2024-08-20 11:00:43","remark":"2024年08月20日 10:43:21 K078+300 菏泽方向 发生障碍物(障碍物)事件","params":{}},"content":"菏泽方向 K078+300 发生障碍物事件"}
+ // };
// 交通流预警
// let params = {
@@ -190,7 +165,7 @@ export default {
// "earlyWorningContentNotic":"","stationName":"平阴","warningLevelString":"YELLOW_ALERT","earlyWarningTypeStringNumber":"6",
// "earlyWorningSignal":"6yj1","warningLevelStringNumber":"1","earlyWorningIssueDate":"2024-06-24T16:40:00","earlyWarningTypeString":"HYPERTHERMIA"}
// }
- _this.$emit("newEvent", params);
+ // _this.$emit("newEvent", params);
// 测试事件变更
// let params = {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 8a6938ed..e83f2961 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,13 +37,8 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://127.0.0.1:8087`,
- target:`http://10.0.111.11:8097`,
- // 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://localhost:3001`,
+ // target:`http://10.0.111.11:8097`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",