测试计划相关接口

test-test/src/main/java/com/test/test/controller/TestPlanController.java

@@ -0,0 +1,82 @@
+package com.test.test.controller;
+
+import com.test.common.annotation.Log;
+import com.test.common.core.controller.BaseController;
+import com.test.common.core.domain.AjaxResult;
+import com.test.common.core.page.TableDataInfo;
+import com.test.common.enums.BusinessType;
+import com.test.test.domain.TestPlan;
+import com.test.test.domain.qo.IDQO;
+import com.test.test.domain.qo.TestPlanAddQO;
+import com.test.test.domain.qo.TestPlanListQO;
+import com.test.test.domain.vo.TestPlanListVO;
+import com.test.test.service.ITestPlanService;
+import jakarta.annotation.Resource;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 测试计划controller
+ */
+@Slf4j
+@RestController
+@RequestMapping("/test/testPlan")
+public class TestPlanController extends BaseController {
+
+
+    @Resource
+    private ITestPlanService testPlanService;
+
+    /**
+     * 查询测试计划列表
+     */
+    @GetMapping("/testPlanList")
+    public TableDataInfo planList(@Validated TestPlanListQO qo) {
+        startPage();
+        List<TestPlanListVO> list = testPlanService.getPlanList(qo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 新增测试计划
+     */
+    @Log(title = "测试计划", businessType = BusinessType.INSERT)
+    @PostMapping("/addPlan")
+    public AjaxResult addPlan(@RequestBody TestPlanAddQO testPlanAddQO) {
+        return toAjax(testPlanService.insertTestPlan(testPlanAddQO));
+    }
+
+    /**
+     * 删除测试计划
+     */
+    @Log(title = "测试计划", businessType = BusinessType.DELETE)
+    @PostMapping("/deletePlan")
+    public AjaxResult deletePlan(@RequestBody IDQO qo) {
+        TestPlan testPlan = testPlanService.selectTestPlanById(qo.getId());
+        testPlan.setDelFlag("1");
+        return toAjax(testPlanService.updateTestPlan(testPlan));
+    }
+
+    /**
+     * 获取测试计划详细信息
+     */
+    @PostMapping("/planDetail")
+    public AjaxResult getInfo(@RequestBody IDQO qo) {
+        return success(testPlanService.selectTestPlanById(qo.getId()));
+    }
+
+    /**
+     * 修改测试计划
+     */
+    @Log(title = "测试计划", businessType = BusinessType.UPDATE)
+    @PostMapping("/updatePlan")
+    public AjaxResult edit(@RequestBody TestPlan testPlan) {
+        return toAjax(testPlanService.updateTestPlan(testPlan));
+    }
+}

test-test/src/main/java/com/test/test/domain/TestPlan.java

@@ -0,0 +1,56 @@
+package com.test.test.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.test.common.annotation.Excel;
+import com.test.common.core.domain.BaseEntity;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 测试计划实例表 test_plan
+ */
+@Getter
+@Setter
+@ToString
+public class TestPlan extends BaseEntity {
+
+    private static final long serialVersionUID = 3214537838879582503L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 测试计划编码 */
+    @Excel(name = "测试计划编码")
+    private String serialNumber;
+
+    /** 测试计划名称 */
+    @Excel(name = "测试计划名称")
+    private String name;
+
+    /** 状态(0,未开始,1,进行中,2,已完成,3,已终止) */
+    @Excel(name = "状态(0,未开始,1,进行中,2,已完成,3,已终止)")
+    private String status;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String manager;
+
+    /** 测试计划开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "测试计划开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 测试计划结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "测试计划结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 版本 */
+    @Excel(name = "版本")
+    private String version;
+
+    /** 0,正常,1,删除 */
+    private String delFlag;
+}

test-test/src/main/java/com/test/test/domain/qo/TestPlanAddQO.java

@@ -0,0 +1,52 @@
+package com.test.test.domain.qo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.test.common.core.domain.BaseEntity;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 测试计划新增请求QO
+ *
+ * @author pfl
+ */
+@Data
+public class TestPlanAddQO extends BaseEntity {
+
+    private static final long serialVersionUID = 3693196640830164441L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 测试计划id */
+    private Long planId;
+
+    /** 测试计划编码 */
+    private String serialNumber;
+
+    /** 测试计划名称 */
+    private String name;
+
+    /** 状态(0,未开始,1,进行中,2,已完成,3,已终止) */
+    private String status;
+
+    /** 负责人 */
+    private String manager;
+
+    /** 测试计划开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 测试计划结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 版本 */
+    private String version;
+
+    /** 0,正常,1,删除 */
+    private String delFlag;
+
+    /** 关联需求id */
+    private Long projectId;
+}

test-test/src/main/java/com/test/test/domain/qo/TestPlanListQO.java

@@ -0,0 +1,52 @@
+package com.test.test.domain.qo;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 查询测试计划列表请求参数qo
+ *
+ * @author pfl
+ */
+@Data
+public class TestPlanListQO implements Serializable {
+
+
+    private static final long serialVersionUID = -1058615526393949211L;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 负责人
+     */
+    private String manager;
+
+    /**
+     * 测试计划名称
+     */
+    private String name;
+
+    /**
+     * 测试计划开始时间起始时间
+     */
+    private Date startPlanTime;
+
+    /**
+     * 测试计划开始时间结束时间
+     */
+    private Date endPlanTime;
+
+    /**
+     * 测试计划截止时间起始时间
+     */
+    private Date startDeadline;
+
+    /**
+     * 测试计划截止时间结束时间
+     */
+    private Date endDeadline;
+}

test-test/src/main/java/com/test/test/domain/vo/TestPlanListVO.java

@@ -0,0 +1,53 @@
+package com.test.test.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.test.common.annotation.Excel;
+import com.test.common.core.domain.BaseEntity;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class TestPlanListVO extends BaseEntity {
+
+    private static final long serialVersionUID = 7768851691630986105L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 测试计划编码 */
+    @Excel(name = "测试计划编码")
+    private String serialNumber;
+
+    /** 测试计划名称 */
+    @Excel(name = "测试计划名称")
+    private String name;
+
+    /** 状态(0,未开始,1,进行中,2,已完成,3,已终止) */
+    @Excel(name = "状态(0,未开始,1,进行中,2,已完成,3,已终止)")
+    private String status;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String manager;
+
+    /** 测试计划开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "测试计划开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 测试计划结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "测试计划结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endTime;
+
+    /** 版本 */
+    @Excel(name = "版本")
+    private String version;
+
+    /** 0,正常,1,删除 */
+    private String delFlag;
+
+    /** 缺陷数量 */
+    @Excel(name = "缺陷数量")
+    private String defectNum;
+}

test-test/src/main/java/com/test/test/mapper/TestPlanMapper.java

@@ -0,0 +1,44 @@
+package com.test.test.mapper;
+
+import com.test.test.domain.TestPlan;
+import com.test.test.domain.qo.TestPlanListQO;
+import com.test.test.domain.vo.TestPlanListVO;
+import java.util.List;
+
+public interface TestPlanMapper {
+
+    /**
+     * 查询测试计划列表
+     * @param qo
+     * @return
+     */
+    List<TestPlanListVO> selectTestPlanList(TestPlanListQO qo);
+
+    /**
+     * 新增测试计划
+     * @param testPlan
+     * @return
+     */
+    int insertTestPlan(TestPlan testPlan);
+
+    /**
+     * 根据id查询测试计划
+     * @param id
+     * @return
+     */
+    TestPlan selectTestPlanById(Long id);
+
+    /**
+     * 修改测试计划
+     * @param testPlan
+     * @return
+     */
+    int updateTestPlan(TestPlan testPlan);
+
+    /**
+     * 根据序列号查询测试计划id
+     * @param serialNumber
+     * @return
+     */
+    Long selectPlanId(String serialNumber);
+}

test-test/src/main/java/com/test/test/mapper/TestProjectPlanMapper.java

@@ -0,0 +1,13 @@
+package com.test.test.mapper;
+
+import com.test.test.domain.qo.TestPlanAddQO;
+
+public interface TestProjectPlanMapper {
+
+    /**
+     * 新增测试计划需求关联
+      * @param testPlanAddQO
+     * @return
+     */
+    int insertTestProjectPlan(TestPlanAddQO testPlanAddQO);
+}

test-test/src/main/java/com/test/test/service/ITestPlanService.java

@@ -0,0 +1,44 @@
+package com.test.test.service;
+
+import com.test.test.domain.TestPlan;
+import com.test.test.domain.qo.TestPlanAddQO;
+import com.test.test.domain.qo.TestPlanListQO;
+import com.test.test.domain.vo.TestPlanListVO;
+import java.util.List;
+
+/**
+ * 测试计划Service接口
+ *
+ * @author pfl
+ */
+public interface ITestPlanService {
+
+
+    /**
+     * 查询测试计划列表
+     * @param qo
+     * @return
+     */
+    List<TestPlanListVO> getPlanList(TestPlanListQO qo);
+
+    /**
+     * 新增测试计划
+     * @param testPlanAddQO
+     * @return
+     */
+    public int insertTestPlan(TestPlanAddQO testPlanAddQO);
+
+    /**
+     * 查询测试计划详情
+     * @param id
+     * @return
+     */
+    public TestPlan selectTestPlanById(Long id);
+
+    /**
+     * 修改测试计划
+     * @param testPlan
+     * @return
+     */
+    public int updateTestPlan(TestPlan testPlan);
+}

test-test/src/main/java/com/test/test/service/impl/TestPlanServiceImpl.java

@@ -0,0 +1,85 @@
+package com.test.test.service.impl;
+
+import com.test.common.utils.DateUtils;
+import com.test.common.utils.bean.BeanUtils;
+import com.test.test.domain.TestPlan;
+import com.test.test.domain.qo.TestPlanAddQO;
+import com.test.test.domain.qo.TestPlanListQO;
+import com.test.test.domain.vo.TestPlanListVO;
+import com.test.test.mapper.TestPlanMapper;
+import com.test.test.mapper.TestProjectPlanMapper;
+import com.test.test.service.ITestPlanService;
+import jakarta.annotation.Resource;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 测试计划Service实现类
+ *
+ * @author pfl
+ */
+@Service
+public class TestPlanServiceImpl implements ITestPlanService {
+
+    @Resource
+    private TestPlanMapper testPlanMapper;
+
+    @Resource
+    private TestProjectPlanMapper testProjectPlanMapper;
+
+    /**
+     * 查询测试计划列表
+     * @param qo
+     * @return
+     */
+    @Override
+    public List<TestPlanListVO> getPlanList(TestPlanListQO qo) {
+        return testPlanMapper.selectTestPlanList(qo);
+    }
+
+    /**
+     * 新增测试计划
+     * @param testPlanAddQO
+     * @return
+     */
+    @Transactional
+    @Override
+    public int insertTestPlan(TestPlanAddQO testPlanAddQO) {
+        TestPlan testPlan = new TestPlan();
+        BeanUtils.copyProperties(testPlanAddQO,testPlan);
+        testPlan.setCreateTime(DateUtils.getNowDate());
+        testPlan.setDelFlag("0");
+        testPlan.setStatus("0");
+        // 新增测试计划
+        testPlanMapper.insertTestPlan(testPlan);
+        testPlanAddQO.setCreateTime(DateUtils.getNowDate());
+        Long planId = testPlanMapper.selectPlanId(testPlanAddQO.getSerialNumber());
+        testPlanAddQO.setPlanId(planId);
+        testPlanAddQO.setDelFlag("0");
+        //新增测试计划需求关联表
+        return testProjectPlanMapper.insertTestProjectPlan(testPlanAddQO);
+    }
+
+
+    /**
+     * 查询测试计划详情
+     * @param id
+     * @return
+     */
+    @Override
+    public TestPlan selectTestPlanById(Long id) {
+        return testPlanMapper.selectTestPlanById(id);
+    }
+
+    /**
+     * 修改测试计划
+     * @param testPlan
+     * @return
+     */
+    @Override
+    public int updateTestPlan(TestPlan testPlan) {
+        testPlan.setUpdateTime(DateUtils.getNowDate());
+        return testPlanMapper.updateTestPlan(testPlan);
+    }
+}

test-test/src/main/resources/mapper/test/TestPlanMapper.xml

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.test.test.mapper.TestPlanMapper">
+
+  <resultMap type="TestPlan" id="TestPlanResult">
+    <result property="id" column="id"/>
+    <result property="serialNumber" column="serial_number"/>
+    <result property="name" column="name"/>
+    <result property="status" column="status"/>
+    <result property="manager" column="manager"/>
+    <result property="startTime" column="start_time"/>
+    <result property="endTime" column="end_time"/>
+    <result property="createTime" column="create_time"/>
+    <result property="updateTime" column="update_time"/>
+    <result property="version" column="version"/>
+    <result property="delFlag" column="del_flag"/>
+  </resultMap>
+
+  <sql id="selectTestPlanVo">
+    SELECT id,
+           serial_number,
+           name,
+           status,
+           manager,
+           start_time,
+           end_time,
+           create_time,
+           update_time,
+           version,
+           del_flag
+    FROM test_plan
+  </sql>
+
+  <insert id="insertTestPlan" parameterType="testPlan">
+    insert into test_plan
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="serialNumber != null and serialNumber != ''">serial_number,</if>
+      <if test="name != null and name != ''">name,</if>
+      <if test="status != null and status != ''">status,</if>
+      <if test="manager != null and manager != ''">manager,</if>
+      <if test="startTime != null">start_time,</if>
+      <if test="endTime != null">end_time,</if>
+      <if test="createTime != null">create_time,</if>
+      <if test="updateTime != null">update_time,</if>
+      <if test="version != null">version,</if>
+      <if test="delFlag != null and delFlag != ''">del_flag,</if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
+      <if test="name != null and name != ''">#{name},</if>
+      <if test="status != null and status != ''">#{status},</if>
+      <if test="manager != null and manager != ''">#{manager},</if>
+      <if test="startTime != null">#{startTime},</if>
+      <if test="endTime != null">#{endTime},</if>
+      <if test="createTime != null">#{createTime},</if>
+      <if test="updateTime != null">#{updateTime},</if>
+      <if test="version != null">#{version},</if>
+      <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+    </trim>
+  </insert>
+
+  <update id="updateTestPlan" parameterType="TestPlan">
+    update test_plan
+    <trim prefix="SET" suffixOverrides=",">
+      <if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
+      <if test="name != null and name != ''">name = #{name},</if>
+      <if test="status != null and status != ''">status = #{status},</if>
+      <if test="manager != null and manager != ''">manager = #{manager},</if>
+      <if test="startTime != null">start_time = #{startTime},</if>
+      <if test="endTime != null">end_time = #{endTime},</if>
+      <if test="createTime != null">create_time = #{createTime},</if>
+      <if test="updateTime != null">update_time = #{updateTime},</if>
+      <if test="version != null">version = #{version},</if>
+      <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+    </trim>
+    where id = #{id}
+  </update>
+
+  <select id="selectTestPlanList" parameterType="TestPlanListQO" resultType="TestPlanListVO">
+    SELECT
+    tp.id,
+    tp.serial_number AS serialNumber,
+    tp.name,
+    tp.status,
+    su.user_name AS manager,
+    tp.start_time AS startTime,
+    tp.end_time AS endTime,
+    tp.version,
+    (
+    SELECT COUNT(1) FROM test_plan_defect tpd
+    WHERE tpd.plan_id = tp.id
+    AND tpd.del_flag = '0'
+    ) AS defectNum
+    FROM test_plan tp
+    LEFT JOIN sys_user su ON su.user_id = tp.manager
+    where 1=1
+    AND tp.del_flag = '0'
+    <if test="status != null and status != ''">
+      AND tp.status = #{status}
+    </if>
+    <if test="manager != null and manager != ''">
+      AND tp.manager = #{manager}
+    </if>
+    <if test="name != null and name != ''">
+      AND tp.name LIKE CONCAT('%', #{name}, '%')
+    </if>
+    <if test="startPlanTime != null">
+      AND DATE_FORMAT(IFNULL(tp.start_time,''),'%Y%m%d') <![CDATA[ >= ]]> DATE_FORMAT(#{startPlanTime},'%Y%m%d')
+    </if>
+    <if test="endPlanTime != null">
+      AND DATE_FORMAT(IFNULL(tp.start_time,''),'%Y%m%d') <![CDATA[ <= ]]> DATE_FORMAT(#{endPlanTime},'%Y%m%d')
+    </if>
+    <if test="startDeadline != null">
+      AND DATE_FORMAT(IFNULL(tp.end_time,''),'%Y%m%d') <![CDATA[ >= ]]> DATE_FORMAT(#{startDeadline},'%Y%m%d')
+    </if>
+    <if test="endDeadline != null">
+      AND DATE_FORMAT(IFNULL(tp.end_time,''),'%Y%m%d') <![CDATA[ <= ]]> DATE_FORMAT(#{endDeadline},'%Y%m%d')
+    </if>
+  </select>
+
+  <select id="selectTestPlanById" parameterType="Long" resultMap="TestPlanResult">
+    <include refid="selectTestPlanVo"/>
+    where id = #{id}
+  </select>
+
+  <select id="selectPlanId" resultType="Long">
+    select id from test_plan where serial_number = #{serialNumber} and del_flag = '0'
+  </select>
+</mapper>

test-test/src/main/resources/mapper/test/TestProjectMapper.xml

@@ -127,6 +127,7 @@
     FROM test_project tp
     LEFT JOIN sys_user su ON su.user_id = tp.manager
     where 1=1
+      AND tp.del_flag = '0'
     <if test="serialNumber != null and serialNumber != ''">
       AND serial_number LIKE concat('%', #{serialNumber}, '%')
     </if>

test-test/src/main/resources/mapper/test/TestProjectPlanMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.test.test.mapper.TestProjectPlanMapper">
+
+  <insert id="insertTestProjectPlan" parameterType="testPlanAddQO">
+    insert into test_project_plan
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="projectId != null and projectId != ''">project_id,</if>
+      <if test="planId != null and planId != ''">plan_id,</if>
+      <if test="createTime != null">create_time,</if>
+      <if test="updateTime != null">update_time,</if>
+      <if test="version != null">version,</if>
+      <if test="delFlag != null and delFlag != ''">del_flag,</if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="projectId != null and projectId != ''">#{projectId},</if>
+      <if test="planId != null and planId != ''">#{planId},</if>
+      <if test="createTime != null">#{createTime},</if>
+      <if test="updateTime != null">#{updateTime},</if>
+      <if test="version != null">#{version},</if>
+      <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+    </trim>
+  </insert>
+</mapper>

test-ui/src/api/test/testPlan.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+const api = {
+  testPlanList: 'test/testPlan/testPlanList',
+  addTestPlan: 'test/testPlan/addPlan',
+  delTestPlan: 'test/testPlan/deletePlan'
+}
+
+export function getTestPlanList(data) {
+  return request({
+    url: api.testPlanList,
+    method: 'get',
+    params: data
+  })
+}
+
+export function addTestPlan(data) {
+  return request({
+    url: api.addTestPlan,
+    method: 'post',
+    data: data
+  })
+}
+
+export function delTestPlan(id) {
+  return request({
+    url: api.delTestPlan,
+    method: 'post',
+    data: {id}
+  })
+}

test-ui/src/router/index.js

@@ -228,6 +228,20 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/testplan/overview',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '',
+        component: () => import('@/views/test/testplan/overview'),
+        name: 'overview',
+        noCache: true,
+        meta: { title: '测试计划', activeMenu: '/testplan' }
+      }
+    ]
+  },
 ]
 
 // 动态路由，基于用户权限动态去加载

test-ui/src/views/test/testplan/index.vue

@@ -0,0 +1,460 @@
+<template>
+  <div class="app-container">
+    <!-- 顶部导航 -->
+    <el-row :gutter="10">
+      <el-col :span="24">
+        <el-header class="header">
+          <div class="head1">
+            <span style="font-size: 18px; font-weight: bold; margin-right: 20px;">测试计划</span>
+          </div>
+          <div class="head2">
+            <el-input placeholder="请输入测试计划名称搜索" v-model="query" class="input-with-select" clearable>
+              <el-button slot="append" icon="el-icon-search" @click="handleQuery"></el-button>
+            </el-input>
+            <el-button
+              type="primary"
+              size="medium"
+              style="margin-right: 10px;"
+              @click="handleCollapse(!activeNames.includes('1'))"
+            >高级筛选
+            </el-button>
+            <el-button icon="el-icon-plus" type="primary" size="medium" style="margin-left: 10px;" @click="addProjectVue">
+              新建计划
+            </el-button>
+          </div>
+        </el-header>
+      </el-col>
+    </el-row>
+
+    <el-collapse v-model="activeNames">
+      <el-collapse-item class="collapse-search" name="1">
+        <el-form :inline="true" ref="queryForm" :model="queryParams" label-width="110px">
+          <el-row :gutter="10" class="high-search">
+            <el-form-item label="状态">
+              <el-select v-model="queryParams.status" placeholder="请选择" clearable>
+                <simple-options :options="dict.type.status"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="负责人">
+              <el-select v-model="queryParams.manager" placeholder="请选择" clearable filterable>
+                <simple-options :options="managerList"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="开始时间范围">
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd"
+              ></el-date-picker>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="10" class="high-search">
+            <el-col :span="12">
+              <el-form-item label="截止时间范围">
+                <el-date-picker
+                  v-model="queryParams.endTime"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" style="text-align: right">
+              <el-form-item>
+                <el-button type="primary" size="mini" icon="el-icon-search" @click="handleAdvancedSearch">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetAdvancedFilter">重置</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-collapse-item>
+    </el-collapse>
+
+    <el-row :gutter="10" class="mb8" style="padding-top: 20px">
+      <right-toolbar @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 标签页 -->
+    <el-tabs v-model="activeTab" @tab-click="handleTabClick" style="margin-top: 10px;">
+      <el-Table v-loading="loading" :data="list" @row-click="handleRowClick">
+        <el-table-column prop="name" label="计划名称" align="left"/>
+        <el-table-column prop="version" label="测试进度" align="left">
+          <template slot-scope="scope">
+            <el-row :gutter="10">
+              <el-col :span="24">
+                <el-row :gutter="10" class="label-progress">
+                  <el-col :span="10" class="label-text">冒烟测试</el-col>
+                  <el-col :span="14">
+                    <el-popover
+                      placement="top-start"
+                      trigger="hover"
+                      content="暂无关联用例"
+                    >
+                      <el-progress slot="reference" :percentage="80" :show-text="false"></el-progress>
+                    </el-popover>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="10" class="label-progress">
+                  <el-col :span="10" class="label-text">功能测试</el-col>
+                  <el-col :span="14">
+                    <el-progress :percentage="scope.row.functionalTestProgress" :show-text="false"></el-progress>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="10" class="label-progress">
+                  <el-col :span="10" class="label-text">回归测试</el-col>
+                  <el-col :span="14">
+                    <el-progress :percentage="scope.row.regressionTestProgress" :show-text="false"></el-progress>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="10" class="label-progress">
+                  <el-col :span="10" class="label-text">准生产验证</el-col>
+                  <el-col :span="14">
+                    <el-progress :percentage="scope.row.preProductionValidationProgress" :show-text="false"></el-progress>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="10" class="label-progress">
+                  <el-col :span="10" class="label-text">生产验证</el-col>
+                  <el-col :span="14">
+                    <el-progress :percentage="scope.row.productionValidationProgress" :show-text="false"></el-progress>
+                  </el-col>
+                </el-row>
+              </el-col>
+            </el-row>
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态" align="center">
+          <template #default="{ row }">
+            <dict-tag :options="dict.type.status" :value="row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="timeStartToEnd" label="起止时间" align="left">
+          <template slot-scope="scope">
+            <div>
+              开始：{{ scope.row.startPlanTime }}
+            </div>
+            <div>
+              截止：{{ scope.row.endPlanTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="manager" label="负责人" align="left"/>
+        <el-table-column prop="defectNum" label="缺陷数" align="left"/>
+        <el-table-column label="操作" align="left" fixed="right">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-delete" @click.native.stop="handleDelete(scope.row.id)">删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-Table>
+    </el-tabs>
+
+    <!-- 操作按钮 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog title="新建计划" :visible.sync="addOpen" width="40%">
+      <el-form ref="form" :rules="rules" :model="form" label-width="110px" label-position="right">
+        <el-form-item label="测试计划编码" prop="serialNumber">
+          <el-input v-model="form.serialNumber" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item label="计划名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item label="起止时间" prop="timeStartToEnd">
+          <el-date-picker
+            v-model="form.timeStartToEnd"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="关联需求" prop="projectId">
+          <el-select v-model="form.projectId" placeholder="请选择需求" clearable filterable>
+            <Simple-options :options="projectList"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="负责人" prop="manager">
+          <el-select v-model="form.manager" style="width: 50%" placeholder="请选择负责人" clearable filterable>
+            <Simple-options :options="managerList"/>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addOpen = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {addProject, delProject, getProjectList, managerList, updateProject} from "@/api/test/project";
+import SimpleOptions from "@/components/FormItem/option/SimpleOptions.vue";
+import {addTestPlan, delTestPlan, getTestPlanList} from "@/api/test/testPlan";
+
+export default {
+  name: 'testplan',
+  components: {SimpleOptions},
+  dicts: ['priority_level', 'project_source', 'project_type', 'status'],
+  data() {
+    return {
+      query: '',
+      rules: {
+        serialNumber: [{required: true, message: '请输入需求ID', trigger: 'blur'}],
+        name: [{required: true, message: '请输入需求名称', trigger: 'blur'}],
+        manager: [{required: true, message: '请选择负责人', trigger: 'blur'}],
+        timeStartToEnd: [{required: true, message: '请选择起止时间', trigger: 'blur'}],
+        projectId: [{required: true, message: '请选择关联需求', trigger: 'blur'}],
+      },
+      searchKeyword: '',
+      activeTab: 'all',
+      total: 0,
+      list: [],
+      title: '',
+      // 遮罩层
+      loading: false,
+      editSubmitLoading: false,
+      submitLoading: false,
+      //新增弹窗
+      addOpen: false,
+      //编辑弹窗
+      editOpen: false,
+      managerList: [],
+      projectList: [],
+      queryParams: {
+        status: '',
+        manager: '',
+        name: '',
+        startTime: [],
+        endTime: [],
+        pageNum: 1,
+        pageSize: 10,
+      },
+      activeNames: [], // 控制 collapse 的展开状态
+      form: {
+        serialNumber: '',
+        name: '',
+        manager: '',
+        projectId: '',
+        timeStartToEnd: [],
+        version: ''
+      },
+      editForm: {},
+    };
+  },
+  created() {
+    this.getList();
+    this.getManagerList();
+    this.ProjectList();
+  },
+  computed: {},
+  methods: {
+    handleRowClick(row) {
+      this.$tab.openPage(`测试计划概览`, "/testplan/overview", {id: row.id});
+    },
+    handleTabClick(tab) {
+      this.activeTab = tab.name;
+      this.getList();
+    },
+    // 获取负责人列表
+    getManagerList() {
+      managerList()
+      .then((list) => {
+        this.managerList = (list.rows || []).map((e) => ({value: e.userId, label: e.userName}))
+      })
+    },
+    // 获取需求列表
+    ProjectList() {
+      getProjectList()
+      .then((list) => {
+        this.projectList = (list.rows || []).map((e) => ({value: e.id, label: e.name}))
+      })
+    },
+    // 搜索
+    handleQuery() {
+      this.queryParams.name = this.query;
+      this.getList();
+    },
+    addProjectVue() {
+      this.addOpen = true;
+      this.reset();
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true
+      const [startPlanTime, endPlanTime] = this.queryParams.startTime || []
+      const [startDeadline, endDeadline] = this.queryParams.endTime || []
+      const queryParams = {
+        ...this.queryParams,
+        startPlanTime,
+        endPlanTime,
+        startDeadline,
+        endDeadline,
+      }
+      getTestPlanList(queryParams).then(list => {
+        this.list = list.rows.map(item => ({
+          ...item,
+          startPlanTime: item.startTime, // 确保字段名正确
+          endPlanTime: item.endTime }));
+        this.total = list.total;
+        this.loading = false
+      })
+    },
+    // 表单重置
+    reset() {
+      const form = {}
+      Object.keys(this.form).forEach((key) => {
+        form[key] = ''
+      })
+      this.form = form
+      this.resetForm('form')
+    },
+    // 展开/折叠
+    handleCollapse(val) {
+      this.activeNames = val ? ['1'] : [];
+    },
+    handleAdvancedSearch() {
+      // 高级筛选条件搜索
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    resetAdvancedFilter() {
+      // 重置高级筛选条件
+      this.resetForm('queryFrom')
+      this.handleAdvancedSearch()
+    },
+    submitForm() {
+      const [startTime, endTime] = this.form.timeStartToEnd || []
+      const form = {
+        ...this.form,
+        startTime,
+        endTime,
+      }
+      this.$refs?.form.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        this.submitLoading = true
+        addTestPlan(form)
+        .then(() => {
+          this.$message.success('添加成功')
+          this.addOpen = false
+          this.getList()
+        })
+        .catch(() => {
+          this.$message.error('添加失败')
+        })
+        .finally(() => {
+          this.submitLoading = false
+        })
+      })
+    },
+    handleDelete(id) {
+      this.$modal.confirm('是否确认删除测试计划？').then(function () {
+        return delTestPlan(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      });
+    },
+    editSubmitForm() {
+      const form = {
+        ...this.editForm,
+      }
+      this.$refs?.editForm.validate((valid) => {
+        if (!valid) {
+          return
+        }
+      })
+      this.editSubmitLoading = true
+      updateProject(form)
+      .then(() => {
+        this.$message.success('编辑成功')
+        this.editSubmitLoading = false
+        this.editOpen = false
+        this.getList()
+      })
+      .catch(() => {
+        this.$message.error('编辑失败')
+        this.editSubmitLoading = false
+      })
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.input-with-select {
+  background-color: #ffffff;
+  width: 300px;
+}
+
+.collapse-search {
+  ::v-deep .el-collapse-item__header {
+    display: none;
+  }
+}
+
+.high-search {
+  padding-top: 40px;
+  background-color: rgb(248, 248, 249);
+}
+
+.header {
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.head1 {
+  display: flex;
+  align-items: center;
+}
+
+.head2 {
+  display: flex;
+  align-items: center;
+  flex: 1;
+  justify-content: flex-end;
+  column-gap: 10px;
+}
+
+.el-dialog .el-form {
+  width: 100%;
+}
+
+.el-dialog .el-form-item {
+  margin-bottom: 20px;
+}
+
+.el-dialog .el-textarea {
+  width: 100%;
+}
+
+.basic-information {
+  background-color: rgb(248, 248, 249) !important;
+}
+
+.label-text {
+  display: flex;
+  align-items: flex-start;
+}
+
+.label-progress {
+  display: flex;
+  align-items: center;
+}
+</style>

test-ui/src/views/test/testplan/overview.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="app-container">
+    <!-- 页面标题 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="24">
+        <el-breadcrumb separator="/">
+          <el-breadcrumb-item>测试计划</el-breadcrumb-item>
+          <el-breadcrumb-item>概览</el-breadcrumb-item>
+        </el-breadcrumb>
+      </el-col>
+    </el-row>
+
+    <!-- 测试计划详情 -->
+    <el-card class="box-card">
+
+    </el-card>
+
+    <!-- 测试用例 -->
+    <el-card class="box-card">
+
+    </el-card>
+  </div>
+</template>
+
+<script>
+import LineChart from '@/views/dashboard/LineChart';
+
+export default {
+  name: 'overview',
+  components: {
+    LineChart,
+  },
+  data() {
+    return {
+
+    };
+  },
+  methods: {
+    // 可以在这里添加更多的方法来处理数据或事件
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+</style>