diff --git a/package-lock.json b/package-lock.json
index 5ccb411..8c9a31a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4869,6 +4869,14 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.8.0.tgz",
+      "integrity": "sha1-ssHPuSKbE9No7hBPyO6mALV01MQ=",
+      "requires": {
+        "zrender": "4.3.1"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "http://r.cnpmjs.org/ee-first/download/ee-first-1.1.1.tgz",
@@ -6388,8 +6396,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6410,14 +6417,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6432,20 +6437,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6562,8 +6564,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6575,7 +6576,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6590,7 +6590,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -6598,14 +6597,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -6624,7 +6621,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6705,8 +6701,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6718,7 +6713,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6804,8 +6798,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6841,7 +6834,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6861,7 +6853,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6905,14 +6896,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -17524,6 +17513,11 @@
           "dev": true
         }
       }
+    },
+    "zrender": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.1.tgz",
+      "integrity": "sha1-uviqbcgYei+BlpLX1fm+36K5D6M="
     }
   }
 }
diff --git a/package.json b/package.json
index 2041b31..01626ce 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   "dependencies": {
     "axios": "^0.18.1",
     "babel-plugin-component": "^1.1.1",
+    "echarts": "^4.8.0",
     "element-theme": "^2.0.1",
     "element-theme-chalk": "^2.4.7",
     "gulp-autoprefixer": "^6.0.0",
diff --git a/src/main.js b/src/main.js
index 0e0008e..894b045 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,8 @@ import http from '@/utils/request'
 import { hasPermission } from '@/utils'
 import cloneDeep from 'lodash/cloneDeep'
 import '@/element-ui/theme/cascader-new.css'
-
+import echarts from 'echarts'
+Vue.prototype.$echarts = echarts
 Vue.config.productionTip = false
 
 Vue.use(Element, {
diff --git a/src/views/modules/points/points-overview.vue b/src/views/modules/points/points-overview.vue
index 8cb4af9..fdc8de0 100644
--- a/src/views/modules/points/points-overview.vue
+++ b/src/views/modules/points/points-overview.vue
@@ -4,12 +4,7 @@
     <div class="mod-sys__user">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
-        <el-form-item label="积分类别">
-          <el-input v-model="dataForm.realName"
-                    placeholder="积分类别"
-                    clearable></el-input>
-        </el-form-item>
+               @keyup.enter.native="getPointsOverview()">
         <span class="demonstration">统计时间</span>&nbsp;&nbsp;
         <el-date-picker @change='setRegistTime'
                         v-model="time"
@@ -20,88 +15,95 @@
                         end-placeholder="结束日期">
         </el-date-picker>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getPointsOverview()">{{ $t('query') }}</el-button>
         </el-form-item>
-
+        <br><br><br><br><br>
+        <div id="myChart"
+             :style="{width: '500px', height: '300px'}"></div>
       </el-form>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
-                border
-                @selection-change="dataListSelectionChangeHandle"
-                @sort-change="dataListSortChangeHandle"
-                style="width: 100%;">
-        <el-table-column prop="realName"
-                         label="姓名"
-                         header-align="center"
-                         align="center"
-                         :formatter="realNameFormat"></el-table-column>
-        <el-table-column :label="$t('handle')"
-                         fixed="right"
-                         header-align="center"
-                         align="center"
-                         width="150">
-          <template slot-scope="scope">
-            <el-button type="text"
-                       size="small"
-                       @click="pointsAdjustHandle(scope.row.id)">积分调整</el-button>
-            <el-button type="text"
-                       size="small"
-                       @click="pointsLogs(scope.row.id)">积分记录</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination :current-page="page"
-                     :page-sizes="[10, 20, 50, 100]"
-                     :page-size="limit"
-                     :total="total"
-                     layout="total, sizes, prev, pager, next, jumper"
-                     @size-change="pageSizeChangeHandle"
-                     @current-change="pageCurrentChangeHandle">
-      </el-pagination>
     </div>
   </el-card>
 </template>
-
 <script>
-import mixinViewModule from '@/mixins/view-module'
+// import mixinViewModule from '@/mixins/view-module'
+
 export default {
-  mixins: [mixinViewModule],
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/app-user/user/pageForPoints',
-        getDataListIsPage: true
-      },
       dataForm: {
-        realName: '',
-        mobile: '',
-        streetId: '',
-        communityId: '',
-        gridId: ''
+        startTime: '',
+        endTime: ''
       },
-      time: ''
+      time: '',
+      resultData: {
+      },
+      myChart: ''
     }
   },
-  created () {
-    this.$http
-      .get(`/sys/user/deptOptions/getByLoginUser`)
-      .then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
+  mounted () {
+    this.myChart = this.$echarts.init(document.getElementById('myChart'))
+    this.myChart.setOption({
+      title: {
+        text: '积分统计',
+        // subtext: '纯属虚构',
+        x: 'center'
+      },
+      tooltip: {
+        trigger: 'item',
+        formatter: '{a} <br/>{b} : {c} ({d}%)'
+      },
+      legend: {
+        orient: 'vertical',
+        bottom: 'bottom',
+        data: ['总积分', '剩余积分']
+      },
+      series: [
+        {
+          name: '访问来源',
+          type: 'pie',
+          radius: '55%',
+          data: [
+            { value: this.resultData.allPoints, name: '总积分' },
+            { value: this.resultData.residuePoints, name: '剩余积分' }
+          ],
+          itemStyle: {
+            emphasis: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: 'rgba(0, 0, 0, 0.5)'
+            }
+          }
         }
-        this.options = res.data.options
-      })
-      .catch(() => { })
+      ]
+    })
   },
   methods: {
-    realNameFormat (row, column) {
-      if (row.realName) {
-        return row.realName
+    getPointsOverview () {
+      if (this.time === null) {
+        this.dataForm.startTime = ''
+        this.dataForm.endTime = ''
       }
-      return row.nickname
+      console.log(this.dataForm)
+      this.$http
+        .get(`points/pointslogs/point/pointsOverview`, { params: this.dataForm })
+        .then(({ data: res }) => {
+          this.myChart.setOption({
+            series: [{
+              data: [
+                { value: res.data.allPoints, name: '总积分' },
+                { value: res.data.residuePoints, name: '剩余积分' }
+              ]
+            }]
+          })
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.resultData = res.data
+          console.log(this.resultData)
+        })
+        .catch(() => { })
     },
     setRegistTime () {
-      console.log(this.time[0])
       this.dataForm.startTime = this.time[0]
       this.dataForm.endTime = this.time[1]
     }
diff --git a/src/views/modules/points/points-statistics.vue b/src/views/modules/points/points-statistics.vue
index bf4ff10..7d1cd24 100644
--- a/src/views/modules/points/points-statistics.vue
+++ b/src/views/modules/points/points-statistics.vue
@@ -89,6 +89,14 @@ export default {
       })
       .catch(() => { })
   },
+  watch: {
+    'time': function (val) {
+      if (this.time === null) {
+        this.dataForm.startTime = ''
+        this.dataForm.endTime = ''
+      }
+    }
+  },
   methods: {
     realNameFormat (row, column) {
       if (row.realName) {
@@ -97,7 +105,7 @@ export default {
       return row.nickname
     },
     setRegistTime () {
-      console.log(this.time[0])
+      // console.log(this.time[0])
       this.dataForm.startTime = this.time[0]
       this.dataForm.endTime = this.time[1]
     }