From 80a4e88a622b173b75f635849efecbbfe5c47502 Mon Sep 17 00:00:00 2001 From: zlm133588 <13996255+zlm133588@user.noreply.gitee.com> Date: Tue, 8 Apr 2025 22:53:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=8B=E8=BD=BD=E9=99=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=AE=8C=E6=88=90=E7=BB=9F=E8=AE=A1=E7=9A=84?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AES-front/README.md | 3 + AES-front/package-lock.json | 236 ++++++++- AES-front/package.json | 3 +- AES-front/pnpm-lock.yaml | 456 ++++++++---------- AES-front/src/api/admin.js | 3 +- .../src/views/admin/problem/problem-list.vue | 2 +- .../views/admin/problem/problem-review.vue | 143 ++++-- .../views/admin/problem/problem-student.vue | 22 +- AES-front/src/views/admin/problem/tongji.vue | 130 +++++ AES-front/src/views/admin/route.js | 14 + .../problem/controller/ProblemController.java | 15 +- .../aes/problem/dao/SubmitReportDaoI.java | 3 + .../aes/problem/dao/impl/ProblemDaoImpl.java | 1 - .../problem/dao/impl/SubmitReportDaoImpl.java | 64 +++ .../aes/problem/model/PMReviewMessage.java | 19 + .../service/Impl/ProblemServiceImpl.java | 38 ++ .../aes/problem/service/ProblemServiceI.java | 2 + .../importClassStudentsFileController.java | 1 - AES/src/main/resources/application.properties | 2 +- 19 files changed, 811 insertions(+), 346 deletions(-) create mode 100644 AES-front/src/views/admin/problem/tongji.vue create mode 100644 AES/src/main/java/com/example/aes/problem/model/PMReviewMessage.java diff --git a/AES-front/README.md b/AES-front/README.md index 47a158f..93606fc 100644 --- a/AES-front/README.md +++ b/AES-front/README.md @@ -36,6 +36,9 @@ pnpm build 4.导出功能的依赖 ```shell npm install xlsx file-saver +5.展示图标的依赖 + ```shell + npm install echarts ## 技术栈 diff --git a/AES-front/package-lock.json b/AES-front/package-lock.json index 8c09e4b..9be0f2b 100644 --- a/AES-front/package-lock.json +++ b/AES-front/package-lock.json @@ -23,7 +23,8 @@ "crypto-js": "^4.2.0", "dayjs": "^1.11.10", "docx": "^8.5.0", - "echarts": "^5.4.3", + "echarts": "^5.6.0", + "element-plus": "^2.9.7", "file-saver": "^2.0.5", "lodash-es": "^4.17.21", "mockjs": "^1.1.0", @@ -840,6 +841,24 @@ "vue": "^3.0.11" } }, + "node_modules/@ctrl/tinycolor": { + "version": "3.6.1", + "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz", + "integrity": "sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/@element-plus/icons-vue": { + "version": "2.3.1", + "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz", + "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==", + "license": "MIT", + "peerDependencies": { + "vue": "^3.2.0" + } + }, "node_modules/@emotion/hash": { "version": "0.8.0", "resolved": "https://registry.npmmirror.com/@emotion/hash/-/hash-0.8.0.tgz", @@ -1261,6 +1280,31 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, + "node_modules/@floating-ui/core": { + "version": "1.6.9", + "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.6.9.tgz", + "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==", + "license": "MIT", + "dependencies": { + "@floating-ui/utils": "^0.2.9" + } + }, + "node_modules/@floating-ui/dom": { + "version": "1.6.13", + "resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.6.13.tgz", + "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==", + "license": "MIT", + "dependencies": { + "@floating-ui/core": "^1.6.0", + "@floating-ui/utils": "^0.2.9" + } + }, + "node_modules/@floating-ui/utils": { + "version": "0.2.9", + "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.9.tgz", + "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==", + "license": "MIT" + }, "node_modules/@gradio/client": { "version": "0.14.0", "resolved": "https://registry.npmmirror.com/@gradio/client/-/client-0.14.0.tgz", @@ -1523,6 +1567,17 @@ "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==", "dev": true }, + "node_modules/@popperjs/core": { + "name": "@sxzz/popperjs-es", + "version": "2.11.7", + "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", + "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==", + "license": "MIT", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@rollup/pluginutils": { "version": "5.1.0", "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", @@ -1608,14 +1663,12 @@ "node_modules/@types/lodash": { "version": "4.14.202", "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.202.tgz", - "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==", - "dev": true + "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==" }, "node_modules/@types/lodash-es": { "version": "4.17.12", "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz", "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", - "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2796,8 +2849,7 @@ "node_modules/async-validator": { "version": "4.2.5", "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz", - "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==", - "dev": true + "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==" }, "node_modules/asynckit": { "version": "0.4.0", @@ -4090,9 +4142,10 @@ } }, "node_modules/dayjs": { - "version": "1.11.10", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz", - "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==" + "version": "1.11.13", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz", + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", + "license": "MIT" }, "node_modules/debug": { "version": "4.3.4", @@ -4416,12 +4469,13 @@ "dev": true }, "node_modules/echarts": { - "version": "5.4.3", - "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz", - "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==", + "version": "5.6.0", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz", + "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", + "license": "Apache-2.0", "dependencies": { "tslib": "2.3.0", - "zrender": "5.4.4" + "zrender": "5.6.1" } }, "node_modules/editor": { @@ -4451,6 +4505,126 @@ "node": ">=0.10.0" } }, + "node_modules/element-plus": { + "version": "2.9.7", + "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.9.7.tgz", + "integrity": "sha512-6vjZh5SXBncLhUwJGTVKS5oDljfgGMh6J4zVTeAZK3YdMUN76FgpvHkwwFXocpJpMbii6rDYU3sgie64FyPerQ==", + "license": "MIT", + "dependencies": { + "@ctrl/tinycolor": "^3.4.1", + "@element-plus/icons-vue": "^2.3.1", + "@floating-ui/dom": "^1.0.1", + "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7", + "@types/lodash": "^4.14.182", + "@types/lodash-es": "^4.17.6", + "@vueuse/core": "^9.1.0", + "async-validator": "^4.2.5", + "dayjs": "^1.11.13", + "escape-html": "^1.0.3", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", + "lodash-unified": "^1.0.2", + "memoize-one": "^6.0.0", + "normalize-wheel-es": "^1.2.0" + }, + "peerDependencies": { + "vue": "^3.2.0" + } + }, + "node_modules/element-plus/node_modules/@types/web-bluetooth": { + "version": "0.0.16", + "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz", + "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==", + "license": "MIT" + }, + "node_modules/element-plus/node_modules/@vueuse/core": { + "version": "9.13.0", + "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz", + "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==", + "license": "MIT", + "dependencies": { + "@types/web-bluetooth": "^0.0.16", + "@vueuse/metadata": "9.13.0", + "@vueuse/shared": "9.13.0", + "vue-demi": "*" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/element-plus/node_modules/@vueuse/core/node_modules/vue-demi": { + "version": "0.14.10", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz", + "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", + "hasInstallScript": true, + "license": "MIT", + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, + "node_modules/element-plus/node_modules/@vueuse/metadata": { + "version": "9.13.0", + "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz", + "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/element-plus/node_modules/@vueuse/shared": { + "version": "9.13.0", + "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz", + "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==", + "license": "MIT", + "dependencies": { + "vue-demi": "*" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, + "node_modules/element-plus/node_modules/@vueuse/shared/node_modules/vue-demi": { + "version": "0.14.10", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz", + "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", + "hasInstallScript": true, + "license": "MIT", + "bin": { + "vue-demi-fix": "bin/vue-demi-fix.js", + "vue-demi-switch": "bin/vue-demi-switch.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@vue/composition-api": "^1.0.0-rc.1", + "vue": "^3.0.0-0 || ^2.6.0" + }, + "peerDependenciesMeta": { + "@vue/composition-api": { + "optional": true + } + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -4573,8 +4747,7 @@ "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" }, "node_modules/escape-string-regexp": { "version": "4.0.0", @@ -6882,14 +7055,24 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash-es": { "version": "4.17.21", "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz", "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" }, + "node_modules/lodash-unified": { + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz", + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", + "license": "MIT", + "peerDependencies": { + "@types/lodash-es": "*", + "lodash": "*", + "lodash-es": "*" + } + }, "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -7260,6 +7443,12 @@ "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", "dev": true }, + "node_modules/memoize-one": { + "version": "6.0.0", + "resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz", + "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==", + "license": "MIT" + }, "node_modules/meow": { "version": "8.1.2", "resolved": "https://registry.npmmirror.com/meow/-/meow-8.1.2.tgz", @@ -7709,6 +7898,12 @@ "node": ">=0.10.0" } }, + "node_modules/normalize-wheel-es": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz", + "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==", + "license": "BSD-3-Clause" + }, "node_modules/npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -11496,9 +11691,10 @@ } }, "node_modules/zrender": { - "version": "5.4.4", - "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz", - "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==", + "version": "5.6.1", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz", + "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", + "license": "BSD-3-Clause", "dependencies": { "tslib": "2.3.0" } diff --git a/AES-front/package.json b/AES-front/package.json index 46c356f..3f01100 100644 --- a/AES-front/package.json +++ b/AES-front/package.json @@ -45,7 +45,8 @@ "crypto-js": "^4.2.0", "dayjs": "^1.11.10", "docx": "^8.5.0", - "echarts": "^5.4.3", + "echarts": "^5.6.0", + "element-plus": "^2.9.7", "file-saver": "^2.0.5", "lodash-es": "^4.17.21", "mockjs": "^1.1.0", diff --git a/AES-front/pnpm-lock.yaml b/AES-front/pnpm-lock.yaml index 05740c8..2bcd18c 100644 --- a/AES-front/pnpm-lock.yaml +++ b/AES-front/pnpm-lock.yaml @@ -25,16 +25,16 @@ importers: version: 6.1.2 '@unocss/eslint-config': specifier: ^0.55.7 - version: 0.55.7(eslint@8.57.0)(typescript@5.4.2) + version: 0.55.7(eslint@8.56.0)(typescript@5.3.3) '@vueuse/core': specifier: ^10.7.2 - version: 10.7.2(vue@3.4.21) + version: 10.7.2(vue@3.4.21(typescript@5.3.3)) '@wangeditor/editor': specifier: ^5.1.23 version: 5.1.23 '@wangeditor/editor-for-vue': specifier: 5.1.12 - version: 5.1.12(@wangeditor/editor@5.1.23)(vue@3.4.21) + version: 5.1.12(@wangeditor/editor@5.1.23)(vue@3.4.21(typescript@5.3.3)) '@wangeditor/plugin-upload-attachment': specifier: ^1.1.0 version: 1.1.0(@uppy/core@2.3.4)(@wangeditor/editor@5.1.23)(snabbdom@3.6.2) @@ -56,6 +56,9 @@ importers: echarts: specifier: ^5.4.3 version: 5.4.3 + file-saver: + specifier: ^2.0.5 + version: 2.0.5 lodash-es: specifier: ^4.17.21 version: 4.17.21 @@ -64,25 +67,25 @@ importers: version: 1.1.0 pinia: specifier: ^2.1.7 - version: 2.1.7(typescript@5.4.2)(vue@3.4.21) + version: 2.1.7(typescript@5.3.3)(vue@3.4.21(typescript@5.3.3)) seemly: specifier: ^0.3.8 version: 0.3.8 vite: specifier: ^4.5.2 - version: 4.5.2(@types/node@20.11.27)(sass@1.70.0) + version: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) vue: specifier: 3.4.21 - version: 3.4.21(typescript@5.4.2) + version: 3.4.21(typescript@5.3.3) vue-codemirror: specifier: ^6.1.1 - version: 6.1.1(codemirror@6.0.1)(vue@3.4.21) + version: 6.1.1(codemirror@6.0.1(@lezer/common@1.2.1))(vue@3.4.21(typescript@5.3.3)) vue-echarts: specifier: ^6.6.8 - version: 6.6.8(echarts@5.4.3)(vue@3.4.21) + version: 6.6.8(@vue/runtime-core@3.4.21)(echarts@5.4.3)(vue@3.4.21(typescript@5.3.3)) vue-router: specifier: ^4.2.5 - version: 4.2.5(vue@3.4.21) + version: 4.2.5(vue@3.4.21(typescript@5.3.3)) xlsx: specifier: ^0.18.5 version: 0.18.5 @@ -101,13 +104,13 @@ importers: version: 2.2.182 '@iconify/vue': specifier: ^4.1.1 - version: 4.1.1(vue@3.4.21) + version: 4.1.1(vue@3.4.21(typescript@5.3.3)) '@unocss/preset-rem-to-px': specifier: ^0.55.7 version: 0.55.7 '@vitejs/plugin-vue': specifier: ^4.6.2 - version: 4.6.2(vite@4.5.2)(vue@3.4.21) + version: 4.6.2(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0))(vue@3.4.21(typescript@5.3.3)) '@vue/compiler-sfc': specifier: ^3.4.18 version: 3.4.18 @@ -119,10 +122,10 @@ importers: version: 5.3.0 commitizen: specifier: ^4.3.0 - version: 4.3.0(@types/node@20.11.27)(typescript@5.4.2) + version: 4.3.0(@types/node@20.5.1)(typescript@5.3.3) cz-conventional-changelog: specifier: ^3.3.0 - version: 3.3.0(@types/node@20.11.27)(typescript@5.4.2) + version: 3.3.0(@types/node@20.5.1)(typescript@5.3.3) cz-customizable: specifier: ^7.0.0 version: 7.0.0 @@ -140,37 +143,37 @@ importers: version: 14.0.1 naive-ui: specifier: ^2.37.3 - version: 2.37.3(vue@3.4.21) + version: 2.37.3(vue@3.4.21(typescript@5.3.3)) rollup-plugin-visualizer: specifier: ^5.12.0 - version: 5.12.0(rollup@2.79.1) + version: 5.12.0(rollup@3.29.4) sass: specifier: ^1.70.0 version: 1.70.0 unocss: specifier: 0.55.3 - version: 0.55.3(postcss@8.4.35)(rollup@2.79.1)(vite@4.5.2) + version: 0.55.3(postcss@5.2.18)(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)) unplugin-auto-import: specifier: ^0.16.7 - version: 0.16.7(@vueuse/core@10.7.2)(rollup@2.79.1) + version: 0.16.7(@vueuse/core@10.7.2(vue@3.4.21(typescript@5.3.3)))(rollup@3.29.4) unplugin-icons: specifier: ^0.16.6 version: 0.16.6(@vue/compiler-sfc@3.4.18) unplugin-vue-components: specifier: ^0.25.2 - version: 0.25.2(rollup@2.79.1)(vue@3.4.21) + version: 0.25.2(@babel/parser@7.23.9)(rollup@3.29.4)(vue@3.4.21(typescript@5.3.3)) vite-plugin-compression: specifier: ^0.5.1 - version: 0.5.1(vite@4.5.2) + version: 0.5.1(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)) vite-plugin-html: specifier: ^3.2.2 - version: 3.2.2(vite@4.5.2) + version: 3.2.2(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)) vite-plugin-mock: specifier: 2.9.6 - version: 2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@4.5.2) + version: 2.9.6(mockjs@1.1.0)(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)) vite-plugin-svg-icons: specifier: ^2.0.1 - version: 2.0.1(vite@4.5.2) + version: 2.0.1(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)) packages: @@ -520,10 +523,6 @@ packages: resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - '@eslint/js@8.57.0': - resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - '@gradio/client@0.14.0': resolution: {integrity: sha512-aFV1gkG3l3omfTWCH5ASp4LDFPhs4Utm1uZaiVjvjy4CfCx7mIqoX7BXa8YVrUqjOXmFUpKBeWwYXFCkuwgj4A==} engines: {node: '>=18.0.0'} @@ -1784,11 +1783,6 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true - eslint@8.57.0: - resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - hasBin: true - esno@0.17.0: resolution: {integrity: sha512-w78cQGlptQfsBYfootUCitsKS+MD74uR5L6kNsvwVkJsfzEepIafbvWsx2xK4rcFP4IUftt4F6J8EhagUxX+Bg==} hasBin: true @@ -1901,6 +1895,9 @@ packages: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} + file-saver@2.0.5: + resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==} + filelist@1.0.4: resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==} @@ -3111,11 +3108,6 @@ packages: rollup: optional: true - rollup@2.79.1: - resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} - engines: {node: '>=10.0.0'} - hasBin: true - rollup@3.29.4: resolution: {integrity: sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} @@ -3544,11 +3536,6 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.4.2: - resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} - engines: {node: '>=14.17'} - hasBin: true - ufo@1.4.0: resolution: {integrity: sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==} @@ -4107,26 +4094,26 @@ snapshots: '@types/node': 20.5.1 chalk: 4.1.2 cosmiconfig: 8.3.6(typescript@5.3.3) - cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6)(ts-node@10.9.2)(typescript@5.3.3) + cosmiconfig-typescript-loader: 4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.3.3))(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.3.3))(typescript@5.3.3) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 resolve-from: 5.0.0 - ts-node: 10.9.2(@types/node@20.11.27)(typescript@5.4.2) + ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.3.3) typescript: 5.3.3 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' - '@commitlint/load@19.1.0(@types/node@20.11.27)(typescript@5.4.2)': + '@commitlint/load@19.1.0(@types/node@20.5.1)(typescript@5.3.3)': dependencies: '@commitlint/config-validator': 19.0.3 '@commitlint/execute-rule': 19.0.0 '@commitlint/resolve-extends': 19.1.0 '@commitlint/types': 19.0.3 chalk: 5.3.0 - cosmiconfig: 8.3.6(typescript@5.4.2) - cosmiconfig-typescript-loader: 5.0.0(@types/node@20.11.27)(cosmiconfig@8.3.6)(typescript@5.4.2) + cosmiconfig: 8.3.6(typescript@5.3.3) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.3.3))(typescript@5.3.3) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -4202,9 +4189,9 @@ snapshots: dependencies: css-render: 0.15.12 - '@css-render/vue3-ssr@0.15.12(vue@3.4.21)': + '@css-render/vue3-ssr@0.15.12(vue@3.4.21(typescript@5.3.3))': dependencies: - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) '@emotion/hash@0.8.0': {} @@ -4279,11 +4266,6 @@ snapshots: eslint: 8.56.0 eslint-visitor-keys: 3.4.3 - '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)': - dependencies: - eslint: 8.57.0 - eslint-visitor-keys: 3.4.3 - '@eslint-community/regexpp@4.10.0': {} '@eslint/eslintrc@2.1.4': @@ -4302,8 +4284,6 @@ snapshots: '@eslint/js@8.56.0': {} - '@eslint/js@8.57.0': {} - '@gradio/client@0.14.0': dependencies: bufferutil: 4.0.8 @@ -4343,10 +4323,10 @@ snapshots: transitivePeerDependencies: - supports-color - '@iconify/vue@4.1.1(vue@3.4.21)': + '@iconify/vue@4.1.1(vue@3.4.21(typescript@5.3.3))': dependencies: '@iconify/types': 2.0.0 - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) '@jridgewell/gen-mapping@0.3.3': dependencies: @@ -4421,34 +4401,35 @@ snapshots: '@polka/url@1.0.0-next.24': {} - '@rollup/plugin-node-resolve@13.3.0(rollup@2.79.1)': + '@rollup/plugin-node-resolve@13.3.0(rollup@3.29.4)': dependencies: - '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + '@rollup/pluginutils': 3.1.0(rollup@3.29.4) '@types/resolve': 1.17.1 deepmerge: 4.3.1 is-builtin-module: 3.2.1 is-module: 1.0.0 resolve: 1.22.8 - rollup: 2.79.1 + rollup: 3.29.4 - '@rollup/pluginutils@3.1.0(rollup@2.79.1)': + '@rollup/pluginutils@3.1.0(rollup@3.29.4)': dependencies: '@types/estree': 0.0.39 estree-walker: 1.0.1 picomatch: 2.3.1 - rollup: 2.79.1 + rollup: 3.29.4 '@rollup/pluginutils@4.2.1': dependencies: estree-walker: 2.0.2 picomatch: 2.3.1 - '@rollup/pluginutils@5.1.0(rollup@2.79.1)': + '@rollup/pluginutils@5.1.0(rollup@3.29.4)': dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 2.79.1 + optionalDependencies: + rollup: 3.29.4 '@transloadit/prettier-bytes@0.0.7': {} @@ -4514,7 +4495,7 @@ snapshots: '@typescript-eslint/types@6.21.0': {} - '@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.2)': + '@typescript-eslint/typescript-estree@6.21.0(typescript@5.3.3)': dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 @@ -4523,20 +4504,21 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.4.2) - typescript: 5.4.2 + ts-api-utils: 1.2.1(typescript@5.3.3) + optionalDependencies: + typescript: 5.3.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.4.2)': + '@typescript-eslint/utils@6.21.0(eslint@8.56.0)(typescript@5.3.3)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.7 '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.2) - eslint: 8.57.0 + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) + eslint: 8.56.0 semver: 7.6.0 transitivePeerDependencies: - supports-color @@ -4549,19 +4531,20 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@unocss/astro@0.55.3(rollup@2.79.1)(vite@4.5.2)': + '@unocss/astro@0.55.3(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0))': dependencies: '@unocss/core': 0.55.3 '@unocss/reset': 0.55.3 - '@unocss/vite': 0.55.3(rollup@2.79.1)(vite@4.5.2) - vite: 4.5.2(@types/node@20.11.27)(sass@1.70.0) + '@unocss/vite': 0.55.3(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)) + optionalDependencies: + vite: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) transitivePeerDependencies: - rollup - '@unocss/cli@0.55.3(rollup@2.79.1)': + '@unocss/cli@0.55.3(rollup@3.29.4)': dependencies: '@ampproject/remapping': 2.2.1 - '@rollup/pluginutils': 5.1.0(rollup@2.79.1) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) '@unocss/config': 0.55.3 '@unocss/core': 0.55.3 '@unocss/preset-uno': 0.55.3 @@ -4590,17 +4573,17 @@ snapshots: '@unocss/core@0.55.7': {} - '@unocss/eslint-config@0.55.7(eslint@8.57.0)(typescript@5.4.2)': + '@unocss/eslint-config@0.55.7(eslint@8.56.0)(typescript@5.3.3)': dependencies: - '@unocss/eslint-plugin': 0.55.7(eslint@8.57.0)(typescript@5.4.2) + '@unocss/eslint-plugin': 0.55.7(eslint@8.56.0)(typescript@5.3.3) transitivePeerDependencies: - eslint - supports-color - typescript - '@unocss/eslint-plugin@0.55.7(eslint@8.57.0)(typescript@5.4.2)': + '@unocss/eslint-plugin@0.55.7(eslint@8.56.0)(typescript@5.3.3)': dependencies: - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.4.2) + '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.3.3) '@unocss/config': 0.55.7 '@unocss/core': 0.55.7 magic-string: 0.30.7 @@ -4619,14 +4602,14 @@ snapshots: gzip-size: 6.0.0 sirv: 2.0.4 - '@unocss/postcss@0.55.3(postcss@8.4.35)': + '@unocss/postcss@0.55.3(postcss@5.2.18)': dependencies: '@unocss/config': 0.55.3 '@unocss/core': 0.55.3 css-tree: 2.3.1 fast-glob: 3.3.2 magic-string: 0.30.7 - postcss: 8.4.35 + postcss: 5.2.18 '@unocss/preset-attributify@0.55.3': dependencies: @@ -4699,10 +4682,10 @@ snapshots: dependencies: '@unocss/core': 0.55.3 - '@unocss/vite@0.55.3(rollup@2.79.1)(vite@4.5.2)': + '@unocss/vite@0.55.3(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0))': dependencies: '@ampproject/remapping': 2.2.1 - '@rollup/pluginutils': 5.1.0(rollup@2.79.1) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) '@unocss/config': 0.55.3 '@unocss/core': 0.55.3 '@unocss/inspector': 0.55.3 @@ -4711,7 +4694,7 @@ snapshots: chokidar: 3.6.0 fast-glob: 3.3.2 magic-string: 0.30.7 - vite: 4.5.2(@types/node@20.11.27)(sass@1.70.0) + vite: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) transitivePeerDependencies: - rollup @@ -4744,10 +4727,10 @@ snapshots: '@uppy/utils': 4.1.3 nanoid: 3.3.7 - '@vitejs/plugin-vue@4.6.2(vite@4.5.2)(vue@3.4.21)': + '@vitejs/plugin-vue@4.6.2(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0))(vue@3.4.21(typescript@5.3.3))': dependencies: - vite: 4.5.2(@types/node@20.11.27)(sass@1.70.0) - vue: 3.4.21(typescript@5.4.2) + vite: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) + vue: 3.4.21(typescript@5.3.3) '@vue/compiler-core@3.4.18': dependencies: @@ -4826,38 +4809,38 @@ snapshots: '@vue/shared': 3.4.21 csstype: 3.1.3 - '@vue/server-renderer@3.4.21(vue@3.4.21)': + '@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.3.3))': dependencies: '@vue/compiler-ssr': 3.4.21 '@vue/shared': 3.4.21 - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) '@vue/shared@3.4.18': {} '@vue/shared@3.4.21': {} - '@vueuse/core@10.7.2(vue@3.4.21)': + '@vueuse/core@10.7.2(vue@3.4.21(typescript@5.3.3))': dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.7.2 - '@vueuse/shared': 10.7.2(vue@3.4.21) - vue-demi: 0.14.7(vue@3.4.21) + '@vueuse/shared': 10.7.2(vue@3.4.21(typescript@5.3.3)) + vue-demi: 0.14.7(vue@3.4.21(typescript@5.3.3)) transitivePeerDependencies: - '@vue/composition-api' - vue '@vueuse/metadata@10.7.2': {} - '@vueuse/shared@10.7.2(vue@3.4.21)': + '@vueuse/shared@10.7.2(vue@3.4.21(typescript@5.3.3))': dependencies: - vue-demi: 0.14.7(vue@3.4.21) + vue-demi: 0.14.7(vue@3.4.21(typescript@5.3.3)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)': + '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)': dependencies: - '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) dom7: 3.0.0 is-url: 1.2.4 lodash.throttle: 4.1.1 @@ -4865,15 +4848,15 @@ snapshots: slate: 0.72.8 snabbdom: 3.6.2 - '@wangeditor/code-highlight@1.0.3(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)': + '@wangeditor/code-highlight@1.0.3(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)': dependencies: - '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) dom7: 3.0.0 prismjs: 1.29.0 slate: 0.72.8 snabbdom: 3.6.2 - '@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)': + '@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)': dependencies: '@types/event-emitter': 0.3.5 '@uppy/core': 2.3.4 @@ -4896,22 +4879,22 @@ snapshots: slate-history: 0.66.0(slate@0.72.8) snabbdom: 3.6.2 - '@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.4.21)': + '@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.4.21(typescript@5.3.3))': dependencies: '@wangeditor/editor': 5.1.23 - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) '@wangeditor/editor@5.1.23': dependencies: '@uppy/core': 2.3.4 '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4) - '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) - '@wangeditor/code-highlight': 1.0.3(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2) - '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) - '@wangeditor/list-module': 1.0.5(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2) - '@wangeditor/table-module': 1.1.4(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) - '@wangeditor/upload-image-module': 1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/basic-modules@1.1.7)(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2) - '@wangeditor/video-module': 1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/core@1.1.19)(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/code-highlight': 1.0.3(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/list-module': 1.0.5(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/table-module': 1.1.4(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/upload-image-module': 1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/video-module': 1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) dom7: 3.0.0 is-hotkey: 0.2.0 lodash.camelcase: 4.3.0 @@ -4925,9 +4908,9 @@ snapshots: slate: 0.72.8 snabbdom: 3.6.2 - '@wangeditor/list-module@1.0.5(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)': + '@wangeditor/list-module@1.0.5(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)': dependencies: - '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) dom7: 3.0.0 slate: 0.72.8 snabbdom: 3.6.2 @@ -4939,9 +4922,9 @@ snapshots: dom7: 4.0.6 snabbdom: 3.6.2 - '@wangeditor/table-module@1.1.4(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)': + '@wangeditor/table-module@1.1.4(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)': dependencies: - '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) dom7: 3.0.0 lodash.isequal: 4.5.0 lodash.throttle: 4.1.1 @@ -4949,22 +4932,22 @@ snapshots: slate: 0.72.8 snabbdom: 3.6.2 - '@wangeditor/upload-image-module@1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/basic-modules@1.1.7)(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2)': + '@wangeditor/upload-image-module@1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2)': dependencies: '@uppy/core': 2.3.4 '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4) - '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) - '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) dom7: 3.0.0 lodash.foreach: 4.5.0 slate: 0.72.8 snabbdom: 3.6.2 - '@wangeditor/video-module@1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/core@1.1.19)(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)': + '@wangeditor/video-module@1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)': dependencies: '@uppy/core': 2.3.4 '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4) - '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) + '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2) dom7: 3.0.0 nanoid: 3.3.7 slate: 0.72.8 @@ -4974,7 +4957,7 @@ snapshots: dependencies: eslint: 8.56.0 eslint-config-prettier: 8.10.0(eslint@8.56.0) - eslint-plugin-prettier: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8) + eslint-plugin-prettier: 4.2.1(eslint-config-prettier@8.10.0(eslint@8.56.0))(eslint@8.56.0)(prettier@2.8.8) eslint-plugin-vue: 9.21.1(eslint@8.56.0) prettier: 2.8.8 transitivePeerDependencies: @@ -5315,10 +5298,10 @@ snapshots: commander@8.3.0: {} - commitizen@4.3.0(@types/node@20.11.27)(typescript@5.4.2): + commitizen@4.3.0(@types/node@20.5.1)(typescript@5.3.3): dependencies: cachedir: 2.3.0 - cz-conventional-changelog: 3.3.0(@types/node@20.11.27)(typescript@5.4.2) + cz-conventional-changelog: 3.3.0(@types/node@20.5.1)(typescript@5.3.3) dedent: 0.7.0 detect-indent: 6.1.0 find-node-modules: 2.1.3 @@ -5387,19 +5370,19 @@ snapshots: object-assign: 4.1.1 vary: 1.1.2 - cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6)(ts-node@10.9.2)(typescript@5.3.3): + cosmiconfig-typescript-loader@4.4.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.3.3))(ts-node@10.9.2(@types/node@20.5.1)(typescript@5.3.3))(typescript@5.3.3): dependencies: '@types/node': 20.5.1 cosmiconfig: 8.3.6(typescript@5.3.3) - ts-node: 10.9.2(@types/node@20.11.27)(typescript@5.4.2) + ts-node: 10.9.2(@types/node@20.5.1)(typescript@5.3.3) typescript: 5.3.3 - cosmiconfig-typescript-loader@5.0.0(@types/node@20.11.27)(cosmiconfig@8.3.6)(typescript@5.4.2): + cosmiconfig-typescript-loader@5.0.0(@types/node@20.5.1)(cosmiconfig@8.3.6(typescript@5.3.3))(typescript@5.3.3): dependencies: - '@types/node': 20.11.27 - cosmiconfig: 8.3.6(typescript@5.4.2) + '@types/node': 20.5.1 + cosmiconfig: 8.3.6(typescript@5.3.3) jiti: 1.21.0 - typescript: 5.4.2 + typescript: 5.3.3 optional: true cosmiconfig@8.3.6(typescript@5.3.3): @@ -5408,17 +5391,9 @@ snapshots: js-yaml: 4.1.0 parse-json: 5.2.0 path-type: 4.0.0 + optionalDependencies: typescript: 5.3.3 - cosmiconfig@8.3.6(typescript@5.4.2): - dependencies: - import-fresh: 3.3.0 - js-yaml: 4.1.0 - parse-json: 5.2.0 - path-type: 4.0.0 - typescript: 5.4.2 - optional: true - crc-32@1.2.2: {} create-require@1.1.1: {} @@ -5468,16 +5443,16 @@ snapshots: csstype@3.1.3: {} - cz-conventional-changelog@3.3.0(@types/node@20.11.27)(typescript@5.4.2): + cz-conventional-changelog@3.3.0(@types/node@20.5.1)(typescript@5.3.3): dependencies: chalk: 2.4.2 - commitizen: 4.3.0(@types/node@20.11.27)(typescript@5.4.2) + commitizen: 4.3.0(@types/node@20.5.1)(typescript@5.3.3) conventional-commit-types: 3.0.0 lodash.map: 4.6.0 longest: 2.0.1 word-wrap: 1.2.5 optionalDependencies: - '@commitlint/load': 19.1.0(@types/node@20.11.27)(typescript@5.4.2) + '@commitlint/load': 19.1.0(@types/node@20.5.1)(typescript@5.3.3) transitivePeerDependencies: - '@types/node' - typescript @@ -5726,12 +5701,13 @@ snapshots: dependencies: eslint: 8.56.0 - eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8): + eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.56.0))(eslint@8.56.0)(prettier@2.8.8): dependencies: eslint: 8.56.0 - eslint-config-prettier: 8.10.0(eslint@8.56.0) prettier: 2.8.8 prettier-linter-helpers: 1.0.0 + optionalDependencies: + eslint-config-prettier: 8.10.0(eslint@8.56.0) eslint-plugin-vue@9.21.1(eslint@8.56.0): dependencies: @@ -5796,49 +5772,6 @@ snapshots: transitivePeerDependencies: - supports-color - eslint@8.57.0: - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@eslint-community/regexpp': 4.10.0 - '@eslint/eslintrc': 2.1.4 - '@eslint/js': 8.57.0 - '@humanwhocodes/config-array': 0.11.14 - '@humanwhocodes/module-importer': 1.0.1 - '@nodelib/fs.walk': 1.2.8 - '@ungap/structured-clone': 1.2.0 - ajv: 6.12.6 - chalk: 4.1.2 - cross-spawn: 7.0.3 - debug: 4.3.4 - doctrine: 3.0.0 - escape-string-regexp: 4.0.0 - eslint-scope: 7.2.2 - eslint-visitor-keys: 3.4.3 - espree: 9.6.1 - esquery: 1.5.0 - esutils: 2.0.3 - fast-deep-equal: 3.1.3 - file-entry-cache: 6.0.1 - find-up: 5.0.0 - glob-parent: 6.0.2 - globals: 13.24.0 - graphemer: 1.4.0 - ignore: 5.3.1 - imurmurhash: 0.1.4 - is-glob: 4.0.3 - is-path-inside: 3.0.3 - js-yaml: 4.1.0 - json-stable-stringify-without-jsonify: 1.0.1 - levn: 0.4.1 - lodash.merge: 4.6.2 - minimatch: 3.1.2 - natural-compare: 1.4.0 - optionator: 0.9.3 - strip-ansi: 6.0.1 - text-table: 0.2.0 - transitivePeerDependencies: - - supports-color - esno@0.17.0: dependencies: tsx: 3.14.0 @@ -5984,6 +5917,8 @@ snapshots: dependencies: flat-cache: 3.2.0 + file-saver@2.0.5: {} + filelist@1.0.4: dependencies: minimatch: 5.1.6 @@ -6751,10 +6686,10 @@ snapshots: mute-stream@0.0.8: {} - naive-ui@2.37.3(vue@3.4.21): + naive-ui@2.37.3(vue@3.4.21(typescript@5.3.3)): dependencies: '@css-render/plugin-bem': 0.15.12(css-render@0.15.12) - '@css-render/vue3-ssr': 0.15.12(vue@3.4.21) + '@css-render/vue3-ssr': 0.15.12(vue@3.4.21(typescript@5.3.3)) '@types/katex': 0.16.7 '@types/lodash': 4.14.202 '@types/lodash-es': 4.17.12 @@ -6769,10 +6704,10 @@ snapshots: lodash-es: 4.17.21 seemly: 0.3.8 treemate: 0.3.11 - vdirs: 0.1.8(vue@3.4.21) - vooks: 0.2.12(vue@3.4.21) - vue: 3.4.21(typescript@5.4.2) - vueuc: 0.4.58(vue@3.4.21) + vdirs: 0.1.8(vue@3.4.21(typescript@5.3.3)) + vooks: 0.2.12(vue@3.4.21(typescript@5.3.3)) + vue: 3.4.21(typescript@5.3.3) + vueuc: 0.4.58(vue@3.4.21(typescript@5.3.3)) namespace-emitter@2.0.1: {} @@ -6988,12 +6923,13 @@ snapshots: pidtree@0.6.0: {} - pinia@2.1.7(typescript@5.4.2)(vue@3.4.21): + pinia@2.1.7(typescript@5.3.3)(vue@3.4.21(typescript@5.3.3)): dependencies: '@vue/devtools-api': 6.5.1 - typescript: 5.4.2 - vue: 3.4.21(typescript@5.4.2) - vue-demi: 0.14.7(vue@3.4.21) + vue: 3.4.21(typescript@5.3.3) + vue-demi: 0.14.7(vue@3.4.21(typescript@5.3.3)) + optionalDependencies: + typescript: 5.3.3 pkg-types@1.0.3: dependencies: @@ -7184,17 +7120,14 @@ snapshots: dependencies: glob: 7.2.3 - rollup-plugin-visualizer@5.12.0(rollup@2.79.1): + rollup-plugin-visualizer@5.12.0(rollup@3.29.4): dependencies: open: 8.4.2 picomatch: 2.3.1 - rollup: 2.79.1 source-map: 0.7.4 yargs: 17.7.2 - - rollup@2.79.1: optionalDependencies: - fsevents: 2.3.3 + rollup: 3.29.4 rollup@3.29.4: optionalDependencies: @@ -7554,25 +7487,25 @@ snapshots: trim-newlines@3.0.1: {} - ts-api-utils@1.2.1(typescript@5.4.2): + ts-api-utils@1.2.1(typescript@5.3.3): dependencies: - typescript: 5.4.2 + typescript: 5.3.3 - ts-node@10.9.2(@types/node@20.11.27)(typescript@5.4.2): + ts-node@10.9.2(@types/node@20.5.1)(typescript@5.3.3): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.9 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.11.27 + '@types/node': 20.5.1 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.4.2 + typescript: 5.3.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 @@ -7612,8 +7545,6 @@ snapshots: typescript@5.3.3: {} - typescript@5.4.2: {} - ufo@1.4.0: {} unconfig@0.3.11: @@ -7625,9 +7556,9 @@ snapshots: undici-types@5.26.5: {} - unimport@3.7.1(rollup@2.79.1): + unimport@3.7.1(rollup@3.29.4): dependencies: - '@rollup/pluginutils': 5.1.0(rollup@2.79.1) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) acorn: 8.11.3 escape-string-regexp: 5.0.0 estree-walker: 3.0.3 @@ -7652,13 +7583,13 @@ snapshots: universalify@2.0.1: {} - unocss@0.55.3(postcss@8.4.35)(rollup@2.79.1)(vite@4.5.2): + unocss@0.55.3(postcss@5.2.18)(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)): dependencies: - '@unocss/astro': 0.55.3(rollup@2.79.1)(vite@4.5.2) - '@unocss/cli': 0.55.3(rollup@2.79.1) + '@unocss/astro': 0.55.3(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)) + '@unocss/cli': 0.55.3(rollup@3.29.4) '@unocss/core': 0.55.3 '@unocss/extractor-arbitrary-variants': 0.55.3 - '@unocss/postcss': 0.55.3(postcss@8.4.35) + '@unocss/postcss': 0.55.3(postcss@5.2.18) '@unocss/preset-attributify': 0.55.3 '@unocss/preset-icons': 0.55.3 '@unocss/preset-mini': 0.55.3 @@ -7673,8 +7604,9 @@ snapshots: '@unocss/transformer-compile-class': 0.55.3 '@unocss/transformer-directives': 0.55.3 '@unocss/transformer-variant-group': 0.55.3 - '@unocss/vite': 0.55.3(rollup@2.79.1)(vite@4.5.2) - vite: 4.5.2(@types/node@20.11.27)(sass@1.70.0) + '@unocss/vite': 0.55.3(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)) + optionalDependencies: + vite: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) transitivePeerDependencies: - postcss - rollup @@ -7682,17 +7614,18 @@ snapshots: unpipe@1.0.0: {} - unplugin-auto-import@0.16.7(@vueuse/core@10.7.2)(rollup@2.79.1): + unplugin-auto-import@0.16.7(@vueuse/core@10.7.2(vue@3.4.21(typescript@5.3.3)))(rollup@3.29.4): dependencies: '@antfu/utils': 0.7.7 - '@rollup/pluginutils': 5.1.0(rollup@2.79.1) - '@vueuse/core': 10.7.2(vue@3.4.21) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) fast-glob: 3.3.2 local-pkg: 0.5.0 magic-string: 0.30.7 minimatch: 9.0.3 - unimport: 3.7.1(rollup@2.79.1) + unimport: 3.7.1(rollup@3.29.4) unplugin: 1.7.1 + optionalDependencies: + '@vueuse/core': 10.7.2(vue@3.4.21(typescript@5.3.3)) transitivePeerDependencies: - rollup @@ -7701,18 +7634,19 @@ snapshots: '@antfu/install-pkg': 0.1.1 '@antfu/utils': 0.7.7 '@iconify/utils': 2.1.22 - '@vue/compiler-sfc': 3.4.18 debug: 4.3.4 kolorist: 1.8.0 local-pkg: 0.4.3 unplugin: 1.7.1 + optionalDependencies: + '@vue/compiler-sfc': 3.4.18 transitivePeerDependencies: - supports-color - unplugin-vue-components@0.25.2(rollup@2.79.1)(vue@3.4.21): + unplugin-vue-components@0.25.2(@babel/parser@7.23.9)(rollup@3.29.4)(vue@3.4.21(typescript@5.3.3)): dependencies: '@antfu/utils': 0.7.7 - '@rollup/pluginutils': 5.1.0(rollup@2.79.1) + '@rollup/pluginutils': 5.1.0(rollup@3.29.4) chokidar: 3.6.0 debug: 4.3.4 fast-glob: 3.3.2 @@ -7721,7 +7655,9 @@ snapshots: minimatch: 9.0.3 resolve: 1.22.8 unplugin: 1.7.1 - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) + optionalDependencies: + '@babel/parser': 7.23.9 transitivePeerDependencies: - rollup - supports-color @@ -7765,21 +7701,21 @@ snapshots: vary@1.1.2: {} - vdirs@0.1.8(vue@3.4.21): + vdirs@0.1.8(vue@3.4.21(typescript@5.3.3)): dependencies: evtd: 0.2.4 - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) - vite-plugin-compression@0.5.1(vite@4.5.2): + vite-plugin-compression@0.5.1(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)): dependencies: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 4.5.2(@types/node@20.11.27)(sass@1.70.0) + vite: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) transitivePeerDependencies: - supports-color - vite-plugin-html@3.2.2(vite@4.5.2): + vite-plugin-html@3.2.2(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)): dependencies: '@rollup/pluginutils': 4.2.1 colorette: 2.0.20 @@ -7793,11 +7729,11 @@ snapshots: html-minifier-terser: 6.1.0 node-html-parser: 5.4.2 pathe: 0.2.0 - vite: 4.5.2(@types/node@20.11.27)(sass@1.70.0) + vite: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) - vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@2.79.1)(vite@4.5.2): + vite-plugin-mock@2.9.6(mockjs@1.1.0)(rollup@3.29.4)(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)): dependencies: - '@rollup/plugin-node-resolve': 13.3.0(rollup@2.79.1) + '@rollup/plugin-node-resolve': 13.3.0(rollup@3.29.4) '@types/mockjs': 1.0.10 chalk: 4.1.2 chokidar: 3.6.0 @@ -7807,12 +7743,12 @@ snapshots: fast-glob: 3.3.2 mockjs: 1.1.0 path-to-regexp: 6.2.1 - vite: 4.5.2(@types/node@20.11.27)(sass@1.70.0) + vite: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) transitivePeerDependencies: - rollup - supports-color - vite-plugin-svg-icons@2.0.1(vite@4.5.2): + vite-plugin-svg-icons@2.0.1(vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0)): dependencies: '@types/svgo': 2.6.4 cors: 2.8.5 @@ -7822,48 +7758,51 @@ snapshots: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 4.5.2(@types/node@20.11.27)(sass@1.70.0) + vite: 4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0) transitivePeerDependencies: - supports-color - vite@4.5.2(@types/node@20.11.27)(sass@1.70.0): + vite@4.5.2(@types/node@20.5.1)(sass@1.70.0)(terser@5.27.0): dependencies: - '@types/node': 20.11.27 esbuild: 0.18.20 postcss: 8.4.35 rollup: 3.29.4 - sass: 1.70.0 optionalDependencies: + '@types/node': 20.5.1 fsevents: 2.3.3 + sass: 1.70.0 + terser: 5.27.0 - vooks@0.2.12(vue@3.4.21): + vooks@0.2.12(vue@3.4.21(typescript@5.3.3)): dependencies: evtd: 0.2.4 - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) - vue-codemirror@6.1.1(codemirror@6.0.1)(vue@3.4.21): + vue-codemirror@6.1.1(codemirror@6.0.1(@lezer/common@1.2.1))(vue@3.4.21(typescript@5.3.3)): dependencies: '@codemirror/commands': 6.3.3 '@codemirror/language': 6.10.1 '@codemirror/state': 6.4.0 '@codemirror/view': 6.24.0 codemirror: 6.0.1(@lezer/common@1.2.1) - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) - vue-demi@0.13.11(vue@3.4.21): + vue-demi@0.13.11(vue@3.4.21(typescript@5.3.3)): dependencies: - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) - vue-demi@0.14.7(vue@3.4.21): + vue-demi@0.14.7(vue@3.4.21(typescript@5.3.3)): dependencies: - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) - vue-echarts@6.6.8(echarts@5.4.3)(vue@3.4.21): + vue-echarts@6.6.8(@vue/runtime-core@3.4.21)(echarts@5.4.3)(vue@3.4.21(typescript@5.3.3)): dependencies: echarts: 5.4.3 resize-detector: 0.3.0 - vue: 3.4.21(typescript@5.4.2) - vue-demi: 0.13.11(vue@3.4.21) + vue: 3.4.21(typescript@5.3.3) + vue-demi: 0.13.11(vue@3.4.21(typescript@5.3.3)) + optionalDependencies: + '@vue/runtime-core': 3.4.21 vue-eslint-parser@9.4.2(eslint@8.56.0): dependencies: @@ -7878,30 +7817,31 @@ snapshots: transitivePeerDependencies: - supports-color - vue-router@4.2.5(vue@3.4.21): + vue-router@4.2.5(vue@3.4.21(typescript@5.3.3)): dependencies: '@vue/devtools-api': 6.5.1 - vue: 3.4.21(typescript@5.4.2) + vue: 3.4.21(typescript@5.3.3) - vue@3.4.21(typescript@5.4.2): + vue@3.4.21(typescript@5.3.3): dependencies: '@vue/compiler-dom': 3.4.21 '@vue/compiler-sfc': 3.4.21 '@vue/runtime-dom': 3.4.21 - '@vue/server-renderer': 3.4.21(vue@3.4.21) + '@vue/server-renderer': 3.4.21(vue@3.4.21(typescript@5.3.3)) '@vue/shared': 3.4.21 - typescript: 5.4.2 + optionalDependencies: + typescript: 5.3.3 - vueuc@0.4.58(vue@3.4.21): + vueuc@0.4.58(vue@3.4.21(typescript@5.3.3)): dependencies: - '@css-render/vue3-ssr': 0.15.12(vue@3.4.21) + '@css-render/vue3-ssr': 0.15.12(vue@3.4.21(typescript@5.3.3)) '@juggle/resize-observer': 3.4.0 css-render: 0.15.12 evtd: 0.2.4 seemly: 0.3.8 - vdirs: 0.1.8(vue@3.4.21) - vooks: 0.2.12(vue@3.4.21) - vue: 3.4.21(typescript@5.4.2) + vdirs: 0.1.8(vue@3.4.21(typescript@5.3.3)) + vooks: 0.2.12(vue@3.4.21(typescript@5.3.3)) + vue: 3.4.21(typescript@5.3.3) w3c-keyname@2.2.8: {} @@ -7944,7 +7884,7 @@ snapshots: wrappy@1.0.2: {} ws@8.16.0(bufferutil@4.0.8): - dependencies: + optionalDependencies: bufferutil: 4.0.8 xlsx@0.18.5: diff --git a/AES-front/src/api/admin.js b/AES-front/src/api/admin.js index 21ee1c7..6b57e85 100644 --- a/AES-front/src/api/admin.js +++ b/AES-front/src/api/admin.js @@ -91,5 +91,6 @@ export default { updateSetup:(data)=>request.post('/problem/updateSetup',data), findStudentSubmit:(data)=>request.post('/problem/findStudentSubmit',data), addTime:(data)=>request.post('/problem/addTime',data), - + findProblemReview:(data)=>request.post('/problem/findProblemReview',data), + findScore:(data)=>request.post('/problem/findScore',data), } diff --git a/AES-front/src/views/admin/problem/problem-list.vue b/AES-front/src/views/admin/problem/problem-list.vue index 6810fdd..6052bde 100644 --- a/AES-front/src/views/admin/problem/problem-list.vue +++ b/AES-front/src/views/admin/problem/problem-list.vue @@ -254,7 +254,7 @@ const onReviewProblem = async (problemid)=>{ await router.push({name: 'AdminProblemStudent', query: - {classId:ProblemInfoValue.value.classId,problemId:id}}) + {classId:ProblemInfoValue.value.classId,problemId:id,courseId:courseId}}) } // const search=async ()=>{ // // ProblemInfoRef.value?.validate(async (errors) => { diff --git a/AES-front/src/views/admin/problem/problem-review.vue b/AES-front/src/views/admin/problem/problem-review.vue index 9e41ac4..ba6c3b5 100644 --- a/AES-front/src/views/admin/problem/problem-review.vue +++ b/AES-front/src/views/admin/problem/problem-review.vue @@ -4,7 +4,7 @@ label-placement="left"style="margin-top: 15px;margin-left: 2%">
+
- {{ problemName }} - + {{ problemReviewValue.title }} +
- {{problemDescription }}
+ {{problemReviewValue.description + }}
{{ - studentMessage.studentNo}} - {{studentMessage - .name}} + problemReviewValue.studentNo}} + {{problemReviewValue + .chineseName}} - {{studentMessage.class}}: + {{problemReviewValue + .banji}}:
- - 点击这里下载附件 - + + 下载附件 +
- -
@@ -64,13 +68,13 @@ 
{{submitReport.aotocomment }}
+ style='white-space: normal;word-wrap: break-word'>{{problemReviewValue.autocomment }} @@ -106,7 +110,7 @@ diff --git a/AES-front/src/views/admin/problem/problem-student.vue b/AES-front/src/views/admin/problem/problem-student.vue index c0ed5b6..5e98213 100644 --- a/AES-front/src/views/admin/problem/problem-student.vue +++ b/AES-front/src/views/admin/problem/problem-student.vue @@ -60,8 +60,8 @@ 导出成绩 - 导出作业附件 + + 统计 @@ -92,7 +92,9 @@ import {onMounted, reactive, ref, watch} from "vue"; import { saveAs } from 'file-saver'; import * as XLSX from 'xlsx'; import {useRoute, useRouter} from 'vue-router' +import { useUserStore } from '@/store'; import api from "@/api/admin"; +const userStore = useUserStore() import ProblemStudentAction from '@/views/admin/problem/components/problem-student-action.vue' import {formatDateTime} from '@/utils'; @@ -114,7 +116,7 @@ const submitList = ref([]) const studentList = reactive([]) -const { classId,problemId, history } = route.query +const { classId,problemId,courseId, history } = route.query const paginationReactive = reactive({ page: 1, pageSize: 50, @@ -283,10 +285,9 @@ const onAddTime=async (studentId)=>{ 'AdminProblemAddTime', query: {classId: classId,problemId:problemId,studentId:id}}) } -const onReview=async ()=>{ - // const {id} = classId - const id=1 - await router.push({name: 'AdminProblemReview', params: {clId: id}, query: {id: clId}}) +const onReview=async (studentId)=>{ + const {id} = studentId + await router.push({name: 'AdminProblemReview', query:{classId: classId,problemId:problemId,courseId:courseId,studentId:id}}) } const onDeleteClass = async (classId)=>{ try { @@ -378,7 +379,12 @@ const exportWeijiaoTable = () => { }); const blob = new Blob([excelBuffer], { type: 'application/octet-stream' }); saveAs(blob, '导出未交名单.xlsx'); -}; +} +const tongji=async (studentId)=>{ + const {id} = studentId + await router.push({name: 'AdminProblemScore', + query:{classId: classId,problemId:problemId,courseId:courseId,studentId:id}}) +} const rowKey = (rowData) => { return rowData.id } diff --git a/AES-front/src/views/admin/problem/tongji.vue b/AES-front/src/views/admin/problem/tongji.vue new file mode 100644 index 0000000..cfd5096 --- /dev/null +++ b/AES-front/src/views/admin/problem/tongji.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/AES-front/src/views/admin/route.js b/AES-front/src/views/admin/route.js index 5b01d58..3246bb6 100644 --- a/AES-front/src/views/admin/route.js +++ b/AES-front/src/views/admin/route.js @@ -30,6 +30,7 @@ export default { { name: 'AdminProblem', path: 'problem', + isHidden: true, redirect: '/admin/problem/problem-list', meta: { title: '作业管理', @@ -78,6 +79,19 @@ export default { keepAlive: true, }, }, + { + name: 'AdminProblemScore', + path: 'tongji', + isHidden: true, + component: () => import('@/views/admin/problem/tongji.vue'), + meta: { + title: '统计成绩', + icon: 'ic:baseline-add', + role: ['admin', 'teacher'], + requireAuth: true, + keepAlive: true, + }, + }, { name: 'AdminProblemEdit', path: 'problem-edit', diff --git a/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java b/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java index bb6e01f..70182d8 100644 --- a/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java +++ b/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java @@ -284,7 +284,20 @@ public class ProblemController { return RespBean.ok("获取学生提交报告列表成功！", dataGrid); } - + @PostMapping("findScore") + public RespBean findScore(@RequestBody PMStudentSubmit pmStudentSubmit){ + List scoreList= + problemServiceI.findScoreList(pmStudentSubmit); + return RespBean.ok("获取分数列表成功！", + scoreList); + } + @PostMapping("findProblemReview") + public RespBean findProblemReview(@RequestBody PMReviewMessage pmReviewMessage){ + PMReviewMessage reviewMessage= + problemServiceI.findProblemReview(pmReviewMessage); + return RespBean.ok("获取批阅报告成功！", + reviewMessage); + } //根据作业id和学生id获取学生当前报告成绩排名 @GetMapping("/getStudentRank") diff --git a/AES/src/main/java/com/example/aes/problem/dao/SubmitReportDaoI.java b/AES/src/main/java/com/example/aes/problem/dao/SubmitReportDaoI.java index 1e79d28..8768d2d 100644 --- a/AES/src/main/java/com/example/aes/problem/dao/SubmitReportDaoI.java +++ b/AES/src/main/java/com/example/aes/problem/dao/SubmitReportDaoI.java @@ -1,5 +1,6 @@ package com.example.aes.problem.dao; +import com.example.aes.problem.model.PMReviewMessage; import com.example.aes.problem.model.PMStudentSubmit; import com.example.aes.problem.model.SubmitReport; import com.example.aes.user.dao.BaseDaoI; @@ -11,5 +12,7 @@ public interface SubmitReportDaoI extends BaseDaoI { public List findWeijiaoList(PMStudentSubmit pmStudentSubmit); public List findYijiaoList(PMStudentSubmit pmStudentSubmit); public int updateAddTime(LocalDateTime addTime,int problemId,int studentId); + public List findProblemReview(PMReviewMessage pmReviewMessage); + public List findScoreList(PMStudentSubmit pmStudentSubmit); } diff --git a/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java b/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java index 5d88223..0171316 100644 --- a/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java +++ b/AES/src/main/java/com/example/aes/problem/dao/impl/ProblemDaoImpl.java @@ -12,7 +12,6 @@ import com.example.aes.user.dao.impl.BaseDaoImpl; import com.example.aes.user.model.Classstudents; import org.hibernate.Query; import org.hibernate.Session; -import com.ibm.jvm.trace.format.api.TraceContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.BeanPropertyRowMapper; diff --git a/AES/src/main/java/com/example/aes/problem/dao/impl/SubmitReportDaoImpl.java b/AES/src/main/java/com/example/aes/problem/dao/impl/SubmitReportDaoImpl.java index 2dc0502..a80cd9f 100644 --- a/AES/src/main/java/com/example/aes/problem/dao/impl/SubmitReportDaoImpl.java +++ b/AES/src/main/java/com/example/aes/problem/dao/impl/SubmitReportDaoImpl.java @@ -1,6 +1,7 @@ package com.example.aes.problem.dao.impl; import com.example.aes.problem.dao.SubmitReportDaoI; +import com.example.aes.problem.model.PMReviewMessage; import com.example.aes.problem.model.PMStudentSubmit; import com.example.aes.problem.model.SubmitReport; import com.example.aes.user.dao.impl.BaseDaoImpl; @@ -122,4 +123,67 @@ String chineseName= return query.getResultList(); } + @Override + public List findScoreList(PMStudentSubmit pmStudentSubmit){ + int classId= pmStudentSubmit.getClassId(); + int problemId= pmStudentSubmit.getProblemId(); +// String studentNo= +// '%'+pmStudentSubmit.getStudentNo()+'%'; +// String chineseName= +// '%'+pmStudentSubmit.getChineseName()+'%'; + String hql="SELECT u.chineseName," + + "u.studentNo, sr" + + ".submissionTime," + + "sr.submissionStatus," + + " COALESCE(sr.score," + + " sr.autoscore) " + + "AS finalScore ,u.id " + + "FROM Classstudents cs left " + + "join Users u on cs" + + ".userId=u.id "+ + "left join PostProblem pp on cs" + + ".classId=pp.classId "+ + "left JOIN"+ + " SubmitReport sr ON " + + "sr" + + ".studentId=u.id"+ + " WHERE cs.classId=:classId " + + "and " + + "pp.problemId " + + "=:problemId" + + " and sr.problemId=:problemId" + + " and sr" + + ".submissionTime is not null"; + Query query = + this.getCurrentSession().createQuery(hql,Object[].class); + query.setParameter("classId", classId); + query.setParameter("problemId", problemId); + return query.getResultList(); + } + @Override + public List findProblemReview(PMReviewMessage pmReviewMessage){ + int studentId= pmReviewMessage.getStudentId(); + int problemId= pmReviewMessage.getProblemId(); + String hql="select p.title," + + "p.description,u.chineseName," + + "u.studentNo,u.banji," + + "sr.attachment," + + "sr.autoscore,sr.autocomment," + + "sr.score," + + "sr.comment " + + "from Problem p " + + "left join SubmitReport sr " + + "on sr.problemId=p.id " + + "inner join Users u " + + "on sr.studentId=u.id " + + "where u.id=:studentId " + + "and" + + " " + + "p.id=:problemId"; + Query query = + this.getCurrentSession().createQuery(hql,Object[].class); + query.setParameter("studentId", studentId); + query.setParameter("problemId", problemId); + return query.getResultList(); + } } diff --git a/AES/src/main/java/com/example/aes/problem/model/PMReviewMessage.java b/AES/src/main/java/com/example/aes/problem/model/PMReviewMessage.java new file mode 100644 index 0000000..f9bcca8 --- /dev/null +++ b/AES/src/main/java/com/example/aes/problem/model/PMReviewMessage.java @@ -0,0 +1,19 @@ +package com.example.aes.problem.model; + +import lombok.Data; + +@Data +public class PMReviewMessage { + private int studentId; + private int problemId; + private String title; + private String description; + private String chineseName; + private String studentNo; + private String banji; + private String attachment; + private float autoscore; + private String autocomment; + private float score; + private String comment; +} diff --git a/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java b/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java index 6bd07fc..1243b9a 100644 --- a/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java +++ b/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java @@ -367,6 +367,14 @@ public class ProblemServiceImpl implements ProblemServiceI { postProblemDao.findPostProblem(problemId,classId); return postProblems; } + @Override + public PMReviewMessage findProblemReview(PMReviewMessage pmReviewMessage){ + List objects= + studentSubmitDao.findProblemReview(pmReviewMessage); + List pmReviewMessageList=new ArrayList<>(); + changeModel6(pmReviewMessageList,objects); + return pmReviewMessageList.get(0); + } @Autowired public void setStudentSubmitDao(SubmitReportDaoI studentSubmitDao) { this.studentSubmitDao = studentSubmitDao; @@ -447,6 +455,15 @@ public class ProblemServiceImpl implements ProblemServiceI { } } @Override + public List findScoreList(PMStudentSubmit pmStudentSubmit){ + List scoreList=new ArrayList<>(); + List theSubmitList= + studentSubmitDao.findScoreList(pmStudentSubmit); + for(Object[] object:theSubmitList){ + scoreList.add((float)object[4]); + }return scoreList; + } + @Override public int editPostProblem(int classId, int problemId,LocalDateTime startTime,LocalDateTime endTime,boolean allow){ int n=0; @@ -549,4 +566,25 @@ public class ProblemServiceImpl implements ProblemServiceI { } } } + private void changeModel6(List pmReviewMessages, + List pmObject) { + if (pmObject != null && pmObject.size() > 0) { + for (Object[] p : pmObject) { + PMReviewMessage pmReviewMessage= + new PMReviewMessage(); + pmReviewMessage.setTitle((String) p[0]); + pmReviewMessage.setDescription(((String) p[1]).replaceAll("<\\/?.*?>", "").trim()); + pmReviewMessage.setChineseName((String) p[2]); + pmReviewMessage.setStudentNo((String) p[3]); + pmReviewMessage.setBanji((String) p[4]); + pmReviewMessage.setAttachment((String) p[5]); + pmReviewMessage.setAutoscore((float) p[6]); + pmReviewMessage.setAutocomment((String)p[7]); + if(p[8]!=null) + pmReviewMessage.setScore((float)p[8]); + pmReviewMessage.setComment((String) p[9]); + pmReviewMessages.add(pmReviewMessage); + } + } + } } diff --git a/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java b/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java index 461feb6..f2645bd 100644 --- a/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java +++ b/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java @@ -49,5 +49,7 @@ public interface ProblemServiceI { LocalDateTime startTime,LocalDateTime endTime,boolean allow); public DataGrid findWeijiaoList(PMStudentSubmit pmStudentSubmit); public DataGrid findYijiaoList(PMStudentSubmit pmStudentSubmit); + public PMReviewMessage findProblemReview(PMReviewMessage pmReviewMessage); public int editSubmitReport(LocalDateTime addTime,int problemId,int studentId); + public List findScoreList(PMStudentSubmit pmStudentSubmit); } diff --git a/AES/src/main/java/com/example/aes/user/controller/importClassStudentsFileController.java b/AES/src/main/java/com/example/aes/user/controller/importClassStudentsFileController.java index cc045cf..1a26ad4 100644 --- a/AES/src/main/java/com/example/aes/user/controller/importClassStudentsFileController.java +++ b/AES/src/main/java/com/example/aes/user/controller/importClassStudentsFileController.java @@ -274,7 +274,6 @@ public class importClassStudentsFileController{ } } - @Transactional public boolean decodeFile(String fileName, int classId) // 解析csv文件 { diff --git a/AES/src/main/resources/application.properties b/AES/src/main/resources/application.properties index e82f2c8..488fc4f 100644 --- a/AES/src/main/resources/application.properties +++ b/AES/src/main/resources/application.properties @@ -5,7 +5,7 @@ server.port=8082 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource jdbc_url=jdbc:mysql://localhost:3306/aes?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=True jdbc_username=root -jdbc_password=13661744518xh +jdbc_password=123456 #spring.datasource.url=jdbc:mysql://localhost:3306/aes?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=True #spring.datasource.username=root #spring.datasource.password=123456