From e560ac8dcbe6be20183f80c89332101c06abc134 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Fri, 17 May 2024 16:03:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B9=BF=E6=92=AD?=
=?UTF-8?q?=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/BroadcastReleases.vue | 112 +++++++++++++-----
.../pages/service/broadcast/index.vue | 2 +-
ruoyi-ui/vue.config.js | 4 +-
3 files changed, 85 insertions(+), 33 deletions(-)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
index af329ca6..c76bd11a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
@@ -10,28 +10,65 @@
{{ data.deviceName }}(当前)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取值范围 1 - 9
+
+
+
+
+
+
+
+ 取值范围 1 - 16
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -46,7 +83,7 @@ import request from "@/utils/request";
import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
import { Message } from "element-ui";
-
+import { broadcastPriority } from "@screen/utils/enum.js";
export default {
name: "BroadcastReleases",
components: {
@@ -67,10 +104,25 @@ export default {
},
data() {
return {
+ broadcastPriority,
submitting: false,
checkList: [],
- releaseMessage: null,
+ dataForm: {
+ content:"",
+ priority:"1",
+ repeatTimes:3,
+ outVol:6
+ },
musicList: [],
+ dataRule: {
+ content: [
+ {
+ required: true,
+ message: "请输入详细内容",
+ trigger: "blur",
+ },
+ ]
+ },
};
},
computed: {
@@ -94,7 +146,7 @@ export default {
},
methods: {
handleSubmit() {
- if (!this.releaseMessage?.trim())
+ if (!this.dataForm.content?.trim())
return Message.error("发布内容不能为空!");
if (!this.checkList.length)
return Message.error("请至少选择一个广播设备!");
@@ -106,10 +158,10 @@ export default {
method: "post",
data: {
name: "task-3",
- outVol: "6",
- priority: "1",
- text: this.releaseMessage.trim(),
- repeatTimes: "3",
+ outVol: "" + this.dataForm.outVol,
+ priority: "" + this.dataForm.priority,
+ text: this.dataForm.content.trim(),
+ repeatTimes: "" + this.dataForm.repeatTimes,
termList: this.checkList.map((str) => JSON.parse(str)),
functionType: "startPaTts",
},
@@ -134,7 +186,7 @@ export default {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
index 8ff821d1..9108070e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
@@ -17,7 +17,7 @@
ref="FormReportRef"
:formList="reportList"
v-model="reportData"
- label-width="100px"
+ label-width="150px"
/>