54321

2023-06-19 19:51:12 +08:00
parent 57c772a913
commit fc5d2c44ea
12 changed files with 275 additions and 59 deletions
--- a/cdTMP/src/views/project/case/index.vue
+++ b/cdTMP/src/views/project/case/index.vue
@@ -14,14 +14,16 @@ import problemApi from "@/api/project/problem"
 const route = useRoute()
 const router = useRouter()
 const roundNumber = route.query.key.split("-")[0]
-const designDemandNumber = route.query.key.split("-")[1]
-const testDemandNumber = route.query.key.split("-")[2]
-const caseNumber = route.query.key.split("-")[3]
+const dutNumber = route.query.key.split("-")[1]
+const designDemandNumber = route.query.key.split("-")[2]
+const testDemandNumber = route.query.key.split("-")[3]
+const caseNumber = route.query.key.split("-")[4]
 const crudOptions = ref({
    api: problemApi.getProblemList,
    parameters: {
        projectId: route.query.id,
        round: roundNumber,
+        dut: dutNumber,
        designDemand: designDemandNumber,
        testDemand: testDemandNumber,
        case: caseNumber
@@ -67,19 +69,19 @@ const crudOptions = ref({
                title: "问题详情"
            },
            {
-                dataIndex:"operation"
+                dataIndex: "operation"
            },
            {
-                dataIndex:"expect"
+                dataIndex: "expect"
            },
            {
-                dataIndex:"result"
+                dataIndex: "result"
            },
            {
-                dataIndex:"rules"
+                dataIndex: "rules"
            },
            {
-                dataIndex:"suggest"
+                dataIndex: "suggest"
            },
            {
                formType: "divider",
@@ -112,7 +114,7 @@ const crudOptions = ref({
                    { span: 12, formList: [{ dataIndex: "revokePerson" }] },
                    { span: 12, formList: [{ dataIndex: "revokeDate" }] }
                ]
-            },
+            }
        ]
    }
 })
