diff --git a/api/api.js b/api/api.js
index c6dd51f..4933319 100644
--- a/api/api.js
+++ b/api/api.js
@@ -353,8 +353,13 @@ const install = (Vue, vm) => {
         authorizations: true,
         isparams: false
     })
+    // 通知公告/
+    let getNoticeList = (params) => http.get('/blade-desk/notice/list', params, {
+        authorizations: true,
+        isparams: false
+    })
     // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
-    vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition,resetPwd};
+    vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition,resetPwd,getNoticeList};
 }
 
 export default {
diff --git a/manifest.json b/manifest.json
index 2633e0f..ab2ab68 100644
--- a/manifest.json
+++ b/manifest.json
@@ -53,7 +53,10 @@
             "sdkConfigs" : {
                 "ad" : {},
                 "push" : {
-                    "unipush" : {}
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : false
+                    }
                 },
                 "maps" : {
                     "amap" : {
diff --git a/pages.json b/pages.json
index a3460d1..17f36a9 100644
--- a/pages.json
+++ b/pages.json
@@ -9,6 +9,20 @@
                 "navigationStyle": "custom",
                 "navigationBarTextStyle": "white"
             }
+        },
+        {
+            "path": "pages/notice/index",
+            "style": {
+                "navigationBarTitleText": "消息中心",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/notice/announcement",
+            "style": {
+                "navigationBarTitleText": "公告中心",
+                "enablePullDownRefresh": false
+            }
         }
     ],
     "subPackages": [
diff --git a/pages/home/components/eacharts.vue b/pages/home/components/eacharts.vue
index e1c1579..37d131a 100644
--- a/pages/home/components/eacharts.vue
+++ b/pages/home/components/eacharts.vue
@@ -1,31 +1,9 @@
 <template>
   <view class="eacharts-box">
-    <view class="eacharts-time">
-      <u-form :model="form" ref="uForm">
-        <u-form-item label="选择时间:" label-width="140" :border-bottom="false">
-          <u-input v-model="form.searchTime" type="select" @click="calendarShow = true" :border="true"
-            placeholder="请选择时间" />
-        </u-form-item>
-      </u-form>
-      <u-calendar v-model="calendarShow" :mode="mode" @change="change"></u-calendar>
-    </view>
     <!-- eacharts 图表 -->
-    <view class="echarts" v-if="type == 'maintenanceStatistics'">
+    <view class="echarts" >
       <l-echart ref="chartRef" :key="Math.random()"></l-echart>
     </view>
-
-    <!-- 饼状图 -->
-    <view class="echartsPie" v-if="type == 'maintenanceStatisticsPie'">
-      <view class="pie-item">
-        <view style="height:308rpx"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
-        <text class="pie-title">故障现象分类</text>
-      </view>
-      <view class="pie-item">
-        <view style="height:308rpx"><l-echart ref="chartRefPieRight" :key="Math.random()"></l-echart></view>
-        <text class="pie-title">设备分类</text>
-      </view>
-    </view>
-
   </view>
 </template>
 <script>
@@ -53,17 +31,7 @@ export default {
     };
   },
   mounted() {
-
-    // 维修统计
-    if (this.type == "maintenanceStatistics") {
-      this.upkeepStat()
-
-
-    }
-    if (this.type == "maintenanceStatisticsPie") {
-      this.pieStat()
-
-    }
+    this.upkeepStat()
   },
   methods: {
     // 维修统计
@@ -72,12 +40,6 @@ export default {
         startTime: this.form.startTime,
         endTime: this.form.endTime,
       }
-      // if(this.form.startTime!=''){
-      //   query_.startTime=this.form.startTime
-      // }
-      // if(this.form.endTime!=''){
-      //   query_.endTime=this.form.endTime
-      // }
       this.$u.api.upkeepStat(query_).then(res => {
         if (res.code == 200) {
           this.upkeepStatInfo = JSON.parse(JSON.stringify(res.data))
@@ -85,36 +47,6 @@ export default {
         }
       })
     },
-    // 饼图数据
-    pieStat() {
-      let query_ = {
-        startTime: this.form.startTime,
-        endTime: this.form.endTime,
-      }
-      this.$u.api.pieStat(query_).then(res => {
-        if (res.code == 200) {
-          this.pieInfo = res.data
-          this.maintenancePieLeftInit();
-          this.maintenancePieRightInit();
-        }
-      })
-    },
-    selectFun() {
-      this.calendarShow = true;
-    },
-    change(e) {
-      this.form.startTime = e.startDate;
-      this.form.endTime = e.endDate;
-      this.form.searchTime = e.startDate + "-" + e.endDate;
-      if (this.type == "maintenanceStatistics") {
-        this.upkeepStat()
-      }
-      if (this.type == "maintenanceStatisticsPie") {
-        this.pieStat()
-      }
-
-      // 查询数据
-    },
     // 维修统计柱状图
     maintenanceInit() {
       let opts = {
@@ -122,12 +54,14 @@ export default {
         legend: {
           //图例组件
           data: ["总计", "已完成", "未完成"],
+          itemWidth: 15,
+          itemHeight: 10,
         },
         xAxis: {
           data: this.upkeepStatInfo.xData,
         },
         grid: {
-          top: "15%",
+          top: "25%",
           left: "10%",
           right: "5%",
           bottom: "15%",
@@ -138,7 +72,7 @@ export default {
             name: "总计",
             type: "bar",
             data: this.upkeepStatInfo.total,
-            barWidth: 30, // 设置柱子宽度
+            barWidth: 25, // 设置柱子宽度
             barGap: "0", // 设置不同系列之间的间隔为0
             itemStyle: {
               color: "#2478f2",
@@ -148,7 +82,7 @@ export default {
             name: "已完成",
             type: "bar",
             data: this.upkeepStatInfo.completed,
-            barWidth: 30, // 设置柱子宽度
+            barWidth: 25, // 设置柱子宽度
             barGap: "0", // 设置不同系列之间的间隔为0
             itemStyle: {
               color: "#84b7f9",
@@ -158,7 +92,7 @@ export default {
             name: "未完成",
             type: "bar",
             data: this.upkeepStatInfo.unCompleted,
-            barWidth: 30, // 设置柱子宽度
+            barWidth: 25, // 设置柱子宽度
             barGap: "0", // 设置不同系列之间的间隔为0
             itemStyle: {
               color: "#5f9cf8",
@@ -174,147 +108,22 @@ export default {
         return chart;
       });
     },
-    // 故障现象分类
-    maintenancePieLeftInit() {
-      let opts = {
-        series: [
-          {
-            name: "",
-            type: "pie",
-            radius: ['40%', '70%'],
-            label: {
-              // 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
-              normal: {
-                show: true,
-                fontSize: 8, // 是否显示标签[ default: false ]
-                position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
-                formatter: "{b}\n {c}", // 标签内容
-                color: '#000'
-              },
-            },
-
-            data: this.pieInfo.fault,
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: "rgba(0, 0, 0, 1)",
-              },
-            },
-            labelLine: {
-              // 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
-              normal: {
-                show: true, // 是否显示视觉引导线。
-                length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
-                length2: 5,
 
-                // 视觉引导项第二段的长度。
-                lineStyle: {
-                  // 视觉引导线的样式
-                  type: "solid",
-                },
-              },
-            },
-          },
-        ],
-      };
-      this.$refs.chartRefPieLeft.init((config) => {
-        const { canvas } = config;
-        const chart = echarts.init(canvas, null, config);
-        chart.setOption(opts);
-        // 需要把 chart 返回
-        return chart;
-      });
-    },
-    maintenancePieRightInit() {
-      let opts = {
-        series: [
-          {
-            type: "pie",
-            radius: ['40%', '70%'],
-            label: {
-              // 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
-              normal: {
-                show: true,
-                fontSize: 8, // 是否显示标签[ default: false ]
-                position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
-                formatter: "{b}\n {c}", // 标签内容
-                color: '#000'
-              },
-            },
-            data: this.pieInfo.device,
-            labelLine: {
-              // 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
-              normal: {
-                show: true, // 是否显示视觉引导线。
-                length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
-                length2: 5,
-                // 视觉引导项第二段的长度。
-                lineStyle: {
-                  // 视觉引导线的样式
-                  type: "solid",
-                },
-              },
-            },
-          },
-        ],
-      };
-      this.$refs.chartRefPieRight.init((config) => {
-        const { canvas } = config;
-        const chart = echarts.init(canvas, null, config);
-        chart.setOption(opts);
-        // 需要把 chart 返回
-        return chart;
-      });
-    },
   },
 };
 </script>
 <style lang="scss" scoped>
 .eacharts-box {
   background: #fff;
-  margin: 0 40rpx 32rpx;
+  margin: 0 32rpx 32rpx;
   border-radius: 20rpx;
   overflow: hidden;
-
-  .eacharts-time {
-    margin: 0 136rpx 0 24rpx;
-    display: flex;
-    flex-direction: row;
-
-    text {
-      line-height: 60rpx;
-      color: rgba(16, 16, 16, 1);
-      font-size: 28rpx;
-      margin-top: 30rpx;
-      margin-right: 10rpx;
-    }
-  }
-
+  height: 368rpx;
   .echarts {
     width: calc(100% - 64rpx);
-    height: 308rpx;
-    margin: 0 auto 20rpx;
-  }
-
-  .echartsPie {
-    width: calc(100% - 64rpx);
-    min-height: 308rpx;
-    margin: 0 auto 0;
-
-    .pie-item {
-      width: 100%;
-      height: 368rpx;
-      // float: left;
-    }
-  }
-
-  .pie-title {
-    height: 30rpx;
-    text-align: center;
-    display: block;
-    color: rgba(16, 16, 16, 1);
-    font-size: 28rpx;
+    height: 328rpx;
+    margin:30rpx auto 20rpx;
+    overflow: hidden;
   }
 }
 </style>
\ No newline at end of file
diff --git a/pages/home/components/eacharts_nightpie.vue b/pages/home/components/eacharts_nightpie.vue
new file mode 100644
index 0000000..8cb7f6e
--- /dev/null
+++ b/pages/home/components/eacharts_nightpie.vue
@@ -0,0 +1,130 @@
+<template>
+  <view class="eacharts-box">
+
+    <!-- 饼状图 -->
+    <view class="echartsPie">
+      <view class="pie-item">
+        <view style="height:308rpx;margin-top: 40rpx;"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
+      </view>
+    </view>
+
+  </view>
+</template>
+<script>
+import * as echarts from "echarts";
+import lEchart from "@/uni_modules/lime-echart/components/lime-echart/";
+export default {
+  components: { lEchart },
+  props: {
+    type: {
+      type: String,
+      default: "",
+    },
+    echartData: {
+      type: Array,
+      default: []
+    }
+  },
+  watch: {
+    echartData(val) {
+      this.pieInfo = val
+      this.maintenancePieInit()
+    }
+  },
+  data() {
+    return {
+      form: {
+        searchTime: "",
+        startTime: "",
+        endTime: "",
+      },
+      pieInfo: [],//饼图数据
+
+    };
+  },
+  mounted() { },
+  methods: {
+    // 故障现象分类
+    maintenancePieInit() {
+      let opts = {
+        series: [
+          {
+            name: "",
+            type: "pie",
+            center: ['50%', '50%'],
+            roseType: 'area',
+            label: {
+              // 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
+              normal: {
+                show: true,
+                fontSize: 8, // 是否显示标签[ default: false ]
+                position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
+                formatter: "{b}\n {c}", // 标签内容
+                color: '#000'
+              },
+            },
+
+            data: this.pieInfo,
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: "rgba(0, 0, 0, 1)",
+              },
+            },
+            labelLine: {
+              // 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
+              normal: {
+                show: true, // 是否显示视觉引导线。
+                length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
+                length2: 5,
+
+                // 视觉引导项第二段的长度。
+                lineStyle: {
+                  // 视觉引导线的样式
+                  type: "solid",
+                },
+              },
+            },
+          },
+        ],
+      };
+      this.$refs.chartRefPieLeft.init((config) => {
+        const { canvas } = config;
+        const chart = echarts.init(canvas, null, config);
+        chart.setOption(opts);
+        // 需要把 chart 返回
+        return chart;
+      });
+    },
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.eacharts-box {
+  background: #fff;
+  margin: 0 32rpx 32rpx;
+  border-radius: 20rpx;
+  overflow: hidden;
+  
+  .echarts {
+    width: calc(100% - 64rpx);
+    height: 368rpx;
+    margin: 0 auto 20rpx;
+  }
+
+  .echartsPie {
+    width: calc(100% - 64rpx);
+    min-height: 308rpx;
+    margin: 0 auto 0;
+
+    .pie-item {
+      width: 100%;
+      height: 368rpx;
+      overflow: hidden;
+      // float: left;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/components/eacharts_pie.vue b/pages/home/components/eacharts_pie.vue
new file mode 100644
index 0000000..090d8d8
--- /dev/null
+++ b/pages/home/components/eacharts_pie.vue
@@ -0,0 +1,129 @@
+<template>
+  <view class="eacharts-box">
+
+    <!-- 饼状图 -->
+    <view class="echartsPie">
+      <view class="pie-item">
+        <view style="height:308rpx;margin-top: 40rpx;"><l-echart ref="chartRefPieLeft" :key="Math.random()"></l-echart></view>
+      </view>
+    </view>
+
+  </view>
+</template>
+<script>
+import * as echarts from "echarts";
+import lEchart from "@/uni_modules/lime-echart/components/lime-echart/";
+export default {
+  components: { lEchart },
+  props: {
+    type: {
+      type: String,
+      default: "",
+    },
+    echartData: {
+      type: Array,
+      default: []
+    }
+  },
+  watch: {
+    echartData(val) {
+      this.pieInfo = val
+      this.maintenancePieInit()
+    }
+  },
+  data() {
+    return {
+      form: {
+        searchTime: "",
+        startTime: "",
+        endTime: "",
+      },
+      pieInfo: [],//饼图数据
+
+    };
+  },
+  mounted() { },
+  methods: {
+    // 故障现象分类
+    maintenancePieInit() {
+      let opts = {
+        series: [
+          {
+            name: "",
+            type: "pie",
+            radius: ['40%', '70%'],
+            label: {
+              // 饼图图形上的文本标签，可用于说明图形的一些数据信息，比如值，名称等.
+              normal: {
+                show: true,
+                fontSize: 8, // 是否显示标签[ default: false ]
+                position: "outside", // 标签的位置。'outside'饼图扇区外侧，通过视觉引导线连到相应的扇区。'inside','inner' 同 'inside',饼图扇区内部。'center'在饼图中心位置。
+                formatter: "{b}\n {c}", // 标签内容
+                color: '#000'
+              },
+            },
+
+            data: this.pieInfo,
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: "rgba(0, 0, 0, 1)",
+              },
+            },
+            labelLine: {
+              // 标签的视觉引导线样式,在 label 位置 设置为'outside'的时候会显示视觉引导线。
+              normal: {
+                show: true, // 是否显示视觉引导线。
+                length: 5, // 在 label 位置 设置为'outside'的时候会显示视觉引导线。
+                length2: 5,
+
+                // 视觉引导项第二段的长度。
+                lineStyle: {
+                  // 视觉引导线的样式
+                  type: "solid",
+                },
+              },
+            },
+          },
+        ],
+      };
+      this.$refs.chartRefPieLeft.init((config) => {
+        const { canvas } = config;
+        const chart = echarts.init(canvas, null, config);
+        chart.setOption(opts);
+        // 需要把 chart 返回
+        return chart;
+      });
+    },
+
+  },
+};
+</script>
+<style lang="scss" scoped>
+.eacharts-box {
+  background: #fff;
+  margin: 0 32rpx 32rpx;
+  border-radius: 20rpx;
+  overflow: hidden;
+  
+  .echarts {
+    width: calc(100% - 64rpx);
+    height: 368rpx;
+    margin: 0 auto 20rpx;
+  }
+
+  .echartsPie {
+    width: calc(100% - 64rpx);
+    min-height: 308rpx;
+    margin: 0 auto 0;
+
+    .pie-item {
+      width: 100%;
+      height: 368rpx;
+      overflow: hidden;
+      // float: left;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/home/components/swiper.vue b/pages/home/components/swiper.vue
index 8d6a15f..48a3768 100644
--- a/pages/home/components/swiper.vue
+++ b/pages/home/components/swiper.vue
@@ -1,8 +1,7 @@
 <template>
   <view v-if="list.length>0">
-    <view class="work-title">实验室巡检</view>
+   
   <view class="notice_bg">
-    
     <view class="line"></view>
     <swiper
       autoplay="true"
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 6b57d09..8198c1a 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,36 +1,78 @@
 <template>
   <view class="page-css">
+    <u-navbar :is-back="false" title="工作台">
+      <view slot="right" @click="goPage('/pages/notice/index')">
+        <u-badge size="mini" type="error" count="7"></u-badge>
+        <u-icon name="chat" size="60" color="#3a62d7" :is-center="true" style="padding-right: 20rpx;">
+        </u-icon>
+      </view>
+    </u-navbar>
+    <!-- 通知公告 -->
+    <view class="notice_box" v-if="noticeList.length > 0">
+      <u-notice-bar mode="horizontal" type="primary" :list="noticeList" :more-icon="true" @getMore="getNotice()"
+        :is-circular="false"></u-notice-bar>
+    </view>
     <view class="">
       <view class="banner-swiper" v-if="swiperList.length > 0">
-        <view class="logo-txt">科研医疗建筑运维平台</view>
-        <!-- <u-icon class="logo-scan" style="padding-right:12rpx" @click="scanCode" size="45" name="scan"></u-icon> -->
-        <!-- <u-swiper height="444" :list="swiperList" mode="none"></u-swiper> -->
         <image :src="swiperList[0]" style="padding-right:12rpx;height:444rpx;width:100%"></image>
       </view>
-      <view class="work-title">工作台</view>
-      <view class="workbench">
-        <view v-for="(item, index) in workList" :key="index" class="workbench-slider">
-          <view class="workbench-item" @click="goPage(item)">
-            <view class="workbench-item-icon">
-              <image :src="item.img" mode="aspectFit" />
+      <view class="menu_box">
+        <view class="menu_title">工作台</view>
+        <view class="menu_list clearfix" v-if="dataTypes==1">
+          <view class="item_box" @click="goPage('/pages/inspection/plan')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">巡检计划</view>
+          </view>
+          <view class="item_box" @click="goPage('/pages/submission/records?name=报送记录')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">报送记录</view>
+          </view>
+        </view>
+        <view class="menu_list clearfix" v-else-if="dataTypes==4">
+          <view class="item_box" @click="goPage('/pages/submission/records?name=维修任务')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">维修任务</view>
+          </view>
+          <view class="item_box" @click="goPage('/pages/inspection/quest')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">巡检任务</view>
+          </view>
+        </view>
+        <view class="menu_list clearfix" v-else>
+          <view class="item_box" @click="goPage('/pages/submission/records?name=接单记录')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
             </view>
-            <u-badge class="badge" type="error" :count="item.num" :offset="[0, 0]"></u-badge>
+            <view class="item_txt">接单记录</view>
+          </view>
+          <view class="item_box" @click="goPage('/pages/inspection/quest')">
+            <view class="item_img">
+              <image src="@/static/images/home/left.svg" mode="aspectFit" />
+            </view>
+            <view class="item_txt">巡检任务</view>
           </view>
-          <view class="workbench-name">{{ item.name }}</view>
         </view>
       </view>
 
-      <view>
-        <swiperSlider></swiperSlider>
-      </view>
-      <!-- <view class="work-title">设备报警</view> -->
-      <view>
-        <alarm></alarm>
-      </view>
+
+      <view class="work-title">设备统计</view>
+      <eachartsPie :echartData="pieInfo"></eachartsPie>
+
+      <view class="work-title">检修单状态</view>
+      <eachartsNightpie :echartData="pieInfo"></eachartsNightpie>
+
       <view class="work-title">维修统计</view>
       <view class="statistics">
         <eacharts :type="'maintenanceStatistics'"></eacharts>
-        <eacharts :type="'maintenanceStatisticsPie'"></eacharts>
+        <!-- <eacharts :type="'maintenanceStatisticsPie'"></eacharts> -->
       </view>
     </view>
     <betone-tabbar ref="tabbarRef" />
@@ -41,27 +83,43 @@
 import swiperSlider from "./components/swiper.vue";
 import alarm from "./components/alarm.vue";
 import eacharts from "./components/eacharts.vue";
+import eachartsPie from "./components/eacharts_pie.vue";
+import eachartsNightpie from "./components/eacharts_nightpie.vue";
 export default {
   components: {
     swiperSlider,
     alarm,
     eacharts,
+    eachartsPie,
+    eachartsNightpie
+  },
+  computed: {
+
+    dataTypes() {
+      return this.$store.state.dataType
+    },
   },
   data() {
     return {
       swiperList: [],
       workList: [],
+      pieInfo: [],//饼图数据
+      noticeList: [
+
+      ],//通知列表
     };
   },
+  onLoad() {
+    this.pieStat()
+  },
   onShow() {
     this.$nextTick(() => {
       this.$refs.tabbarRef.getPermission();
-      //  this.BetLoading.show();
-      //   setTimeout(() => {
-      //    this.BetLoading.hide();
-      //   }, 1000);
+      this.getNoticeList()
+
     });
     //工作台
+
     this.getUserInfo()
     this.getoverview()
   },
@@ -111,14 +169,9 @@ export default {
       })
     },
     goPage(item) {
-      if (item.pagePath == '') {
-        uni.showToast({ title: "功能正在完善中，敬请期待！", icon: "none" });
-      } else {
-        uni.navigateTo({
-          url: item.pagePath,
-        });
-      }
-
+      uni.navigateTo({
+        url: item,
+      });
     },
     scanCode() {
       uni.scanCode({
@@ -131,7 +184,32 @@ export default {
           console.error('扫码失败：' + err);
         }
       });
-    }
+    },
+    // 饼图数据
+    pieStat() {
+      this.$u.api.pieStat().then(res => {
+        if (res.code == 200) {
+          this.pieInfo = res.data.fault
+        }
+      })
+    },
+    // 通知公告
+    getNotice() {
+      uni.navigateTo({
+        url: '/pages/notice/announcement',
+      });
+    },
+
+    getNoticeList() {
+      this.$u.api.getNoticeList().then(res => {
+        if (res.code == 200) {
+          let data = res.data.records
+          data.forEach(item => {
+            this.noticeList.push(item.title)
+          })
+        }
+      })
+    },
   },
 };
 </script>
@@ -140,11 +218,10 @@ export default {
   width: 100%;
   // min-height: 100%;
   padding: 0;
-  background: rgba(239, 239, 239, 1);
   padding-top: var(--status-bar-height);
 
   .banner-swiper {
-    margin-bottom: 64rpx;
+    margin-bottom: 32rpx;
     position: relative;
 
     .logo-txt {
@@ -169,6 +246,7 @@ export default {
     color: rgba(16, 16, 16, 1);
     font-size: 32rpx;
     padding: 0 0 32rpx 36rpx;
+    margin-top: 32rpx;
   }
 
   .workbench {
@@ -219,5 +297,99 @@ export default {
   .statistics_pie {
     width: 100%;
   }
+
+  .menu_box {
+    background: #fff;
+    position: relative;
+    margin: 0 32rpx;
+    border-radius: 20rpx;
+
+    &::after {
+      content: '';
+      position: absolute;
+      height: 4rpx;
+      width: 100%;
+      background: #38D79F;
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
+
+    .menu_title {
+      height: 100rpx;
+      font-weight: 500;
+      font-size: 32rpx;
+      color: #333333;
+      line-height: 100rpx;
+      text-align: left;
+      font-style: normal;
+      margin: 0 32rpx;
+      position: relative;
+
+      &::after {
+        content: '';
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        height: 2rpx;
+        background: #f5f5f5;
+        width: 100%;
+      }
+
+    }
+
+    .menu_list {
+      padding-bottom: 32rpx;
+      margin-left: 32rpx;
+      margin-right: 32rpx;
+      margin-top: 24rpx;
+
+      .item_box {
+        width: 50%;
+        float: left;
+
+        &:nth-child(1) {
+          position: relative;
+
+          &::after {
+            content: '';
+            position: absolute;
+            width: 4rpx;
+            height: 100%;
+            background: #f5f5f5;
+            right: 20rpx;
+            top: 0;
+          }
+        }
+
+        .item_img {
+          width: 64rpx;
+          height: 64rpx;
+          float: left;
+
+          image {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .item_txt {
+          font-weight: 400;
+          font-size: 32rpx;
+          color: #333333;
+          line-height: 64rpx;
+          text-align: left;
+          font-style: normal;
+          padding-left: 20rpx;
+          float: left;
+        }
+      }
+    }
+  }
+
+  .notice_box {
+    width: 100%;
+    background: #fff;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue
index 4e5e207..080c74c 100644
--- a/pages/inspection/quest.vue
+++ b/pages/inspection/quest.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="page-css">
-        <u-navbar v-if="planOrderId" title="巡检任务" back-icon-color="rgb(0, 0, 0)" back-icon-size="54" :title-bold="true"
+        <u-navbar  title="巡检任务" back-icon-color="rgb(0, 0, 0)" back-icon-size="54" :title-bold="true"
             :title-size="38" title-color="rgb(0, 0, 0)"></u-navbar>
         <view class="protocol-content">
             <u-tabs-swiper ref="tabs" :list="subsectionList" :current="subsectionCurrent" :is-scroll="false"
@@ -111,7 +111,7 @@
         </betone-modal>
 
         <betone-loading ref="BetLoading" />
-        <betone-tabbar ref="tabbarRef" v-if="!planOrderId" />
+        <!-- <betone-tabbar ref="tabbarRef" v-if="!planOrderId" /> -->
 
         <betone-modal v-model="detailsShow" v-if="detailsShow" :title="'下载内容'" @confirm="detailsShowFn"
             @cancel="detailsShow = false">
@@ -212,7 +212,7 @@ export default {
 
             // 实验室巡检  跳转进来
             if (!this.planOrderId) {
-                this.$refs.tabbarRef.getPermission();
+                // this.$refs.tabbarRef.getPermission();
             }
 
         });
diff --git a/pages/login/authInfo.vue b/pages/login/authInfo.vue
index 85a5b51..15ed0af 100644
--- a/pages/login/authInfo.vue
+++ b/pages/login/authInfo.vue
@@ -110,7 +110,6 @@
     width: 100%;
     // min-height: 100%;
     padding: 0;
-    background: rgba(239, 239, 239, 1);
     padding-top: var(--status-bar-height);
     .banner-swiper {
       margin-bottom: 64rpx;
diff --git a/pages/my/feedback.vue b/pages/my/feedback.vue
index 21c31ca..edcb355 100644
--- a/pages/my/feedback.vue
+++ b/pages/my/feedback.vue
@@ -135,7 +135,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .page-css {
-  background: #efefef;
   display: flex;
   flex-direction: column;
   .content {
diff --git a/pages/my/my.vue b/pages/my/my.vue
index d7eb79f..4ce885e 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -121,7 +121,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .page-css {
-  background: #efefef;
   padding: 0 0 32rpx 0;
   height: 100vh;
   .sp-my-new {
diff --git a/pages/my/records.vue b/pages/my/records.vue
index 3fb72a8..7d0efd4 100644
--- a/pages/my/records.vue
+++ b/pages/my/records.vue
@@ -138,7 +138,6 @@ export default {
 
 <style lang="scss" scoped>
 .page-css {
-  background: #efefef;
   padding: 0 0 0 0;
   display: flex;
   flex-direction: column;
diff --git a/pages/notice/announcement.vue b/pages/notice/announcement.vue
new file mode 100644
index 0000000..179e102
--- /dev/null
+++ b/pages/notice/announcement.vue
@@ -0,0 +1,178 @@
+<template>
+    <view class="notice-list">
+
+        <scroll-view scroll-y="true"
+            style="height:calc(100vh - 140rpx);width: 100%;background: #F5F5F5;margin-top:32rpx"
+            :refresher-triggered="triggered" :refresher-enabled="true" @refresherrefresh="refresherrefresh"
+            refresher-background="#f1f1f1" @scrolltolower="onListBottom">
+            <ul class="card">
+                <li v-for="(item, index) in dataList" :key="index" @click="jump(item)">
+                    <view class="title">
+                        <view class="text">
+                            <view>{{ item.title }}</view>
+                            <!-- <view class="mark" v-if="!item.readStatus"></view> -->
+                        </view>
+                        <view style="flex-shrink: 0;color: #999999;">{{ item.categoryName }}</view>
+                    </view>
+                    <view>
+                        <u-parse :html="item.content"></u-parse>
+                    </view>
+                </li>
+            </ul>
+            <view style=" line-height: 100rpx;">
+                <uni-load-more :status="scrollType"></uni-load-more>
+            </view>
+        </scroll-view>
+    </view>
+</template>
+<script>
+// import requestName from '@/common/requestName'
+export default {
+    name: 'NoticeList',
+    data() {
+        return {
+            dataList: [
+            ],
+            current: 0,
+            style: {
+                borderRadius: '100px',
+                background: '#fff',
+                padding: '0 32rpx'
+            },
+            search: {
+                pageNo: 1,
+                pageSize: 20,
+                readStatus: ''
+            },
+            scrollType: '',
+            triggered: false,
+            refreshNeed: false
+        }
+    },
+    onLoad(data) {
+        this.getList()
+    },
+    onShow() {
+        console.log(this.refreshNeed);
+        if (this.refreshNeed) {
+            this.reSearch()
+        }
+    },
+    
+    methods: {
+
+        getList() {
+            this.$u.api.getNoticeList(this.search).then(res => {
+                if (res.code == 200) {
+                    let data = res.data.records
+                    this.scrollType = ''
+                    this.triggered = false
+                    if (data.length >= this.search.pageSize) {
+                        this.scrollType = 'more'
+                    }
+                    this.dataList = this.dataList.concat(data)
+                }
+            })
+        },
+
+        reSearch() {
+            this.search.pageNo = 1
+            this.dataList = []
+            this.getList()
+        },
+
+        onListBottom() {
+            if (this.scrollType == 'more') {
+                this.search.pageNo += 1
+                this.getList()
+            }
+        },
+        onreachBottom() {
+            this.getDevicePage()
+        },
+        refresherrefresh() {
+            this.triggered = true
+            this.reSearch()
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.notice-list {
+    height: calc(100vh - 0px);
+    background: #F5F5F5;
+    overflow: hidden;
+
+    .mark-read-btn {
+        background: #FFFFFF;
+        border-radius: 8rpx;
+        border: 1px solid rgba(255, 255, 255, 0.43);
+        padding: 0;
+        margin: 24rpx 30rpx;
+        text-align: center;
+        height: 88rpx;
+        line-height: 88rpx;
+        font-size: 30rpx;
+        color: #FF8800;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        image {
+            width: 34rpx;
+            height: 32rpx;
+            display: block;
+            margin-right: 20rpx;
+            fill: #004BAA
+        }
+    }
+
+
+    .card {
+        margin: 0 16px;
+        list-style: none;
+        padding: 0;
+
+        li {
+            background: #FFFFFF;
+            border-radius: 4px;
+            border: 1px solid rgba(255, 255, 255, 0.43);
+            padding: 12px 14px;
+            margin-bottom: 24rpx;
+            font-size: 28rpx;
+
+            .title {
+                border-bottom: 1px solid #F0F0F0;
+                display: flex;
+                justify-content: space-between;
+                padding-bottom: 10rpx;
+                margin-bottom: 15rpx;
+
+
+                .text {
+                    font-size: 30rpx;
+                    flex-grow: 1;
+                    display: flex;
+                    margin-right: 20rpx;
+                    font-weight: 400;
+                    color: #333333;
+                }
+
+                .mark {
+                    width: 16rpx;
+                    height: 16rpx;
+                    background: #D9362D;
+                    border-radius: 50%;
+                    margin-left: 12rpx;
+                    margin-top: 5rpx;
+                    flex-shrink: 0;
+                }
+
+            }
+
+
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pages/notice/index.vue b/pages/notice/index.vue
new file mode 100644
index 0000000..112b0bc
--- /dev/null
+++ b/pages/notice/index.vue
@@ -0,0 +1,187 @@
+<template>
+  <view class="notice-list">
+    <view @click="markReadAll" class="mark-read-btn">
+      <image src="@/static/images/home/notice.svg" alt="" />
+      一键标记为已读
+    </view>
+    <scroll-view scroll-y="true" style="height:calc(100vh - 140rpx);width: 100%;background: #F5F5F5;"
+      :refresher-triggered="triggered" :refresher-enabled="true" @refresherrefresh="refresherrefresh"
+      refresher-background="#f1f1f1" @scrolltolower="onListBottom">
+      <ul class="card">
+        <li v-for="(item, index) in dataList" :key="index" @click="jump(item)">
+          <view class="title">
+            <view class="text">
+              <view>{{ item.title }}</view>
+              <view class="mark" v-if="!item.readStatus"></view>
+            </view>
+            <view style="flex-shrink: 0;color: #999999;">{{ item.createdAt }}</view>
+          </view>
+          <view>
+            {{ item.content }}
+          </view>
+        </li>
+      </ul>
+      <view style=" line-height: 100rpx;">
+        <uni-load-more :status="scrollType"></uni-load-more>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+<script>
+// import requestName from '@/common/requestName'
+export default {
+  name: 'NoticeList',
+  data() {
+    return {
+      dataList: [],
+      current: 0,
+      style: {
+        borderRadius: '100px',
+        background: '#fff',
+        padding: '0 32rpx'
+      },
+      search: {
+        pageNo: 1,
+        pageSize: 20,
+        readStatus: ''
+      },
+      scrollType: '',
+      triggered: false,
+      refreshNeed: false
+    }
+  },
+  onLoad(data) {
+    this.getList()
+  },
+  onShow() {
+    console.log(this.refreshNeed);
+    if (this.refreshNeed) {
+      this.reSearch()
+    }
+  },
+  methods: {
+   
+    /**
+     * @description 全部设为已读
+     */
+    markReadAll() {
+      // this.$wx_http.post(requestName['updateReadStatus'], [-1]).then(res => {
+      //   if (res.code == 0) {
+      //     this.reSearch()
+      //   }
+      // })
+    },
+
+    getList() {
+      // this.$wx_http.get(requestName['pageNotice'], this.search).then(res => {
+      //   let data = res.data.records
+      //   this.scrollType = ''
+      //   this.triggered = false
+      //   if (data.length >= this.search.pageSize) {
+      //     this.scrollType = 'more'
+      //   }
+      //   this.dataList = this.dataList.concat(data)
+      // })
+    },
+
+    reSearch() {
+      this.search.pageNo = 1
+      this.dataList = []
+      this.getList()
+    },
+
+    onListBottom() {
+      if (this.scrollType == 'more') {
+        this.search.pageNo += 1
+        this.getList()
+      }
+    },
+    onreachBottom() {
+      this.getDevicePage()
+    },
+    refresherrefresh() {
+      this.triggered = true
+      this.reSearch()
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.notice-list {
+  height: calc(100vh - 0px);
+  background: #F5F5F5;
+  overflow: hidden;
+
+  .mark-read-btn {
+    background: #FFFFFF;
+    border-radius: 8rpx;
+    border: 1px solid rgba(255, 255, 255, 0.43);
+    padding: 0;
+    margin: 24rpx 30rpx;
+    text-align: center;
+    height: 88rpx;
+    line-height: 88rpx;
+    font-size: 30rpx;
+    color: #FF8800;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    image {
+      width: 34rpx;
+      height: 32rpx;
+      display: block;
+      margin-right: 20rpx;
+      fill:#004BAA
+    }
+  }
+
+
+  .card {
+    margin: 0 16px;
+    list-style: none;
+    padding: 0;
+
+    li {
+      background: #FFFFFF;
+      border-radius: 4px;
+      border: 1px solid rgba(255, 255, 255, 0.43);
+      padding: 12px 14px;
+      margin-bottom: 24rpx;
+      font-size: 28rpx;
+
+      .title {
+        border-bottom: 1px solid #F0F0F0;
+        display: flex;
+        justify-content: space-between;
+        padding-bottom: 10rpx;
+        margin-bottom: 15rpx;
+
+
+        .text {
+          font-size: 30rpx;
+          flex-grow: 1;
+          display: flex;
+          margin-right: 20rpx;
+          font-weight: 400;
+          color: #333333;
+        }
+
+        .mark {
+          width: 16rpx;
+          height: 16rpx;
+          background: #D9362D;
+          border-radius: 50%;
+          margin-left: 12rpx;
+          margin-top: 5rpx;
+          flex-shrink: 0;
+        }
+
+      }
+
+
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/submission/index.vue b/pages/submission/index.vue
index a731c87..97626a3 100644
--- a/pages/submission/index.vue
+++ b/pages/submission/index.vue
@@ -35,7 +35,6 @@ export default {
 
 <style lang="scss" scoped>
 .page-css {
-  background: #efefef;
   display: flex;
   flex-direction: column;
 
diff --git a/pages/submission/records.vue b/pages/submission/records.vue
index 6733daf..48e3a64 100644
--- a/pages/submission/records.vue
+++ b/pages/submission/records.vue
@@ -1,13 +1,12 @@
 <template>
   <view class="page-css">
-    <!-- <betone-list type="submission" ref="tablist"></betone-list> -->
-    <u-navbar v-if="type != ''" title="报送记录" back-icon-color="rgb(0, 0, 0)" back-icon-size="54" :title-bold="true"
+    <u-navbar  :title="type" back-icon-color="rgb(0, 0, 0)" back-icon-size="54" :title-bold="true"
     :title-size="38" title-color="rgb(0, 0, 0)"></u-navbar>
-    <view class="page-header-txt" v-if="type == ''">科研医疗建筑运维平台</view>
+    <!-- <view class="page-header-txt" v-if="type == ''">科研医疗建筑运维平台</view> -->
     <view class="page-box">
       <view class="page-search-top">
         <betone-new-input v-model="searchInfo.requirementCode" :placeholder="dataTypes == 1 ? '搜索单号' : '搜索单号或单位名称'"
-          icon="search" style="margin-bottom: 32rpx" @changevalue="searchData()" />
+          icon="search" style="margin-bottom: 32rpx;margin-top: 32rpx;" @changevalue="searchData()" />
         <u-tabs :list="tabList" :is-scroll="true" :current="current" @change="changeTab"></u-tabs>
       </view>
       <view class="order-box">
@@ -141,7 +140,7 @@
       <sp-html2pdf-render domId="capture" ref="renderRef" @renderOver="renderOver" pdfFileName="这是一个pdf文件"
         @beforeSavePDF="beforeSavePDF" @successSavePDF="successSavePDF"></sp-html2pdf-render>
     </view>
-    <betone-tabbar ref="tabbarRef" v-if="type == ''" />
+    <!-- <betone-tabbar ref="tabbarRef" v-if="type == ''" /> -->
   </view>
 </template>
 
@@ -219,13 +218,13 @@ export default {
     this.getRecordsList();
   },
   onLoad(options) {
-    this.type = options.type?options.type:''
+    this.type = options.name?options.name:''
   },
   onShow() {
     this.$nextTick(() => {
      
       if(this.type==''){
-        this.$refs.tabbarRef.getPermission();
+        // this.$refs.tabbarRef.getPermission();
       }
       this.getRecordsList()
     });
@@ -532,6 +531,7 @@ export default {
     .page-search-top {
       background-color: #fff;
       padding: 0 40rpx 0;
+      overflow: hidden;
     }
 
     .order-box {
diff --git a/static/images/home/left.svg b/static/images/home/left.svg
new file mode 100644
index 0000000..307764a
--- /dev/null
+++ b/static/images/home/left.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-点检任务@3x</title>
+    <g id="3.1.8移动端" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="工作台首页" transform="translate(-198.000000, -485.000000)">
+            <g id="设备点检任务卡片" transform="translate(15.000000, 422.000000)">
+                <g id="icon-点检任务" transform="translate(183.000000, 63.000000)">
+                    <path d="M10.2555408,-4.14336123e-16 L21.7444592,4.14336123e-16 C25.3105342,-2.4074122e-16 26.6036791,0.371302445 27.9073828,1.06853082 C29.2110865,1.76575919 30.2342408,2.78891348 30.9314692,4.09261719 C31.6286976,5.39632089 32,6.68946584 32,10.2555408 L32,21.7444592 C32,25.3105342 31.6286976,26.6036791 30.9314692,27.9073828 C30.2342408,29.2110865 29.2110865,30.2342408 27.9073828,30.9314692 C26.6036791,31.6286976 25.3105342,32 21.7444592,32 L10.2555408,32 C6.68946584,32 5.39632089,31.6286976 4.09261719,30.9314692 C2.78891348,30.2342408 1.76575919,29.2110865 1.06853082,27.9073828 C0.371302445,26.6036791 1.60494146e-16,25.3105342 -2.76224082e-16,21.7444592 L2.76224082e-16,10.2555408 C-1.60494146e-16,6.68946584 0.371302445,5.39632089 1.06853082,4.09261719 C1.76575919,2.78891348 2.78891348,1.76575919 4.09261719,1.06853082 C5.39632089,0.371302445 6.68946584,2.4074122e-16 10.2555408,-4.14336123e-16 Z" id="矩形" fill="#38D79F"></path>
+                    <g id="编组" transform="translate(6.000000, 6.000000)" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.833333333">
+                        <line x1="14.1666667" y1="4.16666667" x2="17.5" y2="7.5" id="路径"></line>
+                        <line x1="17.5" y1="4.16666667" x2="14.1666667" y2="7.5" id="路径"></line>
+                        <polyline id="路径" points="18.3333333 12.5 15.4166667 15.8333333 13.75 14.1666667"></polyline>
+                        <rect id="矩形" fill="#FFFFFF" fill-rule="nonzero" x="1.66666667" y="4.16666667" width="9.16666667" height="3.33333333"></rect>
+                        <rect id="矩形" fill="#FFFFFF" fill-rule="nonzero" x="1.66666667" y="12.5" width="9.16666667" height="3.33333333"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/home/notice.svg b/static/images/home/notice.svg
new file mode 100644
index 0000000..8275c15
--- /dev/null
+++ b/static/images/home/notice.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>标记已读 (1)</title>
+    <defs>
+        <filter id="filter-1">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1.000000 0 0 0 0 0.533333 0 0 0 0 0.000000 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+        <filter id="filter-2">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.400000 0 0 0 0 0.400000 0 0 0 0 0.400000 0 0 0 1.000000 0"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="3.1.8移动端" stroke="none" stroke-width="1"  fill-rule="evenodd">
+        <g id="编组" transform="translate(-122.000000, -133.000000)" filter="url(#filter-1)">
+            <g transform="translate(122.000000, 131.000000)" filter="url(#filter-2)" id="标记已读-(1)">
+                <g transform="translate(-0.000000, 2.000000)">
+                    <path d="M8.37696335,10.4081424 C7.82912206,10.4084688 7.29851125,10.2166781 6.87748691,9.86615183 L2.90596859,6.56730366 C2.71359171,6.41703784 2.61813778,6.17405323 2.65679946,5.93302635 C2.69546114,5.69199947 2.86212241,5.49105919 3.09184538,5.40849988 C3.32156834,5.32594057 3.57801234,5.37482256 3.76125654,5.53609948 L7.73445026,8.83578534 C8.10648647,9.14551369 8.64660253,9.14551369 9.01863874,8.83578534 L12.9926702,5.53609948 C13.2784317,5.31879802 13.6846744,5.36527799 13.9139688,5.64150922 C14.1432632,5.91774045 14.114156,6.32559616 13.8479581,6.56646597 L9.8747644,9.86698953 C9.45424568,10.217158 8.92418695,10.4086669 8.37696335,10.4081424 L8.37696335,10.4081424 Z" id="路径"  fill-rule="nonzero"></path>
+                    <path d="M14.408377,15.9260473 L2.34554974,15.9260473 C1.05256061,15.9265131 0.00323354393,14.8801841 0,13.587199 L0,5.61232984 C0.000279573081,4.75408428 0.471590841,3.96524112 1.22722513,3.55829843 L7.25863874,0.293795812 C7.95622534,-0.0844047244 8.79770137,-0.0844047244 9.49528796,0.293795812 L15.5275393,3.55829843 C16.2829822,3.96574443 16.7539267,4.7548516 16.7539267,5.61316754 L16.7539267,13.5880366 C16.7502321,14.8806945 15.70104,15.9265142 14.408377,15.9260473 Z M8.37696335,1.35013074 C8.20900955,1.35029585 8.04374673,1.39233134 7.89612565,1.47243455 L1.86471204,4.73693717 C1.54222712,4.91051135 1.34088584,5.24693783 1.34031414,5.61316754 L1.34031414,13.5880366 C1.34354237,14.1406504 1.7929273,14.586665 2.34554974,14.5857344 L14.408377,14.5857344 C14.96165,14.5866615 15.4113042,14.1396302 15.4136126,13.5863613 L15.4136126,5.61149215 C15.4127335,5.24556311 15.2114357,4.90953083 14.8892147,4.73609948 L8.85780105,1.47159686 C8.71010389,1.3917851 8.54484533,1.35013074 8.37696335,1.35013074 Z" id="形状"  fill-rule="nonzero"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/home/right.svg b/static/images/home/right.svg
new file mode 100644
index 0000000..c0c605d
--- /dev/null
+++ b/static/images/home/right.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-点检计划@3x</title>
+    <g id="3.1.8移动端" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="工作台首页" transform="translate(-31.000000, -485.000000)">
+            <g id="设备点检任务卡片" transform="translate(15.000000, 422.000000)">
+                <g id="icon-点检计划" transform="translate(16.000000, 63.000000)">
+                    <path d="M10.2555408,-4.14336123e-16 L21.7444592,4.14336123e-16 C25.3105342,-2.4074122e-16 26.6036791,0.371302445 27.9073828,1.06853082 C29.2110865,1.76575919 30.2342408,2.78891348 30.9314692,4.09261719 C31.6286976,5.39632089 32,6.68946584 32,10.2555408 L32,21.7444592 C32,25.3105342 31.6286976,26.6036791 30.9314692,27.9073828 C30.2342408,29.2110865 29.2110865,30.2342408 27.9073828,30.9314692 C26.6036791,31.6286976 25.3105342,32 21.7444592,32 L10.2555408,32 C6.68946584,32 5.39632089,31.6286976 4.09261719,30.9314692 C2.78891348,30.2342408 1.76575919,29.2110865 1.06853082,27.9073828 C0.371302445,26.6036791 1.60494146e-16,25.3105342 -2.76224082e-16,21.7444592 L2.76224082e-16,10.2555408 C-1.60494146e-16,6.68946584 0.371302445,5.39632089 1.06853082,4.09261719 C1.76575919,2.78891348 2.78891348,1.76575919 4.09261719,1.06853082 C5.39632089,0.371302445 6.68946584,2.4074122e-16 10.2555408,-4.14336123e-16 Z" id="矩形" fill="#38D79F"></path>
+                    <g id="编组" transform="translate(7.000000, 8.000000)" fill="#FFFFFF" fill-rule="nonzero">
+                        <path d="M14,0 C14.5522847,-1.01453063e-16 15,0.44771525 15,1 L15,3 L17.1666667,3 C17.626904,3 18,3.37309604 18,3.83333333 L18,15.1666667 C18,15.626904 17.626904,16 17.1666667,16 L0.833333333,16 C0.373096042,16 2.47152384e-12,15.626904 2.47268872e-12,15.1666667 L2.47268872e-12,3.83333333 C2.47263236e-12,3.37309604 0.373096042,3 0.833333333,3 L3,3 L3,3 L3,1 C3,0.44771525 3.44771525,1.01453063e-16 4,0 C4.55228475,-1.01453063e-16 5,0.44771525 5,1 L5,3 L13,3 L13,3 L13,1 C13,0.44771525 13.4477153,1.01453063e-16 14,0 Z M14,10.3333333 L4,10.3333333 C3.44771525,10.3333333 3,10.7810486 3,11.3333333 C3,11.8461692 3.38604019,12.2688405 3.88337887,12.3266056 L4,12.3333333 L14,12.3333333 C14.5522847,12.3333333 15,11.8856181 15,11.3333333 C15,10.7810486 14.5522847,10.3333333 14,10.3333333 Z M8,6.33333333 L4,6.33333333 C3.44771525,6.33333333 3,6.78104858 3,7.33333333 C3,7.84616917 3.38604019,8.26884049 3.88337887,8.3266056 L4,8.33333333 L8,8.33333333 C8.55228475,8.33333333 9,7.88561808 9,7.33333333 C9,6.78104858 8.55228475,6.33333333 8,6.33333333 Z" id="形状结合"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/scss/sp-components/index.scss b/static/scss/sp-components/index.scss
index 68dd239..56e1805 100644
--- a/static/scss/sp-components/index.scss
+++ b/static/scss/sp-components/index.scss
@@ -8,7 +8,7 @@
     width: 750rpx;
     margin: 0 auto;
     z-index: 2;
-    background: #EFEFEF;
+    background: #f5f5f5;
     box-sizing: border-box;
     padding: 16rpx;
     min-height: 100vh;
diff --git a/store/index.js b/store/index.js
index 60a818a..5538059 100644
--- a/store/index.js
+++ b/store/index.js
@@ -41,7 +41,7 @@ const store = new Vuex.Store({
           commit('updateTabbar', tabBar.ordinary)
 
           uni.reLaunch({
-            url: "/pages/submission/records",
+            url: "/pages/home/index",
           });
 
 
@@ -51,7 +51,7 @@ const store = new Vuex.Store({
           commit('updateTabbar', tabBar.manage)
 
           uni.reLaunch({
-            url: "/pages/submission/records",
+            url: "/pages/home/index",
           });
           // this.$u.api.updateCoordinate().then(res=>{
 
@@ -63,11 +63,9 @@ const store = new Vuex.Store({
           commit('updateTabbar', tabBar.repair)
 
           uni.reLaunch({
-            url: "/pages/submission/records",
+            url: "/pages/home/index",
           });
 
-
-
           // 如果是维修人员登录   则实时更新当前维修人员的位置
 
         }
diff --git a/utils/tabbar.js b/utils/tabbar.js
index 50d5ebb..8aab249 100644
--- a/utils/tabbar.js
+++ b/utils/tabbar.js
@@ -2,13 +2,8 @@
 const ordinary = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
-    text: "接单记录",
-    pagePath: "/pages/submission/records",
-},  {
-    iconPath: "setting",
-    selectedIconPath: "setting-fill",
-    text: "巡检任务",
-    pagePath: "/pages/inspection/quest",
+    text: "工作台",
+    pagePath: "/pages/home/index",
 },{
     iconPath: "account",
     selectedIconPath: "account-fill",
@@ -38,13 +33,8 @@ const member = [{
 const manage = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
-    text: "接单记录",
-    pagePath: "/pages/submission/records",
-}, {
-    iconPath: "setting",
-    selectedIconPath: "setting-fill",
-    text: "巡检任务",
-    pagePath: "/pages/inspection/quest",
+    text: "工作台",
+    pagePath: "/pages/home/index",
 }, {
     iconPath: "account",
     selectedIconPath: "account-fill",
@@ -55,14 +45,9 @@ const manage = [{
 const repair = [{
     iconPath: "photo",
     selectedIconPath: "photo-fill",
-    text: "维修任务",
-    pagePath: "/pages/submission/records",
-}, {
-    iconPath: "setting",
-    selectedIconPath: "setting-fill",
-    text: "巡检任务",
-    pagePath: "/pages/inspection/quest",
-}, {
+    text: "工作台",
+    pagePath: "/pages/home/index",
+},{
     iconPath: "account",
     selectedIconPath: "account-fill",
     text: "我的",