From cfb31f4858929bea562867025d38d7f2a4f474ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Thu, 14 Nov 2024 12:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BF=80=E5=85=89=E7=96=B2=E5=8A=B3=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=B9=BF=E6=92=AD=EF=BC=8C=E5=A4=84=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E6=96=B0=E5=8A=A0=E9=9F=B3=E9=87=8F=EF=BC=8C=E5=BE=AA?=
 =?UTF-8?q?=E7=8E=AF=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FatigueWakesUp/components/DeviceParam.vue | 18 ++++++++---
 .../components/RoadAndEvents/utils/map.js     | 14 ++++-----
 .../DeviceControl/components/ScopeTable.vue   | 31 +++++++++++++++----
 .../plan/addAndEditDialog/ScopeTable.vue      | 12 +++----
 4 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
index a7d9fbf4..1dd61fc4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
@@ -1,8 +1,5 @@
 <template>
-  <div :style="{
-    'max-height': isMultiControl ? '250px' : undefined, 'overflow-y': isMultiControl ? 'auto' : undefined,
-    'margin-left': isMultiControl ? '14px' : undefined
-  }">
+  <div class="multi-control">
     <ElTabs v-model="activeName" class="tabs" @tab-click="tabClick">
       <ElTabPane label="一般模式" name="first">
         <Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList1" column="1" labelWidth="120px" />
