Authored by 陈峰

commit

1 import LayoutSearch from './layout-search'; 1 import LayoutSearch from './layout-search';
2 import LayoutHeader from './layout-header'; 2 import LayoutHeader from './layout-header';
3 import LayoutList from './layout-list'; 3 import LayoutList from './layout-list';
  4 +import LayoutMenu from './layout-menu';
4 5
5 export default { 6 export default {
6 LayoutSearch, 7 LayoutSearch,
7 LayoutHeader, 8 LayoutHeader,
8 - LayoutList 9 + LayoutList,
  10 + LayoutMenu
9 }; 11 };
@@ -4,6 +4,14 @@ @@ -4,6 +4,14 @@
4 <div class="logo"> 4 <div class="logo">
5 <h1>YOHO日志查询</h1> 5 <h1>YOHO日志查询</h1>
6 </div> 6 </div>
  7 + <div class="menus">
  8 + <i-menu mode="horizontal" active-name="1">
  9 + <i-menu-item name="1">
  10 + <i-icon type="android-time"></i-icon>
  11 + 日志查询
  12 + </i-menu-item>
  13 + </i-menu>
  14 + </div>
7 </div> 15 </div>
8 </div> 16 </div>
9 </template> 17 </template>
@@ -25,10 +33,15 @@ export default { @@ -25,10 +33,15 @@ export default {
25 .header-nav { 33 .header-nav {
26 width: 90%; 34 width: 90%;
27 margin: 0 auto; 35 margin: 0 auto;
  36 + display: flex;
28 } 37 }
29 38
30 .logo { 39 .logo {
31 line-height: 60px; 40 line-height: 60px;
  41 + width: 250px;
  42 + }
  43 + .menus {
  44 + flex: 1;
32 } 45 }
33 } 46 }
34 </style> 47 </style>
  1 +<template>
  2 + <i-menu width="auto" class="layout-menu" :active-name="1" @on-select="selectMenu">
  3 + <i-menu-item :name="1">
  4 + 日志查询
  5 + </i-menu-item>
  6 + </i-menu>
  7 +</template>
  8 +
  9 +<script>
  10 +export default {
  11 + name: 'LayoutMenu'
  12 +};
  13 +</script>
  14 +
  15 +<style lang="scss">
  16 +.layout-menu {
  17 + .ivu-menu-item {
  18 + word-wrap: break-word;
  19 + }
  20 +}
  21 +</style>
@@ -6,7 +6,10 @@ @@ -6,7 +6,10 @@
6 <layout-search></layout-search> 6 <layout-search></layout-search>
7 </div> 7 </div>
8 <div class="layout-right"> 8 <div class="layout-right">
9 - <layout-list></layout-list> 9 + <article>
  10 +
  11 + <layout-list></layout-list>
  12 + </article>
10 </div> 13 </div>
11 </div> 14 </div>
12 <BackTop></BackTop> 15 <BackTop></BackTop>
@@ -39,7 +42,6 @@ export default { @@ -39,7 +42,6 @@ export default {
39 width: 380px; 42 width: 380px;
40 padding: 20px; 43 padding: 20px;
41 padding-top: 10px; 44 padding-top: 10px;
42 - border-right: solid 1px #dddee1;  
43 } 45 }
44 .layout-right { 46 .layout-right {
45 flex: 1; 47 flex: 1;
@@ -14,12 +14,12 @@ module.exports = { @@ -14,12 +14,12 @@ module.exports = {
14 env: { 14 env: {
15 NODE_ENV: '"dev"' 15 NODE_ENV: '"dev"'
16 }, 16 },
17 - port: 7002, 17 + port: 9123,
18 autoOpenBrowser: true, 18 autoOpenBrowser: true,
19 assetsSubDirectory: 'static', 19 assetsSubDirectory: 'static',
20 assetsPublicPath: '/', 20 assetsPublicPath: '/',
21 proxyTable: { 21 proxyTable: {
22 - '/api': 'http://localhost:7001' 22 + '/api': 'http://localhost:9122'
23 }, 23 },
24 cssSourceMap: false, 24 cssSourceMap: false,
25 } 25 }
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 "description": "", 4 "description": "",
5 "main": "app.js", 5 "main": "app.js",
6 "scripts": { 6 "scripts": {
7 - "dev": "nodemon --watch server server.js", 7 + "dev": "nodemon --watch server app.js",
8 "static": "node ./build/dev-server.js", 8 "static": "node ./build/dev-server.js",
9 "build": "node ./build/build.js" 9 "build": "node ./build/build.js"
10 }, 10 },