Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_tjbbfx

# Conflicts:
#	jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue

jeecgboot-vue3/src/views/bl/blStuInfo/BlStuInfoList.vue

@@ -235,7 +235,7 @@ const $message = useMessage();
       {
         ifShow: reloadCreateBtn.value,
         label: '重新生成',
-        onClick: reloadCreateFn.bind(null, { id: record.id }),
+        onClick: reloadCreateFn.bind(null, { id: record.id, isDelChildren: false }),
       },
       {
         label: '删除',

jeecgboot-vue3/src/views/bl/blStuInfo/components/BlStuInfoV2Form.vue

@@ -61,7 +61,7 @@
       <div v-if="current == 1" style="padding: 20px;">
 
         <a-col :span="24" class="shuoming">
-          <span>温馨提示：点击导入后选择数据模板进行导入！</span>
+          <span>温馨提示：点击导入后选择数据模板进行导入！<a-switch hidden v-model:checked="isDelChildren" checked-children="删除" un-checked-children="不删除"/></span>
         </a-col>
         <span style="text-align: center;">
           <a-spin :spinning="uploadButtonSpinning">
@@ -129,6 +129,7 @@ const formData = reactive<Record<string, any>>({
 
 const current = ref<number>(0);
 const uploadButtonSpinning = ref<boolean>(false);
+const isDelChildren = ref<boolean>(true);
 
 function log(...d){
   console.log('shangc',...d);
@@ -160,7 +161,8 @@ function handleSuccess(xlsRes){
   uploadButtonSpinning.value = false;
   if(xlsRes.success){
     current.value++;
-    defHttp.get({url:'/blStuAnswer/blStuAnswer/createWord',params:{id:formData.id}}).then(res=>{
+    console.log("参数--------》",{id:formData.id}, xlsRes)
+    defHttp.get({url:'/blStuAnswer/blStuAnswer/createWord',params:{ id:formData.id, isDelChildren: isDelChildren.value }}).then(res=>{
       console.log('---生成报告--->',res);
       if(res.code==200||res=='生成成功'){
         handleWancheng();