test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: 优化定时任务页面

This commit is contained in:
AgAngle 2020-07-19 16:17:16 +08:00
parent f9723d6da7
commit e24ab7a2ad
10 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/metersphere/Application.java
View File

@ -17,6 +17,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
JmeterProperties.class JmeterProperties.class
}) })
@EnableScheduling @EnableScheduling
//@PropertySource(value = {"file:c:\\opt\\metersphere\\conf\\metersphere.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true)
@PropertySource(value = {"file:/opt/metersphere/conf/metersphere.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true) @PropertySource(value = {"file:/opt/metersphere/conf/metersphere.properties"}, encoding = "UTF-8", ignoreResourceNotFound = true)
public class Application { public class Application {
public static void main(String[] args) { public static void main(String[] args) {

12
frontend/src/business/components/common/components/MsScheduleEdit.vue
View File

@ -3,12 +3,14 @@
<div id="app"> <div id="app">
<el-form :model="form" :rules="rules" ref="from"> <el-form :model="form" :rules="rules" ref="from">
<el-form-item <el-form-item
:placeholder="$t('schedule.please_input_cron_expression')"
prop="cronValue"> prop="cronValue">
<el-input v-model="form.cronValue" placeholder class="inp"/> <el-input v-model="form.cronValue" class="inp" :placeholder="$t('schedule.please_input_cron_expression')"/>
<el-button type="primary" @click="showCronDialog">{{$t('schedule.generate_expression')}}</el-button> <!-- <el-button type="primary" @click="showCronDialog">{{$t('schedule.generate_expression')}}</el-button>-->
<el-button type="primary" @click="saveCron">{{$t('commons.save')}}</el-button> <el-button type="primary" @click="saveCron">{{$t('commons.save')}}</el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-link type="primary" @click="showCronDialog">{{$t('schedule.generate_expression')}}</el-link>
</el-form-item>
<crontab-result :ex="form.cronValue" ref="crontabResult" /> <crontab-result :ex="form.cronValue" ref="crontabResult" />
</el-form> </el-form>
<el-dialog :title="$t('schedule.generate_expression')" :visible.sync="showCron" :modal="false"> <el-dialog :title="$t('schedule.generate_expression')" :visible.sync="showCron" :modal="false">
@ -124,4 +126,8 @@
margin-right: 20px; margin-right: 20px;
} }
.el-form-item {
margin-bottom: 10px;
}
</style> </style>

10
frontend/src/business/components/common/cron/CrontabDay.vue
View File

@ -154,19 +154,19 @@ export default {
computed: { computed: {
// 计算两个周期值 // 计算两个周期值
cycleTotal: function () { cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, 1, 31) this.checkNum(this.cycle01, 1, 31)
this.cycle02 = this.checkNum(this.cycle02, 1, 31) this.checkNum(this.cycle02, 1, 31)
return this.cycle01 + '-' + this.cycle02; return this.cycle01 + '-' + this.cycle02;
}, },
// 计算平均用到的值 // 计算平均用到的值
averageTotal: function () { averageTotal: function () {
this.average01 = this.checkNum(this.average01, 1, 31) this.checkNum(this.average01, 1, 31)
this.average02 = this.checkNum(this.average02, 1, 31) this.checkNum(this.average02, 1, 31)
return this.average01 + '/' + this.average02; return this.average01 + '/' + this.average02;
}, },
// 计算工作日格式 // 计算工作日格式
workdayCheck: function () { workdayCheck: function () {
this.workday = this.checkNum(this.workday, 1, 31) this.checkNum(this.workday, 1, 31)
return this.workday; return this.workday;
}, },
// 计算勾选的checkbox值合集 // 计算勾选的checkbox值合集

8
frontend/src/business/components/common/cron/CrontabHour.vue
View File

@ -102,14 +102,14 @@ export default {
computed: { computed: {
// 计算两个周期值 // 计算两个周期值
cycleTotal: function () { cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, 0, 23) this.checkNum(this.cycle01, 0, 23)
this.cycle02 = this.checkNum(this.cycle02, 0, 23) this.checkNum(this.cycle02, 0, 23)
return this.cycle01 + '-' + this.cycle02; return this.cycle01 + '-' + this.cycle02;
}, },
// 计算平均用到的值 // 计算平均用到的值
averageTotal: function () { averageTotal: function () {
this.average01 = this.checkNum(this.average01, 0, 23) this.checkNum(this.average01, 0, 23)
this.average02 = this.checkNum(this.average02, 1, 23) this.checkNum(this.average02, 1, 23)
return this.average01 + '/' + this.average02; return this.average01 + '/' + this.average02;
}, },
// 计算勾选的checkbox值合集 // 计算勾选的checkbox值合集

14
frontend/src/business/components/common/cron/CrontabMin.vue
View File

@ -9,15 +9,15 @@
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="2"> <el-radio v-model='radioValue' :label="2">
{{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}} {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
<el-input-number v-model='cycle01' :min="0" :max="60" /> - <el-input-number v-model='cycle01' :min="0" :max="59" /> -
<el-input-number v-model='cycle02' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}} <el-input-number v-model='cycle02' :min="0" :max="59" /> {{$t('schedule.cron.minutes')}}
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="3"> <el-radio v-model='radioValue' :label="3">
{{$t('schedule.cron.from')}} {{$t('schedule.cron.from')}}
<el-input-number v-model='average01' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}} <el-input-number v-model='average01' :min="0" :max="59" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
<el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.execute_once')}} <el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.minutes')}}{{$t('schedule.cron.execute_once')}}
</el-radio> </el-radio>
</el-form-item> </el-form-item>
@ -100,14 +100,14 @@ export default {
computed: { computed: {
// 计算两个周期值 // 计算两个周期值
cycleTotal: function () { cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, 0, 59) this.checkNum(this.cycle01, 0, 59)
this.cycle02 = this.checkNum(this.cycle02, 0, 59) this.checkNum(this.cycle02, 0, 59)
return this.cycle01 + '-' + this.cycle02; return this.cycle01 + '-' + this.cycle02;
}, },
// 计算平均用到的值 // 计算平均用到的值
averageTotal: function () { averageTotal: function () {
this.average01 = this.checkNum(this.average01, 0, 59) this.checkNum(this.average01, 0, 59)
this.average02 = this.checkNum(this.average02, 1, 59) this.checkNum(this.average02, 1, 59)
return this.average01 + '/' + this.average02; return this.average01 + '/' + this.average02;
}, },
// 计算勾选的checkbox值合集 // 计算勾选的checkbox值合集

8
frontend/src/business/components/common/cron/CrontabMouth.vue
View File

@ -108,14 +108,14 @@ export default {
computed: { computed: {
// 计算两个周期值 // 计算两个周期值
cycleTotal: function () { cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, 1, 12) this.checkNum(this.cycle01, 1, 12)
this.cycle02 = this.checkNum(this.cycle02, 1, 12) this.checkNum(this.cycle02, 1, 12)
return this.cycle01 + '-' + this.cycle02; return this.cycle01 + '-' + this.cycle02;
}, },
// 计算平均用到的值 // 计算平均用到的值
averageTotal: function () { averageTotal: function () {
this.average01 = this.checkNum(this.average01, 1, 12) this.checkNum(this.average01, 1, 12)
this.average02 = this.checkNum(this.average02, 1, 12) this.checkNum(this.average02, 1, 12)
return this.average01 + '/' + this.average02; return this.average01 + '/' + this.average02;
}, },
// 计算勾选的checkbox值合集 // 计算勾选的checkbox值合集

2
frontend/src/business/components/common/cron/CrontabResult.vue
View File

@ -586,7 +586,7 @@ export default {
.popup-result { .popup-result {
box-sizing: border-box; box-sizing: border-box;
line-height: 24px; line-height: 24px;
margin: 25px auto; margin: 10px auto;
padding: 15px 10px 10px; padding: 15px 10px 10px;
border: 1px solid #ccc; border: 1px solid #ccc;
position: relative; position: relative;

14
frontend/src/business/components/common/cron/CrontabSecond.vue
View File

@ -9,15 +9,15 @@
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="2"> <el-radio v-model='radioValue' :label="2">
{{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}} {{$t('schedule.cron.period')}} {{$t('schedule.cron.from')}}
<el-input-number v-model='cycle01' :min="0" :max="60" /> - <el-input-number v-model='cycle01' :min="0" :max="59" /> -
<el-input-number v-model='cycle02' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}} <el-input-number v-model='cycle02' :min="0" :max="59" /> {{$t('schedule.cron.seconds')}}
</el-radio> </el-radio>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-radio v-model='radioValue' :label="3"> <el-radio v-model='radioValue' :label="3">
{{$t('schedule.cron.from')}} {{$t('schedule.cron.from')}}
<el-input-number v-model='average01' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}} <el-input-number v-model='average01' :min="0" :max="59" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.start')}}，{{$t('schedule.cron.every')}}
<el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.execute_once')}} <el-input-number v-model='average02' :min="0" :max="60" /> {{$t('schedule.cron.seconds')}}{{$t('schedule.cron.execute_once')}}
</el-radio> </el-radio>
</el-form-item> </el-form-item>
@ -113,14 +113,14 @@
computed: { computed: {
// 计算两个周期值 // 计算两个周期值
cycleTotal: function () { cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, 0, 59); this.checkNum(this.cycle01, 0, 59);
this.cycle02 = this.checkNum(this.cycle02, 0, 59); this.checkNum(this.cycle02, 0, 59);
return this.cycle01 + '-' + this.cycle02; return this.cycle01 + '-' + this.cycle02;
}, },
// 计算平均用到的值 // 计算平均用到的值
averageTotal: function () { averageTotal: function () {
this.average01 = this.checkNum(this.average01, 0, 59) this.checkNum(this.average01, 0, 59)
this.average02 = this.checkNum(this.average02, 1, 59) this.checkNum(this.average02, 1, 59)
return this.average01 + '/' + this.average02; return this.average01 + '/' + this.average02;
}, },
// 计算勾选的checkbox值合集 // 计算勾选的checkbox值合集

13
frontend/src/business/components/common/cron/CrontabWeek.vue
View File

@ -58,8 +58,7 @@ export default {
average01: 1, average01: 1,
average02: 1, average02: 1,
checkboxList: [], checkboxList: [],
weekList: [ weekList: [this.$t('commons.weeks_1'),
this.$t('commons.weeks_1'),
this.$t('commons.weeks_2'), this.$t('commons.weeks_2'),
this.$t('commons.weeks_3'), this.$t('commons.weeks_3'),
this.$t('commons.weeks_4'), this.$t('commons.weeks_4'),
@ -150,19 +149,19 @@ export default {
computed: { computed: {
// 计算两个周期值 // 计算两个周期值
cycleTotal: function () { cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, 1, 7) this.checkNum(this.cycle01, 1, 7)
this.cycle02 = this.checkNum(this.cycle02, 1, 7) this.checkNum(this.cycle02, 1, 7)
return this.cycle01 + '-' + this.cycle02; return this.cycle01 + '-' + this.cycle02;
}, },
// 计算平均用到的值 // 计算平均用到的值
averageTotal: function () { averageTotal: function () {
this.average01 = this.checkNum(this.average01, 1, 4) this.checkNum(this.average01, 1, 4)
this.average02 = this.checkNum(this.average02, 1, 7) this.checkNum(this.average02, 1, 7)
return this.average01 + '#' + this.average02; return this.average01 + '#' + this.average02;
}, },
// 最近的工作日（格式） // 最近的工作日（格式）
weekdayCheck: function () { weekdayCheck: function () {
this.weekday = this.checkNum(this.weekday, 1, 7) this.checkNum(this.weekday, 1, 7)
return this.weekday; return this.weekday;
}, },
// 计算勾选的checkbox值合集 // 计算勾选的checkbox值合集

8
frontend/src/business/components/common/cron/CrontabYear.vue
View File

@ -120,14 +120,14 @@ export default {
computed: { computed: {
// 计算两个周期值 // 计算两个周期值
cycleTotal: function () { cycleTotal: function () {
this.cycle01 = this.checkNum(this.cycle01, this.fullYear, this.fullYear + 100) this.checkNum(this.cycle01, this.fullYear, this.fullYear + 100)
this.cycle02 = this.checkNum(this.cycle02, this.fullYear + 1, this.fullYear + 101) this.checkNum(this.cycle02, this.fullYear + 1, this.fullYear + 101)
return this.cycle01 + '-' + this.cycle02; return this.cycle01 + '-' + this.cycle02;
}, },
// 计算平均用到的值 // 计算平均用到的值
averageTotal: function () { averageTotal: function () {
this.average01 = this.checkNum(this.average01, this.fullYear, this.fullYear + 100) this.checkNum(this.average01, this.fullYear, this.fullYear + 100)
this.average02 = this.checkNum(this.average02, 1, 10) this.checkNum(this.average02, 1, 10)
return this.average01 + '/' + this.average02; return this.average01 + '/' + this.average02;
}, },
// 计算勾选的checkbox值合集 // 计算勾选的checkbox值合集