From 26f1b627b8431f3ffd66329c6cf42696e90e4506 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 16 Apr 2024 17:24:58 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=91=84=E5=83=8F=E5=A4=B4=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/event/EventDetailDialog/index.vue       | 10 +++++++---
 .../pages/control/event/event/index.vue           | 15 ++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

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 9bdd89a4..cbd6026f 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
@@ -5,13 +5,15 @@
   }">
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
-      <div class="video-pic">
+      <div class="video-pic" :style="{ height: formData.component === 'VideoMulti' ? '220px' : undefined }">
 
-        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px" :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
+          :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
     ? formData.videoList[0] : ''" :camId="formData.upCamId" :pileNum="formData.stakeMark" rangeIndex="upCamera"
           :videoType="formData.videoType" />
 
-        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px" :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+        <component :is="formData.component" v-if="activeName != '-1'" style="height: 100%; width: 380px"
+          :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
     ? formData.videoList[1] : ''" :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
           :videoType="formData.videoType" />
 
@@ -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/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;
 

From 56772980016f5c387b8170a40aa8af848b2a48e6 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 17 Apr 2024 14:29:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A2=84=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../control/event/plan/addAndEditDialog/ScopeTable.vue      | 6 +-----
 .../pages/control/event/plan/addAndEditDialog/index.vue     | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

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 @@
                     <el-option label="智能发布" :value="2"></el-option>
                 </el-select>
             </el-col> -->
-            <el-col v-if="tableInfo.deviceType == 5 && tableInfo.hf_operationType == 1" :span="4">
+            <el-col v-if="tableInfo.deviceType == 5" :span="4">
                 <el-input v-model="tableInfo.hf_content" placeholder="请输入发布内容"></el-input>
             </el-col>
         </el-row>
@@ -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);
               });
           }
         }

