feat:任务管理下---所有二级菜单页面样式调整

shuishen

2025-06-26 60be9da38336d357733098c95cffee789ffb52c5

feat:任务管理下---所有二级菜单页面样式调整

 src/option/job/jobinfo.js

@@ -132,6 +132,7 @@

  height: 'auto',
  calcHeight: 0,

  column: [
    {
      label: '任务应用',

 src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue

@@ -6,7 +6,8 @@
            <el-table border :data="jobListData" class="custom-header">
                <el-table-column label="序号" type="index" width="60">
                    <template #default="{ $index }">
                        {{ ($index + 1 + (jobListParams.current - 1) * jobListParams.size).toString().padStart(2, '0') }}
                        {{ ($index + 1 + (jobListParams.current - 1) * jobListParams.size).toString().padStart(2,
                            '0') }}
                    </template>
                </el-table-column>
                <el-table-column prop="job_info_num" label="任务编号" show-overflow-tooltip align="center" />
@@ -16,22 +17,20 @@
                <el-table-column prop="ai_type_str" label="关联算法" show-overflow-tooltip align="center" />
                <el-table-column label="任务状态" align="center">
                    <template #default="scope">
                        <span
                            :style="{
                                color:
                                    scope.row.status === 1
                                        ? '#00CDC2'
                                        : scope.row.status === 2
                        <span :style="{
                            color:
                                scope.row.status === 1
                                    ? '#00CDC2'
                                    : scope.row.status === 2
                                        ? '#FF720F'
                                        : scope.row.status === 3
                                        ? '#00AA2D'
                                        : scope.row.status === 5
                                        ? '#FF4848'
                                        : scope.row.status === 7
                                        ? '#A6A6A6'
                                        : '',
                            }"
                        >
                                            ? '#00AA2D'
                                            : scope.row.status === 5
                                                ? '#FF4848'
                                                : scope.row.status === 7
                                                    ? '#A6A6A6'
                                                    : '',
                        }">
                            {{ scope.row.status ? getStatusText(scope.row.status) : '' }}
                        </span>
                    </template>
@@ -51,22 +50,12 @@
                <el-table-column prop="creator_name" label="创建人" align="center" show-overflow-tooltip />
                <el-table-column label="操作" width="200" align="center">
                    <template #default="scope">
                        <div
                            v-if="scope.row.status === 2"
                            class="btnItem turnBack"
                            link
                            type="primary"
                            @click="turnBack(scope.row)"
                        >
                        <div v-if="scope.row.status === 2" class="btnItem turnBack" link type="primary"
                            @click="turnBack(scope.row)">
                            返航
                        </div>
                        <div
                            v-if="scope.row.status === 1"
                            class="btnItem cancelTask"
                            link
                            type="primary"
                            @click="cancelTask(scope.row)"
                        >
                        <div v-if="scope.row.status === 1" class="btnItem cancelTask" link type="primary"
                            @click="cancelTask(scope.row)">
                            取消任务
                        </div>
                        <div class="btnItem" link type="primary" @click="handleDetail(scope.row)">查看</div>
@@ -75,17 +64,10 @@
            </el-table>
        </div>
        <div class="pagination">
            <el-pagination
                class="ztzf-pagination"
                popper-class="custom-pagination-dropdown"
                v-model:current-page="jobListParams.current"
                v-model:page-size="jobListParams.size"
                :page-sizes="[10, 20, 30, 40]"
                layout="prev, pager, next, sizes, jumper"
                :total="total"
                @size-change="handleSizeChange"
                @current-change="handleCurrentChange"
            />
            <el-pagination class="ztzf-pagination" popper-class="custom-pagination-dropdown"
                v-model:current-page="jobListParams.current" v-model:page-size="jobListParams.size"
                :page-sizes="[10, 20, 30, 40]" layout="prev, pager, next, sizes, jumper" :total="total"
                @size-change="handleSizeChange" @current-change="handleCurrentChange" />
        </div>
    </div>
    <!-- 添加任务 -->
@@ -97,18 +79,10 @@
        :wayLineJodInfoId="rowData.id"
    /> -->
    <!-- 历史任务详情 -->
    <DeviceJobDetails
        v-if="isShowDeviceJobDetails"
        v-model:show="isShowDeviceJobDetails"
        :wayLineJodInfoId="rowData.id"
        :batchNo="rowData.batch_no"
    />
    <CancelTaskDialog
        ref="cancelTaskDialogRef"
        v-model:isShowCancelTask="isShowCancelTask"
        :row-data="rowData"
        @refresh="getJobList"
    />
    <DeviceJobDetails v-if="isShowDeviceJobDetails" v-model:show="isShowDeviceJobDetails" :wayLineJodInfoId="rowData.id"
        :batchNo="rowData.batch_no" />
    <CancelTaskDialog ref="cancelTaskDialogRef" v-model:isShowCancelTask="isShowCancelTask" :row-data="rowData"
        @refresh="getJobList" />
</template>

<script setup>
@@ -236,15 +210,23 @@

<style lang="scss" scoped>
.task-intermediate-content {
    margin: 0 18px 16px 10px;
    height: 0;
    flex: 1;
    margin: 0 10px 10px 10px;
    background-color: #ffffff;
    padding: 14px 18px;
    padding: 20px;
    border-radius: 5px;
    display: flex;
    flex-direction: column;

    // 表格
    .task-table {
        height: 580px;
        height: 0;
        flex: 1;
        margin-top: 18px;
        overflow: auto;
    }

    .btnItem {
        height: 27px;
        line-height: 27px;
@@ -263,15 +245,17 @@
            border: 1px solid #ffa500;
            color: #ffa500;
        }

        &.cancelTask {
            border: 1px solid #3efe96;
            color: #3efe96;
        }
    }

    // :deep(.el-table) {
    //         --el-table-tr-bg-color: #ffffff;
    //         --el-table-striped-bg-color: #EFEFEF;
			

    //         .el-table__body tr.el-table__row--striped td {
    //             background-color: var(--el-table-striped-bg-color);
    //         }
@@ -280,13 +264,16 @@
    :deep(.custom-header th.el-table__cell) {
        color: rgba(0, 0, 0, 0.85);
    }

    :deep(.el-table td.el-table__cell) {
        color: #606266;
    }

    :deep(.el-pagination) {
        display: flex;
        justify-content: flex-end;
    }

    :deep(.el-pagination button) {
        background: center center no-repeat none !important;
        color: #8eb8ea !important;

 src/views/job/components/TaskTop/TaskEvent.vue

@@ -132,11 +132,13 @@

<style lang="scss" scoped>
.task-event {
width: 529px;
    width: 0;
    flex: 1;
    height: 100%;
    margin-left: 9px;
    margin-left: 10px;
    background: #FFFFFF;
    border-radius: 8px 8px 8px 8px;

    .title {
        padding: 10px 0 10px 16px;
        width: 144px;
@@ -147,11 +149,12 @@
        color: #363636;
        line-height: 18px;
    }

    .chart {
        padding: 6px 0px;
        width: 100%;
        height: 166px;
		

    }
}
</style>

 src/views/job/components/TaskTop/TaskIndustry.vue

@@ -42,7 +42,7 @@
            radius: ['40%', '70%'],
            // center: ['50%', '45%'],
            // radius: '70%', // 设置饼图的半径
            center: ['50%', '50%'], // 调整饼图位置
            center: ['50%', '50%'], // 调整饼图位置
            data: [],
            label: {
                show: true,
@@ -96,11 +96,12 @@

<style lang="scss" scoped>
.task-industry {
width: 276px;
    width: 276px;
    height: 100%;
    background: #FFFFFF;
    border-radius: 8px 8px 8px 8px;
    margin-left: 9px;
    margin-left: 10px;

    .title {
        font-family: Segoe UI, Segoe UI;
        padding: 10px 0 10px 16px;
@@ -111,6 +112,7 @@
        color: #363636;
        line-height: 18px;
    }

    .chart {
        width: 100%;
        height: 180px;

 src/views/job/components/TaskTop/TaskTime.vue

@@ -142,9 +142,10 @@
.task-time {
    width: 529px;
    height: 100%;
    margin-left: 9px;
    margin-left: 10px;
    background: #FFFFFF;
    border-radius: 8px 8px 8px 8px;

    .title {
        padding: 10px 0 10px 16px;
        width: 96px;
@@ -155,6 +156,7 @@
        color: #363636;
        line-height: 18px;
    }

    .chart {
        padding: 6px 0px;
        width: 100%;

 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 />
@@ -14,8 +22,6 @@

<script setup>
import { pxToRem } from '@/utils/rem'
// import CommonWeather from '@/components/CommonWeather.vue'
// import UserOperate from '@/components/UserOperate.vue'
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;

 src/views/job/jobinfo.vue

@@ -1,68 +1,37 @@
<template>
  <basic-container>
    <avue-crud
      :option="option"
      v-model:search="search"
      v-model:page="page"
      v-model="form"
      :table-loading="loading"
      :data="data"
      :permission="permissionList"
      :before-open="beforeOpen"
      ref="crud"
      @row-update="rowUpdate"
      @row-save="rowSave"
      @row-del="rowDel"
      @search-change="searchChange"
      @search-reset="searchReset"
      @selection-change="selectionChange"
      @current-change="currentChange"
      @size-change="sizeChange"
      @refresh-change="refreshChange"
      @on-load="onLoad"
    >
    <avue-crud :option="option" v-model:search="search" v-model:page="page" v-model="form" :table-loading="loading"
      :data="data" :permission="permissionList" :before-open="beforeOpen" ref="crud" @row-update="rowUpdate"
      @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
      @refresh-change="refreshChange" @on-load="onLoad">
      <template #menu-left>
        <el-button
          type="danger"
          icon="el-icon-delete"
          plain
          v-if="permission.jobinfo_delete"
          @click="handleDelete"
          >删 除
        <el-button type="danger" icon="el-icon-delete" plain v-if="permission.jobinfo_delete" @click="handleDelete">删 除
        </el-button>
        <el-button type="info" plain icon="el-icon-sort" @click="handleSync"
          >数 据 同 步
        <el-button type="info" plain icon="el-icon-sort" @click="handleSync">数 据 同 步
        </el-button>
      </template>
      <template #menu="scope">
        <el-button type="primary" text icon="el-icon-video-play" @click="handleRun(scope.row)"
          >运 行
        <el-button type="primary" text icon="el-icon-video-play" @click="handleRun(scope.row)">运 行
        </el-button>
      </template>
      <template #enable="{ row }">
        <el-switch
          v-model="row.enable"
          inline-prompt
          @change="slotChange(row)"
          active-text="启用"
          inactive-text="暂停"
          :active-value="1"
          :inactive-value="0"
        />
        <el-switch v-model="row.enable" inline-prompt @change="slotChange(row)" active-text="启用" inactive-text="暂停"
          :active-value="1" :inactive-value="0" />
      </template>
    </avue-crud>
  </basic-container>
</template>

<script>
import { getList, getDetail, add, update, remove, change, run, sync } from '@/api/job/jobinfo';
import option from '@/option/job/jobinfo';
import { mapGetters } from 'vuex';
import 'nprogress/nprogress.css';
import func from '@/utils/func';
import { getList, getDetail, add, update, remove, change, run, sync } from '@/api/job/jobinfo'
import option from '@/option/job/jobinfo'
import { mapGetters } from 'vuex'
import 'nprogress/nprogress.css'
import func from '@/utils/func'

export default {
  data() {
  data () {
    return {
      form: {},
      query: {},
@@ -76,98 +45,98 @@
      selectionList: [],
      option: option,
      data: [],
    };
    }
  },
  computed: {
    ...mapGetters(['permission']),
    permissionList() {
    permissionList () {
      return {
        addBtn: this.validData(this.permission.jobinfo_add, false),
        viewBtn: this.validData(this.permission.jobinfo_view, false),
        delBtn: this.validData(this.permission.jobinfo_delete, false),
        editBtn: this.validData(this.permission.jobinfo_edit, false),
      };
      }
    },
    ids() {
      let ids = [];
    ids () {
      let ids = []
      this.selectionList.forEach(ele => {
        ids.push(ele.id);
      });
      return ids.join(',');
        ids.push(ele.id)
      })
      return ids.join(',')
    },
  },
  methods: {
    rowSave(row, done, loading) {
    rowSave (row, done, loading) {
      if (func.isArrayAndNotEmpty(row.lifecycle)) {
        const lifecycleStart = row.lifecycle[0];
        const lifecycleEnd = row.lifecycle[1];
        const lifecycleStart = row.lifecycle[0]
        const lifecycleEnd = row.lifecycle[1]
        if (!func.isUndefined(lifecycleStart) && !func.isUndefined(lifecycleEnd)) {
          row.lifecycle = lifecycleStart + ',' + lifecycleEnd;
          row.lifecycle = lifecycleStart + ',' + lifecycleEnd
        }
      } else {
        row.lifecycle = '';
        row.lifecycle = ''
      }
      add(row).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          })
          done()
        },
        error => {
          loading();
          window.console.log(error);
          loading()
          window.console.log(error)
        }
      );
      )
    },
    rowUpdate(row, index, done, loading) {
    rowUpdate (row, index, done, loading) {
      if (func.isArrayAndNotEmpty(row.lifecycle)) {
        const lifecycleStart = row.lifecycle[0];
        const lifecycleEnd = row.lifecycle[1];
        const lifecycleStart = row.lifecycle[0]
        const lifecycleEnd = row.lifecycle[1]
        if (!func.isUndefined(lifecycleStart) && !func.isUndefined(lifecycleEnd)) {
          row.lifecycle = lifecycleStart + ',' + lifecycleEnd;
          row.lifecycle = lifecycleStart + ',' + lifecycleEnd
        }
      }else{
      } else {
        row.lifecycle = ""
      }
      update(row).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          })
          done()
        },
        error => {
          loading();
          console.log(error);
          loading()
          console.log(error)
        }
      );
      )
    },
    rowDel(row) {
    rowDel (row) {
      this.$confirm('确定将选择数据删除?', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(() => {
          return remove(row.id);
          return remove(row.id)
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
        });
          })
        })
    },
    handleDelete() {
    handleDelete () {
      if (this.selectionList.length === 0) {
        this.$message.warning('请选择至少一条数据');
        return;
        this.$message.warning('请选择至少一条数据')
        return
      }
      this.$confirm('确定将选择数据删除?', {
        confirmButtonText: '确定',
@@ -175,130 +144,121 @@
        type: 'warning',
      })
        .then(() => {
          return remove(this.ids);
          return remove(this.ids)
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          this.$refs.crud.toggleSelection();
        });
          })
          this.$refs.crud.toggleSelection()
        })
    },
    handleSync() {
    handleSync () {
      this.$confirm('确定进行数据双向同步?', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(() => {
          return sync();
          return sync()
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
        });
          })
        })
    },
    handleRun(row) {
    handleRun (row) {
      this.$confirm('运行后将创建一个实例执行，是否继续?', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(() => {
          return run(row);
          return run(row)
        })
        .then(() => {
          this.$message({
            type: 'success',
            message: '运行成功!',
          });
        });
          })
        })
    },
    slotChange(row) {
    slotChange (row) {
      if (!row.id) {
        return;
        return
      }
      change(row).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          })
        },
        error => {
          window.console.log(error);
          window.console.log(error)
        }
      );
      )
    },
    beforeOpen(done, type) {
    beforeOpen (done, type) {
      if (['edit', 'view'].includes(type)) {
        getDetail(this.form.id).then(res => {
          this.form = res.data.data;
        });
          this.form = res.data.data
        })
      }
      done();
      done()
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);
    searchReset () {
      this.query = {}
      this.onLoad(this.page)
    },
    searchChange(params, done) {
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
      done();
    searchChange (params, done) {
      this.query = params
      this.page.currentPage = 1
      this.onLoad(this.page, params)
      done()
    },
    selectionChange(list) {
      this.selectionList = list;
    selectionChange (list) {
      this.selectionList = list
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.crud.toggleSelection();
    selectionClear () {
      this.selectionList = []
      this.$refs.crud.toggleSelection()
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
    currentChange (currentPage) {
      this.page.currentPage = currentPage
    },
    sizeChange(pageSize) {
      this.page.pageSize = pageSize;
    sizeChange (pageSize) {
      this.page.pageSize = pageSize
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
    refreshChange () {
      this.onLoad(this.page, this.query)
    },
    onLoad(page) {
      this.loading = true;
    onLoad (page) {
      this.loading = true

      const { jobServerId, jobName } = this.query;
      const { jobServerId, jobName } = this.query

      let values = {
        jobServerId_like: jobServerId,
        jobName_like: jobName,
      };
      }

      getList(page.currentPage, page.pageSize, values).then(res => {
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;
        this.loading = false;
        this.selectionClear();
      });
        const data = res.data.data
        this.page.total = data.total
        this.data = data.records
        this.loading = false
        this.selectionClear()
      })
    },
  },
};
}
</script>

<style scoped lang="scss">
  :deep(){
    .avue-crud__body{
      .el-form{
        height: 745px;
        overflow: auto;
      }
    }
  }
</style>
<style scoped lang="scss"></style>

 src/views/job/jobserver.vue

@@ -1,42 +1,19 @@
<template>
  <basic-container>
    <avue-crud
      :option="option"
      v-model:search="search"
      v-model:page="page"
      v-model="form"
      :table-loading="loading"
      :data="data"
      :permission="permissionList"
      :before-open="beforeOpen"
      ref="crud"
      @row-update="rowUpdate"
      @row-save="rowSave"
      @row-del="rowDel"
      @search-change="searchChange"
      @search-reset="searchReset"
      @selection-change="selectionChange"
      @current-change="currentChange"
      @size-change="sizeChange"
      @refresh-change="refreshChange"
      @on-load="onLoad"
    >
    <avue-crud :option="option" v-model:search="search" v-model:page="page" v-model="form" :table-loading="loading"
      :data="data" :permission="permissionList" :before-open="beforeOpen" ref="crud" @row-update="rowUpdate"
      @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
      @refresh-change="refreshChange" @on-load="onLoad">
      <template #menu-left>
        <el-button
          type="danger"
          icon="el-icon-delete"
          plain
          v-if="permission.jobserver_delete"
          @click="handleDelete"
          >删 除
        <el-button type="danger" icon="el-icon-delete" plain v-if="permission.jobserver_delete" @click="handleDelete">删
          除
        </el-button>
        <el-button type="info" plain icon="el-icon-sort" @click="handleSync"
          >数 据 同 步
        <el-button type="info" plain icon="el-icon-sort" @click="handleSync">数 据 同 步
        </el-button>
      </template>
      <template #menu="scope">
        <el-button type="primary" text icon="el-icon-video-play" @click="handleLink(scope.row)"
          >服务跳转
        <el-button type="primary" text icon="el-icon-video-play" @click="handleLink(scope.row)">服务跳转
        </el-button>
      </template>
    </avue-crud>
@@ -44,14 +21,14 @@
</template>

<script>
import { getList, getDetail, add, update, remove, sync } from '@/api/job/jobserver';
import option from '@/option/job/jobserver';
import { mapGetters } from 'vuex';
import 'nprogress/nprogress.css';
import func from '@/utils/func';
import { getList, getDetail, add, update, remove, sync } from '@/api/job/jobserver'
import option from '@/option/job/jobserver'
import { mapGetters } from 'vuex'
import 'nprogress/nprogress.css'
import func from '@/utils/func'

export default {
  data() {
  data () {
    return {
      form: {},
      query: {},
@@ -65,80 +42,80 @@
      selectionList: [],
      option: option,
      data: [],
    };
    }
  },
  computed: {
    ...mapGetters(['permission']),
    permissionList() {
    permissionList () {
      return {
        addBtn: this.validData(this.permission.jobserver_add, false),
        viewBtn: this.validData(this.permission.jobserver_view, false),
        delBtn: this.validData(this.permission.jobserver_delete, false),
        editBtn: this.validData(this.permission.jobserver_edit, false),
      };
      }
    },
    ids() {
      let ids = [];
    ids () {
      let ids = []
      this.selectionList.forEach(ele => {
        ids.push(ele.id);
      });
      return ids.join(',');
        ids.push(ele.id)
      })
      return ids.join(',')
    },
  },
  methods: {
    rowSave(row, done, loading) {
    rowSave (row, done, loading) {
      add(row).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          })
          done()
        },
        error => {
          loading();
          window.console.log(error);
          loading()
          window.console.log(error)
        }
      );
      )
    },
    rowUpdate(row, index, done, loading) {
    rowUpdate (row, index, done, loading) {
      update(row).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          })
          done()
        },
        error => {
          loading();
          console.log(error);
          loading()
          console.log(error)
        }
      );
      )
    },
    rowDel(row) {
    rowDel (row) {
      this.$confirm('确定将选择数据删除?', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(() => {
          return remove(row.id);
          return remove(row.id)
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
        });
          })
        })
    },
    handleDelete() {
    handleDelete () {
      if (this.selectionList.length === 0) {
        this.$message.warning('请选择至少一条数据');
        return;
        this.$message.warning('请选择至少一条数据')
        return
      }
      this.$confirm('确定将选择数据删除?', {
        confirmButtonText: '确定',
@@ -146,100 +123,91 @@
        type: 'warning',
      })
        .then(() => {
          return remove(this.ids);
          return remove(this.ids)
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          this.$refs.crud.toggleSelection();
        });
          })
          this.$refs.crud.toggleSelection()
        })
    },
    handleLink(row) {
      window.open(func.formatUrl(row.jobServerUrl));
    handleLink (row) {
      window.open(func.formatUrl(row.jobServerUrl))
    },
    handleSync() {
    handleSync () {
      this.$confirm('确定进行数据双向同步?', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(() => {
          return sync();
          return sync()
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
        });
          })
        })
    },
    beforeOpen(done, type) {
    beforeOpen (done, type) {
      if (['edit', 'view'].includes(type)) {
        getDetail(this.form.id).then(res => {
          this.form = res.data.data;
        });
          this.form = res.data.data
        })
      }
      done();
      done()
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);
    searchReset () {
      this.query = {}
      this.onLoad(this.page)
    },
    searchChange(params, done) {
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
      done();
    searchChange (params, done) {
      this.query = params
      this.page.currentPage = 1
      this.onLoad(this.page, params)
      done()
    },
    selectionChange(list) {
      this.selectionList = list;
    selectionChange (list) {
      this.selectionList = list
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.crud.toggleSelection();
    selectionClear () {
      this.selectionList = []
      this.$refs.crud.toggleSelection()
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
    currentChange (currentPage) {
      this.page.currentPage = currentPage
    },
    sizeChange(pageSize) {
      this.page.pageSize = pageSize;
    sizeChange (pageSize) {
      this.page.pageSize = pageSize
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
    refreshChange () {
      this.onLoad(this.page, this.query)
    },
    onLoad(page) {
      this.loading = true;
    onLoad (page) {
      this.loading = true

      const { jobServerName, jobAppName } = this.query;
      const { jobServerName, jobAppName } = this.query

      let values = {
        jobServerName_like: jobServerName,
        jobAppName_like: jobAppName,
      };
      }

      getList(page.currentPage, page.pageSize, values).then(res => {
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;
        this.loading = false;
        this.selectionClear();
      });
        const data = res.data.data
        this.page.total = data.total
        this.data = data.records
        this.loading = false
        this.selectionClear()
      })
    },
  },
};
}
</script>

<style scoped lang="scss">
  :deep(){
    .avue-crud__body{
      .el-form{
        height: 745px;
        overflow: auto;
      }
    }
  }
</style>
<style scoped lang="scss"></style>

 src/views/job/jobstatistics.vue

@@ -1,14 +1,11 @@
<script setup>
import TaskTop from "@/views/job/components/TaskTop/TaskTop.vue";
import TaskIntermediateContent from "@/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue";
import TaskTop from "@/views/job/components/TaskTop/TaskTop.vue"
import TaskIntermediateContent from "@/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue"
</script>

<template>
  <TaskTop/>
  <TaskTop />
  <TaskIntermediateContent />
</template>


<style scoped lang="scss">

</style>
<style scoped lang="scss"></style>

 src/views/odm/task.vue

@@ -1,25 +1,9 @@
<template>
  <basic-container>
    <avue-crud
      :option="option"
      :table-loading="loading"
      :data="data"
      v-model:page="page"
      ref="crud"
      @row-del="rowDel"
      v-model="form"
      :permission="permissionList"
      @row-update="rowUpdate"
      @row-save="rowSave"
      :before-open="beforeOpen"
      @search-change="searchChange"
      @search-reset="searchReset"
      @selection-change="selectionChange"
      @current-change="currentChange"
      @size-change="sizeChange"
      @refresh-change="refreshChange"
      @on-load="onLoad"
    >
    <avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" ref="crud" @row-del="rowDel"
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
      <template #menu-left>
        <!-- <el-button
          type="danger"
@@ -37,21 +21,13 @@
        {{ formatSeconds(row.processingTime) }}
      </template>
      <template #menu="scope">
        <el-button
          type="primary"
          text
          icon="el-icon-guide"
        <el-button type="primary" text icon="el-icon-guide"
          v-if="permission.odm_task_handle && scope.row.taskId == null"
          @click.stop="atHandle(scope.row, scope.index)"
          >立即启动
          @click.stop="atHandle(scope.row, scope.index)">立即启动
        </el-button>
        <el-button
          type="primary"
          text
          icon="el-icon-refresh-right"
        <el-button type="primary" text icon="el-icon-refresh-right"
          v-if="(permission.odm_task_handle && scope.row.status == 30) || scope.row.status == 50"
          @click.stop="restartHandle(scope.row, scope.index)"
          >重新启动
          @click.stop="restartHandle(scope.row, scope.index)">重新启动
        </el-button>
      </template>
    </avue-crud>
@@ -59,12 +35,12 @@
</template>

<script>
import { getList, remove, update, add, createOdmTask, restartOdmTask } from '@/api/odm/task';
import { tourStrategies } from 'element-plus';
import { mapGetters } from 'vuex';
import { getList, remove, update, add, createOdmTask, restartOdmTask } from '@/api/odm/task'
import { tourStrategies } from 'element-plus'
import { mapGetters } from 'vuex'

export default {
  data() {
  data () {
    return {
      form: {},
      query: {},
@@ -90,14 +66,18 @@
        dialogClickModal: false,
        grid: false,
        menuWidth: 260,

        height: 'auto',
        calcHeight: 0,

        column: [
          {
            label: '任务名称',
            prop: 'taskName',
            search: true,
            searchSpan:4,
            searchSpan: 4,
            labelWidth: 130,
            searchPlaceholder:"任务名称",
            searchPlaceholder: "任务名称",
            rules: [
              {
                required: true,
@@ -137,7 +117,7 @@
            prop: 'waylineJobId',
            addDisplay: false,
            editDisplay: false,
            hide:true,
            hide: true,
            labelWidth: 130,
            width: 160,
          },
@@ -149,7 +129,7 @@
            searchSpan: 3,
            width: 100,
            labelWidth: 130,
            searchPlaceholder:"任务类型",
            searchPlaceholder: "任务类型",
            dicData: [
              {
                label: '航测',
@@ -193,7 +173,7 @@
            search: true,
            searchSpan: 3,
            labelWidth: 130,
            searchPlaceholder:"任务状态",
            searchPlaceholder: "任务状态",
            width: 90,
            dicData: [
              {
@@ -237,178 +217,178 @@
          {
            label: '飞行任务完成时间',
            prop: 'completedTime',
            type:"date",
            type: "date",
            addDisplay: false,
            editDisplay: false,
            searchPlaceholder:"任务完成时间",
            searchPlaceholder: "任务完成时间",
            labelWidth: 130,
            search:true,
            searchSpan:4,
            searchLabelWidth:130,
            search: true,
            searchSpan: 4,
            searchLabelWidth: 130,
            valueFormat: 'YYYY-MM-DD',
            width: 160,
          },
        ],
      },
      data: [],
    };
    }
  },
  computed: {
    ...mapGetters(['permission']),
    permissionList() {
    permissionList () {
      return {
        viewBtn: this.validData(this.permission.odm_task_view, true),
        delBtn: this.validData(this.permission.odm_task_delete, true),
        // editBtn: this.validData(this.permission.workspace_edit, true),
      };
      }
    },
    ids() {
      let ids = [];
    ids () {
      let ids = []
      this.selectionList.forEach(ele => {
        ids.push(ele.id);
      });
      return ids.join(',');
        ids.push(ele.id)
      })
      return ids.join(',')
    },
  },
  methods: {
    // 立即处理
    atHandle(row) {
      createOdmTask(row.waylineJobId,row.gsd).then(
    atHandle (row) {
      createOdmTask(row.waylineJobId, row.gsd).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          })
          done()
        },
        error => {
          window.console.log(error);
          loading();
          window.console.log(error)
          loading()
        }
      );
      )
    },
    // 重启启动
    restartHandle(row) {
    restartHandle (row) {
      if (!row.taskName) {
        this.$message({
          type: 'error',
          message: '该航线任务已删除，无法进行重启启动!',
        });
        return;
        })
        return
      }
      restartOdmTask(row.taskId).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          })
          done()
        },
        error => {
          window.console.log(error);
          loading();
          window.console.log(error)
          loading()
        }
      );
      )
    },
    // 时间格式化
    formatSeconds(value) {
    formatSeconds (value) {
      // 如果value不是数字或者小于0，则直接返回'00:00:00'
      if (isNaN(value) || value < 0) {
        return '00:00:00';
        return '00:00:00'
      }

      // 计算小时、分钟和秒
      let seconds = Math.floor(value / 1000);
      let minutes = Math.floor(seconds / 60);
      let hours = Math.floor(minutes / 60);
      let seconds = Math.floor(value / 1000)
      let minutes = Math.floor(seconds / 60)
      let hours = Math.floor(minutes / 60)

      // 格式化为两位数字的字符串
      seconds %= 60;
      minutes %= 60;
      seconds %= 60
      minutes %= 60

      const formattedTime = `${this.padZero(hours)}:${this.padZero(minutes)}:${this.padZero(
        seconds
      )}`;
      )}`

      // 返回格式化后的时间字符串
      return formattedTime;
      return formattedTime
    },
    // 函数用于在数字不足两位数时，在前面补零
    padZero(value) {
      return String(value).padStart(2, '0');
    padZero (value) {
      return String(value).padStart(2, '0')
    },
    rowSave(row, done, loading) {
    rowSave (row, done, loading) {
      add(row).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          })
          done()
        },
        error => {
          window.console.log(error);
          loading();
          window.console.log(error)
          loading()
        }
      );
      )
    },
    rowUpdate(row, index, done, loading) {
    rowUpdate (row, index, done, loading) {
      update(row).then(
        () => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          done();
          })
          done()
        },
        error => {
          window.console.log(error);
          loading();
          window.console.log(error)
          loading()
        }
      );
      )
    },
    rowDel(row) {
    rowDel (row) {
      this.$confirm('确定将选择数据删除?', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning',
      })
        .then(() => {
          return remove(row.id);
          return remove(row.id)
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
        });
          })
        })
    },
    searchReset() {
      this.query = {};
      this.onLoad(this.page);
    searchReset () {
      this.query = {}
      this.onLoad(this.page)
    },
    searchChange(params, done) {
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
      done();
    searchChange (params, done) {
      this.query = params
      this.page.currentPage = 1
      this.onLoad(this.page, params)
      done()
    },
    selectionChange(list) {
      this.selectionList = list;
    selectionChange (list) {
      this.selectionList = list
    },
    selectionClear() {
      this.selectionList = [];
      this.$refs.crud.toggleSelection();
    selectionClear () {
      this.selectionList = []
      this.$refs.crud.toggleSelection()
    },
    handleDelete() {
    handleDelete () {
      if (this.selectionList.length === 0) {
        this.$message.warning('请选择至少一条数据');
        return;
        this.$message.warning('请选择至少一条数据')
        return
      }
      this.$confirm('确定将选择数据删除?', {
        confirmButtonText: '确定',
@@ -416,68 +396,59 @@
        type: 'warning',
      })
        .then(() => {
          return remove(this.ids);
          return remove(this.ids)
        })
        .then(() => {
          this.onLoad(this.page);
          this.onLoad(this.page)
          this.$message({
            type: 'success',
            message: '操作成功!',
          });
          this.$refs.crud.toggleSelection();
        });
          })
          this.$refs.crud.toggleSelection()
        })
    },
    beforeOpen(done, type) {
    beforeOpen (done, type) {
      // if (['edit', 'view'].includes(type)) {
      //   getDetail(this.form.id).then(res => {
      //     this.form = res.data.data;
      //   });
      // }
      done();
      done()
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
    currentChange (currentPage) {
      this.page.currentPage = currentPage
    },
    sizeChange(pageSize) {
      this.page.pageSize = pageSize;
    sizeChange (pageSize) {
      this.page.pageSize = pageSize
    },
    refreshChange() {
      this.onLoad(this.page, this.query);
    refreshChange () {
      this.onLoad(this.page, this.query)
    },
    onLoad(page, params = {}) {
      const { releaseTimeRange } = this.query;
    onLoad (page, params = {}) {
      const { releaseTimeRange } = this.query
      let values = {
        ...params,
        ...this.query,
      };
      }
      if (releaseTimeRange) {
        values = {
          ...values,
          releaseTime_datege: releaseTimeRange[0],
          releaseTime_datelt: releaseTimeRange[1],
        };
        values.releaseTimeRange = null;
        }
        values.releaseTimeRange = null
      }
      this.loading = true;
      this.loading = true
      getList(page.currentPage, page.pageSize, values).then(res => {
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;
        this.loading = false;
        this.selectionClear();
      });
        const data = res.data.data
        this.page.total = data.total
        this.data = data.records
        this.loading = false
        this.selectionClear()
      })
    },
  },
};
}
</script>

<style scoped lang="scss">
  :deep(){
    .avue-crud__body{
      .el-form{
        height: 745px;
        overflow: auto;
      }
    }
  }
</style>
<style scoped lang="scss"></style>