feat:合并

src/components/Modals/ExportHomeWork.vue

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2023-01-07 17:25:14
  * @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
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -12,6 +12,7 @@
     :footer="null"
     wrapClassName="exportHomeWork"
     centered="true"
+    :zIndex="9999"
   >
     <div class="delete">
       <div class="del_header"></div>

src/components/drawers/ExportScore.vue

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