Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev

src/views/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="container_">
     <el-row>
       <el-col v-for="item in serviceList" :span="4">
         <div  @click="goRoute(item.id)">
@@ -9,10 +9,9 @@
 
       </el-col>
     </el-row>
-    <div style="margin-top: 30px">
-    <el-row :gutter="20">
-      <el-col :span="12">
-        <div>
+
+    <div  class="container-box">
+      <div class="flex-box">
         <div style=" font-size: 30px;margin-bottom: 30px">临期提醒</div>
         <el-table
           :data="warnList"
@@ -39,9 +38,7 @@
                     @pagination="getWarnList"
         />
       </div>
-      </el-col>
-      <el-col :span="12">
-        <div>
+      <div class="flex-box">
         <div style="font-size: 30px;margin-bottom: 30px">消息通知</div>
         <el-table
           :data="messageList"
@@ -74,8 +71,7 @@
                     @pagination="getNotifyMessage"
         />
       </div>
-      </el-col>
-    </el-row>
+
     </div>
 
 
@@ -178,6 +174,25 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.container_{
+  background-color: rgb(240, 242, 245);
+  box-sizing: border-box;
+  padding: 15px;
+}
+.container-box{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+.flex-box{
+  width: 49%;
+  background: #fff;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 15px;
+  border-radius: 8px;
+}
 .dashboard-editor-container {
   padding: 32px;
   background-color: rgb(240, 242, 245);