Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue

@@ -10,15 +10,52 @@
             <template #[otherConfig]="{ data }">
               <span style="color: #6ee5fe"> {{ data.deviceName }}(当前) </span>
             </template>
-</CheckboxGroup>
+          </CheckboxGroup>
-</div>
+        </div>
-<div class="right">
+        <div class="right">
           <div class="top-content">
             <Video class="item-video" :pileNum="pileNum" />
 
-    <label>发布内容: </label>
+
-    <ElInput type="textarea" v-model="releaseMessage" :autosize="{ minRows: 3, maxRows: 3 }" :maxlength="150"
+
-      showWordLimit placeholder="请输入发布内容" />
+            <el-form ref="form" :model="dataForm" :rules="dataRule" label-width=" 90px">
+              <el-form-item label="音量" prop="outVol">
+                <el-row :gutter="0">
+                  <el-col :span="6">
+                    <el-input-number v-model="dataForm.outVol" :min="1" :max="9"></el-input-number>
+                  </el-col>
+                  <el-col :span="18"><span style="margin-left: 10px;">取值范围 1 - 9</span></el-col>
+                </el-row>
+              </el-form-item>
+              <el-form-item label="循环次数" prop="repeatTimes">
+                <el-row :gutter="0">
+                  <el-col :span="6">
+                    <el-input-number v-model="dataForm.repeatTimes" :min="1" :max="16"></el-input-number>
+                  </el-col>
+                  <el-col :span="18"><span style="margin-left: 10px;">取值范围 1 - 16</span></el-col>
+                </el-row>
+              </el-form-item>
+              <el-form-item label="紧急度" prop="priority">
+                <el-row :gutter="0">
+                  <el-col :span="6">
+                    <el-select v-model="dataForm.priority" placeholder="请选择">
+                      <el-option v-for="(item, key) in broadcastPriority" :key="key" :label="item" :value="key">
+                      </el-option>
+                    </el-select>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+              <el-form-item label="详细内容" prop="content">
+                <ElInput type="textarea" v-model="dataForm.content" :autosize="{ minRows: 3, maxRows: 3 }"
+                  :maxlength="150" showWordLimit placeholder="请输入发布内容" />
+              </el-form-item>
+            </el-form>
+
+
+
+            <!-- <label>发布内容: </label>
+            <ElInput type="textarea" v-model="dataForm.content" :autosize="{ minRows: 3, maxRows: 3 }" :maxlength="150"
+              showWordLimit placeholder="请输入发布内容" /> -->
           </div>
 
           <div class="footer">
@@ -30,8 +67,8 @@
               确定
             </Button>
           </div>
-</div>
+        </div>
-</div>
+      </div>
     </div>
   </Dialog>
 </template>
@@ -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("请至少选择一个广播设备!");
@@ -113,12 +165,11 @@ export default {
           "functionId": "A1",
           "params": {
             "name": "task-3",
-            "outVol": "6",
+            "outVol": "" + this.dataForm.outVol,
-            "priority": "1",
+            "priority": "" + this.dataForm.priority,
-            "text": "山东高速欢迎您",
+            "text": this.dataForm.content.trim(),
-            "repeatTimes": "3",
+            "repeatTimes": "" + this.dataForm.repeatTimes,
             "termList": [
-
               {
                 ...JSON.parse(i)
               }
@@ -157,7 +208,7 @@ export default {
 <style lang="scss" scoped>
 .BroadcastReleases {
   // width: 450px;
-  height: 420px;
+  height: 520px;
   display: flex;
   flex-direction: column;
   gap: 15px;

ruoyi-ui/src/views/JiHeExpressway/pages/service/broadcast/index.vue

@@ -138,7 +138,7 @@
               </div>
             </draggable>
           </vuescroll>
-          <Empty v-else text="请从设备回读或从模板添加信息..." style="padding-top: 100px"></Empty>
+          <Empty v-else text="请添加待下发信息..." style="padding-top: 100px"></Empty>
         </div>
       </div>
       <!-- ++++++++++右边部分：信息模板++++++++++ -->

ruoyi-ui/vue.config.js

@@ -52,9 +52,9 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
-        // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
         // target: `http://10.168.68.42:8087`, //王思祥
-        target: `http://10.168.72.174:8087`, //赵祥龙
+        // target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝
         // target: `http://10.168.77.128:8087`, //王兴琳