feat:合并

This commit is contained in:
lixg
2023-01-10 15:55:23 +08:00
parent 124b8ca044
commit 52a5690d5e
2 changed files with 16 additions and 5 deletions

View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-07 17:25:14 * @Date: 2023-01-07 17:25:14
* @LastEditors: lixg lixg@dongwu-inc.com * @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-01-09 16:35:38 * @LastEditTime: 2023-01-10 14:26:19
* @FilePath: /fe-manage/src/components/Modals/ExportHomeWork.vue * @FilePath: /fe-manage/src/components/Modals/ExportHomeWork.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
@@ -12,6 +12,7 @@
:footer="null" :footer="null"
wrapClassName="exportHomeWork" wrapClassName="exportHomeWork"
centered="true" centered="true"
:zIndex="9999"
> >
<div class="delete"> <div class="delete">
<div class="del_header"></div> <div class="del_header"></div>

View File

@@ -34,6 +34,7 @@
:multiple="true" :multiple="true"
@change="handleChange" @change="handleChange"
:showUploadList="false" :showUploadList="false"
:data="importHomeWorkData"
> >
<p class="ant-upload-drag-icon"> <p class="ant-upload-drag-icon">
<inbox-outlined></inbox-outlined> <inbox-outlined></inbox-outlined>
@@ -213,9 +214,13 @@ export default {
fileList: [], fileList: [],
succNum: 0, //成功数据数 succNum: 0, //成功数据数
errNum: 0, //失败数据数 errNum: 0, //失败数据数
importHomeWorkData: {}, //传参
}); });
const closeDrawer = () => { const closeDrawer = () => {
ctx.emit("update:eScorevisible", false); ctx.emit("update:eScorevisible", false);
state.fileList = [];
state.uploadpercent = -1;
state.uploadErr = false; //上传失败
}; };
const afterVisibleChange = (bool) => { const afterVisibleChange = (bool) => {
@@ -224,21 +229,26 @@ export default {
//上传文件 //上传文件
const handleChange = (info) => { const handleChange = (info) => {
console.log("info11111", info);
const isType = const isType =
info.file.name.indexOf(".xlsx") !== "-1" || info.file.name.indexOf(".xlsx") !== -1 ||
info.file.name.indexOf(".xls") !== "-1"; info.file.name.indexOf(".xls") != -1;
console.log("info11111", info, isType);
if (!isType) { if (!isType) {
message.destroy(); message.destroy();
message.error("仅支持xls、xlsx格式!"); message.error("仅支持xls、xlsx格式!");
return; return;
} }
state.importHomeWorkData = {
// stageId:props.stageId,
// targetId:props.targetId,
type: props.type,
};
state.addLoading = true; state.addLoading = true;
state.uploadpercent = parseInt(info.file.percent); state.uploadpercent = parseInt(info.file.percent);
console.log("我是文件上传的进度---------->", info.file.percent); console.log("我是文件上传的进度---------->", info.file.percent);
const status = info.file.status; const status = info.file.status;
if (status !== "uploading") { if (status !== "uploading") {
console.log(info.file, info.fileList); // console.log(info.file, info.fileList);
} }
if (status === "done") { if (status === "done") {
let i = 0; let i = 0;