From d1dc5c61cfff55b171fdfe85e059667396ce3cfd Mon Sep 17 00:00:00 2001
From: Shady <931759898@qq.com>
Date: Tue, 10 Sep 2019 19:20:39 +0800
Subject: [PATCH 01/17] sideBar1.0
---
1.html | 22 +++++++++++
build/webpack.base.conf.js | 18 ++++-----
src/components/layout/DashFooter.vue | 2 +-
src/components/layout/Sidebar.vue | 1 +
src/components/layout/SidebarMenu.vue | 50 ++++++++++++++++++------
src/components/views/Access.vue | 22 +++++++++++
src/components/views/Map.vue | 15 +++++++
src/components/views/Tasks.vue | 4 +-
src/routes.js | 56 ++++++++++++++++-----------
9 files changed, 146 insertions(+), 44 deletions(-)
create mode 100644 1.html
create mode 100644 src/components/views/Map.vue
diff --git a/1.html b/1.html
new file mode 100644
index 00000000..cc650f7f
--- /dev/null
+++ b/1.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+ Hello, world!
+
+
+ Hello, world!
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index cd79c65d..5704fc6e 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -28,15 +28,15 @@ module.exports = {
},
module: {
rules: [
- {
- test: /\.(js|vue)$/,
- loader: 'eslint-loader',
- enforce: "pre",
- include: [resolve('src'), resolve('test')],
- options: {
- formatter: require('eslint-friendly-formatter')
- }
- },
+ // {
+ // test: /\.(js|vue)$/,
+ // loader: 'eslint-loader',
+ // enforce: "pre",
+ // include: [resolve('src'), resolve('test')],
+ // options: {
+ // formatter: require('eslint-friendly-formatter')
+ // }
+ // },
{
test: /\.vue$/,
loader: 'vue-loader',
diff --git a/src/components/layout/DashFooter.vue b/src/components/layout/DashFooter.vue
index cb45f9a1..80383882 100644
--- a/src/components/layout/DashFooter.vue
+++ b/src/components/layout/DashFooter.vue
@@ -1,7 +1,7 @@
diff --git a/src/components/layout/Sidebar.vue b/src/components/layout/Sidebar.vue
index d6829475..864f9e01 100644
--- a/src/components/layout/Sidebar.vue
+++ b/src/components/layout/Sidebar.vue
@@ -20,6 +20,7 @@
+