Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-08 5c5712ee7cc9065b8257681c7ec5d92534166aac

 src/views/operate/log/index.vue

@@ -81,7 +81,7 @@
            prop="createTime"
            label="日志时间"
            min-width="10"
            :sort-orders="['descending','ascending']"
            :sort-orders="['descending', 'ascending']"
            sortable="custom"
          >
            <template slot-scope="scope">
@@ -147,7 +147,7 @@
  </div>
</template>
<script>
import {getNowDate} from '@/utils/helper'
import { getNowDate } from "@/utils/helper";
import helper from "@/utils/mydate";
import { parseTime } from "@/utils/index";
import { createNamespacedHelpers } from "vuex";
@@ -209,7 +209,7 @@
        id: "",
        operationType: operationType === "全部" ? "" : operationType,
        portEquipment: "",
        size: pageSize,
        size: 50000,
        startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
        sort: mysort,
      });
@@ -223,7 +223,7 @@
      const href = window.URL.createObjectURL(blob);
      downloadElement.href = href;
      // // 下载后文件名
      downloadElement.download = fileName + '日志数据.xlsx';
      downloadElement.download = fileName + "日志数据.xlsx";
      document.body.appendChild(downloadElement);
      // 点击下载
      downloadElement.click();