diff --git a/HomeWork-vite/src/views/Home/AssignmentList.vue b/HomeWork-vite/src/views/Home/AssignmentList.vue index c17320bf666061dcefbbd8828b4155c27e10a162..374de07792d85d121dae3387aeb0424029f466d2 100644 --- a/HomeWork-vite/src/views/Home/AssignmentList.vue +++ b/HomeWork-vite/src/views/Home/AssignmentList.vue @@ -48,7 +48,6 @@ const tableRowClassName = ({ row, rowIndex }: { row: User; rowIndex: number }) = } }; -// 保存从后端获取的作业数据 const tableData = ref([]); onMounted(() => { diff --git a/TeacherHomeWork-vite/package-lock.json b/TeacherHomeWork-vite/package-lock.json index 79b597616f5d5152ed4fc7a0c525d634967a6012..48f7493faab6f88b0c6e2bca4e7931e991946aae 100644 --- a/TeacherHomeWork-vite/package-lock.json +++ b/TeacherHomeWork-vite/package-lock.json @@ -15,6 +15,7 @@ "lodash": "^4.17.21", "qs": "^6.11.2", "vue": "^3.3.11", + "vue-echarts": "^7.0.3", "vue-router": "^4.5.0" }, "devDependencies": { @@ -1028,7 +1029,7 @@ }, "node_modules/echarts": { "version": "5.6.0", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.6.0.tgz", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz", "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", "dependencies": { "tslib": "2.3.0", @@ -1684,6 +1685,49 @@ } } }, + "node_modules/vue-demi": { + "version": "0.13.11", + "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz", + "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==", + "hasInstallScript": true, + "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/vue-echarts": { + "version": "7.0.3", + "resolved": "https://registry.npmmirror.com/vue-echarts/-/vue-echarts-7.0.3.tgz", + "integrity": "sha512-/jSxNwOsw5+dYAUcwSfkLwKPuzTQ0Cepz1LxCOpj2QcHrrmUa/Ql0eQqMmc1rTPQVrh2JQ29n2dhq75ZcHvRDw==", + "dependencies": { + "vue-demi": "^0.13.11" + }, + "peerDependencies": { + "@vue/runtime-core": "^3.0.0", + "echarts": "^5.5.1", + "vue": "^2.7.0 || ^3.1.1" + }, + "peerDependenciesMeta": { + "@vue/runtime-core": { + "optional": true + } + } + }, "node_modules/vue-router": { "version": "4.5.0", "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.5.0.tgz", diff --git a/TeacherHomeWork-vite/package.json b/TeacherHomeWork-vite/package.json index cb1387fd71b72dbb4012dcdcb0d1e3269cc7ce8c..c384ba9593491958e191afbdec38b62300772052 100644 --- a/TeacherHomeWork-vite/package.json +++ b/TeacherHomeWork-vite/package.json @@ -16,6 +16,7 @@ "lodash": "^4.17.21", "qs": "^6.11.2", "vue": "^3.3.11", + "vue-echarts": "^7.0.3", "vue-router": "^4.5.0" }, "devDependencies": { diff --git a/TeacherHomeWork-vite/src/components/Sidebar.vue b/TeacherHomeWork-vite/src/components/Sidebar.vue index 358aece04d05fe0d4f8d971b852403d4ad292261..d5e02446916d5fb2c5c751577474049460a48790 100644 --- a/TeacherHomeWork-vite/src/components/Sidebar.vue +++ b/TeacherHomeWork-vite/src/components/Sidebar.vue @@ -6,7 +6,7 @@ > 作业管理 成绩管理 - 学习进度 + 学习进度 学期作业统计 @@ -23,6 +23,9 @@ const HomeworkManager = () => { const GradeManger = () => { router.push("/GradeManger") } +const LearningProgress = () => { + router.push("/LearningProgress") +} \ No newline at end of file diff --git a/TeacherHomeWork-vite/src/views/LearningProgress/LearnList.vue b/TeacherHomeWork-vite/src/views/LearningProgress/LearnList.vue new file mode 100644 index 0000000000000000000000000000000000000000..c3345652279b6b5a1fe88b12eb3cc5c1436f9779 --- /dev/null +++ b/TeacherHomeWork-vite/src/views/LearningProgress/LearnList.vue @@ -0,0 +1,52 @@ + + \ No newline at end of file diff --git a/TeacherHomeWork-vite/src/views/LearningProgress/Lhead.vue b/TeacherHomeWork-vite/src/views/LearningProgress/Lhead.vue new file mode 100644 index 0000000000000000000000000000000000000000..45f411cc52c9b35d3e03d67fe9d938322a4f8e44 --- /dev/null +++ b/TeacherHomeWork-vite/src/views/LearningProgress/Lhead.vue @@ -0,0 +1,51 @@ + + + + + \ No newline at end of file diff --git a/TeacherHomeWork-vite/src/views/LearningProgress/Piechart.vue b/TeacherHomeWork-vite/src/views/LearningProgress/Piechart.vue new file mode 100644 index 0000000000000000000000000000000000000000..e9d13d66b540dcc2bc16bf8167f6116f11ed08c4 --- /dev/null +++ b/TeacherHomeWork-vite/src/views/LearningProgress/Piechart.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/TeacherHomeWork-vite/src/views/LearningProgress/index.vue b/TeacherHomeWork-vite/src/views/LearningProgress/index.vue index d4e1e6b113e8de9a1f8169cc662a243ef39c525a..7945686c02e50e7c9b9e9c4c05f7e444a4cce8e6 100644 --- a/TeacherHomeWork-vite/src/views/LearningProgress/index.vue +++ b/TeacherHomeWork-vite/src/views/LearningProgress/index.vue @@ -1,12 +1,21 @@ \ No newline at end of file + diff --git a/TeacherHomeWork-vite/yarn.lock b/TeacherHomeWork-vite/yarn.lock index dc570fc30a2c3d0c10bddbce426bba4fa4e5dd3f..a605530752ab9bcf540ec6b00db6c4c24a952782 100644 --- a/TeacherHomeWork-vite/yarn.lock +++ b/TeacherHomeWork-vite/yarn.lock @@ -144,7 +144,7 @@ dependencies: "@vue/shared" "3.3.11" -"@vue/runtime-core@3.3.11": +"@vue/runtime-core@^3.0.0", "@vue/runtime-core@3.3.11": version "3.3.11" resolved "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.3.11.tgz" integrity sha512-g9ztHGwEbS5RyWaOpXuyIVFTschclnwhqEbdy5AwGhYOgc7m/q3NFwr50MirZwTTzX55JY8pSkeib9BX04NIpw== @@ -290,9 +290,9 @@ delayed-stream@~1.0.0: resolved "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -echarts@^5.6.0: +echarts@^5.5.1, echarts@^5.6.0: version "5.6.0" - resolved "https://registry.npmjs.org/echarts/-/echarts-5.6.0.tgz" + resolved "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz" integrity sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA== dependencies: tslib "2.3.0" @@ -638,6 +638,18 @@ vue-demi@*: resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz" integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg== +vue-demi@^0.13.11: + version "0.13.11" + resolved "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz" + integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A== + +vue-echarts@^7.0.3: + version "7.0.3" + resolved "https://registry.npmmirror.com/vue-echarts/-/vue-echarts-7.0.3.tgz" + integrity sha512-/jSxNwOsw5+dYAUcwSfkLwKPuzTQ0Cepz1LxCOpj2QcHrrmUa/Ql0eQqMmc1rTPQVrh2JQ29n2dhq75ZcHvRDw== + dependencies: + vue-demi "^0.13.11" + vue-router@^4.5.0: version "4.5.0" resolved "https://registry.npmmirror.com/vue-router/-/vue-router-4.5.0.tgz" @@ -645,7 +657,7 @@ vue-router@^4.5.0: dependencies: "@vue/devtools-api" "^6.6.4" -"vue@^3.0.0-0 || ^2.6.0", vue@^3.2.0, vue@^3.2.25, vue@^3.3.11, vue@3.3.11: +"vue@^2.7.0 || ^3.1.1", "vue@^3.0.0-0 || ^2.6.0", vue@^3.2.0, vue@^3.2.25, vue@^3.3.11, vue@3.3.11: version "3.3.11" resolved "https://registry.npmmirror.com/vue/-/vue-3.3.11.tgz" integrity sha512-d4oBctG92CRO1cQfVBZp6WJAs0n8AK4Xf5fNjQCBeKCvMI1efGQ5E3Alt1slFJS9fZuPcFoiAiqFvQlv1X7t/w==