|
@@ -111,7 +111,7 @@ const data = reactive({
|
|
{ time: ['22:00:00', '23:00:00'], list: [] },
|
|
{ time: ['22:00:00', '23:00:00'], list: [] },
|
|
{ time: ['23:00:00', '00:00:00'], list: [] },
|
|
{ time: ['23:00:00', '00:00:00'], list: [] },
|
|
{ time: ['00:00:00', '01:00:00'], list: [] }
|
|
{ time: ['00:00:00', '01:00:00'], list: [] }
|
|
- ],
|
|
|
|
|
|
+ ]
|
|
})
|
|
})
|
|
|
|
|
|
// 时间轴表单
|
|
// 时间轴表单
|
|
@@ -180,11 +180,7 @@ const modal = (res) => {
|
|
let st = e.timer[0]
|
|
let st = e.timer[0]
|
|
let en = e.timer[1]
|
|
let en = e.timer[1]
|
|
if (index !== 24) {
|
|
if (index !== 24) {
|
|
- if(props. type === 'scene'){
|
|
|
|
- return start >= st && start <= en || end >= st && end <= en
|
|
|
|
- }else{
|
|
|
|
- return start >= st && end <= en || start <= st && end >= en
|
|
|
|
- }
|
|
|
|
|
|
+ return start >= st && end <= en || start <= st && end >= en || start > st && start < en || end > st && end < en
|
|
}
|
|
}
|
|
})
|
|
})
|
|
list.map(e => {
|
|
list.map(e => {
|