diff --git a/cdTMP/package-lock.json b/cdTMP/package-lock.json index 3544a67..84667b5 100644 --- a/cdTMP/package-lock.json +++ b/cdTMP/package-lock.json @@ -1,12 +1,12 @@ { "name": "testplant", - "version": "0.0.6", + "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "testplant", - "version": "0.0.6", + "version": "0.1.0", "dependencies": { "@arco-design/color": "^0.4.0", "@arco-design/web-vue": "^2.57.0", @@ -32,7 +32,7 @@ "vue": "^3.5.26", "vue-clipboard3": "^2.0.0", "vue-color-kit": "^1.0.6", - "vue-data-ui": "^3.9.6", + "vue-data-ui": "^3.9.12", "vue-router": "^4.6.4", "vuedraggable": "^2.24.3" }, @@ -5469,9 +5469,9 @@ } }, "node_modules/vue-data-ui": { - "version": "3.9.6", - "resolved": "https://registry.npmmirror.com/vue-data-ui/-/vue-data-ui-3.9.6.tgz", - "integrity": "sha512-XpIqONAc6xYAWvjiR8snVTIjETbZUdxw2gV2vrHnwA71yXMS3Mso2MO+aE9mNhsUI7LThzOPtjylA+vniKANzQ==", + "version": "3.9.12", + "resolved": "https://registry.npmmirror.com/vue-data-ui/-/vue-data-ui-3.9.12.tgz", + "integrity": "sha512-0gNNA9DJw9q9/o4KrK+tesZHHtUxMB6x1JhiGhILU6VS3J/kb+pXC/BQaOqmjK512xzDyE05SGCR5UkHTSNPpQ==", "license": "MIT", "peerDependencies": { "jspdf": "^3.0.1", diff --git a/cdTMP/package.json b/cdTMP/package.json index 71ffd37..be72d11 100644 --- a/cdTMP/package.json +++ b/cdTMP/package.json @@ -35,7 +35,7 @@ "vue": "^3.5.26", "vue-clipboard3": "^2.0.0", "vue-color-kit": "^1.0.6", - "vue-data-ui": "^3.9.6", + "vue-data-ui": "^3.9.12", "vue-router": "^4.6.4", "vuedraggable": "^2.24.3" }, diff --git a/cdTMP/src/api/project/case.js b/cdTMP/src/api/project/case.js index ffe76ff..0188453 100644 --- a/cdTMP/src/api/project/case.js +++ b/cdTMP/src/api/project/case.js @@ -136,7 +136,7 @@ export default { * 批量替换事件 * @returns */ - exetimeReplace(data = { selectRows: [], exetime: "" }) { + exetimeReplace(data = { selectRows: [], exetime: [] }) { return request({ url: "/project/case/timeReplace/", method: "post", diff --git a/cdTMP/src/api/project/designDemand.js b/cdTMP/src/api/project/designDemand.js index fc99b63..187c48b 100644 --- a/cdTMP/src/api/project/designDemand.js +++ b/cdTMP/src/api/project/designDemand.js @@ -120,5 +120,16 @@ export default { method: "get", params }) + }, + /** + * 复制到当前dut下面,CRUD中操作列 + * @returns + */ + copy_current(params = {}) { + return request({ + url: "/project/copy_current", + method: "get", + params + }) } } diff --git a/cdTMP/src/views/project/dut/hooks/useCrudOptions.ts b/cdTMP/src/views/project/dut/hooks/useCrudOptions.ts index 77dad91..ec20223 100644 --- a/cdTMP/src/views/project/dut/hooks/useCrudOptions.ts +++ b/cdTMP/src/views/project/dut/hooks/useCrudOptions.ts @@ -36,15 +36,15 @@ export default function (crudRef: Ref>) { crudRef.value.crudFormRef.actionTitle = `${route.query.ident} > ${(td[round_key] as any).title} > ${(td[round_key] as any).children[dut_key].title} >设计需求[${record.name}]-` return true }, - afterAdd: (res) => { + afterAdd: (res: any) => { let id = projectId.value treeDataStore.updateDesignDemandTreeData(res.data, id) }, - afterEdit: (res) => { + afterEdit: (res: any) => { let id = projectId.value treeDataStore.updateDesignDemandTreeData(res.data, id) }, - afterDelete: (res, record) => { + afterDelete: (_: any, record: any) => { let id = projectId.value if (!record) { record = { key: route.query.key + "-X" } @@ -62,12 +62,12 @@ export default function (crudRef: Ref>) { rowSelection: { showCheckedAll: true }, searchColNumber: 4, tablePagination: false, - operationColumnWidth: 250, + operationColumnWidth: 300, operationColumn: true, operationColumnAlign: "center", formOption: { width: 1200 - }, + } }) return crudOptions } diff --git a/cdTMP/src/views/project/dut/index.vue b/cdTMP/src/views/project/dut/index.vue index 709a439..1fb028c 100644 --- a/cdTMP/src/views/project/dut/index.vue +++ b/cdTMP/src/views/project/dut/index.vue @@ -31,6 +31,10 @@ + + @@ -59,6 +63,7 @@ diff --git a/cdTMP/src/views/project/opeSets/components/CaseTable/ReplaceExetime.vue b/cdTMP/src/views/project/opeSets/components/CaseTable/ReplaceExetime.vue index 8b6e3ec..4f2cffa 100644 --- a/cdTMP/src/views/project/opeSets/components/CaseTable/ReplaceExetime.vue +++ b/cdTMP/src/views/project/opeSets/components/CaseTable/ReplaceExetime.vue @@ -1,20 +1,12 @@