From 89b9e21057deec1cf6b168f30e8943bc4377a0ef Mon Sep 17 00:00:00 2001 From: wangzeyan <258785420@qq.com> Date: Sun, 18 May 2025 21:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7=E5=92=8C?= =?UTF-8?q?=E6=8E=92=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/package-lock.json | 58 + admin/package.json | 7 +- admin/src/app/views/classroom/classroom.vue | 562 +- .../classroom/components/classroom-edit.vue | 577 +- admin/src/app/views/timetables/timetables.vue | 127 + .../src/app/views/yjpz_config/yjpz_config.vue | 81 +- admin/yarn.lock | 7620 ++++++++--------- 7 files changed, 4403 insertions(+), 4629 deletions(-) create mode 100644 admin/src/app/views/timetables/timetables.vue diff --git a/admin/package-lock.json b/admin/package-lock.json index 2621871f..df8586c1 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -9,6 +9,11 @@ "version": "1.0.0", "dependencies": { "@element-plus/icons-vue": "2.0.10", + "@fullcalendar/core": "^6.1.17", + "@fullcalendar/daygrid": "^6.1.17", + "@fullcalendar/interaction": "^6.1.17", + "@fullcalendar/timegrid": "^6.1.17", + "@fullcalendar/vue3": "^6.1.17", "@highlightjs/vue-plugin": "2.1.0", "@types/lodash-es": "4.17.6", "@vueuse/core": "9.12.0", @@ -962,6 +967,50 @@ "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.1.6.tgz", "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==" }, + "node_modules/@fullcalendar/core": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/core/-/core-6.1.17.tgz", + "integrity": "sha512-0W7lnIrv18ruJ5zeWBeNZXO8qCWlzxDdp9COFEsZnyNjiEhUVnrW/dPbjRKYpL0edGG0/Lhs0ghp1z/5ekt8ZA==", + "dependencies": { + "preact": "~10.12.1" + } + }, + "node_modules/@fullcalendar/daygrid": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/daygrid/-/daygrid-6.1.17.tgz", + "integrity": "sha512-K7m+pd7oVJ9fW4h7CLDdDGJbc9szJ1xDU1DZ2ag+7oOo1aCNLv44CehzkkknM6r8EYlOOhgaelxQpKAI4glj7A==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/interaction": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/interaction/-/interaction-6.1.17.tgz", + "integrity": "sha512-AudvQvgmJP2FU89wpSulUUjeWv24SuyCx8FzH2WIPVaYg+vDGGYarI7K6PcM3TH7B/CyaBjm5Rqw9lXgnwt5YA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/timegrid": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/timegrid/-/timegrid-6.1.17.tgz", + "integrity": "sha512-K4PlA3L3lclLOs3IX8cvddeiJI9ZVMD7RA9IqaWwbvac771971foc9tFze9YY+Pqesf6S+vhS2dWtEVlERaGlQ==", + "dependencies": { + "@fullcalendar/daygrid": "~6.1.17" + }, + "peerDependencies": { + "@fullcalendar/core": "~6.1.17" + } + }, + "node_modules/@fullcalendar/vue3": { + "version": "6.1.17", + "resolved": "https://registry.npmmirror.com/@fullcalendar/vue3/-/vue3-6.1.17.tgz", + "integrity": "sha512-0+qi/PK/xCkTQXh2CaeN2AkP+SvQTznPhwBXuIyrtsR0Ua8UpmGEXI+my3qQ6o003r8gPUY2e785ywIyhX2zCA==", + "peerDependencies": { + "@fullcalendar/core": "~6.1.17", + "vue": "^3.0.11" + } + }, "node_modules/@highlightjs/vue-plugin": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz", @@ -4997,6 +5046,15 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, + "node_modules/preact": { + "version": "10.12.1", + "resolved": "https://registry.npmmirror.com/preact/-/preact-10.12.1.tgz", + "integrity": "sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/preact" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz", diff --git a/admin/package.json b/admin/package.json index a113a30d..263f49ca 100644 --- a/admin/package.json +++ b/admin/package.json @@ -10,6 +10,11 @@ }, "dependencies": { "@element-plus/icons-vue": "2.0.10", + "@fullcalendar/core": "^6.1.17", + "@fullcalendar/daygrid": "^6.1.17", + "@fullcalendar/interaction": "^6.1.17", + "@fullcalendar/timegrid": "^6.1.17", + "@fullcalendar/vue3": "^6.1.17", "@highlightjs/vue-plugin": "2.1.0", "@types/lodash-es": "4.17.6", "@vueuse/core": "9.12.0", @@ -55,4 +60,4 @@ "vite": "4.1.0", "vue-tsc": "1.0.24" } -} \ No newline at end of file +} diff --git a/admin/src/app/views/classroom/classroom.vue b/admin/src/app/views/classroom/classroom.vue index a1b11ddd..802324f5 100644 --- a/admin/src/app/views/classroom/classroom.vue +++ b/admin/src/app/views/classroom/classroom.vue @@ -1,280 +1,282 @@ - - - - - + + + + + diff --git a/admin/src/app/views/classroom/components/classroom-edit.vue b/admin/src/app/views/classroom/components/classroom-edit.vue index 569d3824..f389a565 100644 --- a/admin/src/app/views/classroom/components/classroom-edit.vue +++ b/admin/src/app/views/classroom/components/classroom-edit.vue @@ -1,287 +1,290 @@ - - - - - - + + + + + + diff --git a/admin/src/app/views/timetables/timetables.vue b/admin/src/app/views/timetables/timetables.vue new file mode 100644 index 00000000..bbde3c5c --- /dev/null +++ b/admin/src/app/views/timetables/timetables.vue @@ -0,0 +1,127 @@ + + + + + \ No newline at end of file diff --git a/admin/src/app/views/yjpz_config/yjpz_config.vue b/admin/src/app/views/yjpz_config/yjpz_config.vue index b722e31e..cacfcd1d 100644 --- a/admin/src/app/views/yjpz_config/yjpz_config.vue +++ b/admin/src/app/views/yjpz_config/yjpz_config.vue @@ -1,49 +1,54 @@