From e38ea524ec4107ed7f8b1d7491a4177632dd3402 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 15 十月 2024 11:26:26 +0800
Subject: [PATCH] 部分代码修正
---
src/views/fysp/task/TaskManage.vue | 100 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 29 deletions(-)
diff --git a/src/views/fysp/task/TaskManage.vue b/src/views/fysp/task/TaskManage.vue
index 0e2de57..7d1c5d4 100644
--- a/src/views/fysp/task/TaskManage.vue
+++ b/src/views/fysp/task/TaskManage.vue
@@ -3,7 +3,6 @@
<template #header>
<FYSearchBar @search="search">
<template #options>
- <!-- 鍖哄幙 -->
<FYOptionLocation
:allOption="true"
:level="3"
@@ -11,13 +10,14 @@
v-model:value="formSearch.locations"
></FYOptionLocation>
</template>
- <!-- <template #buttons>
- <slot name="buttons"></slot>
- </template> -->
</FYSearchBar>
</template>
<template #aside>
- <SideList :items="tasks" :loading="sideLoading" @item-click="chooseTask"></SideList>
+ <SideList
+ :items="tasks"
+ :loading="sideLoading"
+ @item-click="chooseTask"
+ ></SideList>
</template>
<template #main>
<ToolBar
@@ -31,32 +31,56 @@
class="el-scrollbar"
v-loading="mainLoading"
>
- <div><el-text>鐩戠璁″垝</el-text></div>
+ <el-row justify="space-between">
+ <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-row>
<el-divider></el-divider>
- <el-button type="primary" size="small" @click="editTask">鍦烘櫙璋冩暣</el-button>
- <div><el-text>鐩戠鍦烘櫙</el-text></div>
- <CompMonitorObj :data="curMonitorObjList" v-model:showData="showMonitorObjList"></CompMonitorObj>
- <!-- <div><el-text>鐩戠鍦烘櫙</el-text></div>
- <div>
- <el-space wrap>
- <ItemMonitorObj
- v-for="item in curMonitorObjList"
- :key="item.movid"
- :item="item"
- ></ItemMonitorObj>
- </el-space>
- </div> -->
+ <el-row justify="space-between">
+ <div><el-text>鐩戠鍦烘櫙</el-text></div>
+ <el-button type="warning" size="small" @click="editTask"
+ >鍦烘櫙璋冩暣</el-button
+ >
+ </el-row>
+ <CompMonitorObj :data="curMonitorObjList"></CompMonitorObj>
</el-scrollbar>
<el-empty v-else description="鏆傛棤璁板綍" v-loading="mainLoading" />
</template>
</BaseContentLayout>
+ <el-drawer
+ v-model="subTaskDrawer"
+ title="鍗曟棩璁″垝"
+ direction="btt"
+ size="80%"
+ destroy-on-close
+ >
+ <CompDayTask :day-task="curDayTask"></CompDayTask>
+ </el-drawer>
</template>
<script>
import taskApi from '@/api/fysp/taskApi';
import CompMonitorObj from './components/CompMonitorObj.vue';
+import CompMonitorPlan from './components/CompMonitorPlan.vue';
+import CompDayTask from './components/CompDayTask.vue';
export default {
- components: { CompMonitorObj },
+ beforeRouteEnter(to, from, next) {
+ // 鍦ㄦ覆鏌撹缁勪欢鐨勫搴旇矾鐢辫楠岃瘉鍓嶈皟鐢�
+ // 涓嶈兘鑾峰彇缁勪欢瀹炰緥 `this` 锛�
+ // 鍥犱负褰撳畧鍗墽琛屾椂锛岀粍浠跺疄渚嬭繕娌¤鍒涘缓锛�
+ next((vm) => {
+ if (from.name == 'monitorObjEdit' && vm.task) {
+ vm.chooseTask(vm.task);
+ }
+ });
+ },
+ components: { CompMonitorObj, CompMonitorPlan, CompDayTask },
data() {
return {
formSearch: {
@@ -79,15 +103,19 @@
curTask: {},
//鎿嶄綔鎸夐挳
buttons: [
- {
- name: '璁″垝璋冩暣',
- color: 'success'
- },
- {
- name: '鍦烘櫙璋冩暣',
- color: 'warning'
- }
- ]
+ // {
+ // name: '璁″垝璋冩暣',
+ // color: 'success'
+ // },
+ // {
+ // name: '鍦烘櫙璋冩暣',
+ // color: 'warning'
+ // }
+ ],
+ // 瀛愪换鍔＄紪杈戝脊鍑烘
+ subTaskDrawer: false,
+ // 褰撳墠閫夋嫨鐨勬棩浠诲姟
+ curDayTask: {}
};
},
computed: {
@@ -143,6 +171,7 @@
return type;
},
chooseTask(task) {
+ this.task = task;
this.sideLoading = false;
this.mainLoading = true;
taskApi
@@ -163,6 +192,19 @@
task: encodeURIComponent(JSON.stringify(this.curTask.data))
}
});
+ },
+ editPlan() {
+ this.$router.push({
+ name: 'monitorPlanEdit',
+ query: {
+ data: encodeURIComponent(JSON.stringify(this.curMonitorObjList)),
+ task: encodeURIComponent(JSON.stringify(this.curTask.data))
+ }
+ });
+ },
+ onDateChange(dayTask) {
+ this.subTaskDrawer = true;
+ this.curDayTask = dayTask;
}
},
mounted() {
--
Gitblit v1.9.3