From a16d2be4351a2e82dae02bdf36d26f76fa277571 Mon Sep 17 00:00:00 2001 From: zhoule Date: Thu, 21 Mar 2024 14:55:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A2=84=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/control/event/event/index.vue | 1 + .../event/plan/addAndEditDialog/index.vue | 62 ++++++++++--------- .../control/event/plan/formTable/index.vue | 53 ++++++++-------- .../src/views/JiHeExpressway/utils/enum.js | 60 +++++++++--------- 4 files changed, 88 insertions(+), 88 deletions(-) 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 78cf1f81..c8c55c04 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 @@ -297,6 +297,7 @@ export default { if (result.code != 200) return Message.error(result?.msg); let data = result.data; data.stringDirection = gzDirectionMapping[data.direction] || data.direction; + data.startTime = data?.occurrenceTime || ''; data.videoList = []; if (data.otherConfig) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue index 97459bb7..f805d786 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue @@ -245,15 +245,17 @@ export default { }) }, - async loadData() { - if (this.deviceData.length <= 0) { - let result = await request({ - url: `business/device/query?deviceType=2`, - method: "get", - }) - if (result.code != 200) return Message.error(result?.msg); + async loadData(deviceType = 1) { + this.deviceData = []; + let result = await request({ + url: `business/device/query?deviceType=${deviceType}`, + method: "get", + }) + if (result.code != 200) return Message.error(result?.msg); + if (deviceType == 1) { + this.deviceData = result.data.filter(it => it.childType !== '1-1') + } else { this.deviceData = result.data; - // return result.data; } return this.deviceData; }, @@ -312,32 +314,32 @@ export default { // this.submitting = false; let secondFormTable = this.$refs['secondFormTable'].tableData || []; let thirdFormTable = this.$refs['thirdFormTable'].tableData || []; - let flg = false; - for (let item of secondFormTable) { - if (this.areAllValuesEmpty(item)) { flg = true; break }; - } - if (flg) return Message.warning('执行操作子项不能为空！'); - for (let item of thirdFormTable) { - if (this.areAllValuesEmpty(item)) { flg = true; break }; - } - if (flg) return Message.warning('恢复操作子项不能为空！'); - console.log('12', secondFormTable); - console.log('34', thirdFormTable); + // let flg = false; + // for (let item of secondFormTable) { + // if (this.areAllValuesEmpty(item)) { flg = true; break }; + // } + // if (flg) return Message.warning('执行操作子项不能为空！'); + // for (let item of thirdFormTable) { + // if (this.areAllValuesEmpty(item)) { flg = true; break }; + // } + // if (flg) return Message.warning('恢复操作子项不能为空！'); + // console.log('12', secondFormTable); + // console.log('34', thirdFormTable); let dcArr = []; - // let id = ''; - // if (this.dialogType == 2) id = this.planId; - // secondFormTable.forEach(it => { - // dcArr.push(this.formatData(it, 1, id)); - // }) - // thirdFormTable.forEach(it => { - // dcArr.push(this.formatData(it, 2, id)); - // }) + let id = ''; + if (this.dialogType == 2) id = this.planId; + secondFormTable.forEach(it => { + dcArr.push(this.formatData(it, 1, id)); + }) + thirdFormTable.forEach(it => { + dcArr.push(this.formatData(it, 2, id)); + }) console.log({ ...this.formData, dcExecuteAction: dcArr }) - return; + // return; if (this.dialogType == 1) {//新增 request({ url: `/business/plans`, @@ -385,7 +387,7 @@ export default { }, areAllValuesEmpty(obj) { - console.log('ass',obj) + console.log('ass', obj) return Object.keys(obj).every(function (key) { const value = obj[key]; return ( @@ -413,7 +415,7 @@ export default { .EventAddPlanDialog { gap: 9px; - width: 1080px; + width: 1280px; height: 310px; display: flex; flex-direction: column; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue index 2137a2c7..5fd79f6e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue @@ -11,7 +11,7 @@ - + - + -
+
雨刷: @@ -45,6 +46,7 @@ import Video from "@screen/components/Video"; import Descriptions from "@screen/components/Descriptions.vue"; import CameraControlDialog from "./components/CameraControlDialog.vue"; import LineChart from "../../LineChart/index.vue"; +import { PanoramicCameraTypes } from "@screen/utils/enum.js"; import { getRoadInfoByStakeMark, @@ -69,6 +71,7 @@ export default { }, data() { return { + PanoramicCameraTypes, activeName: "first", controlDialogVisible: false, data: {}, diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js index 6823f1d1..bb19b734 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js @@ -984,6 +984,7 @@ const BoardChildTypes = { "2-3": "雨棚可变信息标志", "2-4": "站前悬臂式可变信息标志", }; +export const PanoramicCameraTypes = Object.keys(CameraChildTypes).slice(3, 5); export const ChildTypes = { 1: CameraChildTypes, From 9587314306271449486dec8437db8e365ab489e9 Mon Sep 17 00:00:00 2001 From: qingzhengli <1204552371@qq.com> Date: Thu, 21 Mar 2024 17:01:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiHeExpressway/pages/control/event/event/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 78cf1f81..78dd8cd9 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 @@ -161,7 +161,7 @@ export default { getData() { if (this.activeName === '-1') { request({ - url: `/perceivedEvents/warning/perceivedEventsList`, + url: `/perceivedEvents/warning/perceivedEventsList`,//感知事件 method: "post", params: { pageNum: this.searchData.pageNum, pageSize: this.searchData.pageSize }, data: { ...this.searchData, warningState: 1 } @@ -255,9 +255,9 @@ export default { }, firstBtnClick(id) { console.log("id", id); - if (this.activeName == '-1') { + if (this.activeName == '-1') { //除了 感知事件外的 事件专题 均须处理 request({ - url: `/perceivedEvents/warning/getWarningById`, + url: `/perceivedEvents/warning/getWarningById`,//感知事件 method: "post", data: { id } }).then((result) => {