+
@@ -63,7 +71,16 @@ import { chartOption } from "./chart"
import moment from "moment";
import Table from "@screen/components/Table.vue";
-
+const icona = require(`@screen/images/layerb/路测设备/摄像机_active.svg`);// childType==='1-2 高清网络枪机
+const icona_f = require(`@screen/images/layerb/路测设备/摄像机_fault.svg`);
+const iconb = require(`@screen/images/deviceType/ballb_active.svg`); // childType==='1-2 高清网络球形摄像机
+const iconb_f = require(`@screen/images/deviceType/ballb_fault.svg`);
+const iconc = require(`@screen/images/deviceType/ballc_active.svg`); // 1-3 桥下高清网络球形摄像机
+const iconc_f = require(`@screen/images/deviceType/ballc_fault.svg`);
+const icond = require(`@screen/images/deviceType/balld_active.svg`); // 1-4 360°全景摄像机
+const icond_f = require(`@screen/images/deviceType/balld_fault.svg`);
+const icone = require(`@screen/images/deviceType/balle_active.svg`); //1-5 180°全景摄像机
+const icone_f = require(`@screen/images/deviceType/balle_fault.svg`);
// 所有交通事件的详情
export default {
name: "RoadNetworkFacilities",
@@ -97,7 +114,10 @@ export default {
upsData:{},
// 收费站增加UPS
upsList:[],
-
+ // 收费站
+ isCameraMap:false,
+ imgSrc:'',
+ cameraMaps:[]
};
},
watch: {
@@ -165,21 +185,53 @@ export default {
// pointList = resPointList.data.result[0]
// }
dData = { ...dData, ...otherConfig,}
-
-
+ this.isCameraMap = false;
+ this.cameraMaps = [];
+ if(dData.facilityType === 1){
+ // console.log('收费站单独处理图像')
+ if(dData.facilityName === '大学城收费站'){
+ this.imgSrc = require('@screen/images/shoufeiz/大学城收费站.jpg')
+ this.cameraMaps = [
+ {icon:icona,iconUn:icona_f,left:50,top:50,status:0,iotDeviceId:'57954'},
+ {icon:iconb,iconUn:iconb_f,left:500,top:50,status:0,iotDeviceId:'57939'},
+ {icon:iconc,iconUn:iconc_f,left:100,top:200,status:0,iotDeviceId:'57941'},
+ {icon:iconc,iconUn:iconc_f,left:600,top:500,status:0,iotDeviceId:'111111'},
+ {icon:icone,iconUn:icone_f,left:200,top:400,status:0,iotDeviceId:'222222'},
+ {icon:icona,iconUn:icona_f,left:30,top:30,status:0,iotDeviceId:'57953'}
+ ]
+ this.isCameraMap = true;
+ }
+ else if(dData.facilityName === '孝里收费站'){
+ this.imgSrc = require('@screen/images/shoufeiz/孝里收费站.jpg')
+ this.isCameraMap = true;
+ }
+ }
this.upsList=otherConfig.UPSList||[]
}
this.data = dData;
-
-
},
methods: {
+ bindNearLoad(e){
+ for(let i of this.cameraMaps){
+ if(e.indexOf(i.iotDeviceId) !== -1){
+ i.status = 1;
+ }
+ }
+ },
camClose(){
if(this.$refs.refVideo.closeContrl){
this.$refs.refVideo.closeContrl()
}
this.upsList =[]
},
+ showCamera(item){
+ if(item.status === 1){
+ this.$refs.refVideo.setCameraId(item.iotDeviceId)
+ } else {
+ this.$message.warning('设备离线')
+ }
+
+ },
bindUPS(id){
request({
url: `business/device/properties/latest/${id}`,
@@ -258,7 +310,10 @@ export default {
height: 160px;
overflow: hidden;
}
-
+.panelParent{
+ display: flex;
+ flex-direction: row;
+}
.RoadNetworkFacilities {
width: 452px;
color: #fff;
@@ -316,4 +371,16 @@ export default {
}
}
}
+
+.cameraMap{
+ position:relative;
+ width:800px;
+ height:600px;
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ img{
+ position: absolute;
+ cursor: pointer;
+ }
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 974aebb2..2f868c7c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -408,6 +408,7 @@ export default {
transition: all .24s linear;
height: 0px;
overflow-y: auto;
+ min-height: 185px;
.device-item {
// position: absolute;
position: relative;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/data.js
new file mode 100644
index 00000000..83fccd47
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/data.js
@@ -0,0 +1,32 @@
+// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
+// import { merge, cloneDeep } from "lodash";
+
+import {directionOptions} from '@screen/utils/enum.js';
+export const searchFormList = [
+ {
+ label: "处理状态:",
+ key: "status",
+ type: "select",
+ options: {
+ clearable: true,
+ options: [
+ {key:'0', label:'未处理'},
+ {key:'1', label:'已处理'},
+ {key:'2', label:'自动处理'}
+ ],
+ },
+ },
+ {
+ label: "发生时间:",
+ key: "createTime",
+ required: false,
+ type: "datePicker",
+ options: {
+ type: "daterange",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ },
+ },
+
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/index.vue
new file mode 100644
index 00000000..501e8dd0
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/abnormal/index.vue
@@ -0,0 +1,242 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/charts.js
index a54da39d..d5367c47 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/analysis/real/charts.js
@@ -59,14 +59,13 @@ var options = {
},
grid: [
{
- left: 40,
+ left: 60,
top: '25%',
right: 10,
height: "35%",
},
{
- left: 40,
-
+ left: 60,
right: 10,
top: "60%",
height: "35%",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts.js
index 064bd531..9609a41a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts.js
@@ -46,6 +46,7 @@ let options = {
yAxis: [
{
name: "(起)",
+ minInterval:1,
nameTextStyle: {
color: "#E5E7E8",
fomtSize: 10,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts3.js
index 6222589d..c36fae1e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts3.js
@@ -1,7 +1,6 @@
import * as echarts from "echarts";
let options = {
- color:['#00A3FF','#0c8c52','#c7d61d'],
tooltip: {
show: true,
trigger: "axis",
@@ -73,6 +72,7 @@ let options = {
axisTick: {
show: false,
},
+ minInterval:1,
},
],
legend: {
@@ -90,174 +90,34 @@ let options = {
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",
+ 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,
+ data: [],
+ }, {
+ name: "小型车",
+ type: "bar",
+ barWidth: "10px",
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: [],
}
],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts4.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts4.js
index e2aae96f..f9edaa48 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts4.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts4.js
@@ -73,6 +73,7 @@ let options = {
axisTick: {
show: false,
},
+ minInterval:1,
},
],
legend: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts6.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts6.js
index 788d677d..d30ea3d0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts6.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts6.js
@@ -1,7 +1,6 @@
import * as echarts from "echarts";
let options = {
- color:['#00A3FF','#0c8c52'],
tooltip: {
show: true,
trigger: "axis",
@@ -73,6 +72,7 @@ let options = {
axisTick: {
show: false,
},
+ minInterval:1,
},
],
legend: {
@@ -89,117 +89,23 @@ let options = {
name: "封闭",
type: "bar",
barWidth: "10px",
+ 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: "#00A3FF", // 0% 处的颜色
- },
- {
- offset: 1,
- color: "#00A3FF00", // 100% 处的颜色
- },
- ],
- false
- );
- },
- },
+ data: [],
+ }, {
+ name: "封闭",
+ type: "bar",
+ barWidth: "10px",
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: [],
}
],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts8.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts8.js
index 97d713cb..20d691d6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts8.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/charts8.js
@@ -14,11 +14,15 @@ var options = {
}
return `${name1}
+
+
+
+
+
+ 
+
+ 刷新
+
+
+
+
+
+ 刷新
+
+
+
+
+
+
+
+
+ - ${params[0].marker}${params[0].seriesName}: ${params[0].value} 辆 + ${params[0].marker}${params[0].seriesName}: ${params[0].value} 辆 +
+ ${params[1].marker}${params[1].seriesName}: ${params[1].value} 辆
${name2}
- ${params[1].marker}${params[1].seriesName}: ${params[1].value} 辆`; + ${params[2].marker}${params[2].seriesName}: ${params[2].value} 辆 +
+ ${params[3].marker}${params[3].seriesName}: ${params[3].value} 辆`; }, }, axisPointer: { @@ -55,14 +59,13 @@ var options = { }, grid: [ { - left: 40, + left: 70, top: '25%', right: 10, height: "35%", }, { - left: 40, - + left: 70, right: 10, top: "60%", height: "35%", @@ -151,6 +154,7 @@ var options = { splitLine: { show: false, }, + minInterval:1, }, { gridIndex: 1, @@ -169,6 +173,7 @@ var options = { splitLine: { show: false, }, + minInterval:1, }, ], series: [ @@ -205,6 +210,40 @@ var options = { 57, 36, 56, 95, 125, 194, 94, 94, 74, 34, 125, 194, 94, 94, 74, 34, ], }, + { + name: "去年同期", + type: "line", + symbol: 'none', + smooth: true, + lineStyle: { + type:'dashed', + width: 1 + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 1, + color: "#5FA52B00", + }, + { + offset: 0, + color: "#5FA52B55", + }, + ], + false + ), + }, + }, + data: [ + 94, 74, 34, 125, 194, 94, 94, 74, 34,57, 36, 56, 95, 125, 194, 94, + ], + }, { name: "本期车流量", type: "line", @@ -241,6 +280,42 @@ var options = { 67, 36, 56, 195, 25, 194, 94, 94, 74, 21, 195, 25, 194, 94, 94, 74, 21, ], }, + { + name: "去年同期", + type: "line", + symbol: 'none', + smooth: true, + xAxisIndex: 1, + yAxisIndex: 1, + lineStyle: { + type:'dashed', + width: 1 + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient( + 0, + 0, + 0, + 1, + [ + { + offset: 1, + color: "#5FA52B00", + }, + { + offset: 0, + color: "#5FA52B55", + }, + ], + false + ), + }, + }, + data: [ + 195,25, 194, 94, 94, 7, 25, 194, 94, 94, 74, 21, 67, 36, 56, 195, 4, 21, + ], + }, ], }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue index dedeb73e..4684da6a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/analysis/index.vue @@ -24,11 +24,13 @@
方向：济南←
- →方向：菏泽
- 方向：出口←
- →方向：入口
-
+
+ 方向：济南←
+ →方向：菏泽
+ 方向：出口←
+ →方向：入口
+
+