odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix : 修复时间频率单位' (#296) from dengjie into dev

Browse Source 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/296
This commit is contained in:
odjbin
2024-03-04 03:22:42 +00:00
parent 8d0232e02a 4fd53e8875
commit bcccbcb0ad
2 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/edit/edit.vue
View File

@@ -32,19 +32,27 @@
<el-input type="number" v-model="form.referenceFrequency" placeholder="请输入基准频率"/> <el-input type="number" v-model="form.referenceFrequency" placeholder="请输入基准频率"/>
</el-form-item> </el-form-item>
<div style="display: flex"> <div style="display: flex">
<el-form-item label="升频时间" prop="upTime"> <el-form-item label="升频时间(分钟)" prop="upTime" label-width="280px">
<el-input-number v-model="form.upTime" :min="0" :max="60"/> <el-input-number v-model="form.upTime" :min="0" :max="60"/>
</el-form-item> </el-form-item>
<el-form-item label="升频率" prop="upFrequency"> <el-form-item label="升频率" prop="upFrequency">
<el-input type="number" v-model="form.upFrequency" placeholder="请输入升频率"/> <el-input type="number" v-model="form.upFrequency" placeholder="请输入升频率">
<template #suffix>
<span>Hz</span>
</template>
</el-input>
</el-form-item> </el-form-item>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<el-form-item label="降频时间" prop="dropTime"> <el-form-item label="降频时间(分钟)" prop="dropTime" label-width="280px">
<el-input-number v-model="form.dropTime" :min="0" :max="60"/> <el-input-number v-model="form.dropTime" :min="0" :max="60"/>
</el-form-item> </el-form-item>
<el-form-item label="降频率" prop="dropFrequency"> <el-form-item label="降频率" prop="dropFrequency">
<el-input type="number" v-model="form.dropFrequency" placeholder="请输入降频率"/> <el-input type="number" v-model="form.dropFrequency" placeholder="请输入降频率">
<template #suffix>
<span>Hz</span>
</template>
</el-input>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="是否默认"> <el-form-item label="是否默认">
@@ -224,7 +232,7 @@ const handleSave = () => {
position: absolute; position: absolute;
top: 250px; top: 250px;
left: 80px; left: 80px;
width: 950px; width: 1000px;
//height: 500px; //height: 500px;
background-image: url(@/assets/images/transducer/bg.png); background-image: url(@/assets/images/transducer/bg.png);
padding: 20px 30px; padding: 20px 30px;
@@ -285,6 +293,12 @@ const handleSave = () => {
color: #fff; color: #fff;
font-size: 38px; font-size: 38px;
} }
.el-input__suffix-inner {
font-size: 30px;
color: #08B7B8;
line-height: 40px;
font-weight: bold;
}
} }
} }
} }

23
src/views/tunnel-manage/index.vue
View File

@@ -107,19 +107,27 @@
<el-input type="number" v-model="form.referenceFrequency" placeholder="请输入基准频率"/> <el-input type="number" v-model="form.referenceFrequency" placeholder="请输入基准频率"/>
</el-form-item> </el-form-item>
<div style="display: flex"> <div style="display: flex">
<el-form-item label="升频时间" prop="upTime"> <el-form-item label="升频时间(分钟)" prop="upTime" label-width="300px">
<el-input-number v-model="form.upTime" :min="0" :max="60"/> <el-input-number v-model="form.upTime" :min="0" :max="60"/>
</el-form-item> </el-form-item>
<el-form-item label="升频率" prop="upFrequency"> <el-form-item label="升频率" prop="upFrequency">
<el-input type="number" v-model="form.upFrequency" placeholder="请输入升频率"/> <el-input type="number" v-model="form.upFrequency" placeholder="请输入升频率">
<template #suffix>
<span>Hz</span>
</template>
</el-input>
</el-form-item> </el-form-item>
</div> </div>
<div style="display: flex"> <div style="display: flex">
<el-form-item label="降频时间" prop="dropTime"> <el-form-item label="降频时间(分钟)" prop="dropTime" label-width="300px">
<el-input-number v-model="form.dropTime" :min="0" :max="60"/> <el-input-number v-model="form.dropTime" :min="0" :max="60"/>
</el-form-item> </el-form-item>
<el-form-item label="降频率" prop="dropFrequency"> <el-form-item label="降频率" prop="dropFrequency">
<el-input type="number" v-model="form.dropFrequency" placeholder="请输入降频率"/> <el-input type="number" v-model="form.dropFrequency" placeholder="请输入降频率">
<template #suffix>
<span>Hz</span>
</template>
</el-input>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="是否默认"> <el-form-item label="是否默认">
@@ -157,6 +165,7 @@ import {getTunnelList, addTunnel, deleteTunnel} from "@/api/tunnelManage";
import {getSiteDrawing, getSiteDetail} from "@/api/site"; import {getSiteDrawing, getSiteDetail} from "@/api/site";
import TunnelTitle from "@/components/tunnelTitle/index.vue"; import TunnelTitle from "@/components/tunnelTitle/index.vue";
import {getTunnelBySiteId} from "@/api/largeScreen"; import {getTunnelBySiteId} from "@/api/largeScreen";
const validateNumber = (rule, value) => { const validateNumber = (rule, value) => {
const reg = /^[A-Za-z0-9]+$/; const reg = /^[A-Za-z0-9]+$/;
return reg.test(value); return reg.test(value);
@@ -618,6 +627,12 @@ const handleMoreDelete = () => {
color: #fff; color: #fff;
font-size: 38px; font-size: 38px;
} }
.el-input__suffix-inner {
font-size: 30px;
color: #08B7B8;
line-height: 40px;
font-weight: bold;
}
} }
} }