From cc1aacf766bc902001f460fdfce20a9ec2ea097d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 09 Apr 2025 17:56:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index ee3f45b..f6b3f34 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -1,6 +1,6 @@
<!-- 任务统计表格 -->
<template>
- <SearchBox @search="searchClick"></SearchBox>
+ <SearchBox @search="searchClick" @addTask="handleAddTask"></SearchBox>
<div class="task-intermediate-content">
<el-table :data="jobListData" style="width: 100%" height="calc(100vh - 180px)">
<el-table-column label="序号" width="60">
@@ -40,10 +40,12 @@
/>
</div>
</div>
+ <AddTask v-model:show="isShowAddTask" @refresh="searchClick"/>
</template>
<script setup>
import SearchBox from '../SearchBox.vue';
+import AddTask from './AddTask.vue';
import { jobList } from '@/api/home/task';
const jobListParams = reactive({
@@ -64,7 +66,6 @@
};
// 状态文字
const getStatusText = (status) => {
- console.log('哒哒哒',status)
const statusMap = {
1: '待执行',
2: '执行中',
@@ -112,6 +113,12 @@
getJobList();
};
+// 新建任务
+const isShowAddTask = ref(false);
+const handleAddTask = () => {
+ isShowAddTask.value = true;
+};
+
onMounted(() => {
getJobList();
});
@@ -120,10 +127,10 @@
<style lang="scss" scoped>
.task-intermediate-content {
position: absolute;
- top: 200px;
- width: calc(100% - 400px - 400px - 100px);
- left: 450px;
- height: 760px;
+ top: 400px;
+ width: calc(100% - 80px);
+ left: 40px;
+ height: 500px;
display: flex;
flex-direction: column;
justify-content: space-between;
--
Gitblit v1.9.3