Merge branch 'develop' of 101.201.121.115:leo/LAPP_ETL_WEBFRONT into feature_table

# Conflicts:
#	src/components/Layout.vue
#	src/views/Home.vue

src/components/ContentContainer.vue

@@ -0,0 +1,12 @@
+<template>
+  <div class="content-container"><slot>我是内容容器</slot></div>
+</template>
+
+<script></script>
+
+<style lang="less" scoped>
+.content-container {
+  box-sizing: border-box;
+  padding: 20px;
+}
+</style>

src/components/Layout.vue

@@ -52,7 +52,7 @@ export default {
   #content-box {
     width: calc(100% - 40px);
     height: 100%;
-		padding: 20px;
+    overflow-y: auto;
   }
 }
 </style>

src/components/NavMenu.vue

@@ -38,6 +38,7 @@ export default {
 <style scoped lang="less">
 .sidebar {
   .el-menu-item {
+    height: 48px;
     font-size: 16px;
     font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;

src/components/SearchTemplate.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="search-template"><slot>我是搜索容器</slot></div>
+</template>
+
+<script></script>
+
+<style lang="less" scoped>
+.search-template {
+  width: 100%;
+  min-height: 48px;
+  box-sizing: border-box;
+  padding: 20px;
+  background: linear-gradient(180deg, #fafcfc 0%, #eeeeee 47%, #e7e7e7 100%);
+  box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25);
+}
+</style>

src/views/Home.vue

@@ -1,58 +1,59 @@
 <template>
-  <el-table
-    :data="tableData"
-    border
-    style="width: 100%">
-    <el-table-column
-      prop="date"
-      label="日期"
-      width="180">
-    </el-table-column>
-    <el-table-column
-      prop="name"
-      label="姓名"
-      width="180">
-    </el-table-column>
-    <el-table-column
-      prop="address"
-      label="地址">
-    </el-table-column>
-		<el-table-column label="操作">
-      <template #default="scope">
-        <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
-        <el-button type="text" size="small">编辑</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
+  <div class="home">
+    <SearchTemplate>
+      <div @click="consoleSolt">我是搜索内容</div>
+    </SearchTemplate>
+    <ContentContainer>
+      <el-table :data="tableData" style="width: 100%" border>
+        <el-table-column prop="date" label="日期" width="180">
+        </el-table-column>
+        <el-table-column prop="name" label="姓名" width="180">
+        </el-table-column>
+        <el-table-column prop="address" label="地址"> </el-table-column>
+      </el-table>
+    </ContentContainer>
+  </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        tableData: [{
-          date: '2016-05-02',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1518 弄'
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1517 弄'
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1519 弄'
-        }, {
-          date: '2016-05-03',
-          name: '王小虎',
-          address: '上海市普陀区金沙江路 1516 弄'
-        }]
-      }
+import SearchTemplate from "../components/SearchTemplate.vue";
+import ContentContainer from "../components/ContentContainer.vue";
+export default {
+  name: "Home",
+  components: {
+    SearchTemplate,
+    ContentContainer,
+  },
+  data() {
+    return {
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1518 弄",
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1517 弄",
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1519 弄",
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          address: "上海市普陀区金沙江路 1516 弄",
+        },
+      ],
+    };
+  },
+  methods: {
+    consoleSolt() {
+      console.log("可以正常输出内容");
     },
-		methods: {
-      handleClick(row) {
-        console.log(row);
-      }
-    },
-  }
+  },
+};
 </script>