diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
index 9258bfdd..c82d208d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
@@ -126,6 +126,8 @@ export default {
return require(`@screen/images/device/气象监测器B.png`)
} else if(warningSource ===8){
return require(`@screen/images/device/边坡.png`)
+ } else if(warningSource ===9){
+ return require(`@screen/images/layer/路网设施/桥梁.svg`)
} else {
return require(`@screen/images/device/view.png`)
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/carbon.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/carbon.vue
index f752dfce..7b0905c6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/carbon.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/carbon.vue
@@ -278,7 +278,6 @@ export default {
btnClick(val) {
if (val) {
this.active = val
- this.getEnergyAnalysisBySiteCode()
}
},
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
index 42dccad4..dafe41d2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
@@ -123,8 +123,8 @@ export const tabList = {
gridColumn: "3",
},
{
- label: "跨径组合",
- key: "spanCombination",
+ label: "结构类型",
+ key: "crossingType",
gridColumn: "3",
},
{
@@ -133,8 +133,8 @@ export const tabList = {
gridColumn: "3",
},
{
- label: "桥梁长度",
- key: "bridgeLength",
+ label: "跨径组合",
+ key: "spanCombination",
gridColumn: "3",
},
{
@@ -142,37 +142,6 @@ export const tabList = {
key: "bridgeWidth",
gridColumn: "3",
},
- {
- label: "集团公司",
- key: "groupCompany",
- gridColumn: "3",
- },
- {
- label: "管养公司",
- key: "maintenanceAndOperatingCompany",
- gridColumn: "3",
- },
- {
- label: "功能名称",
- key: "functionName",
- gridColumn: "3",
- },
- {
- label: "桥梁方向",
- key: "bridgeDirection",
- gridColumn: "3",
- },
- {
- label: "是否子桥",
- key: "subBridge",
- enum: "boolType",
- gridColumn: "3",
- },
- {
- label: "总跨径",
- key: "totalSpan",
- gridColumn: "3",
- },
{
label: "经度",
key: "longitude",
@@ -184,41 +153,16 @@ export const tabList = {
gridColumn: "3",
},
{
- label: "跨越类型",
- key: "crossingType",
+ label: "设计单位",
+ key: "designUnit",
gridColumn: "3",
},
{
- label: "最大跨径",
- key: "maximumSpan",
- gridColumn: "3",
- },
- {
- label: "通车时间",
- key: "openingTime",
- gridColumn: "3",
- },
- {
- label: "跨径类型名称",
- key: "spanTypeName",
- gridColumn: "3",
- },
- {
- label: "跨域结构名称",
- key: "crossDomainStructureName",
- gridColumn: "3",
- },
- {
- label: "上部结构名称",
- key: "superstructureName",
+ label: "监测点数目",
+ key: "numberOfMonitor",
gridColumn: "3",
},
- {
- label: "分中心全称",
- key: "branchCenterFullName",
- gridColumn: "3",
- },
],
},
],
@@ -233,11 +177,11 @@ export const tabList = {
key: "facilityName",
gridColumn: "3",
},
- {
+/* {
label: "方向数量",
key: "interchangeCount",
gridColumn: "3",
- },
+ },*/
{
label: "北方方向",
key: "northDirection",
@@ -253,31 +197,31 @@ export const tabList = {
key: "southDirection",
gridColumn: "3",
},
- {
+/* {
label: "南方道路",
key: "southernRoad",
gridColumn: "3",
- },
- {
+ },*/
+/* {
label: "东方方向",
key: "eastDirection",
gridColumn: "3",
- },
- {
+ },*/
+/* {
label: "东方道路",
key: "eastRoad",
gridColumn: "3",
- },
- {
+ },*/
+/* {
label: "西方方向",
key: "westDirection",
gridColumn: "3",
- },
- {
+ },*/
+/* {
label: "西方道路",
key: "westRoad",
gridColumn: "3",
- },
+ },*/
{
label: "经度",
key: "longitude",
@@ -343,11 +287,11 @@ export const tabList = {
key: "districtName",
gridColumn: "3",
},
- {
+/* {
label: "方向名称",
key: "directionName",
gridColumn: "3",
- },
+ },*/
{
label: "简介",
key: "introduction",
@@ -397,7 +341,7 @@ export const tabList = {
key: "introduction",
gridColumn: "6",
},
-
+
],
}
],
@@ -438,7 +382,7 @@ export const tabList = {
gridColumn: "3",
},
{
- label: "车辆数",
+ label: "路管车辆",
key: "vehicleCount",
gridColumn: "3",
},
@@ -492,7 +436,7 @@ export const tabList = {
key: "latitude",
gridColumn: "3",
},
-
+
],
},
// {
@@ -525,7 +469,7 @@ export const tabList = {
// key: "meaPointName",
// gridColumn: "3",
// },
-
+
// ],
// },
],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
index c215f432..43f8977b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
@@ -1,57 +1,61 @@
-
@@ -63,14 +67,15 @@ import Descriptions from "@screen/components/Descriptions.vue";
import Video from "@screen/components/VideoMulti";
// import Video from "@screen/components/Video";
import request from "@/utils/request";
-import { dialogDelayVisible } from "./../mixin";
-import { tabList } from './data'
-import { DirectionTypes } from "@screen/utils/enum.js"
+import {dialogDelayVisible} from "./../mixin";
+import {tabList} from './data'
+import {DirectionTypes} from "@screen/utils/enum.js"
import * as echarts from "echarts";
-import { chartOption } from "./chart"
+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 高清网络球形摄像机
@@ -96,9 +101,9 @@ export default {
tabList,
activeName: "first",
deviceControlVisible: false,
- bianpoData:[],
- bianpoOptions:[],
- bindpoSelecte:"",
+ bianpoData: [],
+ bianpoOptions: [],
+ bindpoSelecte: "",
data: {
deviceType: "",
deviceStation: "",
@@ -110,46 +115,46 @@ export default {
formList: [],
dateRange: [],
daterangeChangeTime: [],
- upsForm:[],
- upsData:{},
+ upsForm: [],
+ upsData: {},
// 收费站增加UPS
- upsList:[],
+ upsList: [],
// 收费站
- isCameraMap:false,
- imgSrc:'',
- cameraMaps:[],
+ isCameraMap: false,
+ imgSrc: '',
+ cameraMaps: [],
};
},
watch: {
- obverseVisible:{
- handler(val){
- if(val === false){
- if(this.$refs.refVideo.closeContrl){
+ obverseVisible: {
+ handler(val) {
+ if (val === false) {
+ if (this.$refs.refVideo.closeContrl) {
this.$refs.refVideo.closeContrl()
}
}
}
},
-
+
daterangeChangeTime: {
handler(val) {
- if(this.dialogData.facilityType === 9){
+ if (this.dialogData.facilityType === 9) {
this.dateRange = [moment(val[0]).valueOf(), moment(val[1]).valueOf()];
this.bindListAsync();
}
-
+
},
},
- activeName:{
- handler(val){
- if(val.indexOf('UPS_') !== -1){
+ activeName: {
+ handler(val) {
+ if (val.indexOf('UPS_') !== -1) {
this.bindUPS(val.substr(4))
}
}
}
},
async created() {
- let dData = { ...this.dialogData };
+ let dData = {...this.dialogData};
this.formList = tabList[dData.facilityType]
if (dData.facilityType)
@@ -159,7 +164,7 @@ export default {
if (dData.direction) {
dData.direction = DirectionTypes[dData.direction]
}
- if(dData.facilityType === 9){
+ if (dData.facilityType === 9) {
let resPointList = await request({
url: `sideSlope/GetMeasurePointList`,
method: "get",
@@ -167,10 +172,10 @@ export default {
if (resPointList.code != 200) return Message.error(resPointList?.msg);
this.bianpoData = resPointList.data.result;
let _options = [];
- for(let i of resPointList.data.result){
+ for (let i of resPointList.data.result) {
_options.push({
- key: i['pro_code']+'|'+i['unit_code']+'|'+i['meaPointNum'],
- label: i['meaPointName']+' '+i['meaPointNum']
+ key: i['pro_code'] + '|' + i['unit_code'] + '|' + i['meaPointNum'],
+ label: i['meaPointName'] + ' ' + i['meaPointNum']
})
}
console.log(_options)
@@ -179,70 +184,69 @@ export default {
//获取历史数据echart
this.daterangeChangeTime = [moment().startOf('months').format('YYYY-MM-DD'), moment().endOf('months').format('YYYY-MM-DD')]
}
-
+
// let pointList = {};
// if (resPointList.data && resPointList.data.result && resPointList.data.result.length > 0) {
// pointList = resPointList.data.result[0]
// }
- dData = { ...dData, ...otherConfig,}
+ dData = {...dData, ...otherConfig,}
this.isCameraMap = false;
this.cameraMaps = [];
- if(dData.facilityType === 1){
+ if (dData.facilityType === 1) {
// console.log('收费站单独处理图像')
- if(dData.facilityName === '大学城收费站'){
+ 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'}
+ {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 === '孝里收费站'){
+ } else if (dData.facilityName === '孝里收费站') {
this.imgSrc = require('@screen/images/shoufeiz/孝里收费站.jpg')
this.isCameraMap = true;
}
}
- this.upsList=otherConfig.UPSList||[]
+ this.upsList = otherConfig.UPSList || []
}
this.data = dData;
},
methods: {
- bindNearLoad(e){
- for(let i of this.cameraMaps){
- if(e.indexOf(i.iotDeviceId) !== -1){
+ bindNearLoad(e) {
+ for (let i of this.cameraMaps) {
+ if (e.indexOf(i.iotDeviceId) !== -1) {
i.status = 1;
}
}
},
- camClose(){
- if(this.$refs.refVideo.closeContrl){
+ camClose() {
+ if (this.$refs.refVideo.closeContrl) {
this.$refs.refVideo.closeContrl()
}
- this.upsList =[]
- },
- showCamera(item){
- if(item.status === 1){
+ this.upsList = []
+ },
+ showCamera(item) {
+ if (item.status === 1) {
this.$refs.refVideo.setCameraId(item.iotDeviceId)
} else {
this.$message.warning('设备离线')
}
-
+
},
- bindUPS(id){
+ bindUPS(id) {
request({
url: `business/device/properties/latest/${id}`,
method: "get"
- }).then(res=>{
+ }).then(res => {
let _list = [];
let _data = {};
-
+
if (res.code != 200) return Message.error(res?.msg);
res.data.forEach(e => {
- _list.push( {
+ _list.push({
label: e.propertyName,
key: e.propertyName,
gridColumn: "3",
@@ -253,9 +257,9 @@ export default {
this.upsData = _data;
})
},
-
+
async bindListAsync() {
- let aryParam = _.find(this.bianpoOptions,{key:this.bindpoSelecte}).key.split('|')
+ let aryParam = _.find(this.bianpoOptions, {key: this.bindpoSelecte}).key.split('|')
let res = await request({
url: `sideSlope/GetPointDataListAsync`,
method: "get",
@@ -286,17 +290,39 @@ export default {
}
res.data.forEach(e => {
cdata.push((moment(e.measureTime).format('YYYY-MM-DD')))
- if(title === ''){
+ if (title === '') {
title = enum_title[e.data[0].type]
}
cseries1.push(e.data[0].value)
cseries2.push(e.data[0].cum)
});
+
chartOption.xAxis.data = cdata;
- chartOption.yAxis[0].name =title+'日计'
- chartOption.yAxis[1].name =title+'累计'
+ chartOption.series[0].name = title + '日计';
+ chartOption.series[1].name = title + '累计';
+
chartOption.series[0].data = cseries1;
chartOption.series[1].data = cseries2;
+// 假设 chartOption 已经初始化
+ chartOption.tooltip = {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross'
+ },
+ formatter: function (params) {
+ console.log('Params:', params); // 调试信息
+ let tooltipText = `${params[0].name}
`; // 显示日期
+ params.forEach(function (item) {
+ console.log('Item:', item); // 调试信息
+ if (item.seriesName === (title + '日计')) {
+ tooltipText += `${item.seriesName}: ${item.value}
`;
+ } else if (item.seriesName === (title + '累计')) {
+ tooltipText += `${item.seriesName}: ${item.value}
`;
+ }
+ });
+ return tooltipText;
+ }
+ };
const chartIns = echarts.init(this.$refs.chartRef);
chartIns.setOption(chartOption);
}
@@ -305,15 +331,21 @@ export default {
\ No newline at end of file
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/carbon/contentItem/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/carbon/contentItem/index.vue
index 3339ea65..e7f8ceae 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/carbon/contentItem/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/carbon/contentItem/index.vue
@@ -28,10 +28,10 @@ export default {
},
methods: {
transitionAnimation() {
- this.show = false;
+ /*this.show = false;
setTimeout(() => {
this.show = true;
- }, 500);
+ }, 500);*/
}
}
}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue
index f153d571..20329752 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue
@@ -166,6 +166,9 @@ export default {
if(newVehiclesMap.length === 0 && newEmployees.length === 0){
this.$message.warning('未选择人员或车辆')
return;
+ } else if (newEmployees.length < newVehiclesMap.length){
+ this.$message.warning('人员数量不得少于车辆数量')
+ return;
}
if(this.action===0){
this.form.eventId = this.provideData.detail.id
@@ -183,7 +186,7 @@ export default {
this.$emit("handleRefresh",'reload');
});;
}
-
+
},
},
};
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 29f9e186..2e420688 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
@@ -97,6 +97,10 @@ export const gjSearchFormList = [
key: "8",
label: "边坡监测",
},
+ {
+ key: "9",
+ label: "桥梁监测",
+ },
],
},
},
@@ -276,6 +280,10 @@ export const gzSearchFormList = [
key: "14",
label: "边坡监测",
},
+ {
+ key: "15",
+ label: "桥梁监测",
+ },
],
},
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index_v1.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index_v1.vue
index 33306214..609c8a2f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index_v1.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index_v1.vue
@@ -26,7 +26,7 @@
-
+
今日功率统计
今日容量总计:{{chart1Total3}}千瓦
@@ -42,7 +42,7 @@
{{ scope.row.state==='1'?'正常':'异常' }}
-
+
@@ -63,15 +63,15 @@