diff --git a/src/assets/home-circle.png b/src/assets/home-circle.png
new file mode 100644
index 0000000..b6d2f5f
Binary files /dev/null and b/src/assets/home-circle.png differ
diff --git a/src/assets/home-icon1.png b/src/assets/home-icon1.png
new file mode 100644
index 0000000..87510c1
Binary files /dev/null and b/src/assets/home-icon1.png differ
diff --git a/src/assets/home-icon2.png b/src/assets/home-icon2.png
new file mode 100644
index 0000000..730566f
Binary files /dev/null and b/src/assets/home-icon2.png differ
diff --git a/src/assets/home-icon3.png b/src/assets/home-icon3.png
new file mode 100644
index 0000000..cee61e5
Binary files /dev/null and b/src/assets/home-icon3.png differ
diff --git a/src/assets/home-icon4.png b/src/assets/home-icon4.png
new file mode 100644
index 0000000..417ab3a
Binary files /dev/null and b/src/assets/home-icon4.png differ
diff --git a/src/assets/home-icon5.png b/src/assets/home-icon5.png
new file mode 100644
index 0000000..7ecc74e
Binary files /dev/null and b/src/assets/home-icon5.png differ
diff --git a/src/assets/home-icon6.png b/src/assets/home-icon6.png
new file mode 100644
index 0000000..778d121
Binary files /dev/null and b/src/assets/home-icon6.png differ
diff --git a/src/assets/home-icon7.png b/src/assets/home-icon7.png
new file mode 100644
index 0000000..f30e3c9
Binary files /dev/null and b/src/assets/home-icon7.png differ
diff --git a/src/assets/home-icon8.png b/src/assets/home-icon8.png
new file mode 100644
index 0000000..f814326
Binary files /dev/null and b/src/assets/home-icon8.png differ
diff --git a/src/components/myecharts/index.vue b/src/components/myecharts/index.vue
new file mode 100644
index 0000000..06398fb
--- /dev/null
+++ b/src/components/myecharts/index.vue
@@ -0,0 +1,215 @@
+<template>
+  <div class="chartWrap"
+    :style="{ width: width, height: height,'textAlign':'center',lineHeight: height,color:'#909399'}">
+    <div v-if="showChart" ref="mybar"></div>
+    <div v-else>暂无数据</div>
+  </div>
+</template>
+<script>
+  import * as echarts from 'echarts'
+  require('echarts/theme/macarons')
+  import resize from './mixins/resize'
+  const animationDuration = 6000
+  export default {
+    mixins: [resize],
+    props: {
+      //图表数据
+      data: {
+        type: Object,
+        default: () => {},
+      },
+      //图表宽
+      width: {
+        type: String,
+        default: "100%",
+      },
+      //图表高
+      height: {
+        type: String,
+        default: "350px",
+      },
+      //
+      axisPointerType: {
+        type: String,
+        default: "shadow",
+      },
+      //图表颜色
+      colors: {
+        type: Array,
+        default: () => {
+          return [
+            "#f0c99f",
+            "#de454c",
+            "#fac858",
+            "#ee6666",
+            "#73c0de",
+            "#3ba272",
+            "#fc8452",
+            "#9a60b4",
+            "#ea7ccc",
+          ];
+        },
+      },
+    },
+    data() {
+      return {
+        myChart: "",
+        showChart: true
+      };
+    },
+    watch: {
+      data: {
+        // 监听图表变化重新渲染图表
+        handler() {
+          this.initChart(this.$refs.mybar, this.data);
+        },
+        deep: true,
+      },
+    },
+
+    computed: {},
+    created() {},
+    mounted() {
+      // 初始化渲染
+      this.initChart(this.$refs.mybar, this.data);
+    },
+    methods: {
+      initChart(dom, currentData) {
+        if (Object.keys(currentData).length == 0) {
+          console.log("123")
+          this.showChart = false
+          return
+        }
+        //清空重新渲染
+        if (
+          this.myChart != null &&
+          this.myChart != "" &&
+          this.myChart != undefined
+        ) {
+          this.myChart.dispose(); //销毁
+        }
+        // this.myChart = this.$echarts.init(dom);
+        this.myChart = echarts.init(this.$el, 'macarons')
+        let option = this.option(currentData);
+        this.myChart.setOption(option);
+
+
+      },
+      option(currentData) {
+        let seriesList = currentData.list.map((item, index) => {
+          let Linear = item.Linear ? item.Linear : [1, 1, 1, 1]
+          let itemStyle = {
+            normal: {
+              color: new echarts.graphic.LinearGradient(Linear[0], Linear[1], Linear[2], Linear[3], [{
+                offset: 0,
+                color: item.color1 || this.colors[index] // 起始颜色
+              }, {
+                offset: 1,
+                color: item.color2 || this.colors[index] // 结束颜色，透明度为0
+              }]) // 设置渐变色为填充色
+            }
+          }
+          return {
+            name: item.name || "",
+            type: item.type || "line", //不传默认为折线图
+            data: item.data,
+            itemStyle:item.Linear?itemStyle:{},
+            ...item
+          };
+        });
+        // 返回echarts配置参数
+        return {
+          grid: {
+            left: '20',
+            right: '10',
+            top: '20',
+            bottom: currentData.gBottom || '0',
+            containLabel: true
+          },
+
+          color: this.colors, //自定义颜色
+          legend: {
+            show: false
+          },
+          tooltip: { //提示框浮层内容格式器
+            // trigger: "axis",
+            // formatter: currentData.formatter, //自定义格式
+            trigger: currentData.trigger || 'axis',
+            formatter: currentData.formatter,
+            axisPointer: {
+              type: this.axisPointerType,
+            },
+            textStyle: { //提示框内文字样式的设置
+              align: 'left'
+            }
+
+          },
+          itemStyle: {
+            borderRadius: [0, 0, 0, 0],
+
+          },
+          xAxis: {
+            type: currentData.xType || "category",
+            data: currentData.x || '', //横坐标数据
+            position: currentData.xPosition || '',
+            splitArea: false,
+            splitLine: false,
+            axisLine: {
+              show: currentData.xShow,
+              lineStyle: {
+                color: "#f3f3f3", //x轴线颜色
+                width: 1,
+                type: "solid",
+              },
+            },
+            axisTick: {
+              show: false,
+            },
+            toolbox: {},
+            axisLabel: {
+              interval: 0,
+              rotate: currentData.rotate || '',
+              show: true,
+              splitNumber: 15,
+              textStyle: {
+                color: "rgba(122,122,122,1)",
+                fontSize: "14",
+              },
+            },
+          },
+          yAxis: {
+            type: currentData.yType || 'value',
+            splitArea: false,
+            splitLine: false,
+            data: currentData.yData || '',
+            // name: currentData.list[0].unit, //单位
+            axisLabel: {
+              formatter: "{value}", //显示格式
+              show: true,
+              textStyle: {
+                color: "rgba(122,122,122,1)",
+                fontSize: "12",
+              },
+            },
+            axisLine: {
+              show: currentData.yShow,
+              lineStyle: {
+                color: "#fff", //y轴线颜色
+                width: 1,
+                type: "solid",
+              },
+            },
+            // interval: 0
+          },
+          series: seriesList, //每一条配置
+        };
+      },
+    },
+  };
+</script>
+
+<style>
+  .chartWrap {
+    background-color: #fff;
+  }
+</style>
diff --git a/src/components/myecharts/mixins/resize.js b/src/components/myecharts/mixins/resize.js
new file mode 100644
index 0000000..234953b
--- /dev/null
+++ b/src/components/myecharts/mixins/resize.js
@@ -0,0 +1,55 @@
+import { debounce } from '@/utils'
+
+export default {
+  data() {
+    return {
+      $_sidebarElm: null,
+      $_resizeHandler: null
+    }
+  },
+  mounted() {
+    this.$_resizeHandler = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    this.$_initResizeEvent()
+    this.$_initSidebarResizeEvent()
+  },
+  beforeDestroy() {
+    this.$_destroyResizeEvent()
+    this.$_destroySidebarResizeEvent()
+  },
+  // to fixed bug when cached by keep-alive
+  // https://github.com/PanJiaChen/vue-element-admin/issues/2116
+  activated() {
+    this.$_initResizeEvent()
+    this.$_initSidebarResizeEvent()
+  },
+  deactivated() {
+    this.$_destroyResizeEvent()
+    this.$_destroySidebarResizeEvent()
+  },
+  methods: {
+    // use $_ for mixins properties
+    // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential
+    $_initResizeEvent() {
+      window.addEventListener('resize', this.$_resizeHandler)
+    },
+    $_destroyResizeEvent() {
+      window.removeEventListener('resize', this.$_resizeHandler)
+    },
+    $_sidebarResizeHandler(e) {
+      if (e.propertyName === 'width') {
+        this.$_resizeHandler()
+      }
+    },
+    $_initSidebarResizeEvent() {
+      this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+      this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler)
+    },
+    $_destroySidebarResizeEvent() {
+      this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler)
+    }
+  }
+}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c580305..e2d42d2 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,298 +1,335 @@
-<template>
-  <div>
-
-    <div class="statistics">
-      <panel-group :totaldata="list" />
-    </div>
-
-
-  </div>
-</template>
-
-<script>
-  import echarts from "echarts"
-  import PanelGroup from './components/PanelGroup'
-  import {
-    getChartsHome
-  } from "@/api/dashboard"
-
-  export default {
-    components: {
-      PanelGroup
-    },
-    data() {
-      return {
-        col: '',
-        line: '',
-        business_data: [],
-        collect_data: [],
-        list: {},
-        customerArr: [],
-        orderArr: [],
-        chartData: {},
-      }
-    },
-    watch: {
-      chartData(val, newval) {
-        if (newval){
-          this.init();
-        }
-      }
-    },
-    methods: {
-      async loadData() {
-        await getChartsHome().then((res) => {
-          console.log(res);
-          this.list = res.list;
-          this.chartData = res;
-          let _business_data = [];
-          let _collect_data = [];
-          res.business_data.map(item => {
-            _business_data.push(item.server_money_total)
-            _collect_data.push(item.collect_money)
-          })
-          this.business_data = _business_data;
-          this.collect_data = _collect_data;
-          let _customerArr = [];
-          let _orderArr = [];
-
-          res.order_data.map(item => {
-            _customerArr.push(item.active_customer)
-            _orderArr.push(item.order_total)
-          })
-          this.customerArr = _customerArr;
-          this.orderArr = _orderArr;
-        }).catch()
-      },
-      init() {
-        this.col = echarts.init(document.getElementById('col-chart'))
-        this.col.setOption({
-          title: {
-            text: ''
-          },
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-              type: 'shadow'
-            },
-            position: 'bottom'
-          },
-          legend: {},
-          grid: {
-            left: '3%',
-            right: '4%',
-            bottom: '3%',
-            containLabel: true
-          },
-          yAxis: {
-            type: 'value',
-            boundaryGap: [0, 0.01]
-          },
-          xAxis: {
-            type: 'category',
-            data: ['第一周', '第二周', '第三周', '第四周']
-          },
-          series: [{
-              name: '服务金额',
-              type: 'bar',
-              data: this.business_data,
-              itemStyle: {
-                normal: {
-                  color: 'rgb(42,182,252)'
-                },
-              },
-            },
-            {
-              name: '收款',
-              type: 'bar',
-              data: this.collect_data,
-              itemStyle: {
-                normal: {
-                  color: 'rgb(34,228,255)'
-                },
-              },
-            }
-          ]
-        })
-
-        this.line = echarts.init(document.getElementById('line-chart'))
-        this.line.setOption({
-          title: {
-            text: ''
-          },
-          tooltip: {
-            trigger: 'axis'
-          },
-          legend: {
-            data: ['活跃客户', '服务订单']
-          },
-          grid: {
-            left: '3%',
-            right: '6%',
-            bottom: '3%',
-            containLabel: true
-          },
-          toolbox: {
-
-          },
-          xAxis: {
-            type: 'category',
-            boundaryGap: false,
-            data: ['第一周', '第二周', '第三周', '第四周']
-          },
-          yAxis: {
-            type: 'value',
-          },
-          series: [{
-              name: '活跃客户',
-              type: 'line',
-              stack: 'Total',
-              data: this.customerArr,
-              itemStyle: {
-                normal: {
-                  color: 'rgb(42,182,252)'
-                },
-              },
-            },
-            {
-              name: '服务订单',
-              type: 'line',
-              stack: 'Total',
-              data: this.orderArr,
-              itemStyle: {
-                normal: {
-                  color: 'rgb(34,228,255)'
-                },
-              },
-            }
-          ]
-        })
-      }
-    },
-    created() {
-
-      //this.loadData();
-    },
-    mounted() {
-
-
-      //this.init()
-
-      window.onresize = () => {
-        this.col.resize()
-        this.line.resize()
-      }
-
-    },
-    destroyed() {
-      window.onresize = null
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .statistics {
-    display: flex;
-
-    margin-top: 20px;
-
-    &-title {
-
-      padding-left: 6px;
-    }
-
-    &-content {
-      text-align: center;
-      font-size: 13px;
-
-      &-top {
-
-        &__num {
-          font-weight: 600;
-        }
-
-        &__name {
-          font-size: 10px;
-          color: rgb(140, 140, 140);
-        }
-      }
-
-      &-bottom {
-        display: flex;
-        justify-content: space-between;
-
-        &-left {
-
-          &__num {
-            font-weight: 600;
-          }
-
-          &__name {
-            font-size: 10px;
-            color: rgb(140, 140, 140);
-          }
-        }
-
-        &-right {
-
-          &__num {
-            font-weight: 600;
-          }
-
-          &__name {
-            font-size: 10px;
-            color: rgb(140, 140, 140);
-          }
-        }
-      }
-    }
-
-    &>div {
-      flex: 1;
-      margin-right: 20px;
-
-      &:last-child {
-        margin-right: 0;
-      }
-    }
-  }
-
-  .chart {
-    display: flex;
-
-    margin-top: 20px;
-
-
-    .chartItem {
-
-      width: 49%;
-
-      .chartItemTitle {
-        font-size: 16px;
-        margin-bottom: 20px;
-      }
-
-      #col-chart {
-        background: #fff;
-        border-radius: 10px;
-        flex: 1;
-        margin-right: 20px;
-        padding: 20px;
-        box-sizing: border-box;
-        min-height: 400px;
-        width: 100%;
-      }
-
-      #line-chart {
-        background: #fff;
-        border-radius: 10px;
-        flex: 1;
-        padding: 20px;
-        box-sizing: border-box;
-        min-height: 400px;
-      }
-    }
-
-
-  }
+<template>
+  <div class="mainHeight" :style="{height:mainHeight+'px'}">
+    <div class="mainHeight-top">
+      <div class="mainHeight-title">
+        <img src="../../assets/home-circle.png" alt="">
+        一把手”及领导干部统计数据
+        <img src="../../assets/home-circle.png" alt="">
+      </div>
+      <div class="mainHeight-content">
+        <div class="mainHeight-panel">
+          <div v-for="item in panelList" class="mainHeight-panel-item">
+            <div style="width:70%">
+              <div class="mainHeight-panel-item-name">{{item.name}}</div>
+              <div class="mainHeight-panel-item-count">{{item.count}}</div>
+            </div>
+            <div style="width:30%">
+              <img class="mainHeight-panel-item-icon" :src="item.icon" alt="">
+            </div>
+          </div>
+        </div>
+        <div class="mainHeight-chart">
+          <div>
+            <div class="mainHeight-chart-title">
+              <div>
+                <img src="../../assets/home-icon6.png" alt="">
+                月度填报数
+              </div>
+              <div>
+                <div>
+                  <span></span>正常填报数
+                </div>
+                <div>
+                  <span style="background-color: #de454c;"></span>逾期填报数
+                </div>
+              </div>
+            </div>
+            <myecharts :width="'100%'" :height="'100%'" :data="month_record_data"></myecharts>
+          </div>
+          <div>
+            <div class="mainHeight-chart-title">
+              <div>
+                <img src="../../assets/home-icon7.png" alt="">
+                月度填报率
+              </div>
+              <div>
+                <div>
+                  <span></span>正常填报数
+                </div>
+                <div>
+                  <span style="background-color: #de454c;"></span>逾期填报数
+                </div>
+              </div>
+            </div>
+            <myecharts :width="'100%'" :height="'100%'" :data="month_record_data"></myecharts>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="mainHeight-bottom">
+      <div class="mainHeight-title">
+        <img src="../../assets/home-circle.png" alt="">
+        “1+7”清单填报统计数据
+        <img src="../../assets/home-circle.png" alt="">
+      </div>
+      <div class="mainHeight-content">
+        <div class="mainHeight-chart" style="height: 100%;padding-top: 20px;">
+          <div>
+            <div class="mainHeight-chart-title">
+              <div>
+                <img src="../../assets/home-icon6.png" alt="">
+                月度填报数
+              </div>
+              <div>
+                <div>
+                  <span></span>正常填报数
+                </div>
+                <div>
+                  <span style="background-color: #de454c;"></span>逾期填报数
+                </div>
+              </div>
+            </div>
+            <myecharts :width="'100%'" :height="'calc(100% - 40px)'" :data="month_record_data"></myecharts>
+          </div>
+          <div>
+            <div class="mainHeight-chart-title">
+              <div>
+                <img src="../../assets/home-icon8.png" alt="">
+                分类填报数
+              </div>
+              <div>
+                <div>
+                  <span></span>正常填报数
+                </div>
+              </div>
+            </div>
+            <myecharts :width="'100%'" :height="'calc(100% - 40px)'" :data="type_record_data"></myecharts>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import myecharts from '@/components/myecharts';
+  import {
+    getChartsHome
+  } from "@/api/dashboard"
+
+  export default {
+    components: {
+      myecharts
+    },
+    data() {
+      return {
+        mainHeight: 0,
+        panelList: [{
+          name: '“一把手”及领导干部',
+          count: 345,
+          icon: require('@/assets/home-icon1.png')
+        }, {
+          name: '相关单位',
+          count: 45,
+          icon: require('@/assets/home-icon2.png')
+        }, {
+          name: '清单项',
+          count: 245,
+          icon: require('@/assets/home-icon3.png')
+        }, {
+          name: '清单类型',
+          count: 10,
+          icon: require('@/assets/home-icon4.png')
+        }, {
+          name: '填报数量',
+          count: 10423,
+          icon: require('@/assets/home-icon5.png')
+        }],
+
+        month_record_data: {
+          xShow: true,
+          yShow: true,
+          rotate: 30,
+          x: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+          list: [{
+            name: "正常填报数",
+            data: [10, 3, 15, 23, 10, 12, 1, 45, 11, 9, 3, 34],
+            type: 'bar',
+            unit: "",
+            barGap: '0',
+            color1: '#fbd5be',
+            color2: '#ecc392',
+            Linear: [0, 1, 0, 0]
+          }, {
+            name: "预期填报数",
+            data: [1, 13, 5, 3, 1, 2, 12, 5, 1, 19, 13, 3],
+            type: 'bar',
+            unit: "",
+            barGap: '0',
+            color1: '#f0696b',
+            color2: '#d22a36',
+            Linear: [0, 1, 0, 0]
+          }]
+        },
+        type_record_data: {
+          xShow: true,
+          yShow: true,
+          yType: 'category',
+          xType: 'value',
+          gBottom: '15',
+          xPosition: 'bottom',
+          yData: ['类型一', '类型二', '类型三', '类型四', '类型五', '类型六'],
+          list: [{
+            name: "正常填报数",
+            data: [10, 3, 15, 23, 10, 12],
+            type: 'bar',
+            unit: "",
+            barGap: '0',
+            color1: '#fbd5be',
+            color2: '#ecc392',
+            Linear: [0, 0, 1, 0]
+          }]
+        }
+      }
+    },
+    watch: {
+
+    },
+    methods: {
+      initHeight() {
+        let clientHeight = document.documentElement.clientHeight;
+        let topHeight = 50; //页面 头部
+        this.mainHeight = clientHeight - topHeight - 40;
+      },
+    },
+    created() {
+      this.initHeight()
+      //this.loadData();
+    },
+    mounted() {
+
+
+      //this.init()
+
+      // window.onresize = () => {
+      //   this.col.resize()
+      //   this.line.resize()
+      // }
+
+    },
+    destroyed() {
+      window.onresize = null
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .mainHeight {
+    background: #f9fafa;
+    margin-top: 20px;
+    border-radius: 10px;
+    padding: 20px;
+    box-shadow: 0 0 10px rgba(148, 147, 147, .27);
+
+    &-top {
+      margin-bottom: 20px;
+      height: 60%;
+    }
+
+    &-bottom {
+      height: calc(40% - 20px)
+    }
+
+    &-title {
+      text-align: center;
+      color: #fff;
+      background: linear-gradient(to right, #d12935 5%, #f0696b);
+      border-radius: 10px 10px 0 0;
+      height: 40px;
+      line-height: 40px;
+      font-size: 16px;
+
+      img {
+        vertical-align: middle;
+        width: 25px;
+        margin: 0 10px;
+      }
+    }
+
+    &-content {
+      background-color: #fff;
+      border-radius: 0 0 10px 10px;
+      border: 1px solid #dde5f0;
+      border-top: none;
+      height: calc(100% - 40px)
+    }
+
+    &-panel {
+      display: flex;
+      justify-content: space-between;
+      padding: 20px 10px;
+
+      &-item {
+        background: linear-gradient(to right, #facebd 60%, #ebae8f);
+        box-shadow: 0 0 10px rgba(148, 147, 147, .27);
+        border-radius: 10px;
+        display: flex;
+        justify-content: space-between;
+        padding: 10px;
+        width: 20%;
+        margin: 0 10px;
+        align-items: center;
+        color: #68372f;
+
+        &-name {}
+
+        &-count {
+          font-size: 24px;
+          font-weight: bold;
+        }
+
+        &-icon {
+          width: 100%;
+        }
+      }
+    }
+
+    &-chart {
+      padding: 0 20px;
+      height: calc(65% - 20px);
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+
+      &>div {
+        width: 48%;
+        height: 100%;
+      }
+
+      &-title {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        &>div {
+          &:first-child {
+            color: #000;
+            font-weight: bold;
+
+            img {
+              width: 30px;
+              vertical-align: middle;
+            }
+          }
+
+          &:last-child {
+            display: flex;
+            align-items: center;
+
+            span {
+              background-color: #f0c99f;
+              width: 10px;
+              height: 10px;
+              border-radius: 5px;
+              display: inline-block;
+              margin-right: 5px;
+              margin-left: 10px;
+            }
+          }
+        }
+
+      }
+    }
+
+  }
 </style>