From 3d3e7f45086799fdd7a412e2079710a6cdf8dc2b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 24 十月 2024 08:30:04 +0800
Subject: [PATCH] Merge branch 'lsf-dataproduct-1018'
---
src/views/fysp/task/components/CompMonitorPlan.vue | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/src/views/fysp/task/components/CompMonitorPlan.vue b/src/views/fysp/task/components/CompMonitorPlan.vue
index e59c37a..5b86666 100644
--- a/src/views/fysp/task/components/CompMonitorPlan.vue
+++ b/src/views/fysp/task/components/CompMonitorPlan.vue
@@ -22,15 +22,15 @@
<el-row justify="space-between" class="m-t-16">
<el-space direction="vertical">
<el-text size="small">鎬昏</el-text>
- <el-text>{{computeDayTask(data.day).totalTaskNum}}</el-text>
+ <el-text>{{ computeDayTask(data.day).totalTaskNum }}</el-text>
</el-space>
<el-space direction="vertical">
<el-text size="small">瀹屾垚</el-text>
- <el-text>{{computeDayTask(data.day).completeTaskNum}}</el-text>
+ <el-text>{{ computeDayTask(data.day).completeTaskNum }}</el-text>
</el-space>
<el-space direction="vertical">
<el-text size="small">鏁存敼</el-text>
- <el-text>{{computeDayTask(data.day).changedTaskNum}}</el-text>
+ <el-text>{{ computeDayTask(data.day).changedTaskNum }}</el-text>
</el-space>
<!-- <el-statistic title="鎬昏" :value="computeDayTask(data.day).totalTaskNum" />
<el-statistic title="瀹屾垚" :value="computeDayTask(data.day).completeTaskNum" />
@@ -55,9 +55,9 @@
default: () => {}
}
});
-const emit = defineEmits(['dateChange'])
+const emit = defineEmits(['dateChange']);
// 閫変腑鏃ユ湡
-const dateValue = ref(new Date());
+const dateValue = ref();
// 鏃ュ巻鏍囬
const title = computed(() => {
if (props.task) {
@@ -70,18 +70,27 @@
// 鏃ュ巻鑼冨洿
const startDay = computed(() => dayjs(props.task.starttime));
const endDay = computed(() => dayjs(props.task.endtime));
-const dateRange = computed(() => [startDay.value.toDate(), endDay.value.toDate()]);
+const dateRange = computed(() => [
+ startDay.value.toDate(),
+ endDay.value.toDate()
+]);
// const dateRange = computed(() => [new Date(2024, 4, 27), new Date(2024, 5, 30)]);
// 鏃ユ湡鏄惁鍦ㄤ换鍔¤寖鍥村唴
function isDayEnable(day) {
const _day = dayjs(day);
- return _day.isSameOrAfter(startDay.value, 'day') && _day.isSameOrBefore(endDay.value, 'day');
+ return (
+ _day.isSameOrAfter(startDay.value, 'day') &&
+ _day.isSameOrBefore(endDay.value, 'day')
+ );
}
/********************** 鏃ユ湡鏍峰紡 *********************************/
function calendarDayClz(day) {
- return 'calendar-day ' + (isDayEnable(day) ? 'calendar-day-enable' : 'calendar-day-disable');
+ return (
+ 'calendar-day ' +
+ (isDayEnable(day) ? 'calendar-day-enable' : 'calendar-day-disable')
+ );
}
function getDay(day) {
return day.split('-').splice(1, 2).join('-');
@@ -92,12 +101,16 @@
// 鑾峰彇鏃ヤ换鍔＄粺璁′俊鎭�
const dayTaskLoading = ref(false);
const dayTaskList = ref([]);
-function fetchDayTasks(topTaskId) {
+function fetchDayTasks() {
dayTaskLoading.value = true;
- taskApi
- .fetchDayTasks(topTaskId)
+ return taskApi
+ .fetchDayTasks(props.task.tguid)
.then((res) => {
dayTaskList.value = res;
+ // 濡傛灉宸查�夋棩鏈熷瓨鍦紝鍦ㄩ噸鏂拌幏鍙栨棩浠诲姟缁熻淇℃伅鍚庯紝鍐嶆瑙﹀彂鐐瑰嚮浜嬩欢
+ if (dateValue.value) {
+ onDateChange(dateValue.value)
+ }
})
.finally(() => (dayTaskLoading.value = false));
}
@@ -119,11 +132,11 @@
}
function onDateChange(e) {
- const day = dayjs(e).format('YYYY-MM-DD')
- const t = computeDayTask(day)
- console.log(t);
-
- emit('dateChange', t)
+ if (isDayEnable(e)) {
+ const day = dayjs(e).format('YYYY-MM-DD');
+ const t = computeDayTask(day);
+ emit('dateChange', t);
+ }
}
// 鎬讳换鍔＄粺璁�
@@ -141,12 +154,14 @@
watch(
() => props.task,
(nV) => {
- if (nV.tguid) {
- fetchDayTasks(nV.tguid);
+ if (nV && nV.tguid) {
+ fetchDayTasks();
}
},
{ immediate: true }
);
+
+defineExpose({ fetchDayTasks });
</script>
<style scoped>
.li-01 {
@@ -185,7 +200,7 @@
border: 1px solid rgb(172, 165, 165);
border-radius: 50%; */
padding: 8px;
- height: var(--el-calendar-cell-width);
+ /* min-height: var(--el-calendar-cell-width); */
}
.calendar-day-enable {
--
Gitblit v1.9.3