@@ -268,6 +265,11 @@ export default {
   methods: {
     async initData() {
       //查询模式
+      const options={
+        "ASK":"7"
+      }
+      let ask = await this.requestURL("ASKDF",options);
+
       let result = await this.requestURL("ASKMD");
       // if (result.data == 7) {
       //   this.activeName = "second";
@@ -421,4 +423,10 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.multi-control {
+  max-height: 450px;
+  overflow-y: auto;
+  margin-left: 14px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 7287fcca..c6ce67ff 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -60,7 +60,7 @@ export class MarkerCluster {
     //  e.extData.latitude = lnglat[1];
     //});
     marksAddInGraph(data);
-  
+
     if (!data) return;
     if (!Array.isArray(data)) data = [data];
 
@@ -94,7 +94,7 @@ export class MarkerCluster {
         map.setFitView([...this.markerCluster.U], false, [0, 0, 0, 0], 10); //自适应. 覆盖物数组, 动画过渡到指定位置, 周围边距，上、下、左、右,  最大 zoom 级别
       }, 150);
     }
-    
+
   }
 
   async refreshLayer(){
@@ -135,7 +135,7 @@ export class MarkerCluster {
           } else {
             _title = `${e.extData.stakeMark} ${e.extData.direction==='1'?'菏泽方向':'济南方向'} ${e.config?.item.title}事件`
           }
-          
+
         }
         // const lnglat = [e.extData.longitude, e.extData.latitude];//getLnglat(e.extData)
         aryPoints.push({
@@ -143,9 +143,9 @@ export class MarkerCluster {
           longitude: e.extData.longitude, //点坐标经度    【必传字段】
           latitude: e.extData.latitude,  //点坐标纬度    【必传字段】
           iconUrl: getIcon(e,'b'),     // 图标  【必传字段】
-          offset: [0,-48], 
-          size: [42,100], 
-          GGoffsetX: 0, 
+          offset: [0,-48],
+          size: [42,100],
+          GGoffsetX: 0,
           GGoffsetY: -5,
           GGimgOffset:[0,0],
           GGimgsize:[42,103],
@@ -660,4 +660,4 @@ export function getLatAndLng(lnglat) {
   else return lnglat;
 }
 
-export const markerClusterIns = new MarkerCluster();
\ No newline at end of file
+export const markerClusterIns = new MarkerCluster();
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
index 8003eea2..bc6c2565 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue
@@ -148,8 +148,21 @@
                         <i class="el-icon-check"></i>
                     </ButtonGradient>
                 </div>
+
               </div>
             </el-col>
+          <el-col  :span="5" >
+            <span >音量(取1-9)</span>
+          </el-col>
+          <el-col :span="6" >
+            <el-input-number placeholder="" v-model="tableInfo.executeConfig.outVol" :min="1":max="9"></el-input-number>
+          </el-col>
+          <el-col  :span="6" style="margin-left: 5px;" >
+            <span >循环次数(1-16)</span>
+          </el-col>
+          <el-col :span="6" >
+            <el-input-number placeholder="" v-model="tableInfo.executeConfig.repeatTimes" :min="1":max="16"></el-input-number>
+          </el-col>
         </el-row>
         <el-row v-if="tableInfo.deviceType !== 5">
             <el-col :span="3">
@@ -187,7 +200,7 @@
                 </el-select>
             </el-col>
             <el-col v-if="tableInfo.deviceType == 12 && tableInfo.hf_controlModel == '01'" :span="8" style="margin-left: 5px;">
-                <el-time-picker v-model="tableInfo.hf_time" is-range  range-separator="-" placeholder="选择时间" 
+                <el-time-picker v-model="tableInfo.hf_time" is-range  range-separator="-" placeholder="选择时间"
                     value-format="HH:mm" format="HH:mm">
                 </el-time-picker>
             </el-col>
@@ -264,6 +277,12 @@ export default {
     },
     data() {
         return {
+          tableInfo: {
+            executeConfig: {
+              repeatTimes: 1, // 这里设置默认值为 1
+              outVol: 1 // 这里设置默认值为 1
+            }
+          },
             isShowDialog: false,
             deviceOptions: planDeviceOptions,
             zyOptions: [
@@ -381,7 +400,7 @@ export default {
             //    }
             //    await this.loadData(newValue);
             //    this.$emit('check');
-                
+
             },
             immediate: true,
         }
@@ -448,12 +467,12 @@ export default {
                     delete this.tableInfo[key]
                 }
             }
-            
+
             if(value === 2 || value === 5){
                 this.tableInfo["executeConfig"]= {operationType:2}
                 this.tableInfo["recoverConfig"]= {operationType:2}
             }
-            
+
             this.loadData(value);
         },
         gzmsOptions_zx_change(e){
@@ -534,7 +553,7 @@ export default {
 }
 .contentBoard{
     flex:1;
-    background-color: #19425c;  
+    background-color: #19425c;
     color:#dfdfdf;
     padding: 9px 0px;
     text-align: center;
@@ -543,4 +562,4 @@ export default {
 .btn{
     height:40px;
 }
-</style>
\ No newline at end of file
+</style>
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 5355aac7..3fc27b71 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
@@ -48,7 +48,7 @@
                 </el-select>
             </el-col>
             <el-col v-if="tableInfo.deviceType == 2 && tableInfo.zx_operationType == 1" :span="4">
-                <el-input @click.native="clickQbb('zx_dcInfoBoardTemplate')" placeholder="请选择" 
+                <el-input @click.native="clickQbb('zx_dcInfoBoardTemplate')" placeholder="请选择"
                     :value="tableInfo.zx_dcInfoBoardTemplate?tableInfo.zx_dcInfoBoardTemplate.content:''"
                     readonly>
                     <i slot="suffix" class="el-input__icon el-icon-search"></i>
@@ -112,7 +112,7 @@
                 </el-select>
             </el-col>
             <el-col v-if="tableInfo.deviceType == 2 && tableInfo.hf_operationType == 1" :span="4">
-                <el-input @click.native="clickQbb('hf_dcInfoBoardTemplate')" placeholder="请选择" 
+                <el-input @click.native="clickQbb('hf_dcInfoBoardTemplate')" placeholder="请选择"
                     :value="tableInfo.hf_dcInfoBoardTemplate?tableInfo.hf_dcInfoBoardTemplate.content:''"
                     readonly>
                     <i slot="suffix" class="el-input__icon el-icon-search"></i>
@@ -156,7 +156,7 @@
                 <el-input v-model="tableInfo.hf_content" placeholder="请输入发布内容"></el-input>
             </el-col>
         </el-row>
-        
+
         <!-- 情报板弹窗 -->
         <QbbDialog :visible="isShowDialog" :info="qbbData" @close="onCloseDialog" @dialogSubmit="dialogSubmit" />
     </div>
@@ -291,7 +291,7 @@ export default {
         }
     },
     async mounted() {
-        
+
     },
     methods: {
         initData() {
@@ -322,7 +322,7 @@ export default {
             this.isShowDialog = false;
         },
         dialogSubmit(data) {
-           
+
             this.tableInfo[this.clickQbbName] = {
                 "fontType":data.fontType,
                 "screenSize":data.screenSize,
@@ -406,4 +406,4 @@ export default {
     border-color: #FFFFFF;
     color: #FFFFFF;
 }
-</style>
\ No newline at end of file
+</style>