From b66ac3134f5457312fe6c2d35004ed0af1de1971 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 11 Jun 2025 17:16:03 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-web-manage
---
src/views/wel/components/calendarBox.vue | 28 ++++++++++++++++------------
src/views/wel/components/backlog.vue | 21 ++++++++++++++++-----
2 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/src/views/wel/components/backlog.vue b/src/views/wel/components/backlog.vue
index a6c143b..926994b 100644
--- a/src/views/wel/components/backlog.vue
+++ b/src/views/wel/components/backlog.vue
@@ -13,7 +13,8 @@
>
<div>
{{ item.name }}
- <div class="dots">{{ item.number >= 100 ? '99+' : item.number }}</div>
+ <div class="dots" :class="item.number >= 100 ? 'dots1':''">{{ item.number >= 100 ? '99+' : item.number }}</div>
+ <!-- <div class="dots">99+</div> -->
</div>
</div>
</div>
@@ -277,8 +278,21 @@
width: 17px;
height: 17px;
border-radius: 50%;
- background: #366fff;
+ background: #366fff;
color: #fff;
+ font-size: 9px;
+ position: absolute;
+ top: -10px;
+ right: -13px;
+ padding: 1px;
+ line-height: 17px;
+ }
+ .dots1 {
+ width: 17px;
+ height: 17px;
+ border-radius: 50%;
+ background: none !important;
+ color: #366fff !important;
font-size: 9px;
position: absolute;
top: -10px;
@@ -317,9 +331,6 @@
width: 100%;
height: 100%;
}
- // background-position: center;
- // background-repeat: no-repeat;
- // background-size: contain;
}
.content-wrapper {
diff --git a/src/views/wel/components/calendarBox.vue b/src/views/wel/components/calendarBox.vue
index 89e9692..9f43825 100644
--- a/src/views/wel/components/calendarBox.vue
+++ b/src/views/wel/components/calendarBox.vue
@@ -28,7 +28,7 @@
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'
+import { ElMessage } from 'element-plus';
const router = useRouter();
const events = ref({});
const params = ref({
@@ -68,12 +68,15 @@
const getDate = date => {
return date.getDate();
};
+
// 获取对应日期的事件
const getEvents = dateString => {
return events.value[dateString] || [];
};
const monthRange = getCurrentMonthRange();
params.value = monthRange;
+console.log('params.value', params.value);
+
const getJobEventBar = () => {
getCalen(params.value).then(res => {
if (res.data.code !== 0) return;
@@ -81,8 +84,6 @@
});
};
const jumpcalendar = (event, day) => {
-
-
if (event.name === '工单') {
router.push({
path: '/tickets/ticket',
@@ -90,14 +91,13 @@
day: day,
},
});
- }else{
+ } else {
router.push({
path: '/job/jobstatistics',
query: {
day: day,
},
});
- // ElMessage.warning('加急开发中...')
}
};
onMounted(() => {
@@ -106,15 +106,19 @@
</script>
<style lang="scss">
.calenBox {
-.el-calendar__title{
-font-weight: bold;
-font-size: 14px;
-color: #363636;
-}
-
+ .el-button-group>.el-button:not(:first-child):not(:last-child) {
+ border-radius: 0;
+ display: none;
+}
+ .el-calendar__title {
+ font-weight: bold;
+ font-size: 14px;
+ color: #363636;
+ }
+
.el-calendar-table td.is-selected {
- background-color: #f0f7ff;
+ background-color: #f0f7ff;
border: 2px solid #409eff;
border-radius: 4px;
}
--
Gitblit v1.9.3