diff --git a/ruoyi-ui/src/api/event/perceiveEvent.js b/ruoyi-ui/src/api/event/perceiveEvent.js index ed8a01aa..7a147f24 100644 --- a/ruoyi-ui/src/api/event/perceiveEvent.js +++ b/ruoyi-ui/src/api/event/perceiveEvent.js @@ -78,13 +78,13 @@ export function geTwarningTotal(query) { //感知事件源分析 export function getWarningSourceGroup(query) { return request({ - // url: '/perceivedEvents/warning/warningSourceGroup', - // method: 'post', - url: '/business/warning/list', - method: 'get', - // params: { - // ...query, - // } + url: '/perceivedEvents/warning/warningSourceGroup', + method: 'post', + // url: '/business/warning/list', + // method: 'get', + params: { + ...query, + } }) } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue index 9529707f..430ec573 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue @@ -2,7 +2,8 @@
- + +
@@ -12,11 +13,13 @@

- - + +
@@ -69,7 +72,7 @@ export default { label: "位置" }, { - key: "direction", + key: "stringDirection", label: "方向" }, { @@ -79,6 +82,11 @@ export default { ]) } }, + data(){ + return { + picUrl: './test.png' + } + }, emit: ['firstBtnClick', "lastBtnClick"], components: { Button, @@ -123,11 +131,13 @@ export default { flex: 1; display: flex; flex-direction: column; + >p { font-size: 14px; color: #f4f4f4; line-height: 24px; - &:first-child{ + + &:first-child { color: #37E7FF; font-size: 18px; font-weight: bold; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue index af8a36b3..04a31ad7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue @@ -90,10 +90,19 @@ export default { label: '工作模式', key: "workMode", }, + { + label: '上行工作状态', + key: "onWorkStatus", + }, + { + label: '下行工作状态', + key: "inWorkStatus", + }, ] } }, async created() { + console.log(333,this.dialogData,444) this.data = { ...this.dialogData, roadName: null } getProduct(this.dialogData.productId) @@ -107,6 +116,8 @@ export default { this.requestURL(52) .then((result) => { this.data.workMode = { "00": "手动控制", "01": "自动控制", "02": "万年历" }[result.mode]; + this.data.onWorkStatus = result.onWorkStatus + this.data.inWorkStatus = result.inWorkStatus }) .catch((err) => { @@ -123,7 +134,6 @@ export default { request.post(`business/device/functions/${this.dialogData.iotDeviceId}/${functionId}`, options) .then((result) => { if (result.code != 200) return reject(); - resolve(result.data[0]); }) .catch((err) => { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue index 735a1a83..57e87140 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue @@ -23,6 +23,7 @@ import Video from "@screen/components/Video"; import Form from '@screen/components/FormConfig'; import request from "@/utils/request"; import { Message } from "element-ui"; +import moment from "moment"; import { WarningTypeList, WarningSubclassList } from "@screen/utils/enum.js" // import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js" @@ -128,7 +129,7 @@ export default { }, { label: "持续时长:", - key: "parseOtherConfig.duration", + key: "duration", type: "text", }, { @@ -164,6 +165,14 @@ export default { }); }, + convertSecToHHmmss(sec) { + let currentTime = moment.duration(sec, "seconds"); + return moment({ + h: currentTime.hours(), + m: currentTime.minutes(), + s: currentTime.seconds(), + }).format("HH:mm:ss"); + }, getDetails() { request({ url: `/perceivedEvents/warning/getWarningById`, @@ -204,17 +213,17 @@ export default { // "longitude": "116.493888", // "latitude": "36.291145" // }; - + data.duration = this.convertSecToHHmmss(data.duration); this.data = { ...data, roadName: null, lane: data.lane?.split(",") || [] }; - + this.formList[4].options.options = WarningSubclassList[data.warningType] || []; setTimeout(() => { this.$refs.FormConfigRef.reset(true); }); }) - .catch(() => { - Message.error("详情获取失败"); + .catch((e) => { + Message.error("详情获取失败"+e); }) .finally(() => { this.loading = false; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue index f3ae6362..e246f8c9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue @@ -50,14 +50,10 @@ export default { created() { // https://www.yuque.com/dayuanzhong-ovjwn/gkht0m/ww776d5kzs72ilzh?singleDoc= // 获取设备参数 - // request({ - // url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}`, - // method: "get", - // params: {} - // }) - Promise.resolve({ - code: 200, - data: [{ "id": "ab58aab1e4c5fcf0457b3f1d808be44e", "deviceId": "10.0.36.143-1883", "property": "1", "propertyName": "状态包", "type": "object", "numberValue": null, "objectValue": { "dc_out_electricity_2": 0, "dc_out_electricity_1": 0, "power_status": "1", "dc_out_voltage_2": 11.3238, "fan_status": "0", "dc_out_voltage_1": 11.3125, "ac_out_voltage_2": 232.5156, "ac_out_voltage_1": 231.1293, "ac_out_electricity_1": 0, "temperature": "7.9", "humidity": "40.6", "ac_out_electricity_2": 0.1964, "door_status": "1" }, "geoValue": null, "value": { "dc_out_electricity_2": 0, "dc_out_electricity_1": 0, "power_status": "1", "dc_out_voltage_2": 11.3238, "fan_status": "0", "dc_out_voltage_1": 11.3125, "ac_out_voltage_2": 232.5156, "ac_out_voltage_1": 231.1293, "ac_out_electricity_1": 0, "temperature": "7.9", "humidity": "40.6", "ac_out_electricity_2": 0.1964, "door_status": "1" }, "formatValue": { "dc_out_electricity_2": "0.00A", "dc_out_electricity_1": "0.00A", "power_status": "1", "dc_out_voltage_2": "11.32V", "fan_status": "0", "dc_out_voltage_1": "11.31V", "ac_out_voltage_2": "232.52V", "ac_out_voltage_1": "231.13V", "ac_out_electricity_1": "0.00A", "temperature": "7.9", "humidity": "40.6", "ac_out_electricity_2": "0.20A", "door_status": "1" }, "createTime": 1707187234249, "timestamp": 1707187234249, "formatTime": null, "state": null }] + request({ + url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}`, + method: "get", + params: {} }).then(result => { if (result.code != 200) return; const [deviceInfo] = result.data; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js index 3d2c9ffd..81862ba7 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js @@ -82,7 +82,7 @@ export const formList = [ }, { label: "事件描述:", - key: "direction", + key: "remark", type: "input", gridColumn: 3, options: { 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 d6bf0b22..89b43a73 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 @@ -714,7 +714,7 @@ export const route = { export const eventHappenTime = { label: "事件发生时间:", - key: "startTime", + key: "occurrenceTime", required: true, type: "datePicker", options:{ 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 dc0c69ef..929d287b 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 @@ -8,7 +8,7 @@ export const tabConfigList = [ list: [ { ...PresetFormItems.callPolicePersonName, key: 'dcEventAccident.reporterName' }, { ...PresetFormItems.callPolicePersonPhone, key: 'dcEventAccident.reporterPhoneNumber' }, - PresetFormItems.trafficAccidentType, + { ...PresetFormItems.trafficAccidentType, key: 'dcEventAccident.accidentType' }, PresetFormItems.eventLevel, { ...PresetFormItems.locationMode, key: 'dcEventAccident.locationType' }, PresetFormItems.freeway, 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 8a5f74e2..8f219e30 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 @@ -154,10 +154,14 @@ export default { if (this.index == 1) { formData.dcEventVehicleAccident.laneOccupancy = formData.dcEventVehicleAccident.laneOccupancy.join(',') } - // console.log('formData',formData) - // return; + if (this.index == 8) { + let endStakeMark = formData.endStakeMark; + formData.dcEventAbnormalWeather.endStakeMark = (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : ''; + } + console.log('formData',formData) + return; let stakeMark = formData.stakeMark; - let endStakeMark = formData.endStakeMark; + request({ url: `/dc/system/event`, method: "post", @@ -165,7 +169,6 @@ export default { ...formData, eventType: Number(this.index) + 1, stakeMark: (stakeMark && stakeMark.length > 0) ? ('K' + stakeMark[0] + '+' + stakeMark[1]) : '', - endStakeMark: (endStakeMark && endStakeMark.length > 0) ? ('K' + endStakeMark[0] + '+' + endStakeMark[1]) : '', } }) .then((result) => { 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 7b4be9ea..0add8ac7 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 @@ -23,8 +23,90 @@ export const tabMap = { text: "处置记录", }, }; +export const gjSearchFormList = [ + { + label: "事件来源:", + key: "warningSource", + type: "select", + options: { + options: [ + { + key: "1", + label: "视频AI", + }, + { + key: "2", + label: "雷达识别", + }, + { + key: "3", + label: "锥桶", + }, + { + key: "4", + label: "护栏碰撞", + }, + { + key: "5", + label: "扫码报警", + }, + { + key: "6", + label: "非机预警", + }, + ], + }, + }, + { + label: "方向:", + key: "direction", + type: "RadioGroup", + options: { + options: [ + { + key: "1", + label: "上行", + }, + { + key: "3", + label: "下行", + }, + ], + }, + }, + { + label: "时间范围:", + key: "daterange", + required: false, + type: "datePicker", + options: { + type: "daterange", + format: "yyyy-MM-dd HH:mm:ss", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + }, + { + ...PresetFormItems.station, + label: "开始桩号:", + required: false, + }, + merge(cloneDeep(PresetFormItems.station), { + options: { + options: [ + { + key: "endStakeMark[0]", + }, + { + key: "endStakeMark[1]", + }, + ], + }, + label: "结束桩号:", + required: false, + }), +]; -export const searchFormList = [ +export const gzSearchFormList = [ PresetFormItems.eventSources, PresetFormItems.eventType, { @@ -55,8 +137,8 @@ export const searchFormList = [ type: "datePicker", options: { type: "daterange", - format: 'yyyy-MM-dd HH:mm:ss', - valueFormat: 'yyyy-MM-dd HH:mm:ss' + format: "yyyy-MM-dd HH:mm:ss", + valueFormat: "yyyy-MM-dd HH:mm:ss", }, }, { @@ -77,6 +159,5 @@ export const searchFormList = [ }, label: "结束桩号:", required: false, - } - ) + }), ]; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index a1288fdd..1e17b4fc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -57,7 +57,7 @@ import Pagination from "@screen/components/Pagination.vue"; import InputSearch from "@screen/components/InputSearch/index.vue"; import EventDetailDialog from "./EventDetailDialog/index"; import FormEvent from "./FormEvent/index"; -import { tabMap, searchFormList } from "./data"; +import { tabMap, gjSearchFormList, gzSearchFormList } from "./data"; import request from "@/utils/request"; import { Loading } from 'element-ui'; @@ -74,6 +74,39 @@ function getMockData() { })); } +const warningSourceMapping = { + 1: '视频AI', + 2: '雷达识别', + 3: '锥桶', + 4: '护栏碰撞', + 5: '扫码报警', + 6: '非机预警', +} +const directionMapping = { + '1': '上行', + '2': '中', + '3': '下行' +} +const warningStateMapping = { + 1: '上报', + 2: '已完成', + 3: '已终止', + 4: '自动结束' +} +const warningTypeMapping = { + 1: '交通拥堵', + 2: '行人', + 3: '非机动车', + 4: '停车', + 5: '倒车/逆行', + 6: '烟火', + 7: '撒落物8异常天气', + 9: '护栏碰撞', + 10: '交通事故', + 11: '车辆故障', + 99: '其它', +} + export default { name: "RoadNetworkMonitoring2", components: { @@ -89,7 +122,7 @@ export default { return { data: [], total: 0, - searchFormList, + searchFormList: [], activeName: "-1", panels: [ { @@ -120,6 +153,7 @@ export default { }; }, created() { + this.searchFormList = gjSearchFormList; this.getData(); }, methods: { @@ -127,8 +161,9 @@ export default { this.activeName = activeName; this.searchData.eventState = activeName == "-1" ? null : activeName; + this.searchFormList = activeName == "-1" ? gjSearchFormList : gzSearchFormList; - this.getData(); + this.getData(activeName); }, getStateCardBind(item) { const { state, textColor, text } = tabMap[this.activeName]; @@ -140,15 +175,43 @@ export default { }; }, getData() { - request({ - url: `/dc/system/event/list`, - method: "get", - params: this.searchData, - }).then((result) => { - if (result.code != 200) return Message.error(result?.msg); - this.data = result.rows; - this.total = result.total; - }); + console.log('activeName', this.activeName) + if (this.activeName === '-1') { + console.log('activeName22', this.activeName) + request({ + url: `/perceivedEvents/warning/perceivedEventsList`, + method: "post", + params: this.searchData, + data: {} + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + result.rows.forEach(it => { + it.stringEventSource = warningSourceMapping[it.warningSource]; + it.stringDirection = directionMapping[it.direction] || it.direction; + it.startTime = it.warningTime; + + if (it.otherConfig) { + let otherConfig = JSON.parse(it.otherConfig); + it.pictures = otherConfig.pictures || []; + } + + }) + this.data = result.rows; + + this.total = result.total; + }); + } else { + request({ + url: `/dc/system/event/list`, + method: "get", + params: this.searchData, + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + this.data = result.rows; + this.total = result.total; + }); + } + // request({ // url: `/dc/system/event/count`, @@ -220,15 +283,41 @@ export default { }, firstBtnClick(id) { console.log("id", id); - request({ - url: `/dc/system/event/${id}`, - method: "get", - }).then((result) => { - if (result.code != 200) return Message.error(result?.msg); - this.detailDialogFormData = result.data; - - this.eventDetailDialogVisible = true; - }); + if (this.activeName == '-1') { + request({ + url: `/perceivedEvents/warning/getWarningById`, + method: "post", + data: { id } + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let data = result.data; + + data.stringEventSource = warningSourceMapping[data.warningSource]; + data.direction = directionMapping[data.direction] || data.direction; + data.startTime = data.warningTime; + data.stringEventState = warningStateMapping[data.warningState]; + data.stringEventType = warningTypeMapping[data.warningType]; + + this.detailDialogFormData = data; + // console.log('data', this.detailDialogFormData) + + this.eventDetailDialogVisible = true; + }); + } else { + request({ + url: `/dc/system/event/${id}`, + method: "get", + }).then((result) => { + if (result.code != 200) return Message.error(result?.msg); + let data = result.data; + data.stringDirection = directionMapping[data.direction] || data.direction; + + this.detailDialogFormData = data; + + this.eventDetailDialogVisible = true; + }); + } + }, handleClose() { this.eventDetailDialogVisible = false; @@ -247,6 +336,8 @@ export default { ...this.searchData, eventType: data.eventType, eventSources: data.eventSources, + warningSource: data.warningSource, + direction: data.direction, startTime: daterange && daterange.length > 0 ? daterange[0] : "", endTime: daterange && daterange.length > 0 ? daterange[1] : "", stakeMark: stakeMark, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue index b7675237..f6c93929 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue @@ -113,16 +113,16 @@ export default { let numData = [] let mileageData = [] res.data.forEach(item => { - sectionNameData.push(item.section_name) avgNumData.push(item.avgNum) lastNumData.push(item.lastNum) numData.push(item.num) mileageData.push(item.mileage) + sectionNameData.push(item.section_name) }); - chartsStatistics.series[0].data = avgNumData - chartsStatistics.series[1].data = lastNumData - chartsStatistics.series[2].data = numData - chartsStatistics.series[3].data = mileageData + chartsStatistics.series[0].data = numData //事故总量 + chartsStatistics.series[1].data = avgNumData //百公里事故总量 + chartsStatistics.series[2].data = lastNumData //去年事故总量 + chartsStatistics.series[3].data = mileageData //路段里程数 chartsStatistics.xAxis.data = sectionNameData }) }, @@ -140,10 +140,10 @@ export default { avgTimeData.push(item.avgTime) lastNumData.push(item.lastNum) eventSubclassData.push(item.eventSubclassName) - chartsStatistics2.series[0].data = numData - chartsStatistics2.series[1].data = lastNumData - chartsStatistics2.series[2].data = avgTimeData - chartsStatistics2.series[3].data = lastAvgTimeData + chartsStatistics2.series[0].data = numData //事件数量 + chartsStatistics2.series[1].data = lastNumData //去年同期数量 + chartsStatistics2.series[2].data = avgTimeData //平均处置时长 + chartsStatistics2.series[3].data = lastAvgTimeData //去年同期平均处置时长 chartsStatistics2.xAxis.data = eventSubclassData }) @@ -160,8 +160,8 @@ export default { numData.push(item.num) avgTimeData.push(item.avgTime) }) - chartsStatistics3.series[0].data = numData - chartsStatistics3.series[1].data = avgTimeData + chartsStatistics3.series[0].data = numData //事件数量（起） + chartsStatistics3.series[1].data = avgTimeData //平均处置时长（分钟） chartsStatistics3.xAxis.data = typeNameData }) }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js index cf553c78..2fd64d5b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js @@ -44,8 +44,12 @@ var options = { } }, formatter: (params) => { + let count = 0; + echartsData.forEach((it) => { + count += it.value; + }) let obj = echartsData.filter(it => { return it.name == params }) - return `{ast|${obj[0].name}} {bst|${Math.round(obj[0].value)}%}` + return `{ast|${obj[0].name}} {bst|${Math.round(obj[0].value / count * 100)}%}` }, data: echartsData?.map(x => x), }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue index e7552bb8..d3e46290 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue @@ -55,8 +55,14 @@ export default { getWarningStateDay().then(res => { if (res.code == 200) { let data = res.data; - if (data.lemgth > 0) { + if (data.length > 0) { window.echartsData = []; + + // let count = 0; + // data.forEach((it) => { + // count += it.number; + // }) + for (let i = 0; i < data.length; i++) { let it = data[i]; if (it.warningState == 1) { @@ -89,11 +95,6 @@ export default { } - let count = 0; - - echartsData.forEach((it) => { - count += it.value; - }) chartsStatistics.legend.data = window.echartsData?.map(x => x); chartsStatistics.series[0].data = echartsData.map((item, index) => { @@ -140,10 +141,10 @@ export default { context.lineWidth = 1; // 设置线段宽度 // 绘制圆角矩形 - drawRoundRect(context, 272, 50, 120, 24, 12, gr) - drawRoundRect(context, 272, 78, 120, 24, 12, gr) - drawRoundRect(context, 272, 106, 120, 24, 12, gr) - + drawRoundRect(context, 270, 36, 120, 24, 12, gr) + drawRoundRect(context, 270, 63, 120, 24, 12, gr) + drawRoundRect(context, 270, 90, 120, 24, 12, gr) + drawRoundRect(context, 270, 117, 120, 24, 12, gr) }); }); }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index copy.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index copy.vue new file mode 100644 index 00000000..eb1975e4 --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index copy.vue @@ -0,0 +1,679 @@ + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index e90bdd18..500073ad 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -1,20 +1,19 @@ @@ -138,7 +138,7 @@ export default { handleExport() { exportFile({ url: "/business/dcInfoBoardVocabulary/export", - filename: "管辖路段", + filename: "情报板敏感词", data: this.getSearchData() }); }, diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 435592ca..cb0b8db2 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -49,9 +49,9 @@ module.exports = { // target: `http://10.0.81.202:8087`, //现场后台 // target: `http://10.0.81.204:8087`, //现场后台 刘文阁 // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁 - // target: `http://10.168.78.135:8087`, //王钦 + target: `http://10.168.78.135:8087`, //王钦 // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2 - target: `http://10.168.68.42:8087`, //王思祥 + // target: `http://10.168.68.42:8087`, //王思祥 changeOrigin: true, pathRewrite: { ["^" + process.env.VUE_APP_BASE_API]: "",