From c25ef65a36ee2c7d01372b1223c3df22f11af962 Mon Sep 17 00:00:00 2001 From: wanghaoyu <825151728@qq.com> Date: Fri, 29 Nov 2019 15:00:26 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=96=B0=E5=A2=9E=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=A8=A1=E5=9D=97,=E5=88=86=E8=BE=A8=E7=8E=87=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=88=9D=E5=A7=8B=E5=8C=96,=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/main.css | 24 ++++++++ .../src/components/common/Header.vue | 61 +++++++++++++++++++ nezha-fronted/src/components/common/Home.vue | 44 +++++++++++-- nezha-fronted/src/components/common/Login.vue | 17 +++++- .../src/components/common/SideBar.vue | 61 +++++++++++++++++++ .../src/components/page/asset/asset.vue | 15 +++++ .../src/components/page/dashboard.vue | 15 +++++ .../src/components/page/project/project.vue | 54 ++++++++++++++++ nezha-fronted/src/main.js | 9 +++ nezha-fronted/src/router/index.js | 13 +++- 10 files changed, 306 insertions(+), 7 deletions(-) create mode 100644 nezha-fronted/src/assets/css/main.css create mode 100644 nezha-fronted/src/components/common/Header.vue create mode 100644 nezha-fronted/src/components/common/SideBar.vue create mode 100644 nezha-fronted/src/components/page/asset/asset.vue create mode 100644 nezha-fronted/src/components/page/dashboard.vue create mode 100644 nezha-fronted/src/components/page/project/project.vue diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css new file mode 100644 index 000000000..2ac8421c6 --- /dev/null +++ b/nezha-fronted/src/assets/css/main.css @@ -0,0 +1,24 @@ +* { + margin: 0; + padding: 0; +} + +body { + font-family: NotoSansSC-Light; + min-width: 1350px; + background: #F2F7F8; + overflow-x: hidden !important; + height: 100%; + box-sizing: border-box; +} + +html { + overflow: auto; + overflow-y: hidden; + overflow-x: hidden !important; + height: 100%; + box-sizing: border-box; +} + + + diff --git a/nezha-fronted/src/components/common/Header.vue b/nezha-fronted/src/components/common/Header.vue new file mode 100644 index 000000000..8651f1127 --- /dev/null +++ b/nezha-fronted/src/components/common/Header.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/nezha-fronted/src/components/common/Home.vue b/nezha-fronted/src/components/common/Home.vue index f0d9fc9d2..fcc56e346 100644 --- a/nezha-fronted/src/components/common/Home.vue +++ b/nezha-fronted/src/components/common/Home.vue @@ -1,13 +1,49 @@ \ No newline at end of file diff --git a/nezha-fronted/src/components/common/Login.vue b/nezha-fronted/src/components/common/Login.vue index 135eae90e..11a23ae44 100644 --- a/nezha-fronted/src/components/common/Login.vue +++ b/nezha-fronted/src/components/common/Login.vue @@ -1,10 +1,23 @@ diff --git a/nezha-fronted/src/components/common/SideBar.vue b/nezha-fronted/src/components/common/SideBar.vue new file mode 100644 index 000000000..8300b4040 --- /dev/null +++ b/nezha-fronted/src/components/common/SideBar.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue new file mode 100644 index 000000000..7bbf806af --- /dev/null +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/nezha-fronted/src/components/page/dashboard.vue b/nezha-fronted/src/components/page/dashboard.vue new file mode 100644 index 000000000..7b15f8212 --- /dev/null +++ b/nezha-fronted/src/components/page/dashboard.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue new file mode 100644 index 000000000..951bc17ff --- /dev/null +++ b/nezha-fronted/src/components/page/project/project.vue @@ -0,0 +1,54 @@ + + + + + \ No newline at end of file diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index 417390e28..7c87af429 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -1,10 +1,19 @@ // The Vue build version to load with the `import` command // (runtime-only or standalone) has been set in webpack.base.conf with an alias. + +import "./assets/css/main.css"; +import 'element-ui/lib/theme-chalk/index.css'; +import ElementUI from 'element-ui'; +import vueiInfinite from 'vue-infinite-scroll' + + import Vue from 'vue' import App from './App' import router from './router' Vue.config.productionTip = false +Vue.use(ElementUI) +Vue.use(vueiInfinite) /* eslint-disable no-new */ new Vue({ diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js index 2060241d4..13d4964ba 100644 --- a/nezha-fronted/src/router/index.js +++ b/nezha-fronted/src/router/index.js @@ -15,9 +15,20 @@ export default new Router({ }, { path: '/', - name: 'main', component: resolve => require(['../components/common/Home.vue'], resolve), children: [ + { + path: '/dashboard', + component: resolve => require(['../components/page/dashboard.vue'], resolve), + }, + { + path: '/project', + component: resolve => require(['../components/page/project/project.vue'], resolve), + }, + { + path: '/asset', + component: resolve => require(['../components/page/project/project.vue'], resolve), + } ] }, ]