diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue
index 53202380..6a223d83 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/Proxy.vue
@@ -31,7 +31,8 @@ export default {
for (const key in callbacks) {
result[key] = (...args) => callbacks[key](...args, {
data: this.getFormData(),
- formList: this.parent.formList
+ formList: this.parent.formList,
+ self: this
})
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
index b060020b..1b7d0802 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue
@@ -329,7 +329,6 @@ export default {
},
methods: {
initData() {
- console.log("调用initData+++++++");
if(this.isLocked){
return
}
@@ -356,7 +355,7 @@ export default {
}
}
else {
- tempTpl = _.merge(this.deviceCttDefault, this.tpl.origin); //首页弹窗,新增设备项时,需要传设备尺寸过来
+ tempTpl = _.merge({}, this.deviceCttDefault, this.tpl.origin); //首页弹窗,新增设备项时,需要传设备尺寸过来
}
this.dataForm = infoBoardUtils.dialogSourceFormat(tempTpl, this.type, this.mode);
} else {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
index 74fc9358..ddc37af2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
@@ -27,7 +27,7 @@ export default {
},
tpl: {
type: Object,
- default: {}
+ default: ()=>{}
},
},
watch:{
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
index 80c6e030..1fcdedac 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js
@@ -1,4 +1,5 @@
-import { options } from "runjs";
+import request from '@/utils/request'
+import { Message } from "element-ui";
export const source = {
label: "来源:",
@@ -713,6 +714,42 @@ export const locationMode = {
{ key: "4", label: "收费站" },
],
},
+ ons: {
+ change(value, ...args) {
+ const { formList } = args.slice(-1)[0];
+
+ let facilityType = 1;
+ if (value == 2) {
+ facilityType = 6;
+ } else if (value == 3) {
+ facilityType = 3;
+ } else if (value == 4) {
+ facilityType = 1;
+ }
+ if(value && value != 1){
+ //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+ request({
+ url: `/business/facility/query?facilityType=${facilityType}`,
+ method: "get"
+ }).then((result) => {
+ if (result.code != 200) return Message.error(result?.msg);
+ let lwss = [];
+ result.data.forEach(it => lwss.push({ key: it.id, label: it.facilityName}))
+
+ formList.forEach((it) => {
+ if(it.key == "dcEventAccident.facilityId" || it.key == "dcEventVehicleAccident.facilityId"){
+ it.options.options = lwss;
+ }
+ });
+
+ }).catch((err) => {
+ console.log('err',err)
+ Message.error("查询失败", err);
+ })
+ }
+
+ },
+ },
};
export const route = {
@@ -1130,7 +1167,7 @@ export const congestionCause = {
label: "备注项添加",
},
],
- 2 : [
+ 2: [
{
key: "1",
label: "主线车流量大",
@@ -1139,9 +1176,9 @@ export const congestionCause = {
key: "2",
label: "收费站出口车流量大导致主线压车",
},
- ]
- }
- config.options.options = (value != 1 ? ad[1] : ad[2]);
+ ],
+ };
+ config.options.options = value != 1 ? ad[1] : ad[2];
},
},
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
index 9cfe7f00..6d4420b0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js
@@ -67,7 +67,43 @@ export const tabConfigList = [
return true;
}
return false;
- }
+ },
+ ons: {
+ change(value, ...args) {
+ const { formList } = args.slice(-1)[0];
+
+ let facilityType = 1;
+ if (value == 2) {
+ facilityType = 6;
+ } else if (value == 3) {
+ facilityType = 3;
+ } else if (value == 4) {
+ facilityType = 1;
+ }
+ if(value && value != 1){
+ //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+ // request({
+ // url: `/business/facility/query?facilityType=${facilityType}`,
+ // method: "get"
+ // }).then((result) => {
+ // if (result.code != 200) return Message.error(result?.msg);
+ // let lwss = [];
+ // result.data.forEach(it => lwss.push({ key: it.id, label: it.facilityName}))
+
+ // formList.forEach((it) => {
+ // if(it.key == "dcEventAccident.facilityId" || it.key == "dcEventVehicleAccident.facilityId"){
+ // it.options.options = lwss;
+ // }
+ // });
+
+ // }).catch((err) => {
+ // console.log('err',err)
+ // Message.error("查询失败", err);
+ // })
+ }
+
+ },
+ },
},
{
label: "匝道:",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
index 8176fa4f..9c94e6d4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/index.vue
@@ -49,7 +49,8 @@ export default {
tabConfigList,
index: 1,
roads: [],
- direction: []
+ direction: [],
+ lwss: []
}
},
created() {
@@ -77,6 +78,7 @@ export default {
methods: {
initData() {
return Promise.all([
+ //道路
request({
url: `/business/road/query`,
method: "get",
@@ -85,10 +87,10 @@ export default {
result.data.forEach(it => {
this.roads.push({ key: it.id, label: it.roadName })
})
- })
- .catch((err) => {
- Message.error("查询失败", err);
- }),
+ }).catch((err) => {
+ Message.error("查询失败", err);
+ }),
+ //方向字典
request({
url: `/system/dict/data/type/iot_event_direction`,
method: "get",
@@ -97,10 +99,20 @@ export default {
result.data.forEach(it => {
this.direction.push({ key: it.dictValue, label: it.dictLabel })
})
+ }).catch((err) => {
+ Message.error("查询失败", err);
+ }),
+ //路网设施 1 收费站 2 桥梁 3 互通立交 4 枢纽立交 5 隧道 6 服务区
+ request({
+ url: `/business/facility/query`,
+ method: "get"
+ }).then((result) => {
+ if (result.code != 200) return Message.error(result?.msg);
+ result.data.forEach(it => this.lwss.push({ key: it.id, label: it.facilityName, type: facilityType }))
+ }).catch((err) => {
+ Message.error("查询失败", err);
})
- .catch((err) => {
- Message.error("查询失败", err);
- })
+
])
},
handleChange({ index }) {
@@ -108,30 +120,6 @@ export default {
this.index = index;
let formConfig = tabConfigList[index].formConfig;
- if (index == 0 || index == 1 || index == 7) {
- let fwq = [];
-
- request({
- url: `/business/facility/query?facilityType=6`,
- method: "get"
- }).then((result) => {
- if (result.code != 200) return Message.error(result?.msg);
- result.data.forEach(it => {
- fwq.push({ key: it.id, label: it.facilityName })
- })
- })
- .catch((err) => {
- Message.error("查询失败", err);
- });
-
- formConfig.list.forEach(it => {
- if (it.key === 'dcEventServiceArea.facilityId' || it.key === 'dcEventAccident.facilityId') {
- it.options.options = fwq;
- }
- })
-
- }
-
formConfig.list.forEach(it => {
if (it.key == 'direction') {
it.options.options = this.direction;
@@ -139,6 +127,15 @@ export default {
if (it.key == 'roadId') {
it.options.options = this.roads;
}
+ if (index == 7 || it.key === 'dcEventServiceArea.facilityId') {
+ it.options.options = this.lwss.filter(ss => ss.type == 6);
+ }
+ // if (index == 0 || index == 1 || index == 7) {
+ // if (it.key === 'dcEventAccident.facilityId' || it.key === 'dcEventVehicleAccident.facilityId' || it.key === 'dcEventServiceArea.facilityId') {
+ // it.options.options = this.lwss.filter(ss => ss.type == 6);
+ // }
+ // }
+
})
this.formConfig = formConfig;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
index d4e18d36..f958b6f8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
@@ -1,6 +1,35 @@
import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
import { merge, cloneDeep } from "lodash";
+const station = {
+ label: "桩号:",
+ key: "stakeMark",
+ required: true,
+ type: "MultipleLabelItem",
+ options: {
+ options: [
+ {
+ prefix: {
+ text: "K",
+ style: {
+ color: "#3DE8FF",
+ },
+ },
+ key: "stakeMark[0]",
+ },
+ {
+ prefix: {
+ text: "+",
+ style: {
+ color: "#3DE8FF",
+ },
+ },
+ key: "stakeMark[1]",
+ },
+ ],
+ },
+};
+
export const tabMap = {
"-1": {
state: 5,
@@ -86,7 +115,7 @@ export const gjSearchFormList = [
},
},
{
- ...PresetFormItems.station,
+ ...station,
label: "桩号:",
required: false,
},
@@ -142,11 +171,11 @@ export const gzSearchFormList = [
},
},
{
- ...PresetFormItems.station,
+ ...station,
label: "开始桩号:",
required: false,
},
- merge(cloneDeep(PresetFormItems.station), {
+ merge(cloneDeep(station), {
options: {
options: [
{
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 2b30e267..09d1e5cc 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,6 +4,7 @@ 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: {
@@ -238,6 +239,8 @@ var options = {
},
symbolPosition: "end",
data: data1,
+ tooltip: {
+ show:false}
},
{
name: "增涨率",
@@ -269,6 +272,8 @@ var options = {
opacity: 0.7,
},
data: [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18],
+ tooltip: {
+ show:false}
},
],
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
index 7d527476..9fc6cb10 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
@@ -19,19 +19,8 @@ let data2 = [120, 340, 750, 600, 400, 700, 900, 200, 540, 320, 370, 500];
let data3 = [200, 530, 920, 400, 600, 700, 300, 800, 900, 120, 570, 800];
let options = {
tooltip: {
- show: false,
- trigger: "axis",
- axisPointer: {
- // 坐标轴指示器,坐标轴触发有效
- type: "shadow", // 默认为直线,可选为:'line' | 'shadow'
- },
- textStyle: {
- color: "#fff",
- fontSize: 14,
- },
- // backgroundColor: "rgba(3, 31, 71, .0)", //设置背景颜色
- // borderColor: "rgba(3, 31, 71, .0)",
- formatter: "健康监测
{b1}:{c1}人",
+ show: true,
+ trigger: "item",
},
grid: {
left: 0,
@@ -183,7 +172,7 @@ let options = {
data: data2,
},
{
- name: "",
+ name: null,
type: "scatter",
emphasis: {
scale: false,
@@ -204,6 +193,9 @@ let options = {
left: "-100%",
data: data2,
animationDelay: 100,
+ tooltip: {
+ show: false,
+ },
},
// 下半截柱状图linear-gradient(180deg, #61D8FF 0%, #003B4E 100%); linear-gradient(180deg, #06D7B1 0%, #003B4E 100%)
{
@@ -288,6 +280,9 @@ let options = {
left: 10,
data: data1,
animationDelay: 500,
+ tooltip: {
+ show: false,
+ },
},
{
name: "拥挤度",
@@ -369,6 +364,9 @@ let options = {
left: "-100%",
data: data2,
animationDelay: 100,
+ tooltip: {
+ show: false,
+ },
},
],
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js
index f0de8f5a..c87b28ff 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js
@@ -3,35 +3,20 @@ var options = {
color: ["#07A3FB"],
grid: {
left: "0%",
- right: "0%",
+ right: "8%",
bottom: "0%",
top: "10%",
containLabel: true,
},
- legend: {
- show: false,
- icon: "rect",
- top: "0%",
- right: "5%",
- data: ["实时数据"],
- itemWidth: 18,
- itemHeight: 5,
- itemGap: 30,
- itemStyle: {
- color: "#FFD15C",
- },
- textStyle: {
- fontSize: 10,
- color: "#fff",
- padding: [0, 0, 0, 10],
- },
+ tooltip: {
+ show: true,
+ trigger: "axis",
},
xAxis: {
type: "category",
axisLine: {
lineStyle: {
color: "#07A3FB",
- fontSize: 10,
},
},
axisLabel: {
@@ -59,9 +44,6 @@ var options = {
},
yAxis: {
type: "value",
- min: 0,
- max: 800,
- minInterval: 100,
nameTextStyle: {
fontSize: 10,
color: "#fff",
@@ -73,13 +55,6 @@ var options = {
// type: 'dashed', // dotted 虚线
},
},
- splitArea: { show: false },
- axisLine: {
- show: false,
- },
- axisTick: {
- show: false,
- },
axisLabel: {
fontSize: 10,
fontFamily: "Bebas",
@@ -93,7 +68,7 @@ var options = {
showSymbol: false,
smooth: true, // 是否曲线
name: "实时数据", // 图例对应类别
- data: [112, 122, 723, 623, 530, 612, 626, 728, 531, 423, 625, 423, 423], // 纵坐标数据
+ data: [112, 122, 323, 223, 230, 112, 326, 228, 331, 423, 225, 123], // 纵坐标数据
lineStyle: {
color: "#07A3FB",
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js
index fad0f22a..4582c487 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js
@@ -8,30 +8,15 @@ var options = {
top: "10%",
containLabel: true,
},
- legend: {
- show: false,
- icon: "rect",
- top: "0%",
- right: "5%",
- data: ["实时数据"],
- itemWidth: 18,
- itemHeight: 5,
- itemGap: 30,
- itemStyle: {
- color: "#FFD15C",
- },
- textStyle: {
- fontSize: 10,
- color: "#fff",
- padding: [0, 0, 0, 10],
- },
+ tooltip: {
+ show: true,
+ trigger: "axis",
},
xAxis: {
type: "category",
axisLine: {
lineStyle: {
- color: "#fff",
- fontSize: 10,
+ color: "#E29E37",
},
},
axisLabel: {
@@ -59,9 +44,6 @@ var options = {
},
yAxis: {
type: "value",
- min: 0,
- max: 800,
- minInterval: 100,
nameTextStyle: {
fontSize: 10,
color: "#fff",
@@ -73,13 +55,6 @@ var options = {
// type: 'dashed', // dotted 虚线
},
},
- splitArea: { show: false },
- axisLine: {
- show: false,
- },
- axisTick: {
- show: false,
- },
axisLabel: {
fontSize: 10,
fontFamily: "Bebas",
@@ -93,7 +68,7 @@ var options = {
showSymbol: false,
smooth: true, // 是否曲线
name: "实时数据", // 图例对应类别
- data: [112, 122, 723, 623, 530, 612, 626, 728, 531, 423, 625, 423, 423], // 纵坐标数据
+ data: [112, 122, 323, 223, 230, 112, 326, 228, 331, 423, 225, 123], // 纵坐标数据
lineStyle: {
color: "#E29E37",
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js
index d5f824f3..9e02403e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js
@@ -1,6 +1,10 @@
import * as echarts from "echarts";
var options = {
color: ["#32BB8A", "#01B3E4"],
+ tooltip: {
+ show: true,
+ trigger: "axis",
+ },
grid: {
left: "0%",
right: "0%",
@@ -8,30 +12,12 @@ var options = {
top: "10%",
containLabel: true,
},
- legend: {
- show: false,
- icon: "rect",
- top: "0%",
- right: "5%",
- data: ["实时数据"],
- itemWidth: 18,
- itemHeight: 5,
- itemGap: 30,
- itemStyle: {
- color: "#FFD15C",
- },
- textStyle: {
- fontSize: 10,
- color: "#fff",
- padding: [0, 0, 0, 10],
- },
- },
+
xAxis: {
type: "category",
axisLine: {
lineStyle: {
- color: "#fff",
- fontSize: 10,
+ color: "#32BB8A",
},
},
axisLabel: {
@@ -59,27 +45,12 @@ var options = {
},
yAxis: {
type: "value",
- min: 0,
- max: 800,
- minInterval: 100,
- nameTextStyle: {
- fontSize: 10,
- color: "#fff",
- align: "center",
- },
splitLine: {
lineStyle: {
color: "#32BB8A",
// type: 'dashed', // dotted 虚线
},
},
- splitArea: { show: false },
- axisLine: {
- show: false,
- },
- axisTick: {
- show: false,
- },
axisLabel: {
fontSize: 10,
fontFamily: "Bebas",
@@ -92,8 +63,8 @@ var options = {
// symbol: "none",
showSymbol: false,
smooth: true, // 是否曲线
- name: "实时数据", // 图例对应类别
- data: [112, 122, 723, 623, 530, 612, 626, 728, 531, 423, 625, 423, 423], // 纵坐标数据
+ name: "", // 图例对应类别
+ data: [112, 122, 323, 223, 230, 112, 326, 228, 331, 423, 225, 123], // 纵坐标数据
lineStyle: {
color: "#32BB8A",
},
@@ -128,6 +99,9 @@ var options = {
],
},
},
+ tooltip: {
+ show: true,
+ },
},
],
};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts.js
index 0169b1ce..6e1e4103 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts.js
@@ -59,6 +59,10 @@ nameList.map((item, index) => {
});
var options = {
+ tooltip: {
+ show: true,
+ trigger: "axis",
+ },
legend: {
// orient: 'vertical',
icon: "circle",
@@ -78,7 +82,6 @@ var options = {
containLabel: true,
},
xAxis: {
- type: "category",
data: nameList,
axisTick: {
show: false, //隐藏X轴刻度
@@ -99,9 +102,6 @@ var options = {
{
type: "value",
name: "",
- max: 1200,
- min: 0,
- splitNumber: 5,
nameTextStyle: {
color: "#fff",
fontSize: 10,
@@ -117,12 +117,6 @@ var options = {
// return yList[index]
// }
},
- axisLine: {
- show: false,
- },
- axisTick: {
- show: false,
- },
splitLine: {
lineStyle: {
color: "rgba(49, 217, 255, 0.5)",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts2.js
index e750558b..ddfb69f3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts2.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/assets/charts2.js
@@ -16,7 +16,7 @@ let list = [
},
{
name: "拥挤度",
- max: 88,
+ max: 108,
},
{
name: "饱和度",
@@ -28,26 +28,26 @@ let data2 = [[60, 60, 65, 60, 70, 40, 80, 63]];
let options = {
tooltip: {
show: true,
- trigger: "item",
- formatter: (data) => {
- // console.log(data.seriesIndex);
- var tip = '' + data.seriesName + "";
- let tmpData = [];
- if (data.seriesIndex === 0) {
- tmpData = data1;
- } else if (data.seriesIndex === 1) {
- tmpData = data2;
- }
- console.log(tmpData);
- data.value.forEach((item, index) => {
- // console.log(list[index].name)
- tip += "