Skip to content

H
holo-web
Commit 6053c35d authored by ninglx's avatar ninglx
Browse files
Options

安全评价接口调用逻辑修正 部分api替换fetch为axios

parent 0d393994
Hide whitespace changes
Inline Side-by-side
Showing with 330 additions and 244 deletions
wj-manage-web/src/dao/efficiency.js
View file @ 6053c35d
import fetch from '@/utils/fetch' import request from '../utils/request'
// 路口效率排名 // 路口效率排名
export const getEfficiencyRank = (data) => fetch('/holo/analysis-cross-efficiency/getRank', data, 'GET') export const getEfficiencyRank = (data) =>
request({
url: '/holo/analysis-cross-efficiency/getRank',
method: 'get',
params: data
})
// 效率指标对比 // 效率指标对比
export const getEfficiencyContract = (data) => fetch('/holo/analysis-cross-efficiency/getEfficiencyContract', data, 'GET') export const getEfficiencyContract = (data) =>
request({
url: '/holo/analysis-cross-efficiency/getEfficiencyContract',
method: 'get',
params: data
})
// 行人效率 // 行人效率
export const passerbyEfficiency = (data) => fetch('/holo/analysis-cross-pedestrian/list', data, 'GET') export const passerbyEfficiency = (data) =>
request({
url: '/holo/analysis-cross-pedestrian/list',
method: 'get',
params: data
})
// 非机动车效率 // 非机动车效率
export const noVehicleEfficiency = (data) => fetch('/holo/analysis-cross-non-motor/trend', data, 'GET') export const noVehicleEfficiency = (data) =>
request({
url: '/holo/analysis-cross-non-motor/trend',
method: 'get',
params: data
})
// 非机动车效率table // 非机动车效率table
export const noVehicleTable = (data) => fetch('/holo/analysis-cross-non-motor/recently', data, 'GET') export const noVehicleTable = (data) =>
request({
url: '/holo/analysis-cross-non-motor/recently',
method: 'get',
params: data
})
// 机动车效率 // 机动车效率
export const vehicleEfficiency = (data) => fetch('/holo/analysis-cross-motor/trend', data, 'GET') export const vehicleEfficiency = (data) =>
request({
url: '/holo/analysis-cross-motor/trend',
method: 'get',
params: data
})
wj-manage-web/src/dao/organization.js
View file @ 6053c35d
import fetch from '@/utils/fetch' import request from '../utils/request'
// left 路口排名 // left 路口排名
export const orgRank = (data) => fetch('/holo/base-cross-info/org-list', data, 'GET') export const orgRank = (data) =>
request({
url: '/holo/base-cross-info/org-list',
method: 'get',
params: data
})
// 行人 // 行人
export const orgPasserby = (data) => fetch('/holo/analysis-cross-pedestrian/list', data, 'GET') export const orgPasserby = (data) =>
request({
url: '/holo/analysis-cross-pedestrian/list',
method: 'get',
params: data
})
// 非机动车 // 非机动车
export const orgNoVehicle = (data) => fetch('/holo/analysis-cross-non-motor/trend', data, 'GET') export const orgNoVehicle = (data) =>
request({
url: '/holo/analysis-cross-non-motor/trend',
method: 'get',
params: data
})
// 右上 冲突点数据 // 右上 冲突点数据
export const orgConflict = (data) => fetch('/holo/event-cross-conflict/getByCondition', data, 'GET') export const orgConflict = (data) =>
request({
url: '/holo/event-cross-conflict/getByCondition',
method: 'get',
params: data
})
// 获取车道面 polygon // 获取车道面 polygon
export const orgCrossPolygon = (data) => fetch('/holo/base-lane-info/lane-area', data, 'GET') export const orgCrossPolygon = (data) =>
request({
url: '/holo/base-lane-info/lane-area',
method: 'get',
params: data
})
// 按车道和路口和时间获取 流量值 // 按车道和路口和时间获取 流量值
export const orgFlowByLane = (data) => fetch('/holo/analysis-rid-lane-indicators/hour-data', data, 'GET') export const orgFlowByLane = (data) =>
request({
url: '/holo/analysis-rid-lane-indicators/hour-data',
method: 'get',
params: data
})
// 车道转向弧线 // 车道转向弧线
export const orgLaneLine = (data) => fetch('/holo/base-lane-info/lane-turn-arc', data, 'GET') export const orgLaneLine = (data) =>
request({
url: '/holo/base-lane-info/lane-turn-arc',
method: 'get',
params: data
})
// 轨迹点群 // 轨迹点群
export const trackPoints = (data) => fetch('/holo/histrory-track/density-model', data, 'POST') export const trackPoints = (data) =>
request({
url: '/holo/histrory-track/density-model',
method: 'get',
params: data
})
wj-manage-web/src/dao/safety.js
View file @ 6053c35d
import fetch from '../utils/fetch' import request from '../utils/request'
export const safetyRank = (data) => fetch('/holo/analysis-cross-safe-evaluate/getRank', data, 'GET') // left 路口排名
export const safetyRank = (data) =>
export const safetyCompare = (data) => fetch('/holo/analysis-cross-safe-evaluate/getContractData', data, 'GET') request({
url: '/holo/analysis-cross-safe-evaluate/getRank',
export const safetySeveralCycle = (data) => fetch('/holo/analysis-cross-safe-evaluate/event-trend', data, 'POST') method: 'get',
params: data
export const safetyEventList = (data) => fetch('/holo/analysis-cross-safe-evaluate/event-detail', data, 'POST') })
export const safetyCompare = (data) =>
export const safetyPieData = (data) => fetch('/holo/analysis-cross-safe-evaluate/sub-event-statistic', data, 'POST') request({
\ No newline at end of file url: '/holo/analysis-cross-safe-evaluate/getContractData',
method: 'get',
params: data
})
export const safetySeveralCycle = (data) =>
request({
url: '/holo/analysis-cross-safe-evaluate/event-trend',
method: 'post',
data: data
})
export const safetyEventList = (data) =>
request({
url: '/holo/analysis-cross-safe-evaluate/event-detail',
method: 'post',
data: data
})
export const safetyPieData = (data) =>
request({
url: '/holo/analysis-cross-safe-evaluate/sub-event-statistic',
method: 'post',
data: data
})
\ No newline at end of file
wj-manage-web/src/utils/request.js
View file @ 6053c35d
...@@ -78,14 +78,12 @@ service.interceptors.response.use(res => { ...@@ -78,14 +78,12 @@ service.interceptors.response.use(res => {
} }
if (code !== 200) { if (code !== 200) {
ELEMENT.Message.error(res.data.message || res.data.status) ELEMENT.Message.error(res.data.message || res.data.status)
} } else {
if (res.config.showMsg) { if (res.config.showMsg) {
if (code !== 200) {
// ELEMENT.Message.error(res.data.message || res.data.status)
} else {
ELEMENT.Message.success(res.data.message || res.data.status) ELEMENT.Message.success(res.data.message || res.data.status)
} }
} }
return res.data return res.data
}) })
......
wj-manage-web/src/views/safety/analysisTypes.vue
View file @ 6053c35d
...@@ -124,205 +124,7 @@ export default { ...@@ -124,205 +124,7 @@ export default {
computedId() { computedId() {
return `barChart${this.compId}`; return `barChart${this.compId}`;
}, },
barChartOption() { barChartOption() {},
let colors = [
"rgba(65, 130, 242,1)",
"rgba(255, 166, 0,1)",
"rgba(218, 244, 255,1)",
"rgba(218, 244, 255,1)",
"rgba(68, 68, 68,1)",
"rgba(227, 60, 47,1)",
"rgba(31, 72, 125,1)",
"rgba(129, 181, 109,1)",
];
let colorsH = [
"rgba(65, 130, 242,0.2)",
"rgba(255, 166, 0,0.2)",
"rgba(218, 244, 255,0.2)",
"rgba(218, 244, 255,0.2)",
"rgba(68, 68, 68,0.2)",
"rgba(227, 60, 47,0.2)",
"rgba(31, 72, 125,0.2)",
"rgba(129, 181, 109,0.2)",
];
let colorsT = [
"rgba(65, 130, 242,0.5)",
"rgba(255, 166, 0,0.5)",
"rgba(218, 244, 255,0.5)",
"rgba(218, 244, 255,0.5)",
"rgba(68, 68, 68,0.5)",
"rgba(227, 60, 47,0.5)",
"rgba(31, 72, 125,0.5)",
"rgba(129, 181, 109,0.5)",
];
let chartTitle = {
show: false,
};
if (!this.xAxisData.length) {
chartTitle = {
show: true,
text: "暂无数据",
left: "center",
top: "center",
textStyle: {
color: "#abb9be",
},
};
}
return {
title: chartTitle,
tooltip: {
trigger: "axis",
axisPointer: {
type: "shadow",
},
textStyle: {
fontSize: getFontSize(12),
},
confine: true,
},
legend: {
show: false,
itemGap: getFontSize(16),
itemWidth: getFontSize(12),
itemHeight: getFontSize(12),
textStyle: {
color: "rgba(126, 139, 166, 1)",
fontSize: getFontSize(12),
lineHeight: 15,
},
pageTextStyle: {
color: "rgba(126, 139, 166, 1)",
fontSize: getFontSize(12),
},
pageIconColor: "white",
pageIconSize: getFontSize(12),
pageIconInactiveColor: "rgba(153, 153, 153, 1)",
type: "scroll",
},
grid: {
left: getFontSize(4),
right: 0,
bottom: 0,
top: "22%",
containLabel: true,
},
xAxis: {
type: "category",
data: this.xAxisData,
axisLabel: {
fontSize: getFontSize(12),
color: "rgba(217, 231, 255, 1)",
},
},
yAxis: {
axisTick: {
show: false,
},
axisLine: {
show: false,
},
// max: ,
splitLine: {
show: true,
lineStyle: {
type: "dashed",
color: "rgba(255, 255, 255, 0.2)",
},
},
type: "value",
axisLabel: {
fontSize: getFontSize(12),
color: "rgba(217, 231, 255, 1)",
},
},
series: {
markLine: {
silent: true,
data: [
{
symbol: "none",
name: "警戒线",
yAxis: 60,
lineStyle: {
color: "rgba(173, 158, 21, 1)",
type: "solid",
cap: "butt",
},
label: {
show: true,
color: "rgba(217, 231, 255, 1)",
fontSize: 12,
position: "insideEnd",
formatter: () => {
return "警戒线";
},
},
},
{
symbol: "none",
name: "事故线",
yAxis: 90,
label: {
color: "rgba(217, 231, 255, 1)",
fontSize: 12,
show: true,
position: "insideEnd",
formatter: () => {
return "事故线";
},
},
lineStyle: {
color: "rgba(212, 48, 48, 1)",
type: "solid",
cap: "butt",
},
},
],
},
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
1,
0,
0,
[
{
offset: 0,
color: colorsH[0], // 0% 处的颜色
},
{
offset: 0.4,
color: colorsT[0], // 0% 处的颜色
},
{
offset: 1,
color: colors[0], // 100% 处的颜色
},
],
false
),
borderWidth: 1,
borderColor: colors[0],
},
},
name: "",
type: "bar",
label: {
show: false,
},
barWidth: 20,
emphasis: {
focus: "series",
},
data: this.series1,
event: "click",
},
};
},
}, },
watch: {}, watch: {},
data() { data() {
...@@ -351,10 +153,215 @@ export default { ...@@ -351,10 +153,215 @@ export default {
} }
return "未定义"; return "未定义";
}, },
setBarOption(){
let colors = [
"rgba(65, 130, 242,1)",
"rgba(255, 166, 0,1)",
"rgba(218, 244, 255,1)",
"rgba(218, 244, 255,1)",
"rgba(68, 68, 68,1)",
"rgba(227, 60, 47,1)",
"rgba(31, 72, 125,1)",
"rgba(129, 181, 109,1)",
];
let colorsH = [
"rgba(65, 130, 242,0.2)",
"rgba(255, 166, 0,0.2)",
"rgba(218, 244, 255,0.2)",
"rgba(218, 244, 255,0.2)",
"rgba(68, 68, 68,0.2)",
"rgba(227, 60, 47,0.2)",
"rgba(31, 72, 125,0.2)",
"rgba(129, 181, 109,0.2)",
];
let colorsT = [
"rgba(65, 130, 242,0.5)",
"rgba(255, 166, 0,0.5)",
"rgba(218, 244, 255,0.5)",
"rgba(218, 244, 255,0.5)",
"rgba(68, 68, 68,0.5)",
"rgba(227, 60, 47,0.5)",
"rgba(31, 72, 125,0.5)",
"rgba(129, 181, 109,0.5)",
];
let chartTitle = {
show: false,
};
if (!this.xAxisData.length) {
chartTitle = {
show: true,
text: "暂无数据",
left: "center",
top: "center",
textStyle: {
color: "#abb9be",
},
};
}
console.log("x", this.xAxisData);
this.barChart.setOption(
{
title: chartTitle,
tooltip: {
trigger: "axis",
axisPointer: {
type: "shadow",
},
textStyle: {
fontSize: getFontSize(12),
},
confine: true,
},
legend: {
show: false,
itemGap: getFontSize(16),
itemWidth: getFontSize(12),
itemHeight: getFontSize(12),
textStyle: {
color: "rgba(126, 139, 166, 1)",
fontSize: getFontSize(12),
lineHeight: 15,
},
pageTextStyle: {
color: "rgba(126, 139, 166, 1)",
fontSize: getFontSize(12),
},
pageIconColor: "white",
pageIconSize: getFontSize(12),
pageIconInactiveColor: "rgba(153, 153, 153, 1)",
type: "scroll",
},
grid: {
left: getFontSize(4),
right: 0,
bottom: 0,
top: "22%",
containLabel: true,
},
xAxis: {
type: "category",
data: this.xAxisData,
axisLabel: {
fontSize: getFontSize(12),
color: "rgba(217, 231, 255, 1)",
},
},
yAxis: {
axisTick: {
show: false,
},
axisLine: {
show: false,
},
// max: ,
splitLine: {
show: true,
lineStyle: {
type: "dashed",
color: "rgba(255, 255, 255, 0.2)",
},
},
type: "value",
axisLabel: {
fontSize: getFontSize(12),
color: "rgba(217, 231, 255, 1)",
},
},
series: {
markLine: {
silent: true,
data: [
{
symbol: "none",
name: "警戒线",
yAxis: 60,
lineStyle: {
color: "rgba(173, 158, 21, 1)",
type: "solid",
cap: "butt",
},
label: {
show: true,
color: "rgba(217, 231, 255, 1)",
fontSize: 12,
position: "insideEnd",
formatter: () => {
return "警戒线";
},
},
},
{
symbol: "none",
name: "事故线",
yAxis: 90,
label: {
color: "rgba(217, 231, 255, 1)",
fontSize: 12,
show: true,
position: "insideEnd",
formatter: () => {
return "事故线";
},
},
lineStyle: {
color: "rgba(212, 48, 48, 1)",
type: "solid",
cap: "butt",
},
},
],
},
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(
0,
1,
0,
0,
[
{
offset: 0,
color: colorsH[0], // 0% 处的颜色
},
{
offset: 0.4,
color: colorsT[0], // 0% 处的颜色
},
{
offset: 1,
color: colors[0], // 100% 处的颜色
},
],
false
),
borderWidth: 1,
borderColor: colors[0],
},
},
name: "",
type: "bar",
label: {
show: false,
},
barWidth: 20,
emphasis: {
focus: "series",
},
data: this.series1,
event: "click",
},
},
true
);
},
// 路口 || 时间粒度 || 类型 变化时 触发图表更新 // 路口 || 时间粒度 || 类型 变化时 触发图表更新
refreshBarChart() { refreshBarChart() {
this.xAxisData = []; this.xAxisData = [];
this.series1 = []; this.series1 = [];
console.log('cross',this.crossData);
// debugger
if (this.crossData && this.crossData.crossId) { if (this.crossData && this.crossData.crossId) {
this.barChartLoading = true; this.barChartLoading = true;
safetySeveralCycle({ safetySeveralCycle({
...@@ -386,8 +393,7 @@ export default { ...@@ -386,8 +393,7 @@ export default {
this.refreshPieChart(params.dataIndex); this.refreshPieChart(params.dataIndex);
}); });
} }
this.setBarOption()
this.barChart.setOption(this.barChartOption, true);
// 模拟点击最后一根柱子 即获取最新一条数据详情 // 模拟点击最后一根柱子 即获取最新一条数据详情
if (res.content.length) { if (res.content.length) {
this.refreshBarColor(res.content.length - 1); this.refreshBarColor(res.content.length - 1);
...@@ -440,7 +446,7 @@ export default { ...@@ -440,7 +446,7 @@ export default {
} }
} }
} }
this.barChart.setOption(this.barChartOption, true); this.setBarOption()
}, },
refreshTableByTime(index) { refreshTableByTime(index) {
console.log(this.barChartDataSource); console.log(this.barChartDataSource);
......
wj-manage-web/src/views/safety/index.vue
View file @ 6053c35d
...@@ -212,7 +212,7 @@ export default { ...@@ -212,7 +212,7 @@ export default {
// 选择不同路口 => 更新右侧所有数据 // 选择不同路口 => 更新右侧所有数据
crossChange(row) { crossChange(row) {
this.currentCrossData = row; this.currentCrossData = row;
this.$refs[`comp${this.tabsActiveName}`].refreshBarChart(); this.$refs[`comp${this.tabsActiveName}`].initData();
if (Array.isArray(row.cameraList)) { if (Array.isArray(row.cameraList)) {
this.cameraList = row.cameraList; this.cameraList = row.cameraList;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment