From c7bd6db3190ff5c4b55d004db0b9fa944604925f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 18 十月 2024 11:09:15 +0800
Subject: [PATCH] Merge branch 'lsf-topTask'
---
src/views/fysp/task/TaskManage.vue | 117 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 97 insertions(+), 20 deletions(-)
diff --git a/src/views/fysp/task/TaskManage.vue b/src/views/fysp/task/TaskManage.vue
index 7d1c5d4..68efe34 100644
--- a/src/views/fysp/task/TaskManage.vue
+++ b/src/views/fysp/task/TaskManage.vue
@@ -1,7 +1,7 @@
<template>
<BaseContentLayout>
<template #header>
- <FYSearchBar @search="search">
+ <!-- <FYSearchBar @search="search">
<template #options>
<FYOptionLocation
:allOption="true"
@@ -10,7 +10,7 @@
v-model:value="formSearch.locations"
></FYOptionLocation>
</template>
- </FYSearchBar>
+ </FYSearchBar> -->
</template>
<template #aside>
<SideList
@@ -32,14 +32,32 @@
v-loading="mainLoading"
>
<el-row justify="space-between">
- <div><el-text>鐩戠璁″垝</el-text></div>
+ <!-- <div><el-text>鐩戠璁″垝</el-text></div>
<el-button type="warning" size="small" @click="editPlan"
>璁″垝璋冩暣</el-button
- >
- <CompMonitorPlan
- :task="curTask.data"
- @date-change="onDateChange"
- ></CompMonitorPlan>
+ > -->
+ <el-tabs model-value="first">
+ <el-tab-pane label="鐩戠璁″垝" name="first">
+ <el-row>
+ <el-col :span="curSubTaskList.length > 0 ? 16 : 24">
+ <CompMonitorPlan
+ :task="curTask.data"
+ @date-change="onDateChange"
+ ></CompMonitorPlan>
+ </el-col>
+ <el-col v-if="curSubTaskList.length > 0" :span="8">
+ <CompSubTaskList
+ :data="curSubTaskList"
+ height="56vh"
+ @add="subTaskDrawer = true"
+ ></CompSubTaskList>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="鐩戠鍦板浘" name="second">
+ <CompTaskMap></CompTaskMap>
+ </el-tab-pane>
+ </el-tabs>
</el-row>
<el-divider></el-divider>
<el-row justify="space-between">
@@ -50,18 +68,45 @@
</el-row>
<CompMonitorObj :data="curMonitorObjList"></CompMonitorObj>
</el-scrollbar>
- <el-empty v-else description="鏆傛棤璁板綍" v-loading="mainLoading" />
+ <div v-else>
+ <el-empty description="鏆傛棤璁板綍" v-loading="mainLoading" />
+ <el-row v-if="!mainLoading" justify="center">
+ <el-button
+ type="primary"
+ size="default"
+ @click="navToTaskCreate(curTask.data)"
+ >娣诲姞鐩戠鍦烘櫙</el-button
+ >
+ </el-row>
+ </div>
</template>
</BaseContentLayout>
<el-drawer
v-model="subTaskDrawer"
- title="鍗曟棩璁″垝"
+ title="鏃ヨ鍒掔鐞�"
direction="btt"
- size="80%"
+ size="96%"
destroy-on-close
>
- <CompDayTask :day-task="curDayTask"></CompDayTask>
+ <CompDayTask
+ :day-task="curDayTask"
+ :mObjList="curMonitorObjList"
+ ></CompDayTask>
</el-drawer>
+ <el-dialog
+ v-model="topTaskAddVisible"
+ width="600"
+ title="涓�閿垱寤烘�讳换鍔�"
+ destroy-on-close
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :show-close="false"
+ >
+ <CompTaskEdit
+ @submit="navToTaskCreate"
+ @cancel="topTaskAddVisible = false"
+ ></CompTaskEdit>
+ </el-dialog>
</template>
<script>
@@ -69,6 +114,9 @@
import CompMonitorObj from './components/CompMonitorObj.vue';
import CompMonitorPlan from './components/CompMonitorPlan.vue';
import CompDayTask from './components/CompDayTask.vue';
+import CompTaskMap from './components/CompTaskMap.vue';
+import CompTaskEdit from './components/CompTaskEdit.vue';
+import CompSubTaskList from './components/CompSubTaskList.vue';
export default {
beforeRouteEnter(to, from, next) {
// 鍦ㄦ覆鏌撹缁勪欢鐨勫搴旇矾鐢辫楠岃瘉鍓嶈皟鐢�
@@ -77,10 +125,19 @@
next((vm) => {
if (from.name == 'monitorObjEdit' && vm.task) {
vm.chooseTask(vm.task);
+ } else if (from.name == 'monitorTaskCreate') {
+ vm.search();
}
});
},
- components: { CompMonitorObj, CompMonitorPlan, CompDayTask },
+ components: {
+ CompMonitorObj,
+ CompMonitorPlan,
+ CompDayTask,
+ CompTaskMap,
+ CompTaskEdit,
+ CompSubTaskList
+ },
data() {
return {
formSearch: {
@@ -103,10 +160,13 @@
curTask: {},
//鎿嶄綔鎸夐挳
buttons: [
- // {
- // name: '璁″垝璋冩暣',
- // color: 'success'
- // },
+ {
+ name: '涓�閿垱寤烘�讳换鍔�',
+ color: 'success',
+ click: () => {
+ this.topTaskAddVisible = true;
+ }
+ }
// {
// name: '鍦烘櫙璋冩暣',
// color: 'warning'
@@ -115,7 +175,11 @@
// 瀛愪换鍔＄紪杈戝脊鍑烘
subTaskDrawer: false,
// 褰撳墠閫夋嫨鐨勬棩浠诲姟
- curDayTask: {}
+ curDayTask: {},
+ // 褰撳墠閫夋嫨鐨勬棩浠诲姟涓嬬殑瀛愪换鍔�
+ curSubTaskList: [],
+ // 鎬讳换鍔℃柊澧炲脊鍑烘
+ topTaskAddVisible: false
};
},
computed: {
@@ -174,6 +238,7 @@
this.task = task;
this.sideLoading = false;
this.mainLoading = true;
+ this.curSubTaskList = []
taskApi
.fetchMonitorObjectVersion(task.data.tguid)
.then((res) => {
@@ -203,8 +268,20 @@
});
},
onDateChange(dayTask) {
- this.subTaskDrawer = true;
+ // this.subTaskDrawer = true;
this.curDayTask = dayTask;
+ taskApi.fetchSubtaskByDayTask(dayTask.guid).then((res) => {
+ this.curSubTaskList = res;
+ });
+ },
+ navToTaskCreate(value) {
+ this.topTaskAddVisible = false;
+ this.$router.push({
+ name: 'monitorTaskCreate',
+ query: {
+ task: encodeURIComponent(JSON.stringify(value))
+ }
+ });
}
},
mounted() {
@@ -221,6 +298,6 @@
}
.el-scrollbar {
- height: calc((100vh - 60px * 2 - 20px * 2 - var(--height-toolbar)));
+ height: calc((100vh - 60px - 20px * 2 - var(--height-toolbar)));
}
</style>
--
Gitblit v1.9.3