From 9ca0e9dc50759f4c00498e68c0155bcc3db2be2f Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期二, 27 十二月 2022 15:20:02 +0800
Subject: [PATCH] 页面修改

---
 src/plugins/element.js |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/plugins/element.js b/src/plugins/element.js
index 5e79cdb..a17ac33 100644
--- a/src/plugins/element.js
+++ b/src/plugins/element.js
@@ -12,19 +12,11 @@
     MenuItem,
     Message, Option, Pagination,
     Row, Select,
-<<<<<<< HEAD
-    Submenu, Table, TableColumn, Upload,
-=======
-    Submenu, Table, TableColumn, Upload
->>>>>>> 561b46d42e9a1b633f0428911045898b8270dfa2
+    Submenu, Table, TableColumn, Upload,Tree,MessageBox
 } from 'element-ui'
 
 Vue.use(Button).use(Container).use(Header).use(Aside).use(Menu).use(Submenu).use(MenuItem).use(Main).use(Icon).use(Card)
     .use(Col).use(Row).use(Card).use(Table).use(TableColumn).use(Form).use(FormItem).use(Input).use(Select).use(Option)
-<<<<<<< HEAD
-    .use(Pagination).use(Dialog).use(Upload).use(DatePicker)
-=======
-    .use(Pagination).use(Dialog).use(Upload).use(DatePicker).use(Image)
->>>>>>> 561b46d42e9a1b633f0428911045898b8270dfa2
-
+    .use(Pagination).use(Dialog).use(Upload).use(DatePicker).use(Image).use(Tree)
 Vue.prototype.$message = Message
+Vue.prototype.$confirm = MessageBox.confirm

--
Gitblit v1.8.0