Merge branch 'dev-bxy' into 'dev'

fix: 修改批量导入关闭按钮返回页面

See merge request product-group-fe/sfy-safety-group/sfy-safety!190

src/components/batch-import/BatchImport.vue

@@ -43,12 +43,13 @@
       </div>
     </el-card>
 
-    <el-dialog v-model="dialogVisibleErr" title="Warning" width="544" align-center @close="handleBackToImport">
+    <el-dialog v-model="dialogVisibleErr" title="Warning" width="544" align-center :show-close="false">
       <template #header>
         <el-icon :size="24" color="#f2b20a" style="margin: 0 5px 2px">
           <WarnTriangleFilled />
         </el-icon>
         <div class="header-text">导入提示</div>
+        <el-icon class="close-icon" :size="18" @click="handleClose"><Close /></el-icon>
       </template>
       <div class="sum-count">
         成功导入 <span class="succ-sum">{{ sucCount }}</span> 条， 失败 <span class="err-sum">{{ errCount }}</span> 条
@@ -274,6 +275,13 @@
       .header-text {
         font-size: 20px;
       }
+
+      .close-icon {
+        position: absolute;
+        right: 20px;
+        top: 30px;
+        cursor: pointer;
+      }
     }
 
     .el-dialog__headerbtn {