Browse Source

Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

develop
wangsixiang 2 weeks ago
parent
commit
99f625e29d
  1. 2
      ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue
  2. 1
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/carbon.vue
  3. 102
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/data.js
  4. 201
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
  5. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/carbon/contentItem/index.vue
  6. 3
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DispatchLiaison/StatsDialog/index.vue
  7. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
  8. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index_v1.vue
  9. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js
  10. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue
  11. 4
      ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
  12. 4
      ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js

2
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`)
}

1
ruoyi-ui/src/views/JiHeExpressway/pages/Home/carbon.vue

@ -278,7 +278,6 @@ export default {
btnClick(val) {
if (val) {
this.active = val
this.getEnergyAnalysisBySiteCode()
}
},
}

102
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",
gridColumn: "3",
},
{
label: "最大跨径",
key: "maximumSpan",
gridColumn: "3",
},
{
label: "通车时间",
key: "openingTime",
gridColumn: "3",
},
{
label: "跨径类型名称",
key: "spanTypeName",
label: "设计单位",
key: "designUnit",
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",
@ -438,7 +382,7 @@ export const tabList = {
gridColumn: "3",
},
{
label: "车辆",
label: "路管车辆",
key: "vehicleCount",
gridColumn: "3",
},

201
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue

@ -2,54 +2,58 @@
<Dialog
v-model="obverseVisible"
:title="dialogData._itemData && dialogData._itemData.title"
@update:close="camClose"
:width="isCameraMap?'1300px':'500px'" top="10%">
:width="isCameraMap?'1300px':'500px'"
top="10%" @update:close="camClose">
<div class="panelParent" style="display:flex;">
<div class="RoadNetworkFacilities">
<div class="header">
<Video :facilityType="dialogData.facilityType" ref="refVideo" class="video-stream" @nearload="bindNearLoad" :pileNum="dialogData.stakeMark" :rangeIndex="dialogData.facilityType === 1?'all':'upCamera'" :showHeader="false" />
<Video ref="refVideo" :facilityType="dialogData.facilityType" :pileNum="dialogData.stakeMark" :rangeIndex="dialogData.facilityType === 1?'all':'upCamera'"
:showHeader="false" class="video-stream"
@nearload="bindNearLoad"/>
</div>
<div class="SolarEnergy">
<ElTabs v-model="activeName" class="tabs">
<ElTabPane v-for="item in formList" :key="item.key" :label="item.name" :name="item.key">
<Descriptions :labelWidth="item.labelWidth" :list="item.list" :data="data" style="gap: 12px" column="6" />
<Descriptions :data="data" :labelWidth="item.labelWidth" :list="item.list" column="6" style="gap: 12px"/>
</ElTabPane>
<ElTabPane label="边坡测点数据" v-if="dialogData.facilityType === 9">
<Table :data="bianpoData" height="200px" >
<ElTableColumn label="项目编号" prop="pro_code" width="80" ></ElTableColumn>
<ElTableColumn label="标段编号" prop="con_code" width="80" ></ElTableColumn>
<ElTableColumn label="测点名称" prop="meaPointName" width="80" ></ElTableColumn>
<ElTableColumn label="工程编号" prop="unit_code" ></ElTableColumn>
<ElTableColumn label="测点编号" prop="meaPointNum" ></ElTableColumn>
<ElTabPane v-if="dialogData.facilityType === 9" label="边坡测点数据">
<Table :data="bianpoData" height="200px">
<ElTableColumn label="项目编号" prop="pro_code" width="80"></ElTableColumn>
<ElTableColumn label="标段编号" prop="con_code" width="80"></ElTableColumn>
<ElTableColumn label="测点名称" prop="meaPointName" width="80"></ElTableColumn>
<ElTableColumn label="工程编号" prop="unit_code"></ElTableColumn>
<ElTableColumn label="测点编号" prop="meaPointNum"></ElTableColumn>
</Table>
</ElTabPane>
<ElTabPane label="测点历史数据" v-if="dialogData.facilityType === 9">
<el-select v-model="bindpoSelecte" placeholder="" @change="bindListAsync" transfer="true"
style="width: 240px;">
<ElTabPane v-if="dialogData.facilityType === 9" label="测点历史数据">
<el-select v-model="bindpoSelecte" placeholder="" style="width: 240px;" transfer="true"
@change="bindListAsync">
<el-option v-for="item in bianpoOptions"
:key="item.key" :label="item.label"
:value="item.key">
</el-option>
</el-select>
<el-date-picker v-model="daterangeChangeTime" size="mini"
style="width: 190px;float:right;margin-bottom: 10px;" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<div class='chart LineChart' ref="chartRef" />
<el-date-picker v-model="daterangeChangeTime" end-placeholder="结束日期"
range-separator="-" size="mini"
start-placeholder="开始日期"
style="width: 190px;float:right;margin-bottom: 10px;" type="daterange" value-format="yyyy-MM-dd"></el-date-picker>
<div ref="chartRef" class='chart LineChart'/>
</ElTabPane>
<template v-if="dialogData.facilityType === 1">
<ElTabPane :label="'UPS'+(index+1)" :key="'UPS_'+item" :name="'UPS_'+item" v-for="(item,index) in upsList">
<Descriptions labelWidth="142px" :list="upsForm" :data="upsData" style="gap: 12px" column="6" />
<ElTabPane v-for="(item,index) in upsList" :key="'UPS_'+item" :label="'UPS'+(index+1)"
:name="'UPS_'+item">
<Descriptions :data="upsData" :list="upsForm" column="6" labelWidth="142px" style="gap: 12px"/>
</ElTabPane>
</template>
</ElTabs>
</div>
</div>
<div style="margin-left:20px" v-if="isCameraMap">
<div v-if="isCameraMap" style="margin-left:20px">
<div :style="'background-image:url('+imgSrc+')'" class="cameraMap">
<img v-for="(item,index) of cameraMaps" :key="index" @click="showCamera(item)"
<img v-for="(item,index) of cameraMaps" :key="index" :src="item.status===0?item.iconUn:item.icon"
:style="'left:'+item.left+'px;top:'+item.top+'px'"
width="50px" height="50px" :src="item.status===0?item.iconUn:item.icon" />
height="50px" width="50px" @click="showCamera(item)"/>
</div>
</div>
</div>
@ -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,21 +115,21 @@ 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()
}
}
@ -133,23 +138,23 @@ export default {
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)
@ -184,65 +189,64 @@ export default {
// 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 =[]
this.upsList = []
},
showCamera(item){
if(item.status === 1){
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",
@ -255,7 +259,7 @@ export default {
},
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 = `<div><b>${params[0].name}</b></div>`; //
params.forEach(function (item) {
console.log('Item:', item); //
if (item.seriesName === (title + '日计')) {
tooltipText += `<div>${item.seriesName}: ${item.value}</div>`;
} else if (item.seriesName === (title + '累计')) {
tooltipText += `<div>${item.seriesName}: ${item.value}</div>`;
}
});
return tooltipText;
}
};
const chartIns = echarts.init(this.$refs.chartRef);
chartIns.setOption(chartOption);
}
@ -305,15 +331,21 @@ export default {
</script>
<style lang="scss" scoped>
.el-table .cell {
font-size: 14px;
}
.LineChart {
width: 450px !important;
height: 160px;
overflow: hidden;
}
.panelParent{
.panelParent {
display: flex;
flex-direction: row;
}
.RoadNetworkFacilities {
width: 452px;
color: #fff;
@ -336,7 +368,7 @@ export default {
display: flex;
justify-content: center;
>div.video-stream {
> div.video-stream {
height: 286px;
}
}
@ -365,20 +397,21 @@ export default {
align-items: center;
justify-content: end;
>div {
> div {
font-size: 16px;
padding: 6px 12px;
}
}
}
.cameraMap{
position:relative;
width:800px;
height:600px;
.cameraMap {
position: relative;
width: 800px;
height: 600px;
background-repeat: no-repeat;
background-size: 100% 100%;
img{
img {
position: absolute;
cursor: pointer;
}

4
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);*/
}
}
}

3
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

8
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: "桥梁监测",
},
],
},
},

6
ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/solar/index_v1.vue

@ -265,7 +265,8 @@
const idx = parseInt(i.substr(11,2));
data[idx] = result.data[i];
}
this.chart1Total2 = total;
this.chart1Total2 = parseFloat(total.toFixed(2)); //
option2.series[0].data = data;
this.chart2.setOption(option2);
this.chart2.resize();
@ -285,7 +286,7 @@
const idx = parseInt(i.substr(11,2));
data[idx] = result.data[i];
}
this.chart1Total3 = total;
this.chart1Total3 = parseFloat(total.toFixed(2)); //
option3.series[0].data = data;
this.chart3.setOption(option3);
this.chart3.resize()
@ -385,4 +386,3 @@
}
}
</style>

4
ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js

@ -143,6 +143,10 @@ export const searchFormList = [
key: "8",
label: "边坡监测",
},
{
key: "9",
label: "桥梁监测",
},
],
},
},

2
ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/roadNetwork/index.vue

@ -68,7 +68,7 @@ export default {
class: "",
},
{
text: "能见度检测器",
text: "能见度",
type: "arrayRed",
value: [],
class: ["", ""],

4
ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

@ -908,6 +908,9 @@ export const InfoWarningSource = {
8: {
text: "边坡监测",
},
9: {
text: "桥梁监测",
},
};
export const warningSourceMapping = {
@ -919,6 +922,7 @@ export const warningSourceMapping = {
6: "非机预警",
7: '气象检测器',
8: '边坡监测',
9: '桥梁监测',
};
export const warningStateMapping = {

4
ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js

@ -88,6 +88,10 @@ export const source = {
key: 14,
label: "边坡监测",
},
{
key: 15,
label: "桥梁监测",
},
],
},
};

Loading…
Cancel
Save