소스 검색

修改数据统计

cyy 3 년 전
부모
커밋
41bb013244
2개의 변경된 파일과 4개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      src/business/platform/form/formrender/dynamic-form/mixins/StatisOrRecordTable.vue
  2. 3 2
      src/views/statistics/index_kanban.vue

+ 1 - 1
src/business/platform/form/formrender/dynamic-form/mixins/StatisOrRecordTable.vue

@@ -10,7 +10,6 @@
                 v-if="el.type =='Statis'"
                 v-model="isShow"
                 width="380"
-            
                 trigger="manual"
             >
                 <span class="el-icon-close" style="float: right;" @click.stop="closePopover" />
@@ -111,6 +110,7 @@ export default {
         display: flex;
         flex-flow: wrap;
         justify-content: flex-end;
+        margin-left: -13%;
         .sin{
             margin: 5px;
             cursor: pointer;

+ 3 - 2
src/views/statistics/index_kanban.vue

@@ -602,13 +602,14 @@ import * as forEach from 'lodash/forEach'
       getDate(year) {
         year = year || 0
         let nowDate = new Date();
-        let date = new Date(new Date().setDate(1)+ 30 * 24 * 60 * 60 * 1000);
+        let date = new Date(new Date().setDate(1)+ 31 * 24 * 60 * 60 * 1000);
         let month = date.getMonth()+1;
         let m1 = nowDate.getMonth()+1
         let month1 = m1 < 10 ? "0" +m1:nowDate.getMonth()+1;
         month = month<10 ? "0"+month : ""+month;
         // console.log([nowDate.getFullYear() - year + "-" + month1,date.getFullYear() + "-" + month])
-        return [nowDate.getFullYear() - year + "-" + month1,date.getFullYear() + "-" + month];
+        return [nowDate.getFullYear() - year + "-01",nowDate.getFullYear() - year + "-" + month1];
+        // return [nowDate.getFullYear() - year + "-" + month1,date.getFullYear() + "-" + month];
       },
     //   allView(){
     //     screenfull.request() //默认显示全屏