From 9d7dd68bf21da1b03ccc166be51555448491bc2c Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Wed, 17 Apr 2024 16:25:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=20=20=E8=AF=AD=E9=9F=B3=E5=B9=BF=E6=92=AD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BroadcastParamMulti.vue        | 182 ++++++++++++++++++
 .../components/HomeFrameControl/index.vue     |  29 +--
 .../RoadAndEvents/utils/httpList.js           |   8 +
 .../views/JiHeExpressway/pages/Home/index.vue |   2 +-
 4 files changed, 207 insertions(+), 14 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue

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 @@
+<template>
+  <div class="body">
+    <div class="right" :style="{ width: isMultiControl ? '100%' : undefined }">
+      <div class="top-content">
+        <Video v-if="!isMultiControl" class="item-video" :pileNum="pileNum" />
+
+        <label style="width: 99px;">发布内容: </label>
+        <ElInput type="textarea" v-model="releaseMessage" :autosize="{ minRows: 3, maxRows: 3 }" :maxlength="150"
+          showWordLimit placeholder="请输入发布内容" />
+      </div>
+
+      <div class="footer">
+        <Button @click.native="handleSubmit" :loading="submitting">
+          确定
+        </Button>
+
+        <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="cancelClick">
+          取消
+        </Button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue";
+import Video from "@screen/components/Video";
+import CheckboxGroup from "@screen/components/FormConfig/components/ElCheckboxGroup.vue";
+
+import request from "@/utils/request";
+import { batchFunctions } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+
+import { Message } from "element-ui";
+
+export default {
+  name: "BroadcastReleases",
+  components: {
+    Dialog,
+    Button,
+    Video,
+    CheckboxGroup,
+  },
+  model: {
+    prop: "visible",
+    event: "update:value",
+  },
+  props: {
+    visible: Boolean,
+    pileNum: String,
+    otherConfig: String,
+    isMultiControl: Boolean,
+    selectItems: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      submitting: false,
+      checkList: [],
+      releaseMessage: null,
+      // musicList: [],
+    };
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:value", val);
+      },
+    },
+  },
+  created() {
+    // getDeviceList(5).then((data) => {
+    //   if (Array.isArray(data))
+    //     this.musicList = data.map((item) => ({
+    //       ...item,
+    //       disabled: item.deviceState != 1,
+    //     }));
+    // });
+  },
+  methods: {
+    cancelClick() {
+      this.$emit("update:activeIcon", null);
+      this.submitting = false;
+    },
+    handleSubmit() {
+      const selectItems = this.selectItems.map(item => JSON.parse(item));
+      console.log(this.selectItems, selectItems, "selectItems");
+      const checkList = selectItems.map(item => JSON.parse(item.otherConfig));
+      if (!this.releaseMessage?.trim())
+        return Message.error("发布内容不能为空!");
+      if (!selectItems.length)
+        return Message.error("请至少选择一个广播设备!");
+
+      this.submitting = true;
+
+      batchFunctions(
+        {
+          "devices": selectItems,
+          "functions": [
+            {
+              "functionId": "1",//随便 不为空即可
+              "params": {
+                name: "task-3",
+                outVol: "6",
+                priority: "1",
+                text: this.releaseMessage.trim(),
+                repeatTimes: "3",
+                termList: checkList,
+                functionType: "startPaTts",
+              }
+            }
+
+          ]
+        })
+        .then((data) => {
+          const allItems = data.data;
+          const successItems = allItems.filter(item => item.result.retCode == 0);
+          console.log("xxxxxxx111")
+          if (successItems.length == allItems.length) {
+            Message.success("广播设置成功!");
+          } else {
+            Message.error(`广播设置失败, 失败${allItems.length - successItems.length}个!`);
+          }
+        })
+        .finally(() => {
+          this.submitting = false;
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.body {
+  display: flex;
+  gap: 9px;
+  height: 100%;
+  padding-right: 9px;
+  margin-top: 15px;
+
+  .right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+    .top-content {
+      display: flex;
+      flex-direction: row;
+      // gap: 9px;
+      align-items: center;
+
+      .item-video {
+        width: 545px;
+      }
+
+      label {
+        font-size: 15px;
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 400;
+        color: #3de8ff;
+        line-height: 19px;
+        vertical-align: middle;
+        text-align: right;
+        padding-right: 12px;
+        box-sizing: border-box;
+      }
+    }
+  }
+}
+
+.footer {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 9px;
+}
+</style>
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 @@
           <i class="el-icon-close" />
         </span>
         <Form v-model="data" labelWidth="90px" column="2" class="form" ref="FormConfigRef" :formList="formList" />
-        <component :is="componentMap[DeviceTopics[data.deviceType]]" :isMultiControl="true"></component>
-        <!-- -->
-        <div class="footer">
-          <Button @click.native="">
+        <component ref="ControlComponent" :is="componentMap[DeviceTopics[data.deviceType]]" :isMultiControl="true"
+          :selectItems="data.childType" @update:activeIcon="(val) => { this.activeIcon = val }"></component>
+        <!-- <div class="footer">
+          <Button @click.native="submitClick">
             确认
           </Button>
           <Button style="background-color: rgba(0, 179, 204, 0.3)" @click.native="cancelClick"> 取消 </Button>
-        </div>
+        </div> -->
       </div>
     </ElPopover>
 
@@ -38,11 +38,9 @@ import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils
 import { delay } from "@screen/utils/common";
 import { initSearch } from "@screen/utils/enum/common.js"
 import DeviceParams from "@screen/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue";
-import BroadcastParam from "@screen/pages/Home/components/Dialogs/Broadcast/components/BroadcastParam.vue";
+import BroadcastParam from "@screen/pages/Home/components/Dialogs/Broadcast/components/BroadcastParamMulti.vue";
+import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent";
 
-import Vue from "vue";
-
-import { DeviceForMap } from "@screen/pages/Home/components/RoadAndEvents/utils/buttonEvent"
 const componentMap = { "语音广播": "BroadcastParam" } //DeviceTopics[deviceType]
 //"情报板": undefined, "行车诱导": undefined, "疲劳唤醒": undefined, "合流区": undefined,"设备箱": "DeviceParams",
 const controlMulti = Object.keys(componentMap);//6种批量控制
@@ -51,13 +49,14 @@ const DeviceTopics = {};//6种批量控制 事件专题 {key:label}
 Object.keys(DeviceForMap).forEach(DeviceLabel => {
   controlMulti.indexOf(DeviceLabel) !== -1 && (DeviceTopics[DeviceForMap[DeviceLabel].deviceType] = DeviceLabel);
 });
+const deviceTypeDefault = Object.keys(DeviceTopics)[0];
 async function setDeviceOptions(config, filterData, formList) {
   const data = await getDeviceList(config.deviceType, filterData).then(async (data) => {
     await delay(600);
     return data;
   });
   formList[4].options.options = data.map(item => {
-    return { label: `${item.deviceName}`, value: JSON.stringify({ id: item.id, iotDeviceId: item.iotDeviceId }), disabled: item.deviceState != 1 }
+    return { label: `${item.deviceName}`, value: JSON.stringify({ id: item.id, iotDeviceId: item.iotDeviceId, deviceType: item.deviceType, otherConfig: item.otherConfig }), disabled: item.deviceState != 1 }
   })
 };
 function changeHandle(data, formList) {
@@ -85,6 +84,7 @@ export default {
           label: "设备类型:",
           key: "deviceType",
           type: "select",
+          default: deviceTypeDefault,
           options: {
             clearable: true,
             options: Object.keys(DeviceTopics).map(key => { return { label: DeviceTopics[key], value: key } }),
@@ -92,7 +92,6 @@ export default {
           ons: { //on监听 element事件
             change(value, ...args) {
               const { data, formList } = args.slice(-1)[0]; //data 为数据  formList为传入的配置项
-              console.log(Vue, this)
               if (data.deviceType) changeHandle(data, formList);
               else data.childType = undefined;
             }
@@ -274,14 +273,18 @@ export default {
   //     deep: true
   //   }
   // },
+  mounted() {
+    changeHandle(this.data, this.formList);
+  },
   methods: {
+    submitClick() {
+      this.$refs.ControlComponent.handleSubmit()
+    },
     cancelClick() {
       this.activeIcon = null;
     },
     handleClick(type) {
-      console.log("type: ", type);
       this.activeIcon = this.activeIcon === type ? null : type;
-      console.log("this.activeIcon", this.activeIcon);
     },
     filterEnd(data) {
       this.activeIcon = null;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
index 8faea32f..82465cfc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
@@ -3,6 +3,14 @@ import { Message } from "element-ui";
 import moment from "moment";
 import request from "@/utils/request";
 
+export function batchFunctions(data) {
+  return request({
+    url: `/business/device/batchFunctions`,
+    method: "post",
+    data: data,
+  });
+}
+
 /**
  *
  * @param {string} camId 相机 ID
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
index 98aa54f1..91b5bd4c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
@@ -22,7 +22,7 @@
           <HomeVector class="item" />
           <HomeWord class="item" />
           <!-- <HomeVectorControl class="item" /> -->
-          <!-- <HomeFrameControl class="item" /> -->
+          <HomeFrameControl class="item" />
         </div>
         <ConditionStatistics class="right card-menu" />
       </div>

From e0c58921e9cbae440373b2c20118fa42a4dc7ea4 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 18 Apr 2024 10:22:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/control/event/event/FormEvent/data.js               | 4 ++--
 .../pages/control/event/event/FormEvent/index.vue             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 = ''
         }