From 8d999fbc0c52ac1d5dfc51d59f0e579dfa177c6e Mon Sep 17 00:00:00 2001 From: zhoule Date: Wed, 10 Apr 2024 16:05:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=A7=86=E9=A2=91=E8=BD=AE=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventDetailDialog/Carousel/index.vue | 13 ++- .../event/event/EventDetailDialog/index.vue | 103 +++++------------- .../pages/control/event/event/index.vue | 5 +- 3 files changed, 44 insertions(+), 77 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue index 8aff60c9..3b5479d4 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue @@ -11,6 +11,12 @@ + +
+
+ + @@ -21,10 +27,11 @@ import VueSlickCarousel from 'vue-slick-carousel' import 'vue-slick-carousel/dist/vue-slick-carousel.css' // optional style for arrows & dots import 'vue-slick-carousel/dist/vue-slick-carousel-theme.css' +import Video from "@screen/components/Video"; export default { name: "Carousel", - components: { VueSlickCarousel }, + components: { VueSlickCarousel,Video }, props: { pictures: { type: Array, @@ -39,6 +46,10 @@ export default { // "require('@screen/images/shareWith/weChat-active.svg')" ] }, + videos: { + type: Array, + default: () => [] + }, }, data() { return { 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 4781411f..59cb6169 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 @@ -1,89 +1,44 @@ @@ -124,7 +79,7 @@ export default { activeName: String, formData: { type: Object, - default: () => {}, + default: () => { }, }, }, data() { 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 89fea858..cf1666aa 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 @@ -294,8 +294,9 @@ export default { data.visibility = otherConfig.visibility; data.pictures = otherConfig.pictures || []; - data.videoList = otherConfig.videoList || [] - // data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] + data.videoList = otherConfig.videoList || []; + // data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4', + // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4'] } data.videoType = "mp4"; this.detailDialogFormData = data; From a20a38cca6d4be83b9184c1b2b3740a330d357bd Mon Sep 17 00:00:00 2001 From: qingzhengli <1204552371@qq.com> Date: Wed, 10 Apr 2024 16:20:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat=20=20enum=E4=BC=98=E5=8C=96=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E9=87=8D=E5=A4=8D=E6=9E=9A=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/plan/addAndEditDialog/index.vue | 71 +++------- .../src/views/JiHeExpressway/utils/enum.js | 127 ++---------------- 2 files changed, 30 insertions(+), 168 deletions(-) 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 4e4f6b20..653eed22 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 @@ -4,47 +4,24 @@
- + 交通事件 感知事件 - + - - + + - - + + @@ -56,11 +33,7 @@
*执行操作:
- +
@@ -70,11 +43,7 @@
*恢复操作:
- + @@ -82,17 +51,9 @@ @@ -111,7 +72,7 @@ import { gzmsMap, eventSubClassMap, trafficKV, - perceptionKV, + WarningTypeList as perceptionKV, } from "@screen/utils/enum.js"; const typeMap = { @@ -141,7 +102,7 @@ export default { visible: Boolean, detail: { type: Object, - default: () => {}, + default: () => { }, }, }, data() { @@ -201,7 +162,7 @@ export default { }, }; }, - mounted() {}, + mounted() { }, computed: { modelVisible: { get() { @@ -212,7 +173,7 @@ export default { this.eventOptions = typeMap[this.detail.eventCategory]; this.mechanismOptions = eventSubClassMap[this.detail.eventCategory || 1][ - this.detail.eventType + this.detail.eventType ]; this.initData(this.detail.id); } else { @@ -327,7 +288,7 @@ export default { this.eventOptions = typeMap[value]; this.changeEventType(1); }, - handleChange() {}, + handleChange() { }, formatData(it, value = 1, id = "") { let data = { ...it, actionType: value, emergencyPlansId: id }; if ( diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js index c96bd6bb..a04a0945 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js @@ -163,21 +163,7 @@ export const WarningType = { 99: "其他事件", }; -// 交通事件主类 -export const trafficType = { - 1: "交通事故", - 2: "车辆故障", - 3: "交通管制", - 4: "交通拥堵", - 5: "非法上路", - 6: "路障清除", - 7: "施工建设", - 8: "服务区异常", - 9: "设施设备隐患", - 10: "异常天气", - 11: "其他事件", -}; - +//========= 感知事件 主类（key vulue） [{value: 1, label: '交通拥堵'}]========= export const WarningTypeList = Object.keys(WarningType).map((key) => { return { value: key * 1, @@ -185,6 +171,11 @@ export const WarningTypeList = Object.keys(WarningType).map((key) => { }; }); +// 交通事件主类 {1: "交通事故" } 格式 +export const trafficType = Object.keys(EventTopics).reduce((prev, now) => { + return { ...prev, [EventTopics[now]]: now }; +}, {}); + // 感知事件主类的子类(上方) warningSubclass export const WarningSubclass = { 1: { @@ -262,104 +253,14 @@ export const WarningSubclass = { }, }; -//========= 交通事件 主类（key vulue）========= -export const trafficKV = [ - { - value: 1, - label: "交通事故", - }, - { - value: 2, - label: "车辆故障", - }, - { - value: 3, - label: "交通管制", - }, - { - value: 4, - label: "交通拥堵", - }, - { - value: 5, - label: "非法上路", - }, - { - value: 6, - label: "路障清除", - }, - { - value: 7, - label: "施工建设", - }, - { - value: 8, - label: "服务区异常", - }, - { - value: 9, - label: "设施设备隐患", - }, - { - value: 10, - label: "异常天气", - }, - { - value: 11, - label: "其他事件", - }, -]; -//========= 感知事件 主类（key vulue）========= -export const perceptionKV = [ - { - value: 1, - label: "交通拥堵", - }, - { - value: 2, - label: "行人", - }, - { - value: 3, - label: "非机动车", - }, - { - value: 4, - label: "停车", - }, - { - value: 5, - label: "违规驾驶", - }, - { - value: 6, - label: "路障", - }, - { - value: 7, - label: "道路施工", - }, - { - value: 8, - label: "异常天气", - }, - { - value: 9, - label: "护栏碰撞", - }, - { - value: 10, - label: "交通事故", - }, - { - value: 11, - label: "车辆故障", - }, - { - value: 99, - label: "其他事件", - }, -]; +//========= 交通事件 主类（key vulue） ========= +export const trafficKV = Object.keys(trafficType).map((key) => { + return { + value: key * 1, + label: trafficType[key], + }; +}); + //交通事件、感知事件 子类（key vulue）预案使用 export const eventSubClassMap = { 1: { From dc51134c2f6b5c3605a03fa0e54aaf0e49e044a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Wed, 10 Apr 2024 16:45:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BA=94=E6=80=A5=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PeopleCard/index.vue | 5 ++++ .../components/AddNEditDialog.vue | 26 ++++++++++++++++--- .../views/firstResponders/index.vue | 2 +- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/PeopleCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/PeopleCard/index.vue index 632ebe65..c01a56f1 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/PeopleCard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/PeopleCard/index.vue @@ -42,6 +42,10 @@ export default { key: "name", label: "姓名" }, + { + key: "type", + label: "类型" + }, { key: "postName", label: "岗位" @@ -72,6 +76,7 @@ export default { display: flex; flex-direction: column; gap: 6px; + font-size: 14px; } .btns { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue index c38226b5..2c21617b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue @@ -7,7 +7,7 @@ ref="FormConfigRef" :formList="formList" column="1" - labelWidth="90px" + labelWidth="100px" /> @@ -68,6 +68,24 @@ export default { }, ], }, + { + label: "人员类型:", + key: "employeesType", + required: true, + type: "select", + options: { + options: [ + { + key: 1, + label: "路管人员", + }, + { + key: 2, + label: "应急人员", + }, + ], + }, + }, { label: "岗位:", key: "postId", @@ -127,7 +145,7 @@ export default { getSelectOptionsStation(2), ]).then(([post, organization]) => { if (post.status === "fulfilled" && post.value.code == 200) { - this.formList[2].options.options = post.value.data.map((item) => ({ + this.formList[3].options.options = post.value.data.map((item) => ({ key: item.postId + "", label: item.postName, })); @@ -137,7 +155,7 @@ export default { organization.status === "fulfilled" && Array.isArray(organization.value) ) { - this.formList[3].options.options = organization.value; + this.formList[4].options.options = organization.value; } }); }, @@ -181,7 +199,7 @@ export default {