微调

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/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -588,11 +588,8 @@ const changeActiveTabs = (val: number,val2: number) => {
  form.value.activeTabs = val;
  form.value.activeChildTabs= val2;
  tableHeaderInit(val)
-<<<<<<< HEAD
-  //console.log(form,val,666)
-=======
  console.log(form,val,val2,666)
->>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
+
 };

 //根据当前功能，初始化表头下拉框中的默认值和禁用值