diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
index a18985fa..aafb53e0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/channelAnalytics/assets/charts.js
@@ -65,8 +65,9 @@ var options = {
},
tooltip: {
show: true,
- // trigger: "item",
- // formatter: "{b} : {c}",
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
},
legend: {
width: "300px",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
index cb3b31d3..71eb3844 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/eventTypeAnalysis/assets/charts.js
@@ -81,7 +81,9 @@ var options = {
tooltip: {
show: true,
trigger: "item",
- // formatter: "{b} : {c}:{d}",
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
},
legend: {
width: "300px",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
index ff0b4cf9..af418882 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
@@ -3,7 +3,9 @@ var options = {
tooltip: {
show: true,
trigger: "axis",
- // formatter: "{b}：{c}人",
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
},
legend: {
icon: "circle",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
index 28433ebe..28f57d2a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
@@ -23,14 +23,14 @@ let options = {
// 坐标轴指示器，坐标轴触发有效
type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
},
- // backgroundColor: "rgba(3, 31, 71, .0)", //设置背景颜色
- // borderColor: "rgba(3, 31, 71, .0)",
- // formatter: "健康监测
{b}：{c}人",
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
},
grid: {
left: "0",
right: "0",
- top: "70px",
+ top: "90px",
bottom: "20px",
containLabel: true,
},
@@ -61,9 +61,12 @@ let options = {
},
yAxis: [
{
- // max: 900,
- // min: 0,
- // interval: 100,
+ name: "(起)",
+ nameTextStyle: {
+ color: "#E5E7E8",
+ fomtSize: 10,
+ align: "right",
+ },
axisLine: {
lineStyle: {
color: "#1C82C5",
@@ -87,9 +90,12 @@ let options = {
},
},
{
- // max: 90,
- // min: 60,
- // interval: 10,
+ name: " (分钟)",
+ nameTextStyle: {
+ color: "#E5E7E8",
+ fomtSize: 10,
+ align: "center",
+ },
axisLine: {
show: false,
// lineStyle: {
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 fffb4ddc..ee01021c 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
@@ -5,11 +5,13 @@ let options = {
tooltip: {
show: true,
trigger: "axis",
- // formatter: "{b}：{c}人",
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
},
grid: {
right: "4%",
- top: "20%",
+ top: "90px",
left: "2%",
bottom: "0%",
containLabel: true,
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 7dc5ed46..83691ff5 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
@@ -23,10 +23,9 @@ var options = {
},
tooltip: {
show: true,
- // valueFormatter: function (value) {
- // return value;
- // // return (value + minNumber).toFixed(2) + " %";
- // },
+ valueFormatter: function (value) {
+ return value + " 起";
+ },
},
legend: {
// orient: 'vertical',
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/RoadSectionTolls/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/RoadSectionTolls/assets/charts.js
index 095d0d97..6232da6c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/RoadSectionTolls/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/RoadSectionTolls/assets/charts.js
@@ -21,16 +21,13 @@ let options = {
},
tooltip: {
trigger: "axis",
- // axisPointer: {
- // type: "shadow",
- // },
- // backgroundColor: "rgba(255,255,255,0.75)",
- // extraCssText: "box-shadow: 2px 2px 4px 0px rgba(0,0,0,0.3);",
- // textStyle: {
- // fontSize: 14,
- // color: "#000",
- // },
- // formatter: "{a}
{b} :\n\n{c} ",
+ formatter: function (params) {
+ if (params[0].seriesName == "收费金额") {
+ return `${params[0].marker} ${params[0].name} ${params[0].value} 万元
`;
+ } else {
+ return `${params[0].marker} ${params[0].name} ${params[0].value} 万辆
`;
+ }
+ },
},
legend: {
top: 10,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js
index 14c97212..51095a7b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js
@@ -4,20 +4,14 @@ var data1 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15];
var data2 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15];
var options = {
tooltip: {
- // trigger: "axis",
- // backgroundColor: 'rgba(17,95,182,0.5)',
- // textStyle: {
- // color: "#fff"
- // },
- // formatter: function (params) {
- // return params[1].marker + '' + params[1].name + '\n' +
- // "" +
- // "" +
- // " " + params[1].seriesName + ': ' + params[1].value + "\n" + ' ' +
- // "
" +
- // "" +
- // '' + " " + params[3].seriesName + ': ' + params[3].value;
- // }
+ formatter: function (params) {
+ console.log("params", params);
+ if (params.seriesName == "增收金额") {
+ return `${params.marker} ${params.name} ${params.value} 万元
`;
+ } else {
+ return `${params.marker} ${params.name} ${params.value} %
`;
+ }
+ },
},
grid: {
left: "5%",
@@ -67,11 +61,11 @@ var options = {
},
yAxis: [
{
- min: 0,
- max: 18,
+ // min: 0,
+ // max: 18,
type: "value",
- minInterval: 3,
- maxInterval: 3,
+ // minInterval: 3,
+ // maxInterval: 3,
name: "(单位：万)",
nameTextStyle: {
align: "left",
@@ -105,17 +99,9 @@ var options = {
data: ["0", "3", "6", "9", "12", "15", "18"],
},
{
- show: true,
+ // show: true,
name: "",
- min: 0,
- max: 18,
type: "value",
- minInterval: 3,
- maxInterval: 3,
- splitNumber: 3,
- formatter: function (e) {
- console.log("---------------", e);
- },
nameTextStyle: {
align: "left",
color: "rgba(255,255,255,0.8)",
@@ -187,7 +173,8 @@ var options = {
itemStyle: {
// lenged文本
opacity: 1,
- borderCap: "round",
+ barBorderRadius: [13, 13, 13, 13],
+ // borderCap: "round",
color: function (params) {
var a = params.name.slice(0, 2);
return new echarts.graphic.LinearGradient(
@@ -202,7 +189,7 @@ var options = {
},
{
offset: 1,
- color: "#2CAEE3", // 100% 处的颜色
+ color: "#003B4E", // 100% 处的颜色
},
],
false
@@ -213,40 +200,40 @@ var options = {
data: data1,
},
- {
- name: "",
- type: "pictorialBar",
- symbolSize: [12, 12],
- symbolOffset: [0, -4],
- z: 5,
- itemStyle: {
- opacity: 1,
- borderCap: "round",
- color: function (params) {
- var a = params.name.slice(0, 2);
+ // {
+ // name: "",
+ // type: "pictorialBar",
+ // symbolSize: [12, 12],
+ // symbolOffset: [0, -4],
+ // z: 5,
+ // itemStyle: {
+ // opacity: 1,
+ // borderCap: "round",
+ // color: function (params) {
+ // var a = params.name.slice(0, 2);
- return new echarts.graphic.LinearGradient(
- 0,
- 0,
- 0,
- 1,
- [
- {
- offset: 0,
- color: "#0BA7DA", // 0% 处的颜色
- },
- {
- offset: 1,
- color: "#0BA7DA30", // 100% 处的颜色
- },
- ],
- false
- );
- },
- },
- symbolPosition: "end",
- data: data1,
- },
+ // return new echarts.graphic.LinearGradient(
+ // 0,
+ // 0,
+ // 0,
+ // 1,
+ // [
+ // {
+ // offset: 0,
+ // color: "#0BA7DA", // 0% 处的颜色
+ // },
+ // {
+ // offset: 1,
+ // color: "#0BA7DA30", // 100% 处的颜色
+ // },
+ // ],
+ // false
+ // );
+ // },
+ // },
+ // symbolPosition: "end",
+ // data: data1,
+ // },
{
name: "增涨率",
z: 9,
@@ -270,54 +257,54 @@ var options = {
},
},
- {
- name: "",
- type: "bar",
- barWidth: 12,
- barGap: "-100%",
- z: 0,
- itemStyle: {
- borderCap: "round",
- color: "#163F7A",
- opacity: 0.7,
- },
- data: [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18],
- },
- {
- name: "",
- type: "pictorialBar",
- symbolSize: [12, 12],
- symbolOffset: [0, -5],
- z: 5,
- itemStyle: {
- barBorderRadius: [13, 13, 13, 13],
- opacity: 1,
- borderCap: "round",
- color: function (params) {
- var a = params.name.slice(0, 2);
+ // {
+ // name: "",
+ // type: "bar",
+ // barWidth: 12,
+ // barGap: "-100%",
+ // z: 0,
+ // itemStyle: {
+ // borderCap: "round",
+ // color: "#163F7A",
+ // opacity: 0.7,
+ // },
+ // data: [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18],
+ // },
+ // {
+ // name: "",
+ // type: "pictorialBar",
+ // symbolSize: [12, 12],
+ // symbolOffset: [0, -5],
+ // z: 5,
+ // itemStyle: {
+ // barBorderRadius: [13, 13, 13, 13],
+ // opacity: 1,
+ // borderCap: "round",
+ // color: function (params) {
+ // var a = params.name.slice(0, 2);
- return new echarts.graphic.LinearGradient(
- 0,
- 0,
- 0,
- 1,
- [
- {
- offset: 0,
- color: "#2CAEE3", // 0% 处的颜色
- },
- {
- offset: 1,
- color: "#2CAEE3", // 100% 处的颜色
- },
- ],
- false
- );
- },
- },
- symbolPosition: "end",
- data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- },
+ // return new echarts.graphic.LinearGradient(
+ // 0,
+ // 0,
+ // 0,
+ // 1,
+ // [
+ // {
+ // offset: 0,
+ // color: "#2CAEE3", // 0% 处的颜色
+ // },
+ // {
+ // offset: 1,
+ // color: "#2CAEE3", // 100% 处的颜色
+ // },
+ // ],
+ // false
+ // );
+ // },
+ // },
+ // symbolPosition: "end",
+ // data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ // },
],
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js
index 09d1e5cc..847c5128 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/monthlyAnalysis/assets/charts.js
@@ -4,21 +4,15 @@ var data1 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15];
var data2 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15];
var options = {
tooltip: {
- show:true
- // trigger: "axis",
- // backgroundColor: 'rgba(17,95,182,0.5)',
- // textStyle: {
- // color: "#fff"
- // },
- // formatter: function (params) {
- // return params[1].marker + '' + params[1].name + '\n' +
- // "" +
- // "" +
- // " " + params[1].seriesName + ': ' + params[1].value + "\n" + ' ' +
- // "
" +
- // "" +
- // '' + " " + params[3].seriesName + ': ' + params[3].value;
- // }
+ show: true,
+ formatter: function (params) {
+ console.log("params", params);
+ if (params.seriesName == "增收金额") {
+ return `${params.marker} ${params.name} ${params.value} 万元
`;
+ } else {
+ return `${params.marker} ${params.name} ${params.value} %
`;
+ }
+ },
},
grid: {
left: "5%",
@@ -68,10 +62,11 @@ var options = {
},
yAxis: [
{
- min: 0,
- max: 18,
- minInterval: 1,
- maxInterval: 1,
+ // min: 0,
+ // max: 18,
+ // minInterval: 1,
+ // maxInterval: 1,
+ type: "value",
name: "(单位：万)",
nameTextStyle: {
align: "left",
@@ -107,9 +102,9 @@ var options = {
{
show: true,
name: "",
- min: 0,
- max: 18,
- splitNumber: 3,
+ // min: 0,
+ // max: 18,
+ // splitNumber: 3,
nameTextStyle: {
align: "left",
color: "rgba(255,255,255,0.8)",
@@ -207,45 +202,46 @@ var options = {
data: data1,
},
- {
- name: "",
- type: "pictorialBar",
- symbolSize: [12, 12],
- symbolOffset: [0, -4],
- z: 5,
- itemStyle: {
- opacity: 1,
- color: function (params) {
- var a = params.name.slice(0, 2);
+ // {
+ // name: "",
+ // type: "pictorialBar",
+ // symbolSize: [12, 12],
+ // symbolOffset: [0, -4],
+ // z: 5,
+ // itemStyle: {
+ // opacity: 1,
+ // color: function (params) {
+ // var a = params.name.slice(0, 2);
- return new echarts.graphic.LinearGradient(
- 0,
- 0,
- 0,
- 1,
- [
- {
- offset: 0,
- color: "#00E4BB", // 0% 处的颜色
- },
- {
- offset: 1,
- color: "#00E4BB30", // 100% 处的颜色
- },
- ],
- false
- );
- },
- },
- symbolPosition: "end",
- data: data1,
- tooltip: {
- show:false}
- },
+ // return new echarts.graphic.LinearGradient(
+ // 0,
+ // 0,
+ // 0,
+ // 1,
+ // [
+ // {
+ // offset: 0,
+ // color: "#00E4BB", // 0% 处的颜色
+ // },
+ // {
+ // offset: 1,
+ // color: "#00E4BB30", // 100% 处的颜色
+ // },
+ // ],
+ // false
+ // );
+ // },
+ // },
+ // symbolPosition: "end",
+ // data: data1,
+ // tooltip: {
+ // show: false,
+ // },
+ // },
{
name: "增涨率",
z: 9,
- yAxisIndex: 1,
+ // yAxisIndex: 1,
type: "line",
data: data2,
symbol:
@@ -261,20 +257,21 @@ var options = {
},
},
- {
- name: "",
- type: "bar",
- barWidth: 12,
- barGap: "-100%",
- z: 0,
- itemStyle: {
- color: "#163F7A",
- opacity: 0.7,
- },
- data: [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18],
- tooltip: {
- show:false}
- },
+ // {
+ // name: "",
+ // type: "bar",
+ // barWidth: 12,
+ // barGap: "-100%",
+ // z: 0,
+ // itemStyle: {
+ // color: "#163F7A",
+ // opacity: 0.7,
+ // },
+ // data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ // tooltip: {
+ // show: false,
+ // },
+ // },
],
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue
index 44a6ea8f..89ea269f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/index.vue
@@ -1,196 +1,185 @@
-
-
-