diff --git a/supervise-message-ui/src/router/modules/codemenu.js b/supervise-message-ui/src/router/modules/codemenu.js
index b484798e..d3cd1fc5 100644
--- a/supervise-message-ui/src/router/modules/codemenu.js
+++ b/supervise-message-ui/src/router/modules/codemenu.js
@@ -1,68 +1,19 @@
 import Layout from '@/layout'
 
-const codemenu = [{
-  path: '/xxzxqbxx',
-  component: Layout,
-  redirect: '/qbxx/index',
-  meta: {
-    title: '全部消息'
-  },
-  children: [{
-    path: '/qbxx/index',
-    component: () => import('@/views/message/qbxx.vue'),
-    name: 'XxzxQbxx',
+const codemenu = [
+  {
+    path: '/message',
+    component: Layout,
+    redirect: '/message',
     meta: {
-      title: '全部消息',
-      noCache: true
-    }
-  }]
-}, {
-  path: '/xxzxwdxx',
-  component: Layout,
-  redirect: '/wdxx/index',
-  meta: {
-    title: '未读消息'
-  },
-  children: [{
-    path: '/wdxx/index',
-    component: () => import('@/views/message/unreadmessage.vue'),
-    name: 'XxzxWdxx',
-    meta: {
-      title: '未读消息',
-      noCache: true
-    }
-  }]
-}, {
-  path: '/xxzxydxx',
-  component: Layout,
-  redirect: '/ydxx/index',
-  meta: {
-    title: '已读消息'
-  },
-  children: [{
-    path: '/ydxx/index',
-    component: () => import('@/views/message/ydxx.vue'),
-    name: 'XxzxYdxx',
-    meta: {
-      title: '已读消息',
-      noCache: true
-    }
-  }]
-}, {
-  path: '/xxzxydxx',
-  component: Layout,
-  redirect: '/mbxx/index',
-  meta: {
-    title: '模板消息'
-  },
-  children: [{
-    path: '/mbxx/index',
-    component: () => import('@/views/message/mbxx.vue'),
-    name: 'XxzxYdxx',
-    meta: {
-      title: '模板消息',
-      noCache: true
-    }
-  }]
-}]
+      title: '消息管理'
+    },
+    children: [{
+      path: '/message/unreadmessage',
+      component: () => import('@/views/message/unreadmessage.vue'),
+      name: 'UnreadMessage',
+      meta: { title: '消息管理', noCache: true }
+    }]
+  }
+]
 export default codemenu
diff --git a/supervise-message-ui/src/views/message/fullmessage.vue b/supervise-message-ui/src/views/message/fullmessage.vue
new file mode 100644
index 00000000..5411ce6e
--- /dev/null
+++ b/supervise-message-ui/src/views/message/fullmessage.vue
@@ -0,0 +1,204 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div v-show="viewState == 1">
+      <button-bar view-title="消息管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="switch_btn">
+          <el-button class="" @click="handleClick">未读消息</el-button>
+          <el-button class="" @click="handleRead">已读消息</el-button>
+          <el-button :class="{btn_style:viewState === 1}">全部消息</el-button>
+        </div>
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
+              <el-form-item label="消息类型">
+                <el-input v-model="listQuery.params.type" clearable placeholder="" class="addinputw"></el-input>
+              </el-form-item>
+              <el-form-item label="消息来源">
+                <el-input v-model="listQuery.params.msgSource" clearable placeholder="" class="addinputw"></el-input>
+              </el-form-item>
+              <el-form-item label="消息标题">
+                <el-input v-model="listQuery.params.title" clearable placeholder="" class="addinputw"></el-input>
+              </el-form-item>
+              <el-form-item label="发送人">
+                <el-input v-model="listQuery.params.senderName" clearable placeholder="" class="addinputw"></el-input>
+              </el-form-item>
+              <el-form-item class="formItem" label="接收日期">
+                <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.createTimeStart" clearable type="date" placeholder="开始日期" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.createTimeEnd" clearable type="date" placeholder="结束日期" />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">已读消息列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="senderName" width="100" label="发送人" align="center" />
+            <el-table-column prop="title" label="标题" align="left" header-align="center" />
+            <el-table-column prop="createTime" width="150" label="日期" align="center" />
+            <el-table-column prop="type" width="100" label="消息类别" align="center" />
+            <el-table-column prop="msgSource" width="100" label="消息来源" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+    <!-- End 列表页面 -->
+  </div>
+</template>
+
+<script>
+import req from '@/api/message/message'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+
+export default {
+  name: 'ReadMessage',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar
+  },
+  data() {
+    return {
+      viewState: 1,
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      listLoading: false,
+      listQuery: {
+        params: {
+          userSid: '',
+          state: '',
+          createTimeStart: '',
+          createTimeEnd: '',
+          type: '',
+          msgSource: '',
+          title: '',
+          senderName: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = '5d4b06cd-9d5e-11ed-87ce-525401028fe6'
+      req.listPage(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    handleClick() {
+      this.$parent.resetState()
+    },
+    handleRead() {
+      this.$parent.handleRead()
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          userSid: '',
+          state: '',
+          createTimeStart: '',
+          createTimeEnd: '',
+          type: '',
+          msgSource: '',
+          title: '',
+          senderName: ''
+        },
+        current: 1,
+        size: 10,
+        total: 0
+      }
+      this.getList()
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+.btn_style {
+  background-color: #018ad2;
+  color: white;
+  font-weight: 600;
+}
+</style>
diff --git a/supervise-message-ui/src/views/message/readmessage.vue b/supervise-message-ui/src/views/message/readmessage.vue
index 7de09c4a..cb61eb83 100644
--- a/supervise-message-ui/src/views/message/readmessage.vue
+++ b/supervise-message-ui/src/views/message/readmessage.vue
@@ -7,6 +7,7 @@
         <div class="switch_btn">
           <el-button class="" @click="handleClick">未读消息</el-button>
           <el-button :class="{btn_style:viewState === 1}">已读消息</el-button>
+          <el-button class="" @click="handleFull">全部消息</el-button>
         </div>
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@@ -71,7 +72,7 @@ export default {
   components: {
     Pagination,
     pageye,
-    ButtonBar
+    ButtonBar,
   },
   data() {
     return {
@@ -158,6 +159,9 @@ export default {
     handleClick() {
       this.$parent.resetState()
     },
+    handleFull() {
+      this.$parent.handleFull()
+    },
     // 查询按钮
     handleFilter() {
       this.listQuery.current = 1
diff --git a/supervise-message-ui/src/views/message/unreadmessage.vue b/supervise-message-ui/src/views/message/unreadmessage.vue
index 3b05b3a3..713f877e 100644
--- a/supervise-message-ui/src/views/message/unreadmessage.vue
+++ b/supervise-message-ui/src/views/message/unreadmessage.vue
@@ -6,20 +6,21 @@
       <div class="main-content">
         <div class="switch_btn">
           <el-button :class="{btn_style:viewState === 1}">未读消息</el-button>
-          <el-button class="" @click="handleClick">已读消息</el-button>
+          <el-button class="" @click="handleRead">已读消息</el-button>
+          <el-button class="" @click="handleFull">全部消息</el-button>
         </div>
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
               <el-form-item label="消息类型">
-                <el-input v-model="listQuery.params.msgType" clearable placeholder="" class="addinputw"></el-input>
+                <el-input v-model="listQuery.params.type" clearable placeholder="" class="addinputw"></el-input>
               </el-form-item>
               <el-form-item label="消息来源">
                 <el-input v-model="listQuery.params.msgSource" clearable placeholder="" class="addinputw"></el-input>
               </el-form-item>
               <el-form-item label="消息标题">
-                <el-input v-model="listQuery.params.msgTitle" clearable placeholder="" class="addinputw"></el-input>
+                <el-input v-model="listQuery.params.title" clearable placeholder="" class="addinputw"></el-input>
               </el-form-item>
               <el-form-item label="发送人">
                 <el-input v-model="listQuery.params.senderName" clearable placeholder="" class="addinputw"></el-input>
@@ -58,8 +59,10 @@
       </div>
     </div>
     <!-- End 列表页面 -->
-    <!-- 已选择列表 -->
+    <!-- 查看已读消息列表 -->
     <readmessage v-show="viewState == 2" ref="divRead" @doback="resetState"/>
+    <!-- 查看全部消息列表 -->
+    <fullmessage v-show="viewState == 3" ref="divFull" @doback="resetState"/>
   </div>
 </template>
 
@@ -69,6 +72,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import readmessage from './readmessage'
+import fullmessage from './fullmessage'
 
 export default {
   name: 'UnreadMessage',
@@ -76,7 +80,8 @@ export default {
     Pagination,
     pageye,
     ButtonBar,
-    readmessage
+    readmessage,
+    fullmessage
   },
   data() {
     return {
@@ -125,9 +130,9 @@ export default {
           state: '0',
           createTimeStart: '',
           createTimeEnd: '',
-          msgType: '',
+          type: '',
           msgSource: '',
-          msgTitle: '',
+          title: '',
           senderName: ''
         },
         current: 1,
@@ -200,9 +205,13 @@ export default {
         }
       })
     },
-    handleClick() {
+    handleRead() {
       this.viewState = 2
-      this.$refs['divSelect'].getList()
+      this.$refs['divRead'].getList()
+    },
+    handleFull() {
+      this.viewState = 3
+      this.$refs['divFull'].getList()
     },
     // 查询按钮
     handleFilter() {
@@ -216,9 +225,9 @@ export default {
           state: '0',
           createTimeStart: '',
           createTimeEnd: '',
-          msgType: '',
+          type: '',
           msgSource: '',
-          msgTitle: '',
+          title: '',
           senderName: ''
         },
         current: 1,
@@ -229,89 +238,92 @@ export default {
     },
     // 部分标记为已读
     toPartialMark() {
-      if (this.sids.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
-        return
-      }
-      const tip = '请确认是否标记所选 ' + this.sids.length + ' 条记录?'
-      this.$confirm(tip, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        req.ChangeRead(this.sids).then(resp => {
-          if (resp.success) {
-            this.$message({ type: 'success', message: resp.msg, showClose: true })
-          }
-          this.getList()
-          loading.close()
-        }).catch(e => {
-          loading.close()
-        })
-      }).catch(() => {
-      })
+      this.$message({ showClose: true, type: 'info', message: '功能正在开发中' })
+      // if (this.sids.length === 0) {
+      //   this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行操作' })
+      //   return
+      // }
+      // const tip = '请确认是否标记所选 ' + this.sids.length + ' 条记录?'
+      // this.$confirm(tip, '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //   const loading = this.$loading({
+      //     lock: true,
+      //     text: 'Loading',
+      //     spinner: 'el-icon-loading',
+      //     background: 'rgba(0, 0, 0, 0.7)'
+      //   })
+      //   req.ChangeRead(this.sids).then(resp => {
+      //     if (resp.success) {
+      //       this.$message({ type: 'success', message: resp.msg, showClose: true })
+      //     }
+      //     this.getList()
+      //     loading.close()
+      //   }).catch(e => {
+      //     loading.close()
+      //   })
+      // }).catch(() => {
+      // })
     },
     // 全部标记为已读
     toAllMark() {
-      const tip = '请确认是否标记全部记录?'
-      this.$confirm(tip, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        req.changeAll(this.sids).then(resp => {
-          if (resp.success) {
-            this.$message({ type: 'success', message: resp.msg, showClose: true })
-          }
-          this.getList()
-          loading.close()
-        }).catch(e => {
-          loading.close()
-        })
-      }).catch(() => {
-      })
+      this.$message({ showClose: true, type: 'info', message: '功能正在开发中' })
+      // const tip = '请确认是否标记全部记录?'
+      // this.$confirm(tip, '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //   const loading = this.$loading({
+      //     lock: true,
+      //     text: 'Loading',
+      //     spinner: 'el-icon-loading',
+      //     background: 'rgba(0, 0, 0, 0.7)'
+      //   })
+      //   req.changeAll(this.sids).then(resp => {
+      //     if (resp.success) {
+      //       this.$message({ type: 'success', message: resp.msg, showClose: true })
+      //     }
+      //     this.getList()
+      //     loading.close()
+      //   }).catch(e => {
+      //     loading.close()
+      //   })
+      // }).catch(() => {
+      // })
     },
     // 删除
     doDel() {
-      if (this.sids.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
-        return
-      }
-      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-      this.$confirm(tip, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        })
-        req.delete(this.sids).then(resp => {
-          if (resp.success) {
-            this.$message({ type: 'success', message: resp.msg, showClose: true })
-          }
-          this.getList()
-          loading.close()
-        }).catch(e => {
-          loading.close()
-        })
-      }).catch(() => {
-      })
+      this.$message({ showClose: true, type: 'info', message: '功能正在开发中' })
+      // if (this.sids.length === 0) {
+      //   this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+      //   return
+      // }
+      // const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      // this.$confirm(tip, '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //   const loading = this.$loading({
+      //     lock: true,
+      //     text: 'Loading',
+      //     spinner: 'el-icon-loading',
+      //     background: 'rgba(0, 0, 0, 0.7)'
+      //   })
+      //   req.delete(this.sids).then(resp => {
+      //     if (resp.success) {
+      //       this.$message({ type: 'success', message: resp.msg, showClose: true })
+      //     }
+      //     this.getList()
+      //     loading.close()
+      //   }).catch(e => {
+      //     loading.close()
+      //   })
+      // }).catch(() => {
+      // })
     },
     resetState() {
       this.viewState = 1