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

liuyg

2021-04-09 9c67dc3526d8ad356e1dcd0cc80e4382866ea6a7

 src/views/healthcode/healthcode.vue

@@ -191,7 +191,7 @@
        recorder: null,
      };
    },
    mounted:{
    mounted(){

    },
    computed: {
@@ -251,7 +251,7 @@
      getHealthcodeType(){
          if (this.$route.query.type != undefined) {
              var type = this.$route.query.type+"";
              this.$route.query = {};
              //this.$route.query = {};
              return type;
          }
      },
@@ -316,6 +316,14 @@
          };
        }

        if (this.$route.query.timeDesc) {
          values = {
            ...params,
            timeDesc: this.$route.query.timeDesc,
            ...this.query,
          };
        }

        this.loading = true;
        getList(page.currentPage, page.pageSize,values).then(res => {
          const data = res.data.data;