Merge branch '250213-prod-master_1202-gx' into 250213-prod-master_1202-gx-copy

src/components/lecturer/ImportWork.vue

@@ -118,7 +118,7 @@
                           </div>
                         </div>
                       </div>
-                      <div
+                      <!-- <div
                         v-if="uploadpercent === 100"
                         class="defeat"
                         style="
@@ -143,8 +143,8 @@
                               ? require('../../assets/images/err.png')
                               : require('../../assets/images/success.png')
                           "
-                        />
-                        <div
+                        /> -->
+                        <!-- <div
                           style="margin-left: 8px"
                           :style="{
                             color: errNum ? '#ff7474' : 'rgba(0,0,0,0.65)',
@@ -153,8 +153,8 @@
                           {{ succNum }}条数据导入成功，{{
                             errNum
                           }}条数据导入失败
-                        </div>
-                      </div>
+                        </div> -->
+                      <!-- </div> -->
                     </div>
                   </div>
                 </div>

src/views/lecturer/ExternalLecturer.vue

@@ -815,7 +815,7 @@ export default {
     //导出功能
     const handleExport = () => {  
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacher?name=${state.searchParam.name || ""}&status=${state.searchParam.status || ""}`
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacher?name=${state.searchParam.name || ""}&status=${state.searchParam.status || ""}&teacherType=${state.searchParam.teacherType || ""}`
       );
       //   this.download('lesson_records/export', {
       //             ...state.searchParam

src/views/lecturer/InsideTeaching.vue

@@ -512,7 +512,7 @@
       </a-modal>
     </div>
     <!-- 导入01 -->
-    <ImportWork v-model:showWork="showWork" :template="'/admin/export/exportRecordTemplate'" :title="title"></ImportWork>
+    <ImportWork v-model:showWork="showWork" :template="'/admin/export/exportRecordTemplate'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
     <!-- <div> <Upload/> </div>         -->
   </div>
 </template>
@@ -1000,9 +1000,6 @@ export default {
           label: '全部', value: ''
         })
         state.filterOrgListSearch = state.orgListSearch;
-
-
-
       })
     }
     //TODO5