Merge branch 'lsf-dataproduct-1018'

riku

2024-10-24 3d3e7f45086799fdd7a412e2079710a6cdf8dc2b

 src/views/fysp/task/TaskManage.vue

@@ -39,24 +39,28 @@
          <el-tabs model-value="first">
            <el-tab-pane label="监管计划" name="first">
              <el-row>
                <el-col :span="curSubTaskList.length > 0 ? 16 : 24">
                <el-col :span="curSubTaskList ? 16 : 24">
                  <CompMonitorPlan
                    ref="planRef"
                    :task="curTask.data"
                    @date-change="onDateChange"
                  ></CompMonitorPlan>
                </el-col>
                <el-col v-if="curSubTaskList.length > 0" :span="8">
                <el-col v-if="curSubTaskList" :span="8">
                  <CompSubTaskList
                    :data="curSubTaskList"
                    create
                    v-model="curSubTaskList"
                    :loading="subTaskLoading"
                    height="56vh"
                    @add="subTaskDrawer = true"
                    @submit="handleSubtaskSubmit"
                  ></CompSubTaskList>
                </el-col>
              </el-row>
            </el-tab-pane>
            <el-tab-pane label="监管地图" name="second">
            <!-- <el-tab-pane label="监管地图" name="second">
              <CompTaskMap></CompTaskMap>
            </el-tab-pane>
            </el-tab-pane> -->
          </el-tabs>
        </el-row>
        <el-divider></el-divider>
@@ -91,6 +95,7 @@
    <CompDayTask
      :day-task="curDayTask"
      :mObjList="curMonitorObjList"
      @submit="handleSubtaskSubmit"
    ></CompDayTask>
  </el-drawer>
  <el-dialog
@@ -177,7 +182,8 @@
      // 当前选择的日任务
      curDayTask: {},
      // 当前选择的日任务下的子任务
      curSubTaskList: [],
      curSubTaskList: undefined,
      subTaskLoading: false,
      // 总任务新增弹出框
      topTaskAddVisible: false
    };
@@ -238,12 +244,12 @@
      this.task = task;
      this.sideLoading = false;
      this.mainLoading = true;
      this.curSubTaskList = []
      this.curSubTaskList = undefined;
      this.curTask = task;
      taskApi
        .fetchMonitorObjectVersion(task.data.tguid)
        .then((res) => {
          this.curMonitorObjList = res;
          this.curTask = task;
        })
        .finally(() => {
          this.mainLoading = false;
@@ -268,11 +274,19 @@
      });
    },
    onDateChange(dayTask) {
      if (dayTask) {
        this.subTaskLoading = true;
      // this.subTaskDrawer = true;
      this.curDayTask = dayTask;
      taskApi.fetchSubtaskByDayTask(dayTask.guid).then((res) => {
        taskApi
          .fetchSubtaskByDayTask(dayTask.guid)
          .then((res) => {
        this.curSubTaskList = res;
      });
          })
          .finally(() => (this.subTaskLoading = false));
      } else {
        this.curSubTaskList = [];
      }
    },
    navToTaskCreate(value) {
      this.topTaskAddVisible = false;
@@ -282,6 +296,12 @@
          task: encodeURIComponent(JSON.stringify(value))
        }
      });
    },
    handleSubtaskSubmit() {
      this.subTaskLoading = true;
      this.$refs.planRef
        .fetchDayTasks()
        .finally(() => (this.subTaskLoading = false));
    }
  },
  mounted() {