微调

2024-11-14 18:36:00 +08:00
parent 702d1bb699
commit 1ee1b05fca
3 changed files with 3 additions and 16 deletions
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -133,12 +133,9 @@ const handleChange = (val: string[]) => {
 const handleTabsChange = (val) => {
  form.value.activeTabs = 0;
  form.value.activeTabs = 3;
-<<<<<<< HEAD
- // console.log(val)
-=======
  form.value.activeChildTabs = Number(val);
  console.log(val)
->>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
+
 }
 localStorage.setItem("color", "red");
 //功能选择数据