Merge branch 'hotfix0515' into 'release'

Hotfix0515

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!502

src/views/education/create-component.vue

@@ -297,7 +297,7 @@
                     ref="templateForm"
                     :model="item1"
                     label-suffix=":"
-                    label-width="110px"
+                    label-width="130px"
                     style="width: 100%"
                   >
                     <div class="template-content">
@@ -598,7 +598,7 @@
                                 </el-col>
                                 <el-col :span="10" class="item-icon">
                                   <span class="require">*</span>
-                                  <el-form-item label="关联课程">
+                                  <el-form-item label="关联课程名称/ID">
                                     <el-select
                                       v-model="item3.content2"
                                       filterable
@@ -620,7 +620,7 @@
                                         v-for="(itemCourse,
                                         indexCourse) in courseIdSelect"
                                         :key="indexCourse"
-                                        :label="itemCourse.name"
+                                        :label="itemCourse.id + '-' + itemCourse.name"
                                         :value="itemCourse.id + ''"
                                       >
                                       </el-option>
@@ -770,7 +770,7 @@
           </div>
         </el-form>
       </div>
-     
+
       <span slot="footer" class="dialog-footer dialog-foot">
         <el-button
           type="default"
@@ -783,6 +783,25 @@
         >
       </span>
     </el-dialog>
+    <el-dialog
+      class="exportlogistics-dialog"
+      :visible="progressFlag"
+      width="600px"
+      :close-on-click-modal="false"
+      :show-close="false"
+    >
+      <div>
+        <div class="progress-container">
+          <div class="progress-tag">
+            {{ totalIndex }}/{{ fileList.length }}
+            <div class="popper__arrow" />
+          </div>
+          <div class="progress-content">
+            正在导入...
+          </div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -873,6 +892,7 @@ export default {
       resultFlag: "",
       conditionSelect: false,
       newconditionSelect: false,
+      totalIndex: 0, // 一共发了多少次请求
       conditionAnd: true,
       isStorage: false,
       dialogTitle: "选择模板",
@@ -885,6 +905,7 @@ export default {
       certificateLable: "否",
       portCertificateLable: "否",
       moduleIndex: "",
+      fileList: [],
       editableTabs: [
         {
           title: "模块 1",
@@ -917,6 +938,20 @@ export default {
       },
       pageNo: 1,
       pageSize: 3,
+      progressFlagDetection: false, // 导入检测进度弹窗
+      progressFlag: false,
+      ProgressData: {
+        // 倒入相关数据
+        totalNum: '', // 总数
+        nullNum: '', // 空白行
+        status: '', // 1完成 0进行中
+        doneNum: '', // doneNum 完成数量
+        successNum: '', // 成功数量
+        failNum: '', // 失败数量
+        repeatNum: '',
+        errorFileUrl: '', // 失败 原因文件
+        errorList: [], // 失败列表
+      },
       componentList: {
         moduleModelList: [
           {