diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
index d1a86dfd..6998b4c0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
@@ -1,8 +1,7 @@
let zData = ["侧翻", "撞障碍物", "自燃", "追尾", "撞护栏", "货物洒落"];
-let lc = [450, 500, 250, 340,450, 500];
-let lc2 = [400, 550, 200, 140,400, 550];
+let lc = [450, 500, 250, 340, 450, 500];
+let lc2 = [400, 550, 200, 140, 400, 550];
let options = {
-
tooltip: {
show: true,
trigger: "axis",
@@ -14,7 +13,7 @@ let options = {
},
grid: {
right: "4%",
- top: "12%",
+ top: "20%",
left: "2%",
bottom: "0%",
containLabel: true,
@@ -27,7 +26,7 @@ let options = {
interval: 0,
textStyle: {
color: "rgba(255, 255, 255, 0.80)",
- fontSize: 16
+ fontSize: 16,
},
},
axisTick: {
@@ -53,7 +52,7 @@ let options = {
show: true,
textStyle: {
color: "rgba(255, 255, 255, 0.90)",
- fontSize: 16
+ fontSize: 16,
},
},
axisLine: {
@@ -70,6 +69,33 @@ let options = {
},
},
],
+ legend: {
+ // orient: 'vertical',
+ // icon: "circle",
+ itemHeight: 8,
+ itemWidth: 8,
+ top: "5%",
+ right: "10%",
+ textStyle: {
+ color: "#fff",
+ },
+ data: [
+ {
+ name: "从业人员",
+ icon: "circle",
+ itemStyle: {
+ color: "#02A0F8",
+ },
+ },
+ {
+ name: "去年同期数量",
+ icon: "circle",
+ itemStyle: {
+ color: "#01CFEB",
+ },
+ },
+ ],
+ },
series: [
{
name: "从业人员",
@@ -104,18 +130,19 @@ let options = {
},
],
globalCoord: false, // 缺省为 false
- }
+ },
},
},
- symbol: "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
+ symbol:
+ "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
data: lc,
},
- {
+ {
name: "去年同期数量",
type: "pictorialBar",
stack: "else",
- barGap: "10%",
- boundaryGap:"100%",
+ barGap: "10%",
+ boundaryGap: "100%",
label: {
normal: {
show: false,
@@ -145,13 +172,14 @@ let options = {
},
],
globalCoord: false, // 缺省为 false
- }
+ },
},
},
- symbol: "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
+ symbol:
+ "path://M48 0 L49 17 C52 72 68 125 96 173 H0 C25 125 41 73 46 19 L48 0Z",
data: lc2,
},
],
};
-export default options;
\ No newline at end of file
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
index a0a13223..cd91e16e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
@@ -1,144 +1,136 @@
-const sxnja = [
- 400,400,400
- ];
- const sxnja2 = [
- 700,700,700
- ];
-
- const minNumber = 90;
- const minArray = [];
- sxnja.map((value) => {
- minArray.push(parseFloat((value - minNumber).toFixed(2)))
- })
- console.log(minArray)
- let xaxisData = [
- '客车',
- '货车',
- '专项车',
- ];
-
- var options = {
- title: {
- text: '单位/%',
- top: '4%',
- left: '3%',
- textStyle: {
- fontSize: '10px',
- fontWeight: 300,
- color: '#B5C5D4',
- opacity: 0.8
- }
+const sxnja = [400, 400, 400];
+const sxnja2 = [700, 700, 700];
+
+const minNumber = 90;
+const minArray = [];
+sxnja.map((value) => {
+ minArray.push(parseFloat((value - minNumber).toFixed(2)));
+});
+console.log(minArray);
+let xaxisData = ["客车", "货车", "专项车"];
+
+var options = {
+ title: {
+ // text: "单位/%",
+ top: "4%",
+ left: "3%",
+ textStyle: {
+ fontSize: "10px",
+ fontWeight: 300,
+ color: "#B5C5D4",
+ opacity: 0.8,
},
- tooltip: {
- valueFormatter: function (value) {
- return (value + minNumber).toFixed(2) + ' %';
- }
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return (value + minNumber).toFixed(2) + " %";
},
- legend: {
- // orient: 'vertical',
- icon: "circle",
- itemHeight: 6,
- itemWidth: 6,
- top: "5%",
- right: "0%",
- textStyle: {
- fontSize:10,
- color: "#fff",
- },
+ },
+ legend: {
+ // orient: 'vertical',
+ icon: "circle",
+ itemHeight: 8,
+ itemWidth: 8,
+ top: "5%",
+ right: "0%",
+ textStyle: {
+ // fontSize: 12,
+ color: "#fff",
+ },
+ },
+ grid: {
+ left: "1%",
+ right: "0%",
+ top: "20%",
+ bottom: "0%",
+ containLabel: true,
+ },
+ xAxis: {
+ type: "category",
+ data: xaxisData,
+ axisLine: {
+ show: true,
+ lineStyle: {
+ width: 1,
+ color: "#545454",
+ },
},
- grid: {
- left: '1%',
- right: '0%',
- top: '16%',
- bottom: '0%',
- containLabel: true
+ axisTick: {
+ show: false,
},
- xAxis: {
- type: 'category',
- data: xaxisData,
+ axisLabel: {
+ color: "#B5C5D4",
+ fontSize: "10px",
+ interval: 0,
+ },
+ },
+ yAxis: [
+ {
+ // type: 'value',
+ // min: function (value) {
+ // return value.min*0.9;
+ // },
+ type: "value",
+ min: 0,
+ max: 900,
+ splitNumber: 9,
+ // max: yAxisMax,
axisLine: {
- show: true,
+ show: false,
lineStyle: {
width: 1,
- color: '#545454'
- }
+ color: "#545454",
+ },
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "#B2C2D3",
+ opacity: 0.3,
+ type: "dotted",
+ },
},
axisTick: {
- show: false
+ show: false,
},
axisLabel: {
- color: '#B5C5D4',
- fontSize: '10px',
- interval: 0
- }
- },
- yAxis: [
- {
- // type: 'value',
- // min: function (value) {
- // return value.min*0.9;
- // },
- type: 'value',
- min: 0,
- max:900,
- splitNumber: 9,
- // max: yAxisMax,
- axisLine: {
- show: false,
- lineStyle: {
- width: 1,
- color: '#545454'
- }
- },
- splitLine: {
- show: true,
- lineStyle: {
- color: '#B2C2D3',
- opacity: 0.3,
- type: 'dotted'
- }
- },
- axisTick: {
- show: false
+ color: "#B5C5D4",
+ fontSize: "12px",
+ formatter: (value) => {
+ return value + minNumber;
},
- axisLabel: {
- color: '#B5C5D4',
- fontSize: '12px',
- formatter: (value) => {
- return value + minNumber
- }
- }
- }
- ],
- series: [
- {
- name: '事件数量(起)',
- data: minArray,
- type: 'pictorialBar',
- symbol: 'roundRect',
- symbolRepeat: true,
- symbolSize: [12, 5],
- // symbolOffset: symbolOffset,
- // barWidth:'40%',
- itemStyle: {
- color: '#20E7FF'
- }
},
- {
- barGap: "10%",
- name: '平均处置时长(分钟)',
- data: sxnja2 ,
- type: 'pictorialBar',
- symbol: 'roundRect',
- symbolRepeat: true,
- symbolSize: [12, 5],
- // symbolOffset: symbolOffset,
- // barWidth:'40%',
- itemStyle: {
- color: '#20FFC9'
- }
- }
- ]
- };
+ },
+ ],
+ series: [
+ {
+ name: "事件数量(起)",
+ data: minArray,
+ type: "pictorialBar",
+ symbol: "roundRect",
+ symbolRepeat: true,
+ symbolSize: [12, 5],
+ // symbolOffset: symbolOffset,
+ // barWidth:'40%',
+ itemStyle: {
+ color: "#20E7FF",
+ },
+ },
+ {
+ barGap: "10%",
+ name: "平均处置时长(分钟)",
+ data: sxnja2,
+ type: "pictorialBar",
+ symbol: "roundRect",
+ symbolRepeat: true,
+ symbolSize: [12, 5],
+ // symbolOffset: symbolOffset,
+ // barWidth:'40%',
+ itemStyle: {
+ color: "#20FFC9",
+ },
+ },
+ ],
+};
- export default options;
\ No newline at end of file
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/assets/online_bj.jpg b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/assets/online_bj.jpg
new file mode 100644
index 00000000..02b4998e
Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/assets/online_bj.jpg differ
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/index.vue
index 8ee9af9c..95052e57 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/datav/digitalRoadNetwork/index.vue
@@ -1,7 +1,159 @@
-