0531

cdTMP/src/api/project/dut.js

@@ -66,5 +66,16 @@ export default {
             method: "post",
             data: params
         })
+    },
+    /**
+     * 请求打开dut.vue页面，查看当前dut的类型“XQ/XY/SO等”
+     * @returns
+     */
+    getDutType(params = {}) {
+        return request({
+            url: "/project/dut/dut_type",
+            method: "get",
+            params
+        })
     }
 }

cdTMP/src/layout/project-layout.vue

@@ -20,7 +20,7 @@
                             </a-button>
                         </a-popconfirm>
                         <a-tree
-                            class="h-10/12 select-none"
+                            class="h-10/12 select-none my-arco-wrap-class"
                             :data="treeData"
                             size="mini"
                             checkable
@@ -1057,4 +1057,9 @@ const problemRoundRef = ref(null)
 .myhcalc {
     height: calc(100% - 60px);
 }
+.my-arco-wrap-class :deep(.arco-tree-node-title-text) {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
 </style>

cdTMP/src/main.js

@@ -17,6 +17,7 @@ import "@/style/global.less"
 // 读取package.json打印个软件名称和版本
 import tool from "@/utils/tool"
 import packageJson from "../package.json"
+// 启动app之前
 const app = createApp(App)
 app.use(ArcoVue, {})
 app.use(ArcoVueIcon)
@@ -24,7 +25,6 @@ app.use(router)
 app.use(pinia)
 app.use(globalComponents)
 // app.use(directive)
-// 虚拟列表
 
 // 注册ma-icon图标
 const modules = import.meta.glob("./assets/ma-icons/*.vue", { eager: true })

cdTMP/src/style/global.less

@@ -1,5 +1,8 @@
 @import "dark.less";
 @import "animation.less";
+// 导入自己的样式覆盖
+@import "warp.less";
+
 
 html,
 body {

cdTMP/src/style/warp.less

@@ -0,0 +1,7 @@
+.tox-textarea-wrap {
+    height: 100% !important;
+
+    &>textarea.tox-textarea {
+        height: 100%;
+    }
+}

cdTMP/src/views/project/dut/index.vue

@@ -7,11 +7,11 @@
                     {{ showType(record) }}
                 </template>
                 <template #tableAfterButtons>
-                    <a-button status="success" type="outline" @click="handleAddFileInputDemand">
+                    <a-button status="success" type="outline" @click="handleAddFileInputDemand" v-if="isXQ === 'XQ'">
                         <template #icon>
                             <icon-plus />
                         </template>
-                        上传需求快捷录入
+                        上传需求规格说明快捷录入
                     </a-button>
                 </template>
             </ma-crud>
@@ -24,6 +24,7 @@
 import { ref, computed } from "vue"
 import { useRoute, useRouter } from "vue-router"
 import designDemandApi from "@/api/project/designDemand"
+import dutApi from "@/api/project/dut"
 import commonApi from "@/api/common"
 import { useTreeDataStore } from "@/store"
 import FileInputModal from "./components/FileInputModal/index.vue"
@@ -42,6 +43,14 @@ const demandTypeDict = ref([])
     })
 })()
 
+// 5月31日更新，获取当前dut的类型，以判断是否显示“需求录入”的按钮
+const isXQ = ref("")
+async function isXQdemand() {
+    const res = await dutApi.getDutType({ key: route.query.key, project_id: projectId.value })
+    isXQ.value = res.data.dut_type
+}
+isXQdemand()
+
 const showType = (record) => {
     let len = demandTypeDict.value.data.length
     for (let i = 0; i < len; i++) {
@@ -165,7 +174,7 @@ const crudColumns = ref([
 // ~~~大功能打开ma-form-modal~~~
 const fileInputRef = ref(null)
 const handleAddFileInputDemand = () => {
-    fileInputRef.value.open();
+    fileInputRef.value.open()
 }
 </script>
 

cdTMP/src/views/project/testDemand/index.vue

@@ -57,7 +57,6 @@ const crudOptions = ref({
         let design_key = key_split[2]
         let test_key = key_split[3]
         let td = treeDataStore.treeData
-        console.log(route.query.key)
         crudRef.value.crudFormRef.actionTitle = `${route.query.ident} >
         ${td[round_key].title} > ${td[round_key].children[dut_key].title} >
         ${td[round_key].children[dut_key].children[design_key].title} >
@@ -117,6 +116,21 @@ const crudOptions = ref({
                         ]
                     }
                 ]
+            },
+            {
+                formType: "grid",
+                cols: [{ span: 24, formList: [{ dataIndex: "summarize" }] }]
+            },
+            {
+                formType: "grid",
+                cols: [{ span: 24, formList: [{ dataIndex: "initialization" }] }]
+            },
+            {
+                formType: "grid",
+                cols: [
+                    { span: 12, formList: [{ dataIndex: "premise" }] },
+                    { span: 12, formList: [{ dataIndex: "exe_time" }] }
+                ]
             }
         ]
     }
@@ -197,6 +211,12 @@ const crudColumns = ref([
         hide: true,
         addDefaultValue: "软件正常启动，各界面显示工作正常"
     },
+    {
+        title: "执行时间",
+        dataIndex: "exe_time",
+        hide: true,
+        formType: "date",
+    },
     {
         title: "测试步骤",
         dataIndex: "testStep",