From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/job/components/TaskTop/TaskTop.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/job/components/TaskTop/TaskTop.vue b/src/views/job/components/TaskTop/TaskTop.vue
index c0a0a06..68b8a6b 100644
--- a/src/views/job/components/TaskTop/TaskTop.vue
+++ b/src/views/job/components/TaskTop/TaskTop.vue
@@ -1,8 +1,16 @@
+<!--
+ * @Author : yuan
+ * @Date : 2025-06-14 15:19:16
+ * @LastEditors : yuan
+ * @LastEditTime : 2025-06-26 11:46:38
+ * @FilePath : \src\views\job\components\TaskTop\TaskTop.vue
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
+ * 2025-06-14 15:19:16
+-->
<template>
<div class="task-top">
<!--时间 天气-->
- <common-weather />
- <UserOperate />
<div class="statistical-chart">
<TaskTotal />
<TaskIndustry />
@@ -13,9 +21,7 @@
</template>
<script setup>
-// import { pxToRem } from '@/utils/rem'
-// import CommonWeather from '@/components/CommonWeather.vue'
-// import UserOperate from '@/components/UserOperate.vue'
+import { pxToRem } from '@/utils/rem'
import TaskTotal from './TaskTotal.vue'
import TaskIndustry from './TaskIndustry.vue'
import TaskTime from './TaskTime.vue'
@@ -25,12 +31,14 @@
<style lang="scss" scoped>
.task-top {
position: relative;
- margin-bottom: 6px;
+ display: flex;
+
.statistical-chart {
margin-left: 10px;
- margin-right: 40px;
+ margin-right: 10px;
display: flex;
- width:100%;
+ width: 0;
+ flex: 1;
height: 216px;
box-sizing: border-box;
margin-bottom: 10px;
--
Gitblit v1.9.3