gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf: 任务等级支持设置0天表示默认不限时

Browse Source
This commit is contained in:
kuaifan 2021-12-28 14:37:02 +08:00
parent 739d1f2455
commit d7f1246c32
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/SystemController.php
View File

@ -114,7 +114,7 @@ class SystemController extends AbstractController
return Base::retError('参数错误'); return Base::retError('参数错误');
} }
foreach ($list AS $item) { foreach ($list AS $item) {
if (empty($item['name']) || empty($item['color']) || empty($item['days']) || empty($item['priority'])) { if (empty($item['name']) || empty($item['color']) || empty($item['priority'])) {
continue; continue;
} }
$array[] = [ $array[] = [

2
database/seeders/SettingsTableSeeder.php
View File

@ -35,7 +35,7 @@ class SettingsTableSeeder extends Seeder
'id' => 2, 'id' => 2,
'name' => 'priority', 'name' => 'priority',
'desc' => '', 'desc' => '',
'setting' => '[{"name":"\\u91cd\\u8981\\u4e14\\u7d27\\u6025","color":"#ED4014","days":1,"priority":1},{"name":"\\u91cd\\u8981\\u4e0d\\u7d27\\u6025","color":"#F16B62","days":3,"priority":2},{"name":"\\u7d27\\u6025\\u4e0d\\u91cd\\u8981","color":"#19C919","days":5,"priority":3},{"name":"\\u4e0d\\u91cd\\u8981\\u4e0d\\u7d27\\u6025","color":"#2D8CF0","days":7,"priority":4}]', 'setting' => '[{"name":"\\u91cd\\u8981\\u4e14\\u7d27\\u6025","color":"#ED4014","days":1,"priority":1},{"name":"\\u91cd\\u8981\\u4e0d\\u7d27\\u6025","color":"#F16B62","days":3,"priority":2},{"name":"\\u7d27\\u6025\\u4e0d\\u91cd\\u8981","color":"#19C919","days":5,"priority":3},{"name":"\\u4e0d\\u91cd\\u8981\\u4e0d\\u7d27\\u6025","color":"#2D8CF0","days":0,"priority":4}]',
'created_at' => seeders_at('2021-07-01 08:04:30'), 'created_at' => seeders_at('2021-07-01 08:04:30'),
'updated_at' => seeders_at('2021-07-01 09:20:26'), 'updated_at' => seeders_at('2021-07-01 09:20:26'),
), ),

19
resources/assets/js/pages/manage/components/TaskAdd.vue
View File

@ -37,7 +37,7 @@
<Button :class="{advanced: advanced}" @click="advanced=!advanced">{{$L('高级选项')}}</Button> <Button :class="{advanced: advanced}" @click="advanced=!advanced">{{$L('高级选项')}}</Button>
<ul class="advanced-priority"> <ul class="advanced-priority">
<li v-for="(item, key) in taskPriority" :key="key"> <li v-for="(item, key) in taskPriority" :key="key">
<ETooltip :content="item.name + ' (' + item.days + $L('天') + ')'"> <ETooltip :content="taskPriorityContent(item)">
<i <i
class="taskfont" class="taskfont"
:style="{color:item.color}" :style="{color:item.color}"
@ -369,10 +369,23 @@ export default {
} }
}, },
taskPriorityContent(item) {
let days = $A.runNum(item.days);
if (days <= 0) {
return item.name + ' (' + this.$L('无时间限制') + ')';
}
return item.name + ' (' + days + this.$L('天') + ')';
},
choosePriority(item) { choosePriority(item) {
let start = new Date(); let start = new Date();
let end = new Date(new Date().setDate(start.getDate() + $A.runNum(item.days))); let days = $A.runNum(item.days);
this.$set(this.addData, 'times', $A.date2string([start, end])) if (days > 0) {
let end = new Date(new Date().setDate(start.getDate() + days));
this.$set(this.addData, 'times', $A.date2string([start, end]))
} else {
this.$set(this.addData, 'times', [])
}
this.$set(this.addData, 'p_level', item.priority) this.$set(this.addData, 'p_level', item.priority)
this.$set(this.addData, 'p_name', item.name) this.$set(this.addData, 'p_name', item.name)
this.$set(this.addData, 'p_color', item.color) this.$set(this.addData, 'p_color', item.color)