diff --git a/yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm b/yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm
index 5456d88ae..65daf1430 100644
--- a/yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm
+++ b/yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm
@@ -51,7 +51,7 @@
v-hasPermi="['${permissionPrefix}:create']">新增
- 导出
@@ -207,6 +207,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -392,10 +394,12 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return export${simpleClassName}Excel(params);
}).then(response => {
this.downloadExcel(response, '${table.classComment}.xls');
+ this.exportLoading = false;
})
}
}
diff --git a/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue b/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
index abe0fd44f..044a70643 100644
--- a/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
+++ b/yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
@@ -37,7 +37,7 @@
- 导出
@@ -123,6 +123,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -204,10 +206,12 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportApiAccessLogExcel(params);
}).then(response => {
this.downloadExcel(response, 'API 访问日志.xls');
+ this.exportLoading = false;
})
}
}
diff --git a/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue b/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
index 26dc5f4c8..3db6fc268 100644
--- a/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
+++ b/yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
@@ -37,7 +37,7 @@
- 导出
@@ -130,6 +130,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -226,10 +228,12 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportApiErrorLogExcel(params);
}).then(response => {
this.downloadExcel(response, 'API 错误日志.xls');
+ this.exportLoading = false;
})
}
}
diff --git a/yudao-ui-admin/src/views/infra/config/index.vue b/yudao-ui-admin/src/views/infra/config/index.vue
index bae2418a1..6ad67ce2a 100644
--- a/yudao-ui-admin/src/views/infra/config/index.vue
+++ b/yudao-ui-admin/src/views/infra/config/index.vue
@@ -43,13 +43,8 @@
v-hasPermi="['infra:config:create']">新增
- 导出
+ 导出
@@ -130,6 +125,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -279,11 +276,13 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportConfig(queryParams);
}).then(response => {
this.downloadExcel(response, '参数配置.xls');
- })
+ this.exportLoading = false;
+ })
},
}
};
diff --git a/yudao-ui-admin/src/views/infra/job/index.vue b/yudao-ui-admin/src/views/infra/job/index.vue
index bfbddfaa9..a0d8ba0d0 100644
--- a/yudao-ui-admin/src/views/infra/job/index.vue
+++ b/yudao-ui-admin/src/views/infra/job/index.vue
@@ -25,7 +25,7 @@
v-hasPermi="['infra:job:create']">新增
- 导出
@@ -136,6 +136,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -326,10 +328,12 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportJob(queryParams);
}).then(response => {
this.downloadExcel(response, '定时任务.xls');
+ this.exportLoading = false;
})
}
}
diff --git a/yudao-ui-admin/src/views/infra/job/log.vue b/yudao-ui-admin/src/views/infra/job/log.vue
index ddf4daf76..d4f53f1a0 100644
--- a/yudao-ui-admin/src/views/infra/job/log.vue
+++ b/yudao-ui-admin/src/views/infra/job/log.vue
@@ -54,7 +54,7 @@
- 详细
@@ -96,6 +96,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -165,10 +167,12 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportJobLogExcel(params);
}).then(response => {
this.downloadExcel(response, '定时任务日志.xls');
+ this.exportLoading = false;
})
}
}
diff --git a/yudao-ui-admin/src/views/pay/merchant/index.vue b/yudao-ui-admin/src/views/pay/merchant/index.vue
index 44e55ad67..4f2758915 100644
--- a/yudao-ui-admin/src/views/pay/merchant/index.vue
+++ b/yudao-ui-admin/src/views/pay/merchant/index.vue
@@ -37,7 +37,7 @@
v-hasPermi="['pay:merchant:create']">新增
- 导出
@@ -124,6 +124,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -285,10 +287,12 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportMerchantExcel(params);
}).then(response => {
this.downloadExcel(response, '支付商户信息.xls');
+ this.exportLoading = false;
})
}
}
diff --git a/yudao-ui-admin/src/views/system/dict/data.vue b/yudao-ui-admin/src/views/system/dict/data.vue
index f86936ec8..57df3bde9 100644
--- a/yudao-ui-admin/src/views/system/dict/data.vue
+++ b/yudao-ui-admin/src/views/system/dict/data.vue
@@ -26,7 +26,7 @@
v-hasPermi="['system:dict:create']">新增
- 导出
@@ -102,6 +102,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -266,11 +268,13 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportData(queryParams);
}).then(response => {
this.downloadExcel(response, '字典数据.xls');
- })
+ this.exportLoading = false;
+ })
}
}
};
diff --git a/yudao-ui-admin/src/views/system/dict/index.vue b/yudao-ui-admin/src/views/system/dict/index.vue
index caf74fa83..ba8b90b95 100644
--- a/yudao-ui-admin/src/views/system/dict/index.vue
+++ b/yudao-ui-admin/src/views/system/dict/index.vue
@@ -28,7 +28,7 @@
v-hasPermi="['system:dict:create']">新增
- 导出
@@ -102,6 +102,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -252,10 +254,12 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportType(params);
}).then(response => {
this.downloadExcel(response, '字典类型.xls');
+ this.exportLoading = false;
})
}
}
diff --git a/yudao-ui-admin/src/views/system/errorCode/index.vue b/yudao-ui-admin/src/views/system/errorCode/index.vue
index 7567bce77..672bccb39 100644
--- a/yudao-ui-admin/src/views/system/errorCode/index.vue
+++ b/yudao-ui-admin/src/views/system/errorCode/index.vue
@@ -35,7 +35,7 @@
v-hasPermi="['system:error-code:create']">新增
- 导出
@@ -106,6 +106,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -245,10 +247,12 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportErrorCodeExcel(params);
}).then(response => {
this.downloadExcel(response, '错误码.xls');
+ this.exportLoading = false;
})
}
}
diff --git a/yudao-ui-admin/src/views/system/loginlog/index.vue b/yudao-ui-admin/src/views/system/loginlog/index.vue
index 337e7d516..b0187c6a4 100644
--- a/yudao-ui-admin/src/views/system/loginlog/index.vue
+++ b/yudao-ui-admin/src/views/system/loginlog/index.vue
@@ -27,7 +27,7 @@
- 导出
@@ -70,6 +70,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -129,11 +131,13 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportLoginLog(queryParams);
}).then(response => {
this.downloadExcel(response, '登录日志.xls');
- })
+ this.exportLoading = false;
+ })
}
}
};
diff --git a/yudao-ui-admin/src/views/system/operatelog/index.vue b/yudao-ui-admin/src/views/system/operatelog/index.vue
index d46215b3b..736cfedb5 100644
--- a/yudao-ui-admin/src/views/system/operatelog/index.vue
+++ b/yudao-ui-admin/src/views/system/operatelog/index.vue
@@ -33,7 +33,7 @@
- 导出
@@ -138,6 +138,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -216,11 +218,13 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportOperateLog(queryParams);
}).then(response => {
this.downloadExcel(response, '操作日志.xls');
- })
+ this.exportLoading = false;
+ })
}
}
};
diff --git a/yudao-ui-admin/src/views/system/post/index.vue b/yudao-ui-admin/src/views/system/post/index.vue
index 3e17b82d9..70b9e0668 100644
--- a/yudao-ui-admin/src/views/system/post/index.vue
+++ b/yudao-ui-admin/src/views/system/post/index.vue
@@ -24,7 +24,7 @@
v-hasPermi="['system:post:create']">新增
- 导出
@@ -96,6 +96,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -238,11 +240,13 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
- }).then(function() {
+ }).then(() => {
+ this.exportLoading = true;
return exportPost(queryParams);
}).then(response => {
- this.downloadExcel(response, '岗位数据.xls');
- })
+ this.downloadExcel(response, '岗位数据.xls');
+ this.exportLoading = false;
+ })
}
}
};
diff --git a/yudao-ui-admin/src/views/system/role/index.vue b/yudao-ui-admin/src/views/system/role/index.vue
index 50e8b1136..ce101a967 100644
--- a/yudao-ui-admin/src/views/system/role/index.vue
+++ b/yudao-ui-admin/src/views/system/role/index.vue
@@ -30,7 +30,7 @@
v-hasPermi="['system:role:create']">新增
- 导出
@@ -188,6 +188,8 @@ export default {
return {
// 遮罩层
loading: true,
+ // 导出遮罩层
+ exportLoading: false,
// 显示搜索条件
showSearch: true,
// 总条数
@@ -504,10 +506,12 @@ export default {
cancelButtonText: "取消",
type: "warning"
}).then(function() {
+ this.exportLoading = true;
return exportRole(queryParams);
}).then(response => {
this.downloadExcel(response, '角色数据.xls');
- })
+ this.exportLoading = false;
+ })
}
}
};
diff --git a/yudao-ui-admin/src/views/system/sms/smsChannel.vue b/yudao-ui-admin/src/views/system/sms/smsChannel.vue
index 5c1fb016f..59233c266 100644
--- a/yudao-ui-admin/src/views/system/sms/smsChannel.vue
+++ b/yudao-ui-admin/src/views/system/sms/smsChannel.vue
@@ -28,10 +28,6 @@
新增
-
- 导出
-
@@ -247,295 +243,6 @@ export default {
this.getList();
this.msgSuccess("删除成功");
})
- },
- /** 导出按钮操作 */
- handleExport() {
- // 处理查询参数
- let params = {...this.queryParams};
- params.pageNo = undefined;
- params.pageSize = undefined;
- this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
- // 执行导出
- this.$confirm('是否确认导出所有短信渠道数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return exportSmsChannelExcel(params);
- }).then(response => {
- this.downloadExcel(response, '短信渠道.xls');
- })
- }
- }
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
-
- 新增
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
- {{ getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, scope.row.code) }}
-
- >
-
-
- {{ getDictDataLabel(DICT_TYPE.COMMON_STATUS, scope.row.status) }}
-
- >
-
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{dict.label}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-