From aa479d22fe1754b1d140ac60ded8908f0fe2d882 Mon Sep 17 00:00:00 2001 From: ks3356143 <314298729@qq.com> Date: Fri, 9 Aug 2024 19:31:36 +0800 Subject: [PATCH] 1111 --- cdTMP/.eslintrc.cjs | 2 + cdTMP/jsconfig.json | 14 +- cdTMP/package-lock.json | 140 +-- cdTMP/package.json | 6 +- cdTMP/src/config/textInfo.ts | 13 + cdTMP/src/layout/components/navbar.vue | 17 +- cdTMP/src/layout/hooks/tools.js | 3 + cdTMP/src/layout/project-layout.vue | 862 ++---------------- cdTMP/src/layout/treeHooks/mustSoDut.ts | 130 +++ cdTMP/src/layout/treeHooks/nodeCopy.ts | 72 ++ cdTMP/src/layout/treeHooks/rightClick.js | 152 +++ cdTMP/src/layout/treeHooks/searchNodes.ts | 51 ++ cdTMP/src/layout/treeHooks/treeDrag.js | 134 +++ .../src/layout/treeHooks/useLoadTreeNodes.ts | 59 ++ cdTMP/src/layout/treeHooks/useNodeClick.ts | 103 +++ cdTMP/src/layout/treeHooks/useNodeExpand.ts | 20 + cdTMP/src/layout/treeHooks/useRoundMaForm.ts | 252 +++++ cdTMP/src/router/index.js | 1 + .../src/views/dashboard/usermanage/index.vue | 4 +- .../workplace/components/cpns/st-count.vue | 4 +- .../views/datamanage/abbreviation/index.vue | 2 +- .../views/datamanage/dictmanage/dataList.vue | 2 +- .../src/views/datamanage/dictmanage/index.vue | 2 +- .../views/datamanage/projContact/index.vue | 2 +- cdTMP/src/views/monitor/loginLog/index.vue | 3 + .../src/views/monitor/operationLog/index.vue | 5 +- cdTMP/src/views/monitor/operations/index.vue | 3 + .../project/case/components/ProblemChoose.vue | 4 +- cdTMP/src/views/project/case/index.vue | 2 +- .../src/views/project/design-demand/index.vue | 5 +- cdTMP/src/views/project/dut/index.vue | 6 +- cdTMP/src/views/project/round/index.vue | 5 +- cdTMP/src/views/project/testDemand/index.vue | 5 +- .../views/testmanage/projFragment/index.vue | 2 +- .../src/views/testmanage/projmanage/hooks.js | 3 + .../src/views/testmanage/projmanage/index.vue | 8 +- 36 files changed, 1212 insertions(+), 886 deletions(-) create mode 100644 cdTMP/src/config/textInfo.ts create mode 100644 cdTMP/src/layout/treeHooks/mustSoDut.ts create mode 100644 cdTMP/src/layout/treeHooks/nodeCopy.ts create mode 100644 cdTMP/src/layout/treeHooks/rightClick.js create mode 100644 cdTMP/src/layout/treeHooks/searchNodes.ts create mode 100644 cdTMP/src/layout/treeHooks/treeDrag.js create mode 100644 cdTMP/src/layout/treeHooks/useLoadTreeNodes.ts create mode 100644 cdTMP/src/layout/treeHooks/useNodeClick.ts create mode 100644 cdTMP/src/layout/treeHooks/useNodeExpand.ts create mode 100644 cdTMP/src/layout/treeHooks/useRoundMaForm.ts diff --git a/cdTMP/.eslintrc.cjs b/cdTMP/.eslintrc.cjs index 4c45932..948db8e 100644 --- a/cdTMP/.eslintrc.cjs +++ b/cdTMP/.eslintrc.cjs @@ -10,7 +10,9 @@ module.exports = { "@vue/typescript/recommended", "plugin:@typescript-eslint/recommended" ], + parser: "vue-eslint-parser", parserOptions: { + parser: "@typescript-eslint/parser", sourceType: "module", ecmaVersion: 2020, ecmaFeatures: { diff --git a/cdTMP/jsconfig.json b/cdTMP/jsconfig.json index 4adf297..65e704e 100644 --- a/cdTMP/jsconfig.json +++ b/cdTMP/jsconfig.json @@ -2,10 +2,18 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "@/*": ["src/*"], - "@cps/*": ["src/components/*"] + "@/*": [ + "src/*" + ], + "@cps/*": [ + "src/components/*" + ] }, "jsx": "preserve" }, - "exclude": ["node_modules", "dist", "build"] + "exclude": [ + "node_modules", + "dist", + "build" + ] } diff --git a/cdTMP/package-lock.json b/cdTMP/package-lock.json index 7366bdd..f0e2e30 100644 --- a/cdTMP/package-lock.json +++ b/cdTMP/package-lock.json @@ -11,7 +11,7 @@ "@arco-design/color": "^0.4.0", "@arco-design/web-vue": "^2.56.0", "@tinymce/tinymce-vue": "^6.0.1", - "@vueuse/core": "^10.11.0", + "@vueuse/core": "^10.11.1", "axios": "^1.7.3", "dayjs": "^1.11.12", "echarts": "^5.5.1", @@ -26,7 +26,7 @@ "postcss-import": "^16.1.0", "qs": "^6.13.0", "tinymce": "^6.8.4", - "vue": "^3.4.36", + "vue": "^3.4.37", "vue-clipboard3": "^2.0.0", "vue-color-kit": "^1.0.6", "vue-echarts": "^6.5.5", @@ -50,7 +50,7 @@ "less-loader": "^12.2.0", "postcss": "^8.4.41", "prettier": "^3.3.3", - "tailwindcss": "^3.4.8", + "tailwindcss": "^3.4.9", "typescript": "^5.5.3", "vite": "^5.4.0" } @@ -1550,39 +1550,39 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.36.tgz", - "integrity": "sha512-qBkndgpwFKdupmOPoiS10i7oFdN7a+4UNDlezD0GlQ1kuA1pNrscg9g12HnB5E8hrWSuEftRsbJhL1HI2zpJhg==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.37.tgz", + "integrity": "sha512-ZDDT/KiLKuCRXyzWecNzC5vTcubGz4LECAtfGPENpo0nrmqJHwuWtRLxk/Sb9RAKtR9iFflFycbkjkY+W/PZUQ==", "license": "MIT", "dependencies": { "@babel/parser": "^7.24.7", - "@vue/shared": "3.4.36", + "@vue/shared": "3.4.37", "entities": "^5.0.0", "estree-walker": "^2.0.2", "source-map-js": "^1.2.0" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.36.tgz", - "integrity": "sha512-eEIjy4GwwZTFon/Y+WO8tRRNGqylaRlA79T1RLhUpkOzJ7EtZkkb8MurNfkqY6x6Qiu0R7ESspEF7GkPR/4yYg==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.37.tgz", + "integrity": "sha512-rIiSmL3YrntvgYV84rekAtU/xfogMUJIclUMeIKEtVBFngOL3IeZHhsH3UaFEgB5iFGpj6IW+8YuM/2Up+vVag==", "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.4.36", - "@vue/shared": "3.4.36" + "@vue/compiler-core": "3.4.37", + "@vue/shared": "3.4.37" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.36.tgz", - "integrity": "sha512-rhuHu7qztt/rNH90dXPTzhB7hLQT2OC4s4GrPVqmzVgPY4XBlfWmcWzn4bIPEWNImt0CjO7kfHAf/1UXOtx3vw==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.37.tgz", + "integrity": "sha512-vCfetdas40Wk9aK/WWf8XcVESffsbNkBQwS5t13Y/PcfqKfIwJX2gF+82th6dOpnpbptNMlMjAny80li7TaCIg==", "license": "MIT", "dependencies": { "@babel/parser": "^7.24.7", - "@vue/compiler-core": "3.4.36", - "@vue/compiler-dom": "3.4.36", - "@vue/compiler-ssr": "3.4.36", - "@vue/shared": "3.4.36", + "@vue/compiler-core": "3.4.37", + "@vue/compiler-dom": "3.4.37", + "@vue/compiler-ssr": "3.4.37", + "@vue/shared": "3.4.37", "estree-walker": "^2.0.2", "magic-string": "^0.30.10", "postcss": "^8.4.40", @@ -1590,13 +1590,13 @@ } }, "node_modules/@vue/compiler-ssr": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.36.tgz", - "integrity": "sha512-Wt1zyheF0zVvRJyhY74uxQbnkXV2Le/JPOrAxooR4rFYKC7cFr+cRqW6RU3cM/bsTy7sdZ83IDuy/gLPSfPGng==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.37.tgz", + "integrity": "sha512-TyAgYBWrHlFrt4qpdACh8e9Ms6C/AZQ6A6xLJaWrCL8GCX5DxMzxyeFAEMfU/VFr4tylHm+a2NpfJpcd7+20XA==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.4.36", - "@vue/shared": "3.4.36" + "@vue/compiler-dom": "3.4.37", + "@vue/shared": "3.4.37" } }, "node_modules/@vue/devtools-api": { @@ -1606,64 +1606,64 @@ "license": "MIT" }, "node_modules/@vue/reactivity": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.36.tgz", - "integrity": "sha512-wN1aoCwSoqrt1yt8wO0gc13QaC+Vk1o6AoSt584YHNnz6TGDhh1NCMUYgAnvp4HEIkLdGsaC1bvu/P+wpoDEXw==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.37.tgz", + "integrity": "sha512-UmdKXGx0BZ5kkxPqQr3PK3tElz6adTey4307NzZ3whZu19i5VavYal7u2FfOmAzlcDVgE8+X0HZ2LxLb/jgbYw==", "license": "MIT", "dependencies": { - "@vue/shared": "3.4.36" + "@vue/shared": "3.4.37" } }, "node_modules/@vue/runtime-core": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.36.tgz", - "integrity": "sha512-9+TR14LAVEerZWLOm/N/sG2DVYhrH2bKgFrbH/FVt/Q8Jdw4OtdcGMRC6Tx8VAo0DA1eqAqrZaX0fbOaOxxZ4A==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.37.tgz", + "integrity": "sha512-MNjrVoLV/sirHZoD7QAilU1Ifs7m/KJv4/84QVbE6nyAZGQNVOa1HGxaOzp9YqCG+GpLt1hNDC4RbH+KtanV7w==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.4.36", - "@vue/shared": "3.4.36" + "@vue/reactivity": "3.4.37", + "@vue/shared": "3.4.37" } }, "node_modules/@vue/runtime-dom": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.36.tgz", - "integrity": "sha512-2Qe2fKkLxgZBVvHrG0QMNLL4bsx7Ae88pyXebY2WnQYABpOnGYvA+axMbcF9QwM4yxnsv+aELbC0eiNVns7mGw==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.37.tgz", + "integrity": "sha512-Mg2EwgGZqtwKrqdL/FKMF2NEaOHuH+Ks9TQn3DHKyX//hQTYOun+7Tqp1eo0P4Ds+SjltZshOSRq6VsU0baaNg==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.4.36", - "@vue/runtime-core": "3.4.36", - "@vue/shared": "3.4.36", + "@vue/reactivity": "3.4.37", + "@vue/runtime-core": "3.4.37", + "@vue/shared": "3.4.37", "csstype": "^3.1.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.36.tgz", - "integrity": "sha512-2XW90Rq8+Y7S1EIsAuubZVLm0gCU8HYb5mRAruFdwfC3XSOU5/YKePz29csFzsch8hXaY5UHh7ZMddmi1XTJEA==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.37.tgz", + "integrity": "sha512-jZ5FAHDR2KBq2FsRUJW6GKDOAG9lUTX8aBEGq4Vf6B/35I9fPce66BornuwmqmKgfiSlecwuOb6oeoamYMohkg==", "license": "MIT", "dependencies": { - "@vue/compiler-ssr": "3.4.36", - "@vue/shared": "3.4.36" + "@vue/compiler-ssr": "3.4.37", + "@vue/shared": "3.4.37" }, "peerDependencies": { - "vue": "3.4.36" + "vue": "3.4.37" } }, "node_modules/@vue/shared": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.36.tgz", - "integrity": "sha512-fdPLStwl1sDfYuUftBaUVn2pIrVFDASYerZSrlBvVBfylObPA1gtcWJHy5Ox8jLEJ524zBibss488Q3SZtU1uA==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.37.tgz", + "integrity": "sha512-nIh8P2fc3DflG8+5Uw8PT/1i17ccFn0xxN/5oE9RfV5SVnd7G0XEFRwakrnNFE/jlS95fpGXDVG5zDETS26nmg==", "license": "MIT" }, "node_modules/@vueuse/core": { - "version": "10.11.0", - "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-10.11.0.tgz", - "integrity": "sha512-x3sD4Mkm7PJ+pcq3HX8PLPBadXCAlSDR/waK87dz0gQE+qJnaaFhc/dZVfJz+IUYzTMVGum2QlR7ImiJQN4s6g==", + "version": "10.11.1", + "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-10.11.1.tgz", + "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==", "license": "MIT", "dependencies": { "@types/web-bluetooth": "^0.0.20", - "@vueuse/metadata": "10.11.0", - "@vueuse/shared": "10.11.0", + "@vueuse/metadata": "10.11.1", + "@vueuse/shared": "10.11.1", "vue-demi": ">=0.14.8" }, "funding": { @@ -1697,18 +1697,18 @@ } }, "node_modules/@vueuse/metadata": { - "version": "10.11.0", - "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-10.11.0.tgz", - "integrity": "sha512-kQX7l6l8dVWNqlqyN3ePW3KmjCQO3ZMgXuBMddIu83CmucrsBfXlH+JoviYyRBws/yLTQO8g3Pbw+bdIoVm4oQ==", + "version": "10.11.1", + "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-10.11.1.tgz", + "integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@vueuse/shared": { - "version": "10.11.0", - "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-10.11.0.tgz", - "integrity": "sha512-fyNoIXEq3PfX1L3NkNhtVQUSRtqYwJtJg+Bp9rIzculIZWHTkKSysujrOk2J+NrRulLTQH9+3gGSfYLWSEWU1A==", + "version": "10.11.1", + "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-10.11.1.tgz", + "integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==", "license": "MIT", "dependencies": { "vue-demi": ">=0.14.8" @@ -4957,9 +4957,9 @@ "dev": true }, "node_modules/tailwindcss": { - "version": "3.4.8", - "resolved": "https://registry.npmmirror.com/tailwindcss/-/tailwindcss-3.4.8.tgz", - "integrity": "sha512-GkP17r9GQkxgZ9FKHJQEnjJuKBcbFhMFzKu5slmN6NjlCuFnYJMQ8N4AZ6VrUyiRXlDtPKHkesuQ/MS913Nvdg==", + "version": "3.4.9", + "resolved": "https://registry.npmmirror.com/tailwindcss/-/tailwindcss-3.4.9.tgz", + "integrity": "sha512-1SEOvRr6sSdV5IDf9iC+NU4dhwdqzF4zKKq3sAbasUWHEM6lsMhX+eNN5gkPx1BvLFEnZQEUFbXnGj8Qlp83Pg==", "dev": true, "license": "MIT", "dependencies": { @@ -5307,16 +5307,16 @@ } }, "node_modules/vue": { - "version": "3.4.36", - "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.36.tgz", - "integrity": "sha512-mIFvbLgjODfx3Iy1SrxOsiPpDb8Bo3EU+87ioimOZzZTOp15IEdAels70IjBOLO3ZFlLW5AhdwY4dWbXVQKYow==", + "version": "3.4.37", + "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.37.tgz", + "integrity": "sha512-3vXvNfkKTBsSJ7JP+LyR7GBuwQuckbWvuwAid3xbqK9ppsKt/DUvfqgZ48fgOLEfpy1IacL5f8QhUVl77RaI7A==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.4.36", - "@vue/compiler-sfc": "3.4.36", - "@vue/runtime-dom": "3.4.36", - "@vue/server-renderer": "3.4.36", - "@vue/shared": "3.4.36" + "@vue/compiler-dom": "3.4.37", + "@vue/compiler-sfc": "3.4.37", + "@vue/runtime-dom": "3.4.37", + "@vue/server-renderer": "3.4.37", + "@vue/shared": "3.4.37" }, "peerDependencies": { "typescript": "*" diff --git a/cdTMP/package.json b/cdTMP/package.json index 0eaee1e..d9386e1 100644 --- a/cdTMP/package.json +++ b/cdTMP/package.json @@ -14,7 +14,7 @@ "@arco-design/color": "^0.4.0", "@arco-design/web-vue": "^2.56.0", "@tinymce/tinymce-vue": "^6.0.1", - "@vueuse/core": "^10.11.0", + "@vueuse/core": "^10.11.1", "axios": "^1.7.3", "dayjs": "^1.11.12", "echarts": "^5.5.1", @@ -29,7 +29,7 @@ "postcss-import": "^16.1.0", "qs": "^6.13.0", "tinymce": "^6.8.4", - "vue": "^3.4.36", + "vue": "^3.4.37", "vue-clipboard3": "^2.0.0", "vue-color-kit": "^1.0.6", "vue-echarts": "^6.5.5", @@ -53,7 +53,7 @@ "less-loader": "^12.2.0", "postcss": "^8.4.41", "prettier": "^3.3.3", - "tailwindcss": "^3.4.8", + "tailwindcss": "^3.4.9", "typescript": "^5.5.3", "vite": "^5.4.0" } diff --git a/cdTMP/src/config/textInfo.ts b/cdTMP/src/config/textInfo.ts new file mode 100644 index 0000000..f8b75b0 --- /dev/null +++ b/cdTMP/src/config/textInfo.ts @@ -0,0 +1,13 @@ +/** + * 该文件主要用于代码写死的文字信息 + */ + +interface ITextInfo { + [p: string]: string +} +const textInfo: ITextInfo = { + testUnitAddDefaultText: "中国科学院卫星软件测评中心", + testUnitContactPersonName: "高才栋", + testUnintContactPhoneNumber: "13564753024" +} +export default textInfo diff --git a/cdTMP/src/layout/components/navbar.vue b/cdTMP/src/layout/components/navbar.vue index 6e7ec95..a294214 100644 --- a/cdTMP/src/layout/components/navbar.vue +++ b/cdTMP/src/layout/components/navbar.vue @@ -11,6 +11,7 @@ > 测试管理平台 + V0.0.1 { margin-left: 14px; } } +.version { + color: #666; + user-select: none; +} .title { cursor: pointer; @@ -222,10 +227,18 @@ const handleClickLogo = () => { } @keyframes neon6 { from { - text-shadow: 0 0 10px #fff, 0 0 20px #2563eb, 0 0 30px #2563eb, 0 0 40px #2563eb; + text-shadow: + 0 0 10px #fff, + 0 0 20px #2563eb, + 0 0 30px #2563eb, + 0 0 40px #2563eb; } to { - text-shadow: 0 0 5px #fff, 0 0 10px #2563eb, 0 0 15px #2563eb, 0 0 20px #2563eb; + text-shadow: + 0 0 5px #fff, + 0 0 10px #2563eb, + 0 0 15px #2563eb, + 0 0 20px #2563eb; } } diff --git a/cdTMP/src/layout/hooks/tools.js b/cdTMP/src/layout/hooks/tools.js index 739e816..40d562d 100644 --- a/cdTMP/src/layout/hooks/tools.js +++ b/cdTMP/src/layout/hooks/tools.js @@ -1,3 +1,6 @@ +/** + * 获取a-tree右键的元素信息 + */ export function getContextNodeInfo(element) { const pElement = element.parentElement if (pElement.dataset.key) { diff --git a/cdTMP/src/layout/project-layout.vue b/cdTMP/src/layout/project-layout.vue index e1f9022..89fec4d 100644 --- a/cdTMP/src/layout/project-layout.vue +++ b/cdTMP/src/layout/project-layout.vue @@ -232,811 +232,113 @@