Skip to content

F
fk-spider-web
Commit 2fcb89ec by yzh
Options

feat:修改cron表达式组件

parent 6505f76f
Showing with 46 additions and 32 deletions
src/components/Crontab/src/Crontab.vue
...@@ -497,8 +497,17 @@ const submit = () => { ...@@ -497,8 +497,17 @@ const submit = () => {
' ' + ' ' +
value_week.value + value_week.value +
year year
emit('update:modelValue', defaultValue.value)
dialogVisible.value = false const res = defaultValue.value.split('*').length - 1
console.log(defaultValue.value)
if (res >= 5) {
emit('update:modelValue', defaultValue.value)
dialogVisible.value = false
}else{
ElMessage.warning('cron表达式错误,只可设置一个间隔')
defaultValue.value = '* * * * * *'
}
} }
const inputChange = () => { const inputChange = () => {
...@@ -521,10 +530,10 @@ const inputChange = () => { ...@@ -521,10 +530,10 @@ const inputChange = () => {
<el-form> <el-form>
<el-form-item label="类型" > <el-form-item label="类型" >
<el-radio-group v-model="cronValue.second.type"> <el-radio-group v-model="cronValue.second.type">
<el-radio-button value="0">任意值</el-radio-button> <el-radio-button value="0">重置</el-radio-button>
<el-radio-button value="1">范围</el-radio-button> <!-- <el-radio-button value="1">范围</el-radio-button> -->
<el-radio-button value="2">间隔</el-radio-button> <el-radio-button value="2">间隔</el-radio-button>
<el-radio-button value="3">指定</el-radio-button> <!-- <el-radio-button value="3">指定</el-radio-button> -->
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.second.type == '1'" label="范围" class="m-t-4"> <el-form-item v-if="cronValue.second.type == '1'" label="范围" class="m-t-4">
...@@ -533,8 +542,9 @@ const inputChange = () => { ...@@ -533,8 +542,9 @@ const inputChange = () => {
<el-input-number v-model="cronValue.second.range.end" :max="59" :min="0" controls-position="right" /> <el-input-number v-model="cronValue.second.range.end" :max="59" :min="0" controls-position="right" />
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.second.type == '2'" label="间隔" class="m-t-4"> <el-form-item v-if="cronValue.second.type == '2'" label="间隔" class="m-t-4">
<el-input-number v-model="cronValue.second.loop.start" :max="59" :min="0" controls-position="right" /> <!-- <el-input-number v-model="cronValue.second.loop.start" :max="59" :min="0" controls-position="right" />
秒开始，每 秒开始，每 -->
每
<el-input-number v-model="cronValue.second.loop.end" :max="59" :min="0" controls-position="right" /> <el-input-number v-model="cronValue.second.loop.end" :max="59" :min="0" controls-position="right" />
秒执行一次 秒执行一次
</el-form-item> </el-form-item>
...@@ -555,10 +565,10 @@ const inputChange = () => { ...@@ -555,10 +565,10 @@ const inputChange = () => {
<el-form> <el-form>
<el-form-item label="类型"> <el-form-item label="类型">
<el-radio-group v-model="cronValue.minute.type"> <el-radio-group v-model="cronValue.minute.type">
<el-radio-button value="0">任意值</el-radio-button> <el-radio-button value="0">重置</el-radio-button>
<el-radio-button value="1">范围</el-radio-button> <!-- <el-radio-button value="1">范围</el-radio-button> -->
<el-radio-button value="2">间隔</el-radio-button> <el-radio-button value="2">间隔</el-radio-button>
<el-radio-button value="3">指定</el-radio-button> <!-- <el-radio-button value="3">指定</el-radio-button> -->
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.minute.type == '1'" label="范围" class="m-t-4"> <el-form-item v-if="cronValue.minute.type == '1'" label="范围" class="m-t-4">
...@@ -567,8 +577,9 @@ const inputChange = () => { ...@@ -567,8 +577,9 @@ const inputChange = () => {
<el-input-number v-model="cronValue.minute.range.end" :max="59" :min="0" controls-position="right" /> <el-input-number v-model="cronValue.minute.range.end" :max="59" :min="0" controls-position="right" />
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.minute.type == '2'" label="间隔" class="m-t-4"> <el-form-item v-if="cronValue.minute.type == '2'" label="间隔" class="m-t-4">
<el-input-number v-model="cronValue.minute.loop.start" :max="59" :min="0" controls-position="right" /> <!-- <el-input-number v-model="cronValue.minute.loop.start" :max="59" :min="0" controls-position="right" />
分钟开始，每 分钟开始， -->
每
<el-input-number v-model="cronValue.minute.loop.end" :max="59" :min="0" controls-position="right" /> <el-input-number v-model="cronValue.minute.loop.end" :max="59" :min="0" controls-position="right" />
分钟执行一次 分钟执行一次
</el-form-item> </el-form-item>
...@@ -589,10 +600,10 @@ const inputChange = () => { ...@@ -589,10 +600,10 @@ const inputChange = () => {
<el-form> <el-form>
<el-form-item label="类型"> <el-form-item label="类型">
<el-radio-group v-model="cronValue.hour.type"> <el-radio-group v-model="cronValue.hour.type">
<el-radio-button value="0">任意值</el-radio-button> <el-radio-button value="0">重置</el-radio-button>
<el-radio-button value="1">范围</el-radio-button> <!-- <el-radio-button value="1">范围</el-radio-button> -->
<el-radio-button value="2">间隔</el-radio-button> <el-radio-button value="2">间隔</el-radio-button>
<el-radio-button value="3">指定</el-radio-button> <!-- <el-radio-button value="3">指定</el-radio-button> -->
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.hour.type == '1'" label="范围" class="m-t-4"> <el-form-item v-if="cronValue.hour.type == '1'" label="范围" class="m-t-4">
...@@ -601,8 +612,9 @@ const inputChange = () => { ...@@ -601,8 +612,9 @@ const inputChange = () => {
<el-input-number v-model="cronValue.hour.range.end" :max="23" :min="0" controls-position="right" /> <el-input-number v-model="cronValue.hour.range.end" :max="23" :min="0" controls-position="right" />
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.hour.type == '2'" label="间隔" class="m-t-4"> <el-form-item v-if="cronValue.hour.type == '2'" label="间隔" class="m-t-4">
<el-input-number v-model="cronValue.hour.loop.start" :max="23" :min="0" controls-position="right" /> <!-- <el-input-number v-model="cronValue.hour.loop.start" :max="23" :min="0" controls-position="right" />
小时开始，每 小时开始， -->
每
<el-input-number v-model="cronValue.hour.loop.end" :max="23" :min="0" controls-position="right" /> <el-input-number v-model="cronValue.hour.loop.end" :max="23" :min="0" controls-position="right" />
小时执行一次 小时执行一次
</el-form-item> </el-form-item>
...@@ -623,10 +635,10 @@ const inputChange = () => { ...@@ -623,10 +635,10 @@ const inputChange = () => {
<el-form> <el-form>
<el-form-item label="类型"> <el-form-item label="类型">
<el-radio-group v-model="cronValue.day.type"> <el-radio-group v-model="cronValue.day.type">
<el-radio-button value="0">任意值</el-radio-button> <el-radio-button value="0">重置</el-radio-button>
<el-radio-button value="1">范围</el-radio-button> <!-- <el-radio-button value="1">范围</el-radio-button> -->
<el-radio-button value="2">间隔</el-radio-button> <el-radio-button value="2">间隔</el-radio-button>
<el-radio-button value="3">指定</el-radio-button> <!-- <el-radio-button value="3">指定</el-radio-button> -->
<!-- <el-radio-button value="4">本月最后一天</el-radio-button> <!-- <el-radio-button value="4">本月最后一天</el-radio-button>
<el-radio-button value="5">不指定</el-radio-button> --> <el-radio-button value="5">不指定</el-radio-button> -->
</el-radio-group> </el-radio-group>
...@@ -637,8 +649,9 @@ const inputChange = () => { ...@@ -637,8 +649,9 @@ const inputChange = () => {
<el-input-number v-model="cronValue.day.range.end" :max="31" :min="1" controls-position="right" /> <el-input-number v-model="cronValue.day.range.end" :max="31" :min="1" controls-position="right" />
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.day.type == '2'" label="间隔" class="m-t-4"> <el-form-item v-if="cronValue.day.type == '2'" label="间隔" class="m-t-4">
<el-input-number v-model="cronValue.day.loop.start" :max="31" :min="1" controls-position="right" /> <!-- <el-input-number v-model="cronValue.day.loop.start" :max="31" :min="1" controls-position="right" />
号开始，每 号开始， -->
每
<el-input-number v-model="cronValue.day.loop.end" :max="31" :min="1" controls-position="right" /> <el-input-number v-model="cronValue.day.loop.end" :max="31" :min="1" controls-position="right" />
天执行一次 天执行一次
</el-form-item> </el-form-item>
...@@ -659,10 +672,10 @@ const inputChange = () => { ...@@ -659,10 +672,10 @@ const inputChange = () => {
<el-form> <el-form>
<el-form-item label="类型"> <el-form-item label="类型">
<el-radio-group v-model="cronValue.month.type"> <el-radio-group v-model="cronValue.month.type">
<el-radio-button value="0">任意值</el-radio-button> <el-radio-button value="0">重置</el-radio-button>
<el-radio-button value="1">范围</el-radio-button> <!-- <el-radio-button value="1">范围</el-radio-button> -->
<el-radio-button value="2">间隔</el-radio-button> <el-radio-button value="2">间隔</el-radio-button>
<el-radio-button value="3">指定</el-radio-button> <!-- <el-radio-button value="3">指定</el-radio-button> -->
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.month.type == '1'" label="范围" class="m-t-4"> <el-form-item v-if="cronValue.month.type == '1'" label="范围" class="m-t-4">
...@@ -671,8 +684,9 @@ const inputChange = () => { ...@@ -671,8 +684,9 @@ const inputChange = () => {
<el-input-number v-model="cronValue.month.range.end" :max="12" :min="1" controls-position="right" /> <el-input-number v-model="cronValue.month.range.end" :max="12" :min="1" controls-position="right" />
</el-form-item> </el-form-item>
<el-form-item v-if="cronValue.month.type == '2'" label="间隔" class="m-t-4"> <el-form-item v-if="cronValue.month.type == '2'" label="间隔" class="m-t-4">
<el-input-number v-model="cronValue.month.loop.start" :max="12" :min="1" controls-position="right" /> <!-- <el-input-number v-model="cronValue.month.loop.start" :max="12" :min="1" controls-position="right" />
月开始，每 月开始， -->
每
<el-input-number v-model="cronValue.month.loop.end" :max="12" :min="1" controls-position="right" /> <el-input-number v-model="cronValue.month.loop.end" :max="12" :min="1" controls-position="right" />
月执行一次 月执行一次
</el-form-item> </el-form-item>
...@@ -694,10 +708,10 @@ const inputChange = () => { ...@@ -694,10 +708,10 @@ const inputChange = () => {
<el-form> <el-form>
<el-form-item label="类型"> <el-form-item label="类型">
<el-radio-group v-model="cronValue.week.type"> <el-radio-group v-model="cronValue.week.type">
<el-radio-button value="0">任意值</el-radio-button> <el-radio-button value="0">重置</el-radio-button>
<el-radio-button value="1">范围</el-radio-button> <!-- <el-radio-button value="1">范围</el-radio-button> -->
<el-radio-button value="2">间隔</el-radio-button> <el-radio-button value="2">间隔</el-radio-button>
<el-radio-button value="3">指定</el-radio-button> <!-- <el-radio-button value="3">指定</el-radio-button> -->
<!-- <el-radio-button value="4">本月最后一周</el-radio-button> <!-- <el-radio-button value="4">本月最后一周</el-radio-button>
<el-radio-button value="5">不指定</el-radio-button> --> <el-radio-button value="5">不指定</el-radio-button> -->
</el-radio-group> </el-radio-group>
......
src/views/os-status/components/qbDataMonitor.vue
...@@ -110,10 +110,10 @@ const goToSTDataPage = () => { ...@@ -110,10 +110,10 @@ const goToSTDataPage = () => {
background-image: url("@/assets/picture/wenjianjia.png"); background-image: url("@/assets/picture/wenjianjia.png");
background-size: 100% 120%; background-size: 100% 120%;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-top: 3%; margin-top: -5%;
display: flex; display: flex;
// border: 1.5px solid rgb(193, 188, 188); // border: 1.5px solid rgb(193, 188, 188);
height: 50%; height: 65%;
width: 50%; width: 50%;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment