From 11eeef489a325aa05a8192282ec7790ef25c45d1 Mon Sep 17 00:00:00 2001 From: mengff <1198151809@qq.com> Date: Wed, 30 Oct 2024 14:24:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=84=9F=E7=9F=A5=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=A4=8D=E6=A0=B8=E6=98=BE=E7=A4=BA=E5=92=8C=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/event/EventDetailDialog/data.js | 45 +++++++++++++++++++ .../event/event/EventDetailDialog/index.vue | 2 +- .../eventDetection/statistics/data.js | 22 +++++++++ .../eventDetection/statistics/index.vue | 23 +++++++--- .../src/views/JiHeExpressway/utils/enum.js | 10 ++++- 5 files changed, 93 insertions(+), 9 deletions(-) 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 48afaacd..a3ef24f9 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 @@ -407,6 +407,51 @@ export const _formListGz = [ gap: "12px", }, }, + { + label: "审核状态:", + key: "auditFlags", + type: "input", + options: { + disabled: true, + placeholder: "", + }, + visible: (data) => { + if (data?.auditFlags) { + return true; + } + return false; + }, + }, + { + label: "审核人:", + key: "auditor", + type: "input", + options: { + disabled: true, + placeholder: "", + }, + visible: (data) => { + if (data?.auditor) { + return true; + } + return false; + }, + }, + { + label: "审核时间:", + key: "auditTime", + type: "input", + options: { + disabled: true, + placeholder: "", + }, + visible: (data) => { + if (data?.auditTime) { + return true; + } + return false; + }, + }, ] export const timeLine1List = [ { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index 6a984050..eca4a748 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -63,7 +63,7 @@ @click.native="onEnd">终止 - diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js index 6f76be95..45e1fb14 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js @@ -164,6 +164,28 @@ export const searchFormList = [ ], }, }, + { + label: "审核状态:", + key: "auditFlag", + type: "select", + options: { + clearable: true, + options: [ + { + key: "0", + label: "未审核", + }, + { + key: "1", + label: "正确", + }, + { + key: "2", + label: "错误", + }, + ], + }, + }, { label: "事件主类:", key: "warningType", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue index 770140d9..424f5338 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/index.vue @@ -29,8 +29,8 @@ - - + +
{ if (result.code != 200) return Message.error(result?.msg); - + result.rows.forEach(it => { it.stringEventSource = it?.warningSource ? warningSourceMapping[it?.warningSource] : ''; it.stringDirection = gzDirectionMapping[it.direction] || it.direction; @@ -148,7 +155,7 @@ export default { text: "文件正在下载...", }); // request.post(url, {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' }) - + request({ url: url,//感知事件 method: "post", @@ -190,6 +197,9 @@ export default { data.stringEventState = warningStateMapping[data.warningState]; data.stringEventType = warningTypeMapping[data.warningType]; data.stringDirection = gzDirectionMapping[data.direction] || data.direction; + data.auditFlags=auditType[data.auditFlag]; + data.auditor=data.auditor; + data.auditTime=data.auditTime; let eventInfo = await request({ url: `/dc/system/event/eventSubclass/${id}`, method: "GET", @@ -236,13 +246,14 @@ export default { if (dendStakeMark) { endStakeMark = dendStakeMark[0] ? `K${dendStakeMark[0].padStart(3,'0')}+${dendStakeMark[1].padStart(3,'0')}` : ''; } - + this.searchData = { ...this.searchData, warningState: data.warningState, warningType: data.warningType, warningSource: data?.warningSource || '', direction: data.direction, + auditFlag:data.auditFlag, startTime: daterange && daterange.length > 0 ? daterange[0] : "", // endTime: this.activeName != "-1" && daterange && daterange.length > 0 ? daterange[1] : "", completeTime: daterange && daterange.length > 0 ? daterange[1] : "", diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js index 8eaa6a18..d23b9a96 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js @@ -12,7 +12,7 @@ function arrayToDic(arr) { return obj; } export const WarnintType = { - 1: "交通拥堵", + 1: "交通拥堵", 2: "行人", 3: "非机动车", 4: "停车", @@ -1270,6 +1270,12 @@ export const controlType = { }, }; +export const auditType = { + 0: "未审核", + 1: "正确", + 2: "错误", +}; + export const boolType = { 0: { text: "否", @@ -1352,4 +1358,4 @@ export const broadcastPriority = { "2":"重要", "3":"一般", "4":"提示" -} \ No newline at end of file +}