From e7ade0eb3482376680bf9fe9c91cb9f5b5e93fe0 Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Tue, 27 Aug 2024 14:46:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A1=A5=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/rescue/Locations.vue | 2 +- src/views/rescue/api/rescueCarSpend.js | 9 +++++++++ src/views/rescue/index.vue | 11 +++++++++-- src/views/rescue/rescueCarSpend.vue | 19 +++++++++++++------ src/views/rescue/rescueCw.vue | 18 +++++++++++++++--- 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/views/rescue/Locations.vue b/src/views/rescue/Locations.vue index 8c2e75c..b19437b 100644 --- a/src/views/rescue/Locations.vue +++ b/src/views/rescue/Locations.vue @@ -34,7 +34,7 @@ {{ scope.$index + 1 }} - + diff --git a/src/views/rescue/api/rescueCarSpend.js b/src/views/rescue/api/rescueCarSpend.js index 586e534..0f4283c 100644 --- a/src/views/rescue/api/rescueCarSpend.js +++ b/src/views/rescue/api/rescueCarSpend.js @@ -53,3 +53,12 @@ export function listCar() { } }) } + +export function exportCarSpend(params) { + return request({ + url: 'rescue/rescueCarSpend/export', + method: 'get', + params, + responseType: 'blob' + }) +} diff --git a/src/views/rescue/index.vue b/src/views/rescue/index.vue index 56249cc..bc5e7ca 100644 --- a/src/views/rescue/index.vue +++ b/src/views/rescue/index.vue @@ -94,7 +94,7 @@ - 导出 + 导出 @@ -392,6 +392,8 @@ export default { dicts: ['dljy_type', 'fee_type', 'rescue_car_type', 'yes_no','jy_status','jy_order_status'], data() { return { + // 导出遮罩层 + exportLoading: false, chooseDriverId:'', rescueInfoId:'', // 遮罩层 @@ -686,10 +688,15 @@ export default { /** 导出按钮操作 */ async handleExport() { try { + this.exportLoading = true + this.queryParams.pageNo = 1 + this.queryParams.pageSize = 500 const data = await downloadOrder(this.queryParams) this.$download.excel(data, `救援订单_${new Date().getTime()}.xls`) }catch {} - finally {} + finally { + this.exportLoading = false + } } } }; diff --git a/src/views/rescue/rescueCarSpend.vue b/src/views/rescue/rescueCarSpend.vue index 44617a7..8e81314 100644 --- a/src/views/rescue/rescueCarSpend.vue +++ b/src/views/rescue/rescueCarSpend.vue @@ -83,7 +83,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - + :loading="exportLoading" >导出 @@ -215,7 +215,7 @@ - - diff --git a/src/views/knowledge/views/archives/archives_bak.vue b/src/views/knowledge/views/archives/archives_bak.vue new file mode 100644 index 0000000..e6f080e --- /dev/null +++ b/src/views/knowledge/views/archives/archives_bak.vue @@ -0,0 +1,594 @@ + + + + + 全部文件 + + + + + + 图片 + + + + + + 视频 + + + + + + 文档 + + + + + + 音频 + + + 回收站 + + + + + + + 上传文件 + 新建文件夹 + + 批量删除 + 批量删除 + 返回 + + + + + + + + + + + + + + + + + + {{ scope.row.curFilename }} + {{ scope.row.curFilename }} + + + + + + {{ (scope.row.fileSize/(1024*1024)).toFixed(1) }}MB + + + + + + + 文件夹 + 图片 + 视频 + 文档 + 音频 + + + + + {{ formatDate(scope.row.createTime) }} + + + + + {{ scope.row.updateTime }} + + + + + + 还原 + 下载 + 删除 + 删除 + + + + + + + + + + + + * + + + + + + + + + * 名称: + + + + + + + + + + + + diff --git a/src/views/knowledge/views/archives/components/ArchivesTable.vue b/src/views/knowledge/views/archives/components/ArchivesTable.vue new file mode 100644 index 0000000..72b9095 --- /dev/null +++ b/src/views/knowledge/views/archives/components/ArchivesTable.vue @@ -0,0 +1,177 @@ + + + + + 当前选择的是: {{ chooseData }} + + + + + 新增 + + + + 修改 + + + + 删除 + + + + + + + + + {{ truncateText(data.label, 15) }} + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + 新增 + + + + + + + + + + + diff --git a/src/views/knowledge/views/archives/components/ArchivesType.vue b/src/views/knowledge/views/archives/components/ArchivesType.vue new file mode 100644 index 0000000..86af51a --- /dev/null +++ b/src/views/knowledge/views/archives/components/ArchivesType.vue @@ -0,0 +1,16 @@ + + + + + + + + +