@@ -270,7 +272,7 @@ const crudColumns = ref([
        title: "设师上级",
        hide: true,
        dataIndex: "designerPerson",
-        commonRules: [{ required: true, message: "提单人必填" }],
+        commonRules: [{ required: true, message: "提单人必填" }]
    },
    {
        title: "提单日期",
--- a/cdTMP/src/views/project/design-demand/index.vue
+++ b/cdTMP/src/views/project/design-demand/index.vue
@@ -15,13 +15,15 @@ const route = useRoute()
 const router = useRouter()
 // 根据传参获取key，分别为轮次、设计需求的key
 const roundNumber = route.query.key.split("-")[0]
-const designDemandNumber = route.query.key.split("-")[1]
+const dutNumber = route.query.key.split("-")[0]
+const designDemandNumber = route.query.key.split("-")[2]
 // crud组件
 const crudOptions = ref({
    api: testDemandApi.getTestDemandList,
    parameters: {
        projectId: route.query.id,
        round: roundNumber,
+        dut: dutNumber,
        designDemand: designDemandNumber
    },
    showIndex: false,
@@ -90,7 +92,7 @@ const crudColumns = ref([
    {
        title: "充分条件",
        hide: true,
-        addDefaultValue:"覆盖需求相关功能",
+        addDefaultValue: "覆盖需求相关功能",
        dataIndex: "adequacy",
        commonRules: [{ required: true, message: "充分性描述必填" }]
    },
@@ -108,7 +110,7 @@ const crudColumns = ref([
    {
        title: "前提条件",
        hide: true,
-        addDefaultValue:"软件正常运行，外部接口通信正常",
+        addDefaultValue: "软件正常运行，外部接口通信正常",
        dataIndex: "premise",
        commonRules: [{ required: true, message: "前提条件必填" }]
    },
@@ -121,7 +123,7 @@ const crudColumns = ref([
    {
        title: "测试内容",
        hide: true,
-        dataIndex:"testContent",
+        dataIndex: "testContent",
        commonRules: [{ required: true, message: "测试内容必填" }],
        formType: "children-form",
        type: "table",
--- a/cdTMP/src/views/project/dut/index.vue
+++ b/cdTMP/src/views/project/dut/index.vue
@@ -0,0 +1,83 @@
+<template>
+    <div class="ma-content-block lg:flex justify-between p-4">
+        <div class="lg:w-full w-full lg:ml-4 mt-5 lg:mt-0">
+            <!-- CRUD组件 -->
+            <ma-crud :options="crudOptions" :columns="crudColumns"></ma-crud>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import { ref } from "vue"
+import { useRoute, useRouter } from "vue-router"
+import designDemandApi from "@/api/project/designDemand"
+const route = useRoute()
+const router = useRouter()
+const roundNumber = route.query.key.split("-")[0]
+const dutNumber = route.query.key.split("-")[1]
+// crud组件
+const crudOptions = ref({
+    api: designDemandApi.getDesignDemandList,
+    parameters: {
+        projectId: route.query.id,
+        round: roundNumber,
+        dut: dutNumber
+    },
+    showIndex: false,
+    rowSelection: { showCheckedAll: true },
+    add: { show: true },
+    edit: { show: true },
+    delete: { show: true },
+    searchColNumber: 3,
+    tablePagination: true,
+    operationColumn: true,
+    formOption: {
+        width: 1200
+    }
+})
+const crudColumns = ref([
+    {
+        title: "ID",
+        width: 50,
+        dataIndex: "id",
+        search: true,
+        commonRules: [{ required: true, message: "标识是必填" }],
+        validateTrigger: "blur"
+    },
+    {
+        title: "标识",
+        width: 120,
+        dataIndex: "ident",
+        search: true,
+        commonRules: [{ required: true, message: "标识是必填" }],
+        validateTrigger: "blur"
+    },
+    {
+        title: "需求名称",
+        width: 150,
+        dataIndex: "name",
+        search: true,
+        commonRules: [{ required: true, message: "需求名称是必填" }],
+        validateTrigger: "blur"
+    },
+    {
+        title: "需求类型",
+        width: 150,
+        dataIndex: "demandType",
+        formType: "radio",
+        search: true,
+        dict: { name: "demandType", props: { label: "title", value: "key" }, translation: true },
+        commonRules: [{ required: true, message: "需求类型是必填" }],
+        validateTrigger: "blur"
+    },
+    {
+        title: "需求描述",
+        dataIndex: "description",
+        width: 300,
+        formType: "editor",
+        height: 300
+    }
+])
+</script>
+
+<style lang="less" scoped></style>
--- a/cdTMP/src/views/project/round/index.vue
+++ b/cdTMP/src/views/project/round/index.vue
@@ -10,13 +10,13 @@
 <script setup>
 import { ref } from "vue"
 import { useRoute, useRouter } from "vue-router"
-import designDemandApi from "@/api/project/designDemand"
+import dutApi from "@/api/project/dut"
 const route = useRoute()
 const router = useRouter()

 // crud组件
 const crudOptions = ref({
-    api: designDemandApi.getDesignDemandList,
+    api: dutApi.getDutList,
    parameters: {
        projectId: route.query.id,
        round: route.query.key
@@ -30,13 +30,14 @@ const crudOptions = ref({
    tablePagination: true,
    operationColumn: true,
    formOption: {
-        width: 1200
+        width: 500
    }
 })
 const crudColumns = ref([
    {
        title: "ID",
        width: 50,
+        align:'center',
        dataIndex: "id",
        search: true,
        commonRules: [{ required: true, message: "标识是必填" }],
@@ -44,37 +45,61 @@ const crudColumns = ref([
    },
    {
        title: "标识",
-        width: 120,
+        width: 150,
+        align:'center',
        dataIndex: "ident",
        search: true,
        commonRules: [{ required: true, message: "标识是必填" }],
        validateTrigger: "blur"
    },
    {
-        title: "需求名称",
-        width: 150,
+        title: "被测件名",
+        width: 120,
        dataIndex: "name",
        search: true,
        commonRules: [{ required: true, message: "需求名称是必填" }],
        validateTrigger: "blur"
    },
    {
-        title: "需求类型",
-        width: 150,
-        dataIndex: "demandType",
-        formType: "radio",
-        search: true,
-        dict: { name: "demandType", props: { label: "title", value: "key" }, translation: true },
-        commonRules: [{ required: true, message: "需求类型是必填" }],
-        validateTrigger: "blur"
+        title:"空行",
+        hide:true,
+        align:'center',
+        dataIndex:"black_line"
    },
    {
-        title: "需求描述",
-        dataIndex: "description",
-        width: 300,
-        formType: "editor",
-        height: 300
-    }
+        title:"纯注释",
+        hide:true,
+        align:'center',
+        dataIndex:"pure_code_line"
+    },
+    {
+        title:"混合行",
+        hide:true,
+        align:'center',
+        dataIndex:"mix_line"
+    },
+    {
+        title:"总注释",
+        hide:true,
+        align:'center',
+        dataIndex:"total_comment_line"
+    },
+    {
+        title:"总代码",
+        align:'center',
+        dataIndex:"total_code_line"
+    },
+    {
+        title:"总行数",
+        align:'center',
+        dataIndex:"total_line"
+    },
+    {
+        title:"注释率",
+        align:'center',
+        dataIndex:"comment_line",
+        commonRules: [{ required: true, message: "注释率必填" }],
+    },
 ])
 </script>

--- a/cdTMP/src/views/project/testDemand/index.vue
+++ b/cdTMP/src/views/project/testDemand/index.vue
@@ -14,14 +14,16 @@ import caseApi from "@/api/project/case"
 const route = useRoute()
 const router = useRouter()
 const roundNumber = route.query.key.split("-")[0]
-const designDemandNumber = route.query.key.split("-")[1]
-const testDemandNumber = route.query.key.split("-")[2]
+const dutNumber = route.query.key.split("-")[1]
+const designDemandNumber = route.query.key.split("-")[2]
+const testDemandNumber = route.query.key.split("-")[3]
 // crud设置
 const crudOptions = ref({
    api: caseApi.getCaseList,
    parameters: {
        projectId: route.query.id,
        round: roundNumber,
+        dut: dutNumber,
        designDemand: designDemandNumber,
        testDemand: testDemandNumber
    },