From f03b3fbc36f39cdfb2c3c30cd967948ab4abab3e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 16 Jun 2025 10:22:19 +0800
Subject: [PATCH] feat:个人工作台铺满
---
src/views/wel/index.vue | 16 ++++---
src/views/dataCenter/dataCenter.vue | 16 ++++----
src/views/wel/components/calendarBox.vue | 58 +++++++++++++++++------------
3 files changed, 51 insertions(+), 39 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index ece9562..97f546c 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -417,19 +417,19 @@
const detailTitle = ref('');
const lookDetail = val => {
console.log('查看',val.resultType);
-// if(val.resultType === 4){ // 正射
-// getOrthoimageInfo(val.id).then(res=>{
-// console.log('正射',res.data.data);
-// dialogDetailList.value = res.data.data;
-// })
-// }else{
+if(val.resultType === 4){ // 正射
+ getOrthoimageInfo(val.id).then(res=>{
+ console.log('正射',res.data.data);
+ dialogDetailList.value = res.data.data;
+ })
+}else{
getAttachInfoAPI(val.id).then(res => {
detailTitle.value = res.data.data.nickName;
dialogDetailList.value = res.data.data;
dialogDetailList.value = { ...res.data.data, checkedinput: false };
- // console.log('detailTitle.value',dialogDetailList.value);
+ console.log('detailTitle.value',dialogDetailList.value);
});
-// }
+}
dialogVisible.value = true;
};
diff --git a/src/views/wel/components/calendarBox.vue b/src/views/wel/components/calendarBox.vue
index 3590300..20ce47e 100644
--- a/src/views/wel/components/calendarBox.vue
+++ b/src/views/wel/components/calendarBox.vue
@@ -69,14 +69,12 @@
return date.getDate();
};
-
// 获取对应日期的事件
const getEvents = dateString => {
return events.value[dateString] || [];
};
const monthRange = getCurrentMonthRange();
params.value = monthRange;
-
const getJobEventBar = () => {
getCalen(params.value).then(res => {
@@ -107,36 +105,48 @@
</script>
<style lang="scss">
.calenBox {
+ height: 630px;
+ .el-calendar {
+ height: 100%; // 日历填充容器
+ // 标题样式
+ &__title {
+ font-weight: bold;
+ font-size: 14px;
+ color: #363636;
+ }
- .el-button-group>.el-button:not(:first-child):not(:last-child) {
- border-radius: 0;
+ // 日历主体
+ &__body {
+ height: 98%; // 关键：继承父高度
+
+ .el-calendar-table {
+ height: 90% !important; // 百分比生效
+ }
+ }
+
+ // 选中日期样式
+ .el-calendar-table td.is-selected {
+ background-color: #f0f7ff;
+ border: 2px solid #409eff;
+ border-radius: 4px;
+
+ .date-number {
+ font-weight: bold;
+ color: #409eff;
+ }
+ }
+ }
+
+ // 隐藏按钮组中间按钮
+ .el-button-group > .el-button:not(:first-child):not(:last-child) {
display: none;
-}
- .el-calendar__title {
- font-weight: bold;
- font-size: 14px;
- color: #363636;
- }
-
- .el-calendar-table td.is-selected {
- background-color: #f0f7ff;
- border: 2px solid #409eff;
- border-radius: 4px;
- }
- .el-calendar-table td.is-selected .date-number {
- font-weight: bold;
- color: #409eff;
- }
-
- .el-calendar-table td.is-selected .events {
- // padding: 2px;
}
}
</style>
<style lang="scss" scoped>
.calenBox {
margin-top: 17px;
- height: 567px;
+ height: 630px;
overflow: hidden;
.event-item {
font-size: 12px;
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index c8a1d7a..6611797 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -514,6 +514,7 @@
padding: 0px 20px 0 10px;
display: flex;
justify-content: space-between;
+height: calc(100% - 5rem);
}
.workleft {
width: 68%;
@@ -523,7 +524,7 @@
background: #ffffff;
border-radius: 8px 8px 8px 8px;
.comprehensive {
- padding: 14px 14px 0 21px;
+ padding: 17px 14px 0 21px;
.title {
display: flex;
justify-content: space-between;
@@ -586,7 +587,7 @@
width: 60%;
border-right: 1px solid #dfdfdf;
.workOrder {
- margin-top: 21px;
+ margin-top: 31px;
display: flex;
justify-content: space-between;
border-bottom: 1px solid #dfdfdf;
@@ -594,7 +595,7 @@
width: 40%;
.card-title {
display: flex;
- margin-bottom: 10px;
+ margin-bottom: 17px;
align-items: center;
img {
width: 36px;
@@ -628,6 +629,7 @@
grid-template-columns: repeat(2, 1fr);
row-gap: 14px;
gap: 10px;
+ margin-bottom: 27px;
.status-item {
display: flex;
text-align: center;
@@ -636,6 +638,7 @@
max-width: 158px;
background: #f6f8fe;
border-radius: 8px 8px 8px 8px;
+ margin-bottom: 9px;
img {
width: 26px;
height: 26px;
@@ -665,7 +668,7 @@
font-weight: bold;
font-size: 30px;
color: #363636;
- margin: 5px 0;
+ // margin: 5px 0;
// font-style: italic;
display: inline-block;
transform: skewX(-5deg);
@@ -693,7 +696,7 @@
// 飞行统计
.flyOrder {
- margin-top: 5px;
+ margin-top: 10px;
.fytitle {
display: flex;
align-items: center;
@@ -708,8 +711,7 @@
}
}
.flycenter {
- margin-top: 13px;
-
+ margin-top: 22px;
.centerBox {
display: flex;
justify-content: space-between;
--
Gitblit v1.9.3