a

src/router/index.js

@@ -89,6 +89,26 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/noticeList',
+    component: Layout,
+    // redirect: '公告管理',
+    meta: { title: '公告管理', icon : "dashboard" },
+    children: [
+      {
+        path: 'noticeList',
+        component: () => import('@/views/notice/noticeList'),
+        name: 'noticeList',
+        meta: { title: '公告列表', icon: 'user' }
+      },
+      {
+        path: 'addnotice',
+        component: () => import('@/views/notice/addNotice'),
+        name: 'addNotice',
+        meta: { title: '创建公告', icon: 'user' }
+      }
+    ]
+  },
   {
     path: '/messageList',
     component: Layout,
@@ -105,7 +125,7 @@ export const constantRoutes = [
         path: 'addMessage',
         component: () => import('@/views/message/addMessage'),
         name: 'addMessage',
-        meta: { title: '添加消息', icon: 'user' }
+        meta: { title: '创建消息', icon: 'user' }
       }
     ]
   }

src/views/message/messageList.vue

@@ -26,13 +26,62 @@
 
 
 
-    <div class="down">
-
+      <div class="down">
+        
+        <div class="down-add">
+          <el-row :gutter="24">
+          <el-col :span="22" class="down-title"> <i class="el-icon-tickets">消息列表</i> </el-col>
+          <el-col :span="2"> <el-button>添加</el-button> </el-col>
+          </el-row>
+        </div>
+        
+        <div class="down-table">
+          <el-table :data="tableData" border style="width: 100%" class="messagetable">
+            <el-table-column
+              prop="id"
+              label="ID"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="messageTitle"
+              label="消息标题"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="messageTitle"
+              label="消息标题"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="phoneNumber"
+              label="手机号"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="publishTime"
+              label="发布时间"
+              >
+            </el-table-column>
+            <el-table-column
+              prop="operate"
+              label="操作">
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="bottom">
+        <div class="bottom-page"><el-pagination background layout="prev, pager, next" :total="1"></el-pagination></div>
+        <span class="bottom-number">共{{ 0 }}条 </span>
+      </div>
+     
     </div>
-  </div>
+
+
+
 </template>
 
 <script>
+<<<<<<< HEAD
 
 // import {getMessageList} from '../../mock/message-box.ts'
 export default {
@@ -55,9 +104,18 @@ export default {
   
   }
 }
+=======
+export default {
+    data() {
+      return {
+        tableData: []
+      }
+    }
+  }
+>>>>>>> b30873e230bf17d674bfeb83ddfd5a0d3654db88
 </script>
 
-<style scoped >
+<style scoped>
 .up {
   width: 96%;
   height: 150px;
@@ -92,15 +150,42 @@ export default {
 
 }
 
-.anniu {
-  margin-top: 20px;
-  margin-left: 20px;
+
+.down{
+  margin-top: 40px;
+}
+.down-add{
+  padding: 10px;
+  margin: 0 27px;
+  border:1px solid #ccc ; 
+  border-radius: 2px
+}
+.down-title{
+  padding-top: 10px;
+  color: #303133;
+}
+.down-table{
+  margin-top: 15px;
+  text-align: center;
+  margin: 35px 27px;
 }
-.right-up{
-  float: right;
-  padding-right: 15px;
-} 
 
+.el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th {
+    word-break: break-word;
+    /* background-color: #f8f8f9; */
+    color: #515a6e;
+    height: 40px;
+    font-size: 13px;
+    text-align: center;
+}
+.bottom-number{
+  padding-top: 5px;
+  color: #303133;
+  float: right;
+}
+.bottom-page{
+  float:right;
+}
 /**
 自适应
 */
@@ -111,7 +196,4 @@ export default {
   height: 100%;
   /* background-color: #9dc3e6; */
 }
-.left-up{
-  float: left;
-}
 </style>

src/views/notice/addNotice.vue

@@ -0,0 +1,7 @@
+<template>
+    <div :class="className" :style="{height:height,width:width}" >添加公告</div>
+  </template>
+  
+  <script>
+  
+  </script>

src/views/notice/noticeList.vue

@@ -0,0 +1,7 @@
+<template>
+    <div :class="className" :style="{height:height,width:width}" >公告列表</div>
+  </template>
+  
+  <script>
+  
+  </script>