Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-05-09 4f11d6a54ade61ba7daf8ba856014d2f8994badf

 src/views/parcel/parcelKind.vue

@@ -77,6 +77,7 @@
        form: {},
        query: {},
        showViewer: false, // 显示查看器
        activeClass:0,
        imgUrl:'',
        loading: true,
        page: {
@@ -221,6 +222,7 @@
        this.query = {};
        //清空this.$route.query
        this.$router.push({ query: {} });
        this.activeClass=0;
        this.onLoad(this.page);
      },
      searchChange(params, done) {
@@ -310,6 +312,23 @@
                decisioDiagramResult:this.$route.query.decisioDiagramResult
              };
            }
            this.activeClass=4;
        }

        if(this.activeClass==0){
          this.page.currentPage = 1;
          // 当前时间
          var date = new Date();
          //年
          var Y = date.getFullYear();
          //月
          var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
          //日
          var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
          params = {
            startTime:Y + "-" + M + "-" + D + " 00:00:00",
            endTime:Y +"-" +M +"-" + D +  " 23:59:59"
          }
        }

        if (dateTime) {