From 84d3ca7935f6cd913699cc5506cdc42a94fed640 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 21 Jul 2025 09:28:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.196.74.78:10010/r/drone/drone-web-manage into dev
---
src/views/wel/components/calendarBox.vue | 107 +++++++++++++++++++++++++++++------------------------
1 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/src/views/wel/components/calendarBox.vue b/src/views/wel/components/calendarBox.vue
index aaae5fe..1fb2eb7 100644
--- a/src/views/wel/components/calendarBox.vue
+++ b/src/views/wel/components/calendarBox.vue
@@ -5,10 +5,15 @@
<div :class="data.isSelected ? 'is-selected' : ''">
<div class="date-number">{{ data.day.slice(8, 10) }}</div>
<div class="events">
- <div v-for="(event, index) in getEvents(data.day)" :key="index" class="event-item" :class="event.type"
- @click="jumpcalendar(event, data.day)">
- <img :src="getEventIcon(event.type)" alt="" />
- {{ event.name }}<span>{{ event.value }}</span>
+ <div
+ v-for="(event, index) in getEvents(data.day)"
+ :key="index"
+ class="event-item"
+ :class="event.type"
+ @click="jumpcalendar(event, data.day)"
+ >
+ <div class="imgBox"><img :src="getEventIcon(event.type)" alt="" /> {{ event.name }}</div>
+ <span>{{ event.value }}</span>
</div>
</div>
</div>
@@ -18,65 +23,71 @@
</template>
<script setup>
-import dayjs from 'dayjs'
-import { jobEventBar, getCalen } from '@/api/home/index'
-import { useRouter } from 'vue-router'
-import ev1 from '@/assets/images/workbench/ev1.svg'
-import ev2 from '@/assets/images/workbench/ev2.svg'
-import { ElMessage } from 'element-plus'
-const router = useRouter()
-const events = ref({})
+import dayjs from 'dayjs';
+import { jobEventBar, getCalen } from '@/api/home/index';
+import { useRouter } from 'vue-router';
+import ev1 from '@/assets/images/workbench/ev1.svg';
+import ev2 from '@/assets/images/workbench/ev2.svg';
+import { ElMessage } from 'element-plus';
+const router = useRouter();
+const events = ref({});
const params = ref({
end_date: undefined,
start_date: undefined,
-})
+});
const eventIcons = ref({
'work-order': ev1,
task: ev2,
-})
+});
const getEventIcon = type => {
- return eventIcons.value[type] || eventIcons.value.default
-}
-function getCurrentMonthRange () {
+ return eventIcons.value[type] || eventIcons.value.default;
+};
+function getCurrentMonthRange() {
return {
start_date: dayjs().startOf('month').format('YYYY-MM-DD HH:mm:ss'),
end_date: dayjs().endOf('month').format('YYYY-MM-DD HH:mm:ss'),
- }
+ };
}
-const leftValue = ref(new Date())
+const leftValue = ref(new Date());
watch(
() => leftValue.value,
(newV, oldV) => {
if (newV && oldV) {
- const newDate = dayjs(newV)
+ const newDate = dayjs(newV);
params.value = {
start_date: newDate.startOf('month').format('YYYY-MM-DD HH:mm:ss'),
end_date: newDate.endOf('month').format('YYYY-MM-DD HH:mm:ss'),
- }
- getJobEventBar()
+ };
+ getJobEventBar();
}
},
{ deep: true, immediate: true }
-)
+);
// 获取日期数字
const getDate = date => {
- return date.getDate()
-}
+ return date.getDate();
+};
// 获取对应日期的事件
const getEvents = dateString => {
- return events.value[dateString] || []
-}
-const monthRange = getCurrentMonthRange()
-params.value = monthRange
+ return events.value[dateString] || [];
+};
+const monthRange = getCurrentMonthRange();
+params.value = monthRange;
const getJobEventBar = () => {
getCalen(params.value).then(res => {
- if (res.data.code !== 0) return
- events.value = res.data.data
- })
-}
+ if (res.data.code !== 0) return;
+ const a = res.data.data;
+ const filteredData = {};
+ for (let date in a) {
+ filteredData[date] = a[date].filter(item => item.type !== 'work-order');
+ }
+ events.value = filteredData;
+ // events.value = res.data.data
+ });
+};
const jumpcalendar = (event, day) => {
if (event.name === '工单') {
router.push({
@@ -84,32 +95,30 @@
query: {
day: day,
},
- })
+ });
} else {
router.push({
path: '/job/jobstatistics',
query: {
day: day,
},
- })
+ });
}
-}
+};
onMounted(() => {
- getJobEventBar()
-})
+ getJobEventBar();
+});
</script>
-
<style lang="scss">
.calenBox {
// height: 630px;
height: pxToVh(660);
-
-
-
// 隐藏按钮组中间按钮
- .el-button-group>.el-button:not(:first-child):not(:last-child) {
+ .el-button-group > .el-button:not(:first-child):not(:last-child) {
display: none;
}
+ .date-number {
+ font-size: 13px !important;}
}
</style>
@@ -123,7 +132,6 @@
background-color: #fff;
::v-deep(.el-calendar) {
-
// height: 80%; // 日历填充容器
// 标题样式
.el-calendar__title {
@@ -141,9 +149,10 @@
// }
// }
.el-calendar-table .el-calendar-day {
- height: 78px !important;
+
+ height: pxToVh(91) !important;
}
-
+
// 选中日期样式
.el-calendar-table td.is-selected {
background-color: #f0f7ff;
@@ -160,7 +169,7 @@
.event-item {
font-size: 12px;
// padding: 2px;
-
+ text-align: center;
border-radius: 3px;
white-space: nowrap;
@@ -184,11 +193,13 @@
span {
font-weight: 600;
- font-size: 14px;
+ font-size: 18px;
color: #029d36;
margin-left: 2px;
}
}
+ .imgBox {
+ font-size: 12px;}
}
}
</style>
--
Gitblit v1.9.3