修改了统计分析的日期默认值

pages/meter-statistics/certificate-rate/MeterCertificateRate.vue

@@ -26,7 +26,7 @@
                   </el-date-picker>
                 </Form-item>
                 <Form-item class="marginLeft-70" style="margin-left: -60px;">
-                  <Button type="primary" class="width-80" @click="_search">搜索</Button>
+                  <Button type="primary" class="width-80" @click="_getData">搜索</Button>
                 </Form-item>
               </Form>
             </div>
@@ -66,6 +66,10 @@ export default {
   },
   data() {
     const date = this.$dateformat(new Date(), 'yyyy-mm')
+    const date2 = this.$dateformat(
+      new Date().setMonth(new Date().getMonth() + 1),
+      'yyyy-mm'
+    )
     return {
       forObject: {
         edateBegin: undefined,
@@ -73,16 +77,18 @@ export default {
       },
       tempData: {
         beginDate: date,
-        endDate: date
+        endDate: date2
       },
       pieData: {
         beginDate: date,
         endDate: date
       },
-      queryDate: [date, date]
+      queryDate: [date, date2]
     }
   },
   mounted() {
+    this.forObject.edateBegin = this.tempData.beginDate
+    this.forObject.edateEnd = this.tempData.endDate
     this._getData()
     // this._search();
   },
@@ -105,6 +111,10 @@ export default {
       this.$refs.contractTableModal._pieOpen(res)
     },
     _getData: async function() {
+      this.forObject.edateBegin = this.queryDate[0]
+      this.forObject.edateEnd = this.queryDate[1]
+      console.log('753951')
+      console.log('选择时间后的请求', this.forObject)
       const result = await meterSample.pageCertificateRateStatistics(
         this.forObject
       )

pages/meter-statistics/certificate-rate/ReportTimelyPie.vue

@@ -95,8 +95,8 @@ export default {
         (document.documentElement.clientWidth - 200) / 2.6 + 'px'
     },
     _openPie(data) {
-      // this.option.series[0].data = []
-      // this.option.legend.data = []
+      this.option.series[0].data = []
+      this.option.legend.data = []
       const testerList = []
       for (let i = 0; i < data.length; i++) {
         testerList.push(data[i].type)

pages/meter-statistics/customer-entrust/MeterCustomerEntrust.vue

@@ -11,22 +11,22 @@
                 <Form-item label="委托日期:">
                   <el-date-picker
                     v-model="queryDate"
+                    @change="_dateChange"
                     type="monthrange"
                     range-separator="-"
                     start-placeholder="开始月份"
                     end-placeholder="结束月份"
                     size="small"
-                    value-format="yyyy-MM"
-                    @change="_dateChange">
+                    value-format="yyyy-MM">
                   </el-date-picker>
                 </Form-item>
                 <Form-item class="search-btn">
-                  <Button type="primary" class="width-80" @click="_getData">搜索</Button>
+                  <Button @click="_getData" type="primary" class="width-80">搜索</Button>
                 </Form-item>
               </Form>
             </div>
             <div class="fr">
-              <Button class="width-80" @click="_exportSampleForm">导出</Button>
+              <Button @click="_exportSampleForm" class="width-80">导出</Button>
             </div>
             <div class="clear"></div>
           </Col>
@@ -35,7 +35,7 @@
             <Row :gutter="16">
               <Col span="14">
                 <ElTableNoPage id="table-year" ref="pageTable" :table-height="tableHeight"
-                               :get-page="getPage" hide-checkbox @on-result-change="_tableResultChange" >
+                               :get-page="getPage" @on-result-change="_tableResultChange" hide-checkbox >
                   <el-table-column fixed type="index" label="序号" width="100">
                   </el-table-column>
                   <el-table-column
@@ -79,6 +79,10 @@ export default {
   },
   data() {
     const date = this.$dateformat(new Date(), 'yyyy-mm')
+    const date2 = this.$dateformat(
+      new Date().setMonth(new Date().getMonth() + 1),
+      'yyyy-mm'
+    )
     return {
       beginDate: new Date(),
       endDate: new Date(),
@@ -103,10 +107,10 @@ export default {
         groupId: '',
         groupName: '',
         beginDate: date,
-        endDate: date
+        endDate: date2
       },
       testerData: [],
-      queryDate: [date, date],
+      queryDate: [date, date2],
       serviceType: '',
       serviceTypeList: []
     }
@@ -128,6 +132,10 @@ export default {
   methods: {
     // 服务类型
     _getData: async function() {
+      this.formObj.edateBegin = this.queryDate[0]
+      this.formObj.edateEnd = this.queryDate[1]
+      console.log('753951')
+      console.log('选择时间后的请求', this.formObj)
       const result = await meterSample.pageCustomerEntrustStatistics(
         this.formObj
       )

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

@@ -8,11 +8,11 @@
             <div class="fl">
               <Form id="search-form" :label-width="70" inline onsubmit="return false">
                 <label class="label-sign"></label>
-                <Form-item class="search-item" label="人员:">
-                  <AutoCompletes :value="tester" :blur="true" :down-data="testerData" show-key="realname"
-                                 placeholder="请选择人员" @on-result-change="_testerChange"
-                  ></AutoCompletes>
-                </Form-item>
+<!--                <Form-item class="search-item" label="人员:">-->
+<!--                  <AutoCompletes :value="tester" :blur="true" :down-data="testerData" show-key="realname"-->
+<!--                                 placeholder="请选择人员" @on-result-change="_testerChange"-->
+<!--                  ></AutoCompletes>-->
+<!--                </Form-item>-->
 <!--                <Form-item class="search-item" label="服务类型:">-->
 <!--                  <Select v-model="serviceType" placeholder="请选择服务类型" clearable>-->
 <!--                    <Option v-for="item in serviceTypeList" :value="item.name" :key="item.name">{{ item.name }}</Option>-->
@@ -78,7 +78,6 @@
 </template>
 
 <script>
-import AutoCompletes from '../../../components/base/AutoCompletes'
 import { meterSample } from '../../../api'
 import UserTestPie from './UserTestPie'
 import Detail from './Detail'
@@ -86,11 +85,14 @@ import Detail from './Detail'
 export default {
   components: {
     UserTestPie,
-    AutoCompletes,
     Detail
   },
   data() {
     const date = this.$dateformat(new Date(), 'yyyy-mm')
+    const date2 = this.$dateformat(
+      new Date().setMonth(new Date().getMonth() + 1),
+      'yyyy-mm'
+    )
     return {
       beginDate: new Date(),
       endDate: new Date(),
@@ -131,10 +133,14 @@ export default {
         groupId: '',
         groupName: '',
         beginDate: date,
-        endDate: date
+        endDate: date2
+      },
+      formObj: {
+        edateBegin: undefined,
+        edateEnd: undefined
       },
       testerData: [],
-      queryDate: [date, date],
+      queryDate: [date, date2],
       serviceType: '',
       serviceTypeList: []
     }
@@ -148,6 +154,8 @@ export default {
     this.$refs.pageTable._hideLoading()
     // this._contHide()
     // this._getUserGroup()
+    this.formObj.edateBegin = this.tempData.beginDate
+    this.formObj.edateEnd = this.tempData.endDate
     this._getData()
     // this._getServiceTypeList()
   },

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

@@ -106,7 +106,6 @@ export default {
         (document.documentElement.clientWidth - 200) / 2.6 + 'px'
     },
     _openPie(data) {
-      console.log('123456')
       // alert(this.option.series[0].data)
       const testerList = []
       const seriesList = []

pages/meter-statistics/sample-quantity/MeterSampleQuantity.vue

@@ -79,6 +79,10 @@ export default {
   },
   data() {
     const date = this.$dateformat(new Date(), 'yyyy-mm')
+    const date2 = this.$dateformat(
+      new Date().setMonth(new Date().getMonth() + 1),
+      'yyyy-mm'
+    )
     return {
       beginDate: new Date(),
       endDate: new Date(),
@@ -119,10 +123,10 @@ export default {
         groupId: '',
         groupName: '',
         beginDate: date,
-        endDate: date
+        endDate: date2
       },
       testerData: [],
-      queryDate: [date, date],
+      queryDate: [date, date2],
       serviceType: '',
       serviceTypeList: []
     }