diff --git a/src/styles/normalize.scss b/src/styles/normalize.scss index 2c181b08f..352d455ea 100644 --- a/src/styles/normalize.scss +++ b/src/styles/normalize.scss @@ -358,3 +358,8 @@ template { height: 100%; color: #fff; } +ul,li{ + padding:0; + margin:0; + list-style:none; +} diff --git a/src/views/home/components/empennage/index.vue b/src/views/home/components/empennage/index.vue new file mode 100644 index 000000000..127ce3b3b --- /dev/null +++ b/src/views/home/components/empennage/index.vue @@ -0,0 +1,48 @@ + + + + + + diff --git a/src/views/home/components/navMenu/index.vue b/src/views/home/components/navMenu/index.vue index eb92c5bdf..d58965008 100644 --- a/src/views/home/components/navMenu/index.vue +++ b/src/views/home/components/navMenu/index.vue @@ -66,11 +66,11 @@ .nav-menu { margin-bottom: 10px; .top { - margin-bottom: 20px; display: flex; + margin-bottom: 20px; .menu-item { - margin-right: 10px; flex: 1; + margin-right: 10px; height: 50px; line-height: 50px; text-align: center; @@ -91,8 +91,8 @@ flex: 1; line-height: 100px; text-align: center; - border: 1px solid #ddd; margin-right: 10px; + border: 1px solid #ddd; &:last-child { margin-right: 0; } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 99e95b942..a3af6d1a2 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -15,10 +15,10 @@
- + - + @@ -29,6 +29,11 @@
+
+ +
@@ -38,10 +43,14 @@ import dynamic from './components/dynamic' import navMenu from './components/navMenu' import todoList from './components/todoList' + import Empennage from 'views/home/components/empennage' + // import empennage from 'views/home/components/empennage' export default { name: 'Home', components: { + Empennage, + // empennage, searchGroup, information, dynamic, @@ -105,22 +114,29 @@ } } .home_main { + display: flex; height: 77vh; padding: 10px 0; margin-top: 16px; - display: flex; .left_wrapper { display: flex; - border: 1px solid #ddd; flex: 1; - margin-right: 10px; flex-direction: column; + margin-right: 10px; + border: 1px solid #ddd; + .tabtitle { + ::v-deep { + .el-tabs__item { + font-size: 40px; + } + } + } } .right_wrapper { - width: 550px; - height: 100%; display: flex; flex-direction: column; + width: 550px; + height: 100%; } .search-condition { display: block; @@ -129,5 +145,9 @@ } } } + .footer { + height: 40px; + border: 1px solid #ddd; + } }