diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index de5bcb5..b8f8ede 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -215,6 +215,7 @@ export default {
       searchForm: {
         // 搜索框对应data对象
         name: "",
+        tableId: "",
       },
       modalTaskTitle: "",
       modalTitle: "", // 添加或编辑标题
@@ -263,6 +264,11 @@ export default {
     };
   },
   mounted() {
+    console.log(this.searchForm)
+    console.log(this.$route.params.name)
+    if (this.$route.params.name !== null) {
+      this.searchForm.name=this.$route.params.name
+    }
     this.init();
   },
   methods: {
@@ -272,9 +278,12 @@ export default {
     loadData(){},
     getDataList() {
       this.loading = true;
+      console.log("this.searchForm")
+      console.log(this.searchForm)
       this.getAction(this.url.todoList,this.searchForm).then(res => {
         this.loading = false;
         if (res.success) {
+          console.log(res)
           this.data = res.result||[];
           this.total = this.data.leading;
         }
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index 25618f6..0b810f5 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -1,95 +1,100 @@
 <template>
-  <div style="height: 740px;">
-    <div style="width: 100% ;height: 100%;">
+  <div style="height: 740px;margin: 20px 10px 0px;">
       <div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%">
         <!--待办任务-->
-        <div class="top-div" style="width: 33%;">
-          <a-card class="div-card" title="待办" style="overflow: hidden" extra="刷新" @click="todoList">
+        <div class="top-div" style="width: 33%;height: 100%;">
+          <a-card class="div-card" title="待办" style="overflow: hidden">
             <a-table
-              class="j-table-force-nowrap"
               rowKey="id"
+              :scroll="{x: false, y: 300 }"
               :loading="loading"
               :show-header="false"
               :columns="columns"
               :dataSource="tasks"
-              :pagination="true"
-            ></a-table>
-<!--            <ul class="ul-li" style="width: 100%; list-style-type:none;padding-left: 0px;">-->
-<!--              &lt;!&ndash;这里可以用for循环&ndash;&gt;-->
-<!--              &lt;!&ndash;用于存放从数据库中查出来的信息并对其进行循环&ndash;&gt;-->
-<!--              <li v-for="(task,index) in tasks.slice(0,8)" :key="index" style="width: 100%;">-->
-<!--                &lt;!&ndash;类型&ndash;&gt;-->
-<!--                <a-button class="ant-col-md-4" :title="task.title" type="primary"-->
-<!--                          style="width: 80px;height: 25px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;"-->
-<!--                          @click="gotodoList">-->
-<!--                  {{task.title}}-->
-<!--                </a-button>-->
-<!--                <span class="ant-col-md-10" :title='task.processName' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">-->
-<!--                    关于{{task.processName}}的审批流程-->
-<!--                </span>-->
-<!--                <span class="ant-col-md-10" :title='task.createTime' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right; line-height: 25px;">-->
-<!--                    {{task.createTime}}-->
-<!--                  </span>-->
-<!--              </li>-->
-<!--            </ul>-->
+              :pagination="false"
+              :customRow="rowClick"
+            >
+            </a-table>
           </a-card>
         </div>
 
         <!--站内消息-->
-        <div class="top-div" style="width: 33%; margin: 0 0.5%;">
+        <div class="top-div" style="width: 33%;height: 100%;margin: 0 1%;">
           <a-card class="div-card" title="站内消息" style="overflow: hidden">
+            <a-table
+              rowKey="id"
+              :scroll="{x: false, y: 300 }"
+              :show-header="false"
+              :columns="msgColumns"
+              :dataSource="msgContent"
+              :pagination="false"
+              :customRow="rowClickToDo"
+            >
+            </a-table>
           </a-card>
         </div>
 
         <!--登录日志-->
-        <div class="top-div" style="width: 33%;">
+        <div class="top-div" style="width: 33%;height: 100%;">
           <a-card class="div-card"  title="登录日志" style="overflow: hidden">
-            <ul class="ul-li" style="list-style-type:none;padding-left: 0px;">
-              <!--这里可以用for循环-->
-              <!--当一个用户登录后增加一条数据-->
-              <li v-for="(loginlog,index) in loginlogs" style="width: 100%;">
-                <!--类型-->
-                <a-button class="ant-col-md-8" type="primary" style="width: 80px;height: 25px;">{{loginlog.department}}</a-button>
-                <span class="ant-col-md-9" style="text-align: center; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">
-                  {{loginlog.loginName}}
-                </span>
-                <span class="ant-col-md-10" style="text-align: right; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">
-                  {{loginlog.loginTime}}
-                </span>
-
-              </li>
-            </ul>
+            <a-table
+              rowKey="id"
+              :scroll="{x: false, y: 300 }"
+              :show-header="false"
+              :columns="loginColumns"
+              :dataSource="loginLogs"
+              :pagination="false"
+            >
+            </a-table>
+
           </a-card>
         </div>
 
       </div>
 
 
-      <div class="bottom-div" style="width: 100%;height: 70%;margin-top: 0.5%">
+      <div class="bottom-div" style="width: 100%;height: 60%;margin-top: 1%">
         <a-card style="width: 100%;height: 90%;border-radius: 10px;" title="全部应用">
           <ul class="apply-use" style="list-style-type: none;padding: 0px">
+            <li @click='informationManagement'  class="ant-col-md-4">
+              <a-icon type="table" style="font-size: 25px;" /> 基础信息管理
+            </li>
             <li @click='processManage'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
+              <a-icon type="cluster" style="font-size: 25px;" /> 流程管理
             </li>
             <li @click='materialManage'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;物资管理
+              <a-icon type="setting" style="font-size: 25px;" /> 物资管理
             </li>
             <li @click='statisticalAnalysis'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;统计分析
+              <a-icon type="line-chart" style="font-size: 25px;" /> 统计分析
             </li>
             <li @click='dictionaryLibrary'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;标准字典库
+              <a-icon type="read" style="font-size: 25px;" /> 标准字典库
             </li>
             <li @click='isystemManage'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;系统管理
+              <a-icon type="setting" style="font-size: 25px;" /> 系统管理
+            </li>
+            <li @click='portalInformation'  class="ant-col-md-4">
+              <a-icon type="bank" style="font-size: 25px;" /> 门户信息
+            </li>
+            <li @click='statisticalTreatment'  class="ant-col-md-4">
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
+            </li>
+            <li @click='statisticalTreatment'  class="ant-col-md-4">
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
+            </li>
+            <li @click='statisticalTreatment'  class="ant-col-md-4">
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
+            </li>
+            <li @click='statisticalTreatment'  class="ant-col-md-4">
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
             </li>
             <li @click='statisticalTreatment'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;统计报表
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
             </li>
           </ul>
         </a-card>
       </div>
-    </div>
 
   </div>
 </template>
@@ -99,70 +104,173 @@
 import { getAction } from '@api/manage'
 import { JVXETypes } from '@/components/jeecg/JVxeTable/index'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
+
 
 
 export default {
   name: 'HomePage',
+  // mixins:[JeecgListMixin],
   components:{
     JVXETypes,
   },
   data() {
     return {
+      //登录日志查询条件
+      queryParam:{
+        logType:1,
+        keyWord:'登录成功',
+      },
+      isorter:{
+        column: 'createTime',
+        order: 'desc',
+      },
+      //待办 登录日志 站内消息查询地址
       url: {
-        todoManger: '/actTask/todoList'
+        todoManger: '/actTask/todoList',
+        lists: '/sys/log/list',
+        listMseeage: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
       },
-
+      //待办显示内容
       columns:[
         {
           align:"left",
           dataIndex: 'title',
+          ellipsis: true,
         },
         {
           align:"left",
           dataIndex: 'processName',
+          ellipsis: true,
         },
         {
           align:"center",
           dataIndex: 'createTime',
+          ellipsis: true,
         }
       ],
-      loading:true,
       tasks:[],
-      loginlogs:[
+      //登录日志显示内容
+      loginColumns:[
+        {
+          align:"left",
+          dataIndex: 'logType_dictText',
+          ellipsis: true,
+          sorter: true
+        },
         {
-          department: "企划部",
-          loginName: "李朝阳",
-          loginTime: "2022.10.26 12:00:00"
+          align:"left",
+          dataIndex: 'username',
+          ellipsis: true,
+          sorter: true
+        },
+        {
+          align:"center",
+          dataIndex: 'createTime',
+          ellipsis: true,
+          sorter: true
         },
+      ],
+      loginLogs:[],
+      //站内消息显示内容
+      msgColumns:[
         {
-          department: "企划部",
-          loginName: "李朝阳",
-          loginTime: "2022.10.26 12:00:00"
+          align: "left",
+          dataIndex: "msgContent",
+          ellipsis: true,
         }
-      ]
+      ],
+      msgContent: [],
+      //加载状态
+      loading:true,
+
 
     }
   },
 
   created() {
     this.todoList();
+    this.loginList();
+    this.systemMessage();
   },
 
-
   methods: {
+    //待办任务的行点击事件(前往待办)
+    rowClick: function(record, index) {
+      return {
+        on: {
+          click: () => {
+            console.log(record)
+            console.log(record.id)
+            this.$router.push({name:'activiti-todoManage',
+              params:{
+                id: record.id
+              }
+            })
+          },
+        }
+      }
+    },
+    rowClickToDo: function(record, index) {
+      return {
+        on: {
+          click: () => {
+            console.log(record)
+            // this.$router.push({name:'activiti-todoManage',
+            //   params:{
+            //     businessKey: record.busId
+            //   }
+            // })
+          },
+        }
+      }
+    },
+    //待办任务查询
     todoList(){
       getAction(this.url.todoManger).then((res) => {
         if (res.success) {
+          console.log("res")
           this.loading = false
           this.tasks = res.result
           console.log(res.result)
         }
       })
+    },
+
+    // 系统消息查询
+    systemMessage(){
+      let queryUnRead = {
+        readFlag: '0'
+      }
+      let param = Object.assign({},queryUnRead,this.isorter);
+
+      getAction(this.url.listMseeage,param).then((res) => {
+        if (res.success) {
+          console.log("resMessage")
+          this.loading = false
+          this.msgContent = res.result.records
+          console.log(res.result)
+        }
+      })
+    },
+
+    // 登录日志查询
+    loginList(){
+      let param = Object.assign({}, this.queryParam, this.isorter);
 
+      getAction(this.url.lists,param).then((res) => {
+        if (res.success) {
+          console.log("resnew")
+          console.log(res.result)
+          this.loading = false
+          this.loginLogs = res.result.records
+        }
+      })
     },
 
     // 跳转地址
+    informationManagement(){
+      this.$router.push('/supplier/regulate')
+    },
     processManage(){
       this.$router.push('/activiti/applyHome')
     },
@@ -178,6 +286,9 @@ export default {
     isystemManage(){
       this.$router.push('/isystem/user')
     },
+    portalInformation(){
+      this.$router.push('')
+    },
     statisticalTreatment(){
       this.$router.push('/report/ArchivesStatisticst')
     },
@@ -194,13 +305,22 @@ export default {
 <style scoped>
 @import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
 
+/deep/.ant-card-head{
+  margin-bottom:0px;
+}
+
+/deep/.ant-table-placeholder{
+  margin-top:0px;
+  border-top: 0px;
+  border-bottom: 0px;
+}
 
 /deep/.ant-table-tbody .ant-table-row td{
   padding: 3% 0 0 0;
 }
 /deep/.ant-table-tbody > tr > td {
 
-   border-bottom: 0px;
+  border-bottom: 0px;
   font-weight: 400;
 }
 /deep/.ant-table-tbody > tr:hover>td {
@@ -212,9 +332,6 @@ export default {
 /deep/.ant-table-tbody > tr:hover{
   background: white;
 }
-.top-div {
-  height: 100%;
-}
 
 .div-card {
   width: 100%;
@@ -229,18 +346,15 @@ export default {
   font-weight: bold;
 }
 
-.iconfont{
-  vertical-align: -10%;
-  /*background-color: #f28123;*/
-  /*border-radius: 10px;*/
-}
 .apply-use li{
-  text-align: center;
-  margin-top: 20px;
+  text-align: left;
+  margin-top: 60px;
+  padding: 0 40px;
 }
 
-.mouse:hover {
+.apply-use li:hover {
   cursor: pointer;
+  color: #5cb6ff;
 }
 
 /deep/.ant-card-body {