Browse Source

激光疲劳,语音广播,处置页新加音量,循环次数

develop
王兴琳 2 weeks ago
parent
commit
cfb31f4858
  1. 18
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue
  2. 19
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue

18
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceParam.vue

@ -1,8 +1,5 @@
<template> <template>
<div :style="{ <div class="multi-control">
'max-height': isMultiControl ? '250px' : undefined, 'overflow-y': isMultiControl ? 'auto' : undefined,
'margin-left': isMultiControl ? '14px' : undefined
}">
<ElTabs v-model="activeName" class="tabs" @tab-click="tabClick"> <ElTabs v-model="activeName" class="tabs" @tab-click="tabClick">
<ElTabPane label="一般模式" name="first"> <ElTabPane label="一般模式" name="first">
<Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList1" column="1" labelWidth="120px" /> <Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList1" column="1" labelWidth="120px" />
@ -268,6 +265,11 @@ export default {
methods: { methods: {
async initData() { async initData() {
// //
const options={
"ASK":"7"
}
let ask = await this.requestURL("ASKDF",options);
let result = await this.requestURL("ASKMD"); let result = await this.requestURL("ASKMD");
// if (result.data == 7) { // if (result.data == 7) {
// this.activeName = "second"; // this.activeName = "second";
@ -421,4 +423,10 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped>
.multi-control {
max-height: 450px;
overflow-y: auto;
margin-left: 14px;
}
</style>

19
ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DeviceControl/components/ScopeTable.vue

@ -148,8 +148,21 @@
<i class="el-icon-check"></i> <i class="el-icon-check"></i>
</ButtonGradient> </ButtonGradient>
</div> </div>
</div> </div>
</el-col> </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>
<el-row v-if="tableInfo.deviceType !== 5"> <el-row v-if="tableInfo.deviceType !== 5">
<el-col :span="3"> <el-col :span="3">
@ -264,6 +277,12 @@ export default {
}, },
data() { data() {
return { return {
tableInfo: {
executeConfig: {
repeatTimes: 1, // 1
outVol: 1 // 1
}
},
isShowDialog: false, isShowDialog: false,
deviceOptions: planDeviceOptions, deviceOptions: planDeviceOptions,
zyOptions: [ zyOptions: [

Loading…
Cancel
Save