Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-front

src/views/energyPlan/components/supplyAndDemand/planProjectDataMonth.vue

@@ -13,12 +13,20 @@
                     <el-row>
                         <el-col :span="6">
                             <el-form-item label="查找日期">
-                                <zj-timegran-date
+                                <!-- <zj-timegran-date
                                     v-model="filterForm.data.may"
                                     style="width: 100%;"
                                     :timegranId="'MONTH'"
                                     :oneFoo="getTableData"
                                     :custom="1"
+                                ></zj-timegran-date> -->
+                                <zj-timegran-date
+                                    v-model="filterForm.data.may"
+                                    style="width: 100%;"
+                                    :type="'daterange'"
+                                    :timegranId="'MONTH'"
+                                    :oneFoo="getTableData"
+                                    :defaultOffset="-1"
                                 ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
@@ -1117,7 +1125,8 @@ export default {
                     updatetime: that.filterForm.data.updatetime,
                     updateman: that.filterForm.data.updateman,
                     memo: that.filterForm.data.memo,
-                    may: that.filterForm.data.may
+                    startTime: that.filterForm.data.may[0],
+                    endTime: that.filterForm.data.may[1]
                 };
                 for (let key in pData) {
                     if (pData[key]) {

src/views/energyPlan/components/supplyAndDemand/planProjectDataYear.vue

@@ -1,6 +1,4 @@
 <template>
-<!-- 转供电实绩 -->
-<!-- 当有审核与取消审核权限时，默认其为审核人，审核人无法修改数据 -->
     <div class="outElectricity">
         <div class="box">
             <div class="box-top">