diff --git a/src/icons/svg/tubiao.svg b/src/icons/svg/chart.svg
similarity index 100%
rename from src/icons/svg/tubiao.svg
rename to src/icons/svg/chart.svg
diff --git a/src/icons/svg/component.svg b/src/icons/svg/component.svg
new file mode 100644
index 00000000..a8008c84
--- /dev/null
+++ b/src/icons/svg/component.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/tuozhuai.svg b/src/icons/svg/drag.svg
similarity index 100%
rename from src/icons/svg/tuozhuai.svg
rename to src/icons/svg/drag.svg
diff --git a/src/icons/svg/zonghe.svg b/src/icons/svg/example.svg
similarity index 100%
rename from src/icons/svg/zonghe.svg
rename to src/icons/svg/example.svg
diff --git a/src/icons/svg/EXCEL.svg b/src/icons/svg/excel.svg
similarity index 100%
rename from src/icons/svg/EXCEL.svg
rename to src/icons/svg/excel.svg
diff --git a/src/icons/svg/yanjing.svg b/src/icons/svg/eye.svg
similarity index 100%
rename from src/icons/svg/yanjing.svg
rename to src/icons/svg/eye.svg
diff --git a/src/icons/svg/form.svg b/src/icons/svg/form.svg
new file mode 100644
index 00000000..79716f06
--- /dev/null
+++ b/src/icons/svg/form.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/from.svg b/src/icons/svg/from.svg
deleted file mode 100644
index 7a4bd166..00000000
--- a/src/icons/svg/from.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/icons/svg/icons.svg b/src/icons/svg/icon.svg
similarity index 100%
rename from src/icons/svg/icons.svg
rename to src/icons/svg/icon.svg
diff --git a/src/icons/svg/quanxian.svg b/src/icons/svg/lock.svg
similarity index 100%
rename from src/icons/svg/quanxian.svg
rename to src/icons/svg/lock.svg
diff --git a/src/icons/svg/mima.svg b/src/icons/svg/password.svg
similarity index 100%
rename from src/icons/svg/mima.svg
rename to src/icons/svg/password.svg
diff --git a/src/icons/svg/xinrenzhinan.svg b/src/icons/svg/people.svg
similarity index 100%
rename from src/icons/svg/xinrenzhinan.svg
rename to src/icons/svg/people.svg
diff --git a/src/icons/svg/QQ.svg b/src/icons/svg/qq.svg
similarity index 100%
rename from src/icons/svg/QQ.svg
rename to src/icons/svg/qq.svg
diff --git a/src/icons/svg/shouce.svg b/src/icons/svg/shouce.svg
deleted file mode 100644
index 94c68bb6..00000000
--- a/src/icons/svg/shouce.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/icons/svg/wujiaoxing.svg b/src/icons/svg/star.svg
similarity index 100%
rename from src/icons/svg/wujiaoxing.svg
rename to src/icons/svg/star.svg
diff --git a/src/icons/svg/tab.svg b/src/icons/svg/tab.svg
index 657057df..17aa088b 100644
--- a/src/icons/svg/tab.svg
+++ b/src/icons/svg/tab.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/icons/svg/a.svg b/src/icons/svg/trendChart1.svg
similarity index 100%
rename from src/icons/svg/a.svg
rename to src/icons/svg/trendChart1.svg
diff --git a/src/icons/svg/b.svg b/src/icons/svg/trendChart2.svg
similarity index 100%
rename from src/icons/svg/b.svg
rename to src/icons/svg/trendChart2.svg
diff --git a/src/icons/svg/c.svg b/src/icons/svg/trendChart3.svg
similarity index 100%
rename from src/icons/svg/c.svg
rename to src/icons/svg/trendChart3.svg
diff --git a/src/icons/svg/yonghuming.svg b/src/icons/svg/user.svg
similarity index 100%
rename from src/icons/svg/yonghuming.svg
rename to src/icons/svg/user.svg
diff --git a/src/icons/svg/weixin.svg b/src/icons/svg/wechat.svg
similarity index 100%
rename from src/icons/svg/weixin.svg
rename to src/icons/svg/wechat.svg
diff --git a/src/icons/svg/zujian.svg b/src/icons/svg/zujian.svg
deleted file mode 100644
index d183e56c..00000000
--- a/src/icons/svg/zujian.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index c235005a..a705a736 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,7 +32,7 @@ export const constantRouterMap = [
path: '/introduction',
component: Layout,
redirect: '/introduction/index',
- icon: 'xinrenzhinan',
+ icon: 'people',
noDropdown: true,
children: [{ path: 'index', component: _import('introduction/index'), name: '简述' }]
}
@@ -50,7 +50,7 @@ export const asyncRouterMap = [
component: Layout,
redirect: '/permission/index',
name: '权限测试',
- icon: 'quanxian',
+ icon: 'lock',
meta: { role: ['admin'] },
noDropdown: true,
children: [{ path: 'index', component: _import('permission/index'), name: '权限测试页', meta: { role: ['admin'] }}]
@@ -58,7 +58,7 @@ export const asyncRouterMap = [
{
path: '/icon',
component: Layout,
- icon: 'icons',
+ icon: 'icon',
noDropdown: true,
children: [{ path: 'index', component: _import('svg-icons/index'), name: 'icons' }]
},
@@ -67,7 +67,7 @@ export const asyncRouterMap = [
component: Layout,
redirect: '/components/index',
name: '组件',
- icon: 'zujian',
+ icon: 'component',
children: [
{ path: 'index', component: _import('components/index'), name: '介绍 ' },
{ path: 'tinymce', component: _import('components/tinymce'), name: '富文本编辑器' },
@@ -88,7 +88,7 @@ export const asyncRouterMap = [
component: Layout,
redirect: '/charts/index',
name: '图表',
- icon: 'tubiao',
+ icon: 'chart',
children: [
{ path: 'index', component: _import('charts/index'), name: '介绍' },
{ path: 'keyboard', component: _import('charts/keyboard'), name: '键盘图表' },
@@ -102,7 +102,7 @@ export const asyncRouterMap = [
component: Layout,
redirect: 'noredirect',
name: '综合实例',
- icon: 'zonghe',
+ icon: 'example',
children: [
{
path: '/example/table',
@@ -117,8 +117,8 @@ export const asyncRouterMap = [
{ path: 'table', component: _import('example/table/table'), name: '综合table' }
]
},
- { path: 'form/edit', icon: 'shouce', component: _import('example/form'), name: '编辑Form', meta: { isEdit: true }},
- { path: 'form/create', icon: 'from', component: _import('example/form'), name: '创建Form' },
+ { path: 'form/edit', icon: 'form', component: _import('example/form'), name: '编辑Form', meta: { isEdit: true }},
+ { path: 'form/create', icon: 'form', component: _import('example/form'), name: '创建Form' },
{ path: 'tab/index', icon: 'tab', component: _import('example/tab/index'), name: 'Tab' }
]
},
@@ -147,7 +147,7 @@ export const asyncRouterMap = [
component: Layout,
redirect: '/excel/download',
name: 'excel',
- icon: 'EXCEL',
+ icon: 'excel',
children: [
{ path: 'download', component: _import('excel/index'), name: '导出excel' },
{ path: 'download2', component: _import('excel/selectExcel'), name: '导出已选择项' },
diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue
index 9517c2a4..ad657137 100644
--- a/src/views/dashboard/admin/index.vue
+++ b/src/views/dashboard/admin/index.vue
@@ -34,12 +34,12 @@
文章
-
+
浏览量
-
+
diff --git a/src/views/example/tab/components/tabPane.vue b/src/views/example/tab/components/tabPane.vue
index 8a8575e0..efb29471 100644
--- a/src/views/example/tab/components/tabPane.vue
+++ b/src/views/example/tab/components/tabPane.vue
@@ -29,7 +29,7 @@
-
+
diff --git a/src/views/example/table/dragTable.vue b/src/views/example/table/dragTable.vue
index 864e2c7b..64886f60 100644
--- a/src/views/example/table/dragTable.vue
+++ b/src/views/example/table/dragTable.vue
@@ -29,7 +29,7 @@
-
+
@@ -47,7 +47,7 @@
-
+
diff --git a/src/views/example/table/inlineEditTable.vue b/src/views/example/table/inlineEditTable.vue
index fc07a379..dfd53cc1 100644
--- a/src/views/example/table/inlineEditTable.vue
+++ b/src/views/example/table/inlineEditTable.vue
@@ -23,7 +23,7 @@
-
+
diff --git a/src/views/example/table/table.vue b/src/views/example/table/table.vue
index abfbb35d..3b7b8db4 100644
--- a/src/views/example/table/table.vue
+++ b/src/views/example/table/table.vue
@@ -60,7 +60,7 @@
-
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1adbc394..b4923042 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -5,18 +5,18 @@
-
+
-
+
-
+
登录
diff --git a/src/views/login/socialsignin.vue b/src/views/login/socialsignin.vue
index 71b9d60a..70d30917 100644
--- a/src/views/login/socialsignin.vue
+++ b/src/views/login/socialsignin.vue
@@ -1,10 +1,10 @@