|
|
@ -63,7 +63,7 @@ |
|
|
<div class="task-content-col"> |
|
|
<div class="task-content-col"> |
|
|
<div class="task-title-row"> |
|
|
<div class="task-title-row"> |
|
|
<span class="task-title">{{ item.enterpriseName || '-' }}</span> |
|
|
<span class="task-title">{{ item.enterpriseName || '-' }}</span> |
|
|
<span v-if="item.isUnion === 1" class="union-badge">联</span> |
|
|
<span v-if="item.isUnion === 1 && item.associatedPlans && item.associatedPlans.length" class="union-badge">联</span> |
|
|
</div> |
|
|
</div> |
|
|
<div class="task-time-info"> |
|
|
<div class="task-time-info"> |
|
|
<van-icon name="clock-o" size="14" color="#999" /> |
|
|
<van-icon name="clock-o" size="14" color="#999" /> |
|
|
@ -302,6 +302,7 @@ const getTimeStart = (item) => { |
|
|
const time = item.planActualTime || item.planTime; |
|
|
const time = item.planActualTime || item.planTime; |
|
|
if (time === 1) return '09:00'; |
|
|
if (time === 1) return '09:00'; |
|
|
if (time === 2) return '14:00'; |
|
|
if (time === 2) return '14:00'; |
|
|
|
|
|
if (time === 3) return '18:00'; |
|
|
return ''; |
|
|
return ''; |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
@ -309,12 +310,13 @@ const getTimeEnd = (item) => { |
|
|
const time = item.planActualTime || item.planTime; |
|
|
const time = item.planActualTime || item.planTime; |
|
|
if (time === 1) return '12:00'; |
|
|
if (time === 1) return '12:00'; |
|
|
if (time === 2) return '18:00'; |
|
|
if (time === 2) return '18:00'; |
|
|
|
|
|
if (time === 3) return '21:00'; |
|
|
return ''; |
|
|
return ''; |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
const getTimeRange = (item) => { |
|
|
const getTimeRange = (item) => { |
|
|
const time = item.planActualTime || item.planTime; |
|
|
const time = item.planActualTime || item.planTime; |
|
|
if (time === 3) return '其他'; |
|
|
// if (time === 3) return '其他'; |
|
|
return `${getTimeStart(item)}-${getTimeEnd(item)}`; |
|
|
return `${getTimeStart(item)}-${getTimeEnd(item)}`; |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
@ -371,6 +373,14 @@ const loadTaskList = () => { |
|
|
loading.value = false; |
|
|
loading.value = false; |
|
|
if (res.code === 200 && res.data) { |
|
|
if (res.code === 200 && res.data) { |
|
|
taskList.value = res.data; |
|
|
taskList.value = res.data; |
|
|
|
|
|
// 按时段固定排序:上午(1) → 下午(2) → 其他,同一时段的多条任务相邻 |
|
|
|
|
|
taskList.value.sort((a, b) => { |
|
|
|
|
|
const ta = a.planActualTime || a.planTime; |
|
|
|
|
|
const tb = b.planActualTime || b.planTime; |
|
|
|
|
|
const ra = ta === 1 ? 0 : ta === 2 ? 1 : 2; |
|
|
|
|
|
const rb = tb === 1 ? 0 : tb === 2 ? 1 : 2; |
|
|
|
|
|
return ra - rb; |
|
|
|
|
|
}); |
|
|
// 第二次请求:加载联合执法任务的关联单位信息 |
|
|
// 第二次请求:加载联合执法任务的关联单位信息 |
|
|
loadAssociatedPlans(); |
|
|
loadAssociatedPlans(); |
|
|
} else { |
|
|
} else { |
|
|
|