Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

pages/meter-statistics/personal-task/MeterPersonalTask.vue

@@ -31,7 +31,7 @@
                   </el-date-picker>
                 </Form-item>
                 <Form-item class="search-btn">
-                  <Button type="primary" class="width-80" @click="_search">搜索</Button>
+                  <Button type="primary" class="width-80" @click="_getData">搜索</Button>
                 </Form-item>
               </Form>
             </div>
@@ -162,7 +162,7 @@ export default {
   methods: {
     // 服务类型
     _getData: async function() {
-      const result = await meterSample.pagePersonalTaskStatistics()
+      const result = await meterSample.pagePersonalTaskStatistics(this.formObj)
       if (result) {
         this.getPage.records = result
         this.$refs.testPieModal._openPie(this.getPage.records)
@@ -183,9 +183,13 @@ export default {
       if (data) {
         this.tempData.beginDate = data[0]
         this.tempData.endDate = data[1]
+        this.formObj.edateBegin = data[0]
+        this.formObj.edateEnd = data[1]
       } else {
         this.tempData.beginDate = ''
         this.tempData.endDate = ''
+        this.formObj.edateBegin = undefined
+        this.formObj.edateEnd = undefined
       }
     },
     _contHide() {