diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
new file mode 100644
index 00000000..0fabeb8f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
index 18227f6a..6fea9c31 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFrameControl/index.vue
@@ -13,14 +13,14 @@
+
-
-
@@ -51,6 +53,7 @@ import Form from "@screen/components/FormConfig";
import { formList } from "./data";
// import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js"
import Video from "@screen/components/Video";
+import VideoMulti from "@screen/components/VideoMulti";
import Carousel from "./Carousel/index.vue";
import EventPlanDialog from "./eventPlanDialog/index.vue";
import Button from "@screen/components/Buttons/Button.vue";
@@ -66,6 +69,7 @@ export default {
TimeLine1,
TimeLine2,
Video,
+ VideoMulti,
Carousel,
Button,
EventPlanDialog,
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 251c488c..6f046ee6 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
@@ -945,7 +945,7 @@ export const tabConfigList = [
},
{
label: "限制类型:",
- key: "dcEventAccident.limitedType",
+ key: "dcEventTrafficControl.limitedType",
required: true,
type: "select",
options: {
@@ -963,7 +963,7 @@ export const tabConfigList = [
},
{
label: "车辆类型:",
- key: "dcEventAccident.vehicleType",
+ key: "dcEventTrafficControl.vehicleType",
required: true,
type: "select",
options: {
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 70f91816..964a4986 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
@@ -162,7 +162,7 @@ export default {
formData.lang = "";
}
if (this.index == 2 && formData.dcEventTrafficControl.facilityId instanceof Array) {
- let ids = formData.dcEventTrafficControl.facilityId.join(',');
+ let ids = formData.dcEventTrafficControl.facilityId;
formData.dcEventTrafficControl.facilityIds = ids
formData.dcEventTrafficControl.facilityId = ''
}
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 cf1666aa..501dd3be 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
@@ -299,6 +299,7 @@ export default {
// 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
}
data.videoType = "mp4";
+ data.component = "Video";
this.detailDialogFormData = data;
// console.log('data', this.detailDialogFormData)
@@ -316,16 +317,12 @@ export default {
data.videoList = [];
- const { downCamera, upCamera } = ((await getNearCameraNew(data.stakeMark))?.data || {});//新的上下游摄像头接口
- data.downCamId = downCamera?.camId;
- data.upCamId = upCamera?.camId;
+ data.component = "VideoMulti";
+
+ // const { downCamera, upCamera } = ((await getNearCameraNew(data.stakeMark))?.data || {});//新的上下游摄像头接口
+ // data.downCamId = downCamera?.camId;
+ // data.upCamId = upCamera?.camId;
data.videoType = "flv";
- // if (data.otherConfig) {
- // let otherConfig = JSON.parse(data.otherConfig);
- // // 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']
- // }
this.detailDialogFormData = data;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue
index a6b44689..bfd9003a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/ScopeTable.vue
@@ -155,7 +155,7 @@
-->
-
+
@@ -213,10 +213,6 @@ export default {
},
{
value: 3,
- label: '事发下游最近'
- },
- {
- value: 4,
label: '最近公里数'
},
],
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 404e0476..71088655 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
@@ -273,7 +273,7 @@ export default {
let dcArr = [];
this.tableData.forEach(item => {
let dcData = {
- id: item.id || '',
+ id: null,
deviceType: item.deviceType,
searchRule: item.searchRule,
number: item.number
@@ -346,13 +346,13 @@ export default {
if (result.code != 200) return Message.error(result?.msg);
Message.success("提交成功");
this.modelVisible = false;
+ this.$emit("reInitData", true);
})
.catch(() => {
Message.error("提交失败");
})
.finally(() => {
this.submitting = false;
- this.$emit("reInitData", true);
});
}
}