Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/src/routers/modules/staticRouter.ts
2024-10-11 08:51:01 +08:00
parent 0cb14955c5 e9be3ca31c
commit 1008946049
30 changed files with 3140 additions and 131 deletions
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -226,7 +226,8 @@ onMounted(() => {
 <style lang="scss" scoped>
 .static {
  width: 100%;
-  height: calc(100vh - 165px);
+  // height: calc(100vh - 165px);
+  height: 100%;
  display: flex;
  justify-content: space-between;
  // background-color: #eee;