Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-04-19 9094dea7cd9e45e4bb0a3d22a8dc1d682ca7463b

 src/views/healthcode/healthcode.vue

@@ -23,21 +23,37 @@
        <template slot="menuLeft">
          <el-button
            v-bind:class="activeClass == 0 ? 'btn-color' : ''"
            size="medium "
            size="small "
            @click="getHealthcodeData(0)"
            >本日
          </el-button>
          <el-button
            v-bind:class="activeClass == 1 ? 'btn-color' : ''"
            size="medium "
            size="small "
            @click="getHealthcodeData(1)"
            >本周
          </el-button>
          <el-button
            v-bind:class="activeClass == 2 ? 'btn-color' : ''"
            size="medium "
            size="small "
            @click="getHealthcodeData(2)"
            >本月
          </el-button>
        </template>

        <template slot="menuLeft">
          <el-button type="warning"
                      size="small"
                      plain
                      icon="el-icon-download"
                      @click="handleExport">导出
          </el-button>
          <el-button type="warning"
          style="display:none"
                      size="small"
                      plain
                      icon="el-icon-download"
                      @click="handleExportStatis">导出报表
          </el-button>
        </template>

@@ -124,7 +140,7 @@
            {
              label: '省份',
              prop: 'province',
              search: true,
              //search: true,
              searchSpan: 3,
              type: 'select',
              props: {
@@ -140,7 +156,7 @@
              prop: 'city',
              type: 'select',
              searchSpan: 3,
              search: true,
              //search: true,
              props: {
                label: 'name',
                value: 'name'
@@ -151,7 +167,7 @@
            {
              label: '区县',
              searchSpan: 3,
              search: true,
              //search: true,
              prop: 'district',
              type: 'select',
              props: {
@@ -279,6 +295,30 @@
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
      },
      //数据导出
      handleExport() {
        this.$confirm("是否导出用户数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          window.open(`/api/blade-jfpts/healthcode/healthcode/export-healthcode?begTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&type=${this.$route.query.type}&timeDesc=${this.$route.query.timeDesc}`);
        });
      },
      //数据报表导出
      handleExportStatis() {
        this.$confirm("是否导出用户数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          let begTime = this.$route.query.startTime==undefined? '':this.$route.query.startTime;
          let endTime = this.$route.query.endTime==undefined? '':this.$route.query.endTime;
          let type = this.$route.query.type==undefined? '':this.$route.query.type;
          let timeDesc = this.$route.query.timeDesc==undefined? '':this.$route.query.timeDesc;
          window.open(`http://localhost:8108/ureport/excel?_u=blade-healthcode.statis.xml.ureport.xml&begTime=${begTime}&endTime=${endTime}&type=${type}&timeDesc=${timeDesc}`);
        });
      },
      onLoad(page, params = {}) {
        const { dateTime } = this.query;
        let values = {