From 4b7a9d3c5f360e9451e29c440cf413185a4d0ac9 Mon Sep 17 00:00:00 2001 From: ks3356143 <314298729@qq.com> Date: Wed, 13 Mar 2024 21:18:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E8=81=94=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cdTMP/src/api/generate/jlGenerate.js | 14 + cdTMP/src/api/project/problem.js | 34 ++ cdTMP/src/api/project/project.js | 15 - .../ma-form/formItem/form-switch.vue | 9 - cdTMP/src/layout/project-layout.vue | 21 +- cdTMP/src/store/project/treeData.js | 14 - .../views/datamanage/dictmanage/dataList.vue | 1 - .../project/case/components/ProblemChoose.vue | 388 ++++++++++++++++++ cdTMP/src/views/project/case/index.vue | 46 ++- .../src/views/testmanage/projmanage/index.vue | 17 +- 10 files changed, 482 insertions(+), 77 deletions(-) create mode 100644 cdTMP/src/api/generate/jlGenerate.js create mode 100644 cdTMP/src/views/project/case/components/ProblemChoose.vue diff --git a/cdTMP/src/api/generate/jlGenerate.js b/cdTMP/src/api/generate/jlGenerate.js new file mode 100644 index 0000000..eeac4f0 --- /dev/null +++ b/cdTMP/src/api/generate/jlGenerate.js @@ -0,0 +1,14 @@ +import { request } from "@/api/request" +export default { + /** + * 生成测试用例记录那一堆表格 + * @returns Promise(message) + */ + createJLcaserecord(params = {}) { + return request({ + url: `/generateJL/create/caserecord`, + method: "get", + params + }) + } +} diff --git a/cdTMP/src/api/project/problem.js b/cdTMP/src/api/project/problem.js index dd900b7..67cb1c9 100644 --- a/cdTMP/src/api/project/problem.js +++ b/cdTMP/src/api/project/problem.js @@ -45,4 +45,38 @@ export default { data }) }, + /* 预览问题单/关联问题单的请求table接口 */ + /** + * 关联问题单界面-查询所有的问题单 + * @returns 一个项目的所有问题单(分页) + */ + searchAllProblem(params = {}) { + return request({ + url: "/project/problem/searchAllProblem", + method: "get", + params + }) + }, + /** + * 单独去掉dut、designDemand、test等等的更新请求 + * @returns 去掉各种id只留projectId请求后端的接口 + */ + modalupdate(id, data = {}) { + return request({ + url: "/project/problem/modalupdate/" + id, + method: "put", + data + }) + }, + /** + * 1.case信息 2.问题单的id 3.现在的值是什么 + * @returns 让case关联问题单 + */ + relateProblem(params = {}) { + return request({ + url: "/project/problem/relateProblem", + method: "get", + params + }) + } } diff --git a/cdTMP/src/api/project/project.js b/cdTMP/src/api/project/project.js index c07c965..e447c14 100644 --- a/cdTMP/src/api/project/project.js +++ b/cdTMP/src/api/project/project.js @@ -71,19 +71,4 @@ export default { } }) }, - /** - * 根据项目名、树节点等级和key查找问题单 - * @returns 返回问题单problem - */ - getProblemInfo(projectId, key, level) { - return request({ - url: `project/getProblemInfo`, - method: "get", - params: { - projectId: projectId, - key: key, - level: level - } - }) - }, } diff --git a/cdTMP/src/components/ma-form/formItem/form-switch.vue b/cdTMP/src/components/ma-form/formItem/form-switch.vue index 97cdd92..6c835bf 100644 --- a/cdTMP/src/components/ma-form/formItem/form-switch.vue +++ b/cdTMP/src/components/ma-form/formItem/form-switch.vue @@ -1,12 +1,3 @@ - @@ -16,6 +26,7 @@ import { ref } from "vue" import { useRoute, useRouter } from "vue-router" import problemApi from "@/api/project/problem" import { useTreeDataStore } from "@/store" +import ProblemChoose from "./components/ProblemChoose.vue" const treeDataStore = useTreeDataStore() const route = useRoute() const router = useRouter() @@ -26,13 +37,25 @@ const testDemandNumber = route.query.key.split("-")[3] const caseNumber = route.query.key.split("-")[4] const crudRef = ref() const projectId = ref(route.query.id) +const problemchoose = ref() +// ~~~~关联问题单逻辑~~~~ +//// 点击关联按钮 +const handleRelatedProblem = () => { + problemchoose.value.open() +} +//// 当关联a-modal删除一个问题单时,通知我刷新表格 +const related_reload = () => { + crudRef.value.refresh() +} + const crudOptions = ref({ api: problemApi.getProblemList, add: { show: true, api: problemApi.save }, edit: { show: true, api: problemApi.update }, delete: { show: true, api: problemApi.delete }, + operationColumnAlign: "center", // 操作列居中 beforeOpenAdd: function () { - let key_split = route.query.key.split("-") + let key_split = route.query.key.split("-") let round_key = key_split[0] let dut_key = key_split[1] let design_key = key_split[2] @@ -47,7 +70,7 @@ const crudOptions = ref({ return true }, beforeOpenEdit: function (record) { - let key_split = route.query.key.split("-") + let key_split = route.query.key.split("-") let round_key = key_split[0] let dut_key = key_split[1] let design_key = key_split[2] @@ -62,19 +85,6 @@ const crudOptions = ref({ >用例[${record.name}]-` return true }, - afterAdd: (res) => { - console.log(res) - let id = projectId.value - treeDataStore.updateProblemTreeData(res.data, id) - }, - afterEdit: (res) => { - let id = projectId.value - treeDataStore.updateProblemTreeData(res.data, id) - }, - afterDelete: (res, record) => { - let id = projectId.value - treeDataStore.updateProblemTreeData(record, id) - }, parameters: { projectId: route.query.id, round: roundNumber, @@ -263,13 +273,13 @@ const crudColumns = ref([ } const tagObj = [] for (let item in record.closeMethod) { - if (item === "0") { + if (record.closeMethod[item] === "1") { tagObj.push( 修改文档 ) - } else if (item === "1") { + } else if (record.closeMethod[item] === "2") { tagObj.push( 修改程序 diff --git a/cdTMP/src/views/testmanage/projmanage/index.vue b/cdTMP/src/views/testmanage/projmanage/index.vue index 4437b62..f3b412f 100644 --- a/cdTMP/src/views/testmanage/projmanage/index.vue +++ b/cdTMP/src/views/testmanage/projmanage/index.vue @@ -14,8 +14,13 @@ 进入工作区 @@ -40,6 +45,7 @@ import preview from "./cpns/preview.vue" import dgGenerateApi from "@/api/generate/dgGenerate" import seitaiGenerateApi from "@/api/generate/seitaiGenerate" import smGenerateApi from "@/api/generate/smGenerate" +import jlGenerateApi from "@/api/generate/jlGenerate" import { Message } from "@arco-design/web-vue" import Progress from "./cpns/progress.vue" const router = useRouter() @@ -87,6 +93,13 @@ const createSeitaiDagang = async (record) => { Message.success(st.message) } +// 记录生成二级文档 +const createJLItem = async (record) => { + const st = await jlGenerateApi.createJLcaserecord({ id: record.id }) + + Message.success(st.message) +} + // 说明生成二级文档 const createSmItem = async (record) => { // 生成测评对象 - 和大纲一样 - 可能会删除