Merge branch 'feature-task'

wlzboy

2025-10-26 2c86a8bd60deed0dd0e044bad6fb83f75d19a332

 ruoyi-ui/src/views/task/general/index.vue

New file
@@ -0,0 +1,682 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="任务编号" prop="taskCode">
        <el-input
          v-model="queryParams.taskCode"
          placeholder="请输入任务编号"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="任务类型" prop="taskType">
        <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable>
          <el-option
            v-for="dict in dict.type.sys_task_type"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="任务状态" prop="taskStatus">
        <el-select v-model="queryParams.taskStatus" placeholder="请选择任务状态" clearable>
          <el-option
            v-for="dict in dict.type.sys_task_status"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="计划开始时间">
        <el-date-picker
          v-model="dateRange"
          style="width: 240px"
          value-format="yyyy-MM-dd"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['task:general:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['task:general:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['task:general:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['task:general:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="任务编号" align="center" prop="taskCode">
        <template slot-scope="scope">
          <el-button
            type="text"
            @click="handleView(scope.row)"
            v-hasPermi="['task:general:query']"
          >{{ scope.row.taskCode }}</el-button>
        </template>
      </el-table-column>
      <el-table-column label="任务类型" align="center" prop="taskType" width="120">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_task_type" :value="scope.row.taskType"/>
          <el-tag v-if="scope.row.taskType === 'EMERGENCY_TRANSFER'" type="danger" size="mini" style="margin-left: 5px;">
            <i class="el-icon-warning"></i>
          </el-tag>
        </template>
      </el-table-column>
      <el-table-column label="任务状态" align="center" prop="taskStatus">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_task_status" :value="scope.row.taskStatus"/>
        </template>
      </el-table-column>
      <el-table-column label="出发地址" align="center" prop="departureAddress" show-overflow-tooltip />
      <el-table-column label="目的地址" align="center" prop="destinationAddress" show-overflow-tooltip />
      <el-table-column label="预计公里数" align="center" prop="estimatedDistance" width="120">
        <template slot-scope="scope">
          <span v-if="scope.row.estimatedDistance">{{ scope.row.estimatedDistance }} km</span>
          <span v-else style="color: #C0C4CC;">--</span>
        </template>
      </el-table-column>
      <el-table-column label="计划开始时间" align="center" prop="plannedStartTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.plannedStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="计划结束时间" align="center" prop="plannedEndTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.plannedEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="创建人" align="center" prop="creatorName" />
      <el-table-column label="执行人" align="center" prop="assigneeName" />
      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-view"
            @click="handleView(scope.row)"
            v-hasPermi="['task:general:query']"
          >查看</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['task:general:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-user"
            @click="handleAssign(scope.row)"
            v-hasPermi="['task:general:assign']"
          >分配</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-refresh"
            @click="handleStatusChange(scope.row)"
            v-hasPermi="['task:general:status']"
          >状态</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['task:general:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
    </el-table>
    
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />

    <!-- 添加或修改任务管理对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="任务类型" prop="taskType">
          <el-select v-model="form.taskType" placeholder="请选择任务类型">
            <el-option
              v-for="dict in dict.type.sys_task_type"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="任务描述" prop="taskDescription">
          <el-input v-model="form.taskDescription" type="textarea" placeholder="请输入任务描述" />
        </el-form-item>
        <el-form-item label="出发地址" prop="departureAddress">
          <el-input v-model="form.departureAddress" placeholder="请输入出发地址" />
        </el-form-item>
        <el-form-item label="目的地址" prop="destinationAddress">
          <el-input v-model="form.destinationAddress" placeholder="请输入目的地址" />
        </el-form-item>
        
        <!-- GPS坐标信息 -->
        <el-divider content-position="left">GPS坐标信息</el-divider>
        
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="出发地经度" prop="departureLongitude">
              <el-input-number 
                v-model="form.departureLongitude" 
                :precision="7" 
                :step="0.0000001" 
                :min="-180" 
                :max="180"
                placeholder="请输入经度"
                style="width: 100%"
                @change="calculateDistance"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="出发地纬度" prop="departureLatitude">
              <el-input-number 
                v-model="form.departureLatitude" 
                :precision="7" 
                :step="0.0000001" 
                :min="-90" 
                :max="90"
                placeholder="请输入纬度"
                style="width: 100%"
                @change="calculateDistance"
              />
            </el-form-item>
          </el-col>
        </el-row>
        
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="目的地经度" prop="destinationLongitude">
              <el-input-number 
                v-model="form.destinationLongitude" 
                :precision="7" 
                :step="0.0000001" 
                :min="-180" 
                :max="180"
                placeholder="请输入经度"
                style="width: 100%"
                @change="calculateDistance"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="目的地纬度" prop="destinationLatitude">
              <el-input-number 
                v-model="form.destinationLatitude" 
                :precision="7" 
                :step="0.0000001" 
                :min="-90" 
                :max="90"
                placeholder="请输入纬度"
                style="width: 100%"
                @change="calculateDistance"
              />
            </el-form-item>
          </el-col>
        </el-row>
        
        <el-form-item label="预计公里数" prop="estimatedDistance">
          <el-input-number 
            v-model="form.estimatedDistance" 
            :precision="2" 
            :step="0.01" 
            :min="0"
            placeholder="自动计算"
            style="width: 200px"
            :disabled="true"
          />
          <span style="margin-left: 10px; color: #909399; font-size: 12px;">
            <i class="el-icon-info"></i> 根据GPS坐标自动计算
          </span>
        </el-form-item>
        <el-form-item label="计划开始时间" prop="plannedStartTime">
          <el-date-picker clearable
            v-model="form.plannedStartTime"
            type="datetime"
            value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择计划开始时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="计划结束时间" prop="plannedEndTime">
          <el-date-picker clearable
            v-model="form.plannedEndTime"
            type="datetime"
            value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择计划结束时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="执行人" prop="assigneeId">
          <el-select v-model="form.assigneeId" placeholder="请选择执行人" clearable>
            <el-option
              v-for="user in userList"
              :key="user.userId"
              :label="user.nickName"
              :value="user.userId"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>


    <!-- 任务分配对话框 -->
    <el-dialog title="任务分配" :visible.sync="assignOpen" width="500px" append-to-body>
      <el-form ref="assignForm" :model="assignForm" :rules="assignRules" label-width="80px">
        <el-form-item label="执行人" prop="assigneeId">
          <el-select v-model="assignForm.assigneeId" placeholder="请选择执行人" clearable>
            <el-option
              v-for="user in userList"
              :key="user.userId"
              :label="user.nickName"
              :value="user.userId"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="assignForm.remark" type="textarea" placeholder="请输入备注" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitAssign">确 定</el-button>
        <el-button @click="cancelAssign">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 状态变更对话框 -->
    <el-dialog title="状态变更" :visible.sync="statusOpen" width="500px" append-to-body>
      <el-form ref="statusForm" :model="statusForm" :rules="statusRules" label-width="80px">
        <el-form-item label="任务状态" prop="taskStatus">
          <el-select v-model="statusForm.taskStatus" placeholder="请选择任务状态">
            <el-option
              v-for="dict in dict.type.sys_task_status"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="statusForm.remark" type="textarea" placeholder="请输入备注" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitStatusChange">确 定</el-button>
        <el-button @click="cancelStatusChange">取 消</el-button>
      </div>
    </el-dialog>
  </div>
</template>

<script>
import { listTask, getTask, delTask, addTask, updateTask, assignTask, changeTaskStatus } from "@/api/task";
import { listUser } from "@/api/system/user";

export default {
  name: "Task",
  dicts: ['sys_task_type', 'sys_task_status'],
  data() {
    return {
      // 遮罩层
      loading: true,
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 任务管理表格数据
      taskList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 是否显示分配弹出层
      assignOpen: false,
      // 是否显示状态变更弹出层
      statusOpen: false,
      // 日期范围
      dateRange: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        taskCode: null,
        taskType: null,
        taskStatus: null,
        plannedStartTimeBegin: null,
        plannedStartTimeEnd: null,
      },
      // 表单参数
      form: {},
      // 分配表单
      assignForm: {},
      // 状态变更表单
      statusForm: {},
      // 用户列表
      userList: [],
      // 表单校验
      rules: {
        taskType: [
          { required: true, message: "任务类型不能为空", trigger: "change" }
        ],
        taskDescription: [
          { required: true, message: "任务描述不能为空", trigger: "blur" }
        ],
        plannedStartTime: [
          { required: true, message: "计划开始时间不能为空", trigger: "blur" }
        ],
        plannedEndTime: [
          { required: true, message: "计划结束时间不能为空", trigger: "blur" }
        ]
      },
      // 分配表单校验
      assignRules: {
        assigneeId: [
          { required: true, message: "执行人不能为空", trigger: "change" }
        ]
      },
      // 状态变更表单校验
      statusRules: {
        taskStatus: [
          { required: true, message: "任务状态不能为空", trigger: "change" }
        ]
      }
    };
  },
  created() {
    this.getList();
    this.getUserList();
  },
  methods: {
    /** 查询任务管理列表 */
    getList() {
      this.loading = true;
      if (this.dateRange != null && this.dateRange.length === 2) {
        this.queryParams.plannedStartTimeBegin = this.dateRange[0];
        this.queryParams.plannedStartTimeEnd = this.dateRange[1];
      }
      listTask(this.queryParams).then(response => {
        this.taskList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    /** 查询用户列表 */
    getUserList() {
      listUser().then(response => {
        this.userList = response.rows;
      });
    },
    // 取消按钮
    cancel() {
      this.open = false;
      this.reset();
    },
    // 表单重置
    reset() {
      this.form = {
        taskId: null,
        taskType: null,
        taskDescription: null,
        departureAddress: null,
        destinationAddress: null,
        departureLongitude: null,
        departureLatitude: null,
        destinationLongitude: null,
        destinationLatitude: null,
        estimatedDistance: null,
        plannedStartTime: null,
        plannedEndTime: null,
        assigneeId: null,
        remark: null
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.dateRange = [];
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.taskId)
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加任务管理";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset();
      const taskId = row.taskId || this.ids
      getTask(taskId).then(response => {
        this.form = response.data;
        this.open = true;
        this.title = "修改任务管理";
      });
    },
    /** 查看按钮操作 */
    handleView(row) {
      this.$router.push('/task/general-detail/index/' + row.taskId);
    },
    /** 分配按钮操作 */
    handleAssign(row) {
      this.assignForm = {
        taskId: row.taskId,
        assigneeId: row.assigneeId,
        remark: null
      };
      this.assignOpen = true;
    },
    /** 状态变更按钮操作 */
    handleStatusChange(row) {
      this.statusForm = {
        taskId: row.taskId,
        taskStatus: row.taskStatus,
        remark: null
      };
      this.statusOpen = true;
    },
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.taskId != null) {
            updateTask(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addTask(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
          }
        }
      });
    },
    /** 提交分配 */
    submitAssign() {
      this.$refs["assignForm"].validate(valid => {
        if (valid) {
          assignTask(this.assignForm.taskId, this.assignForm).then(response => {
            this.$modal.msgSuccess("分配成功");
            this.assignOpen = false;
            this.getList();
          });
        }
      });
    },
    /** 提交状态变更 */
    submitStatusChange() {
      this.$refs["statusForm"].validate(valid => {
        if (valid) {
          changeTaskStatus(this.statusForm.taskId, this.statusForm).then(response => {
            this.$modal.msgSuccess("状态变更成功");
            this.statusOpen = false;
            this.getList();
          });
        }
      });
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const taskIds = row.taskId || this.ids;
      this.$modal.confirm('是否确认删除任务管理编号为"' + taskIds + '"的数据项？').then(function() {
        return delTask(taskIds);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('task/export', {
        ...this.queryParams
      }, `task_${new Date().getTime()}.xlsx`)
    },
    /** 取消分配 */
    cancelAssign() {
      this.assignOpen = false;
      this.assignForm = {};
    },
    /** 取消状态变更 */
    cancelStatusChange() {
      this.statusOpen = false;
      this.statusForm = {};
    },
    
    /** 计算GPS坐标距离 */
    calculateDistance() {
      if (this.form.departureLongitude && this.form.departureLatitude && 
          this.form.destinationLongitude && this.form.destinationLatitude) {
        
        // 验证坐标有效性
        if (this.isValidCoordinate(this.form.departureLatitude, this.form.departureLongitude) &&
            this.isValidCoordinate(this.form.destinationLatitude, this.form.destinationLongitude)) {
          
          // 使用Haversine公式计算距离
          const distance = this.calculateHaversineDistance(
            this.form.departureLatitude, this.form.departureLongitude,
            this.form.destinationLatitude, this.form.destinationLongitude
          );
          
          this.form.estimatedDistance = Math.round(distance * 100) / 100; // 保留2位小数
        } else {
          this.form.estimatedDistance = 0;
        }
      } else {
        this.form.estimatedDistance = 0;
      }
    },
    
    /** 验证GPS坐标是否有效 */
    isValidCoordinate(latitude, longitude) {
      return latitude >= -90 && latitude <= 90 && longitude >= -180 && longitude <= 180;
    },
    
    /** 使用Haversine公式计算两点间距离 */
    calculateHaversineDistance(lat1, lon1, lat2, lon2) {
      const R = 6371; // 地球半径（公里）
      const dLat = this.toRadians(lat2 - lat1);
      const dLon = this.toRadians(lon2 - lon1);
      const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
                Math.cos(this.toRadians(lat1)) * Math.cos(this.toRadians(lat2)) *
                Math.sin(dLon / 2) * Math.sin(dLon / 2);
      const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
      return R * c;
    },
    
    /** 角度转弧度 */
    toRadians(degrees) {
      return degrees * (Math.PI / 180);
    }
  }
};
</script>