微调

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/system/dictionary/dictTree/index.vue
+++ b/frontend/src/views/system/dictionary/dictTree/index.vue
@@ -80,11 +80,8 @@
      prop: 'operation',
      label: '操作',
      fixed: 'right',
-<<<<<<< HEAD
      width:250,
-=======
-      width: 250,
->>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
+
    },
  ])

@@ -96,10 +93,6 @@
  
  // 删除字典类型
  const handleDelete = async (params: Dict.ResDictTree) => {
-<<<<<<< HEAD
-=======
-    console.log(params)
->>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
    await useHandleData(deleteDictTree, params, `删除【${params.name}】树形字典类型`)
    proTable.value?.getTableList()
  }