# frontend/src/views/home/components/table.vue

#	frontend/src/views/home/tabs/dashboard.vue
#	frontend/src/views/system/dictionary/dictTree/index.vue

frontend/src/views/system/dictionary/dictTree/index.vue

@@ -21,7 +21,7 @@
   </template>
   
   <script setup lang='tsx' name='dict'>
-  import {CirclePlus, Delete, EditPen, Download, View} from '@element-plus/icons-vue'
+  import {CirclePlus, Delete, EditPen} from '@element-plus/icons-vue'
   import {type Dict} from '@/api/system/dictionary/interface'
   import type { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
   import TreePopup from '@/views/system/dictionary/dictTree/components/treePopup.vue'
@@ -80,7 +80,11 @@
       prop: 'operation',
       label: '操作',
       fixed: 'right',
+<<<<<<< HEAD
       width:250,
+=======
+      width: 250,
+>>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
     },
   ])
 
@@ -92,6 +96,10 @@
   
   // 删除字典类型
   const handleDelete = async (params: Dict.ResDictTree) => {
+<<<<<<< HEAD
+=======
+    console.log(params)
+>>>>>>> 12201e065fe575761995440a3bf1e9876321c6e6
     await useHandleData(deleteDictTree, params, `删除【${params.name}】树形字典类型`)
     proTable.value?.getTableList()
   }