修改bug

src/views/kc/kcSysConfig/components/KcSysConfigKkpz.vue

@@ -44,7 +44,6 @@
         </a-col>
         <a-col :span="24" style="text-align: center;">
             <a-button type="primary" @click="submitForm">保存</a-button>
-            <a-button type="primary" @click="ketangFun" style="margin-left: 10px;">生成本学期课堂数据</a-button>
         </a-col>
       </a-row>
     </a-form>
@@ -113,7 +112,6 @@ const queryParam = ref<any>({});
 
   const list = (queryParam) => defHttp.get({ url: '/kcSysConfig/kcSysConfig/queryById', params:queryParam });
   
-  const listKcxx = (queryParam) => defHttp.get({ url: '/kcSysConfig/kcSysConfig/listKcxx', params:queryParam });
   
   //进入就加载
   onMounted(() => {
@@ -135,18 +133,6 @@ const queryParam = ref<any>({});
     edit({});
   }
 
-  function ketangFun(){
-    let startTime = new Date(getSysConfig().bxqkssj);
-    let nowDate = new Date();
-    if(nowDate.getTime()<startTime.getTime()){
-      listKcxx(null).then(res=>{
-          createMessage.success(res);
-      })
-    }else{
-      createMessage.error("本学期已经开始，不能重复生成课程数据");
-    }
-    
-  }
 
   /**
    * 编辑

src/views/kc/kcSysConfig/components/KcSysConfigMain.vue

@@ -9,7 +9,8 @@
       <a-row>
         <a-col :span="6">
           <a-form-item label="本学期名称" v-bind="validateInfos.flag1">
-            <a-input v-model:value="formData.flag1" placeholder="请输入本学期名称" ></a-input>
+            <!-- <a-input v-model:value="formData.flag1" placeholder="请输入本学期名称" ></a-input> -->
+            <JDictSelectTag type="list" v-model:value="formData.flag1" dictCode="xnxq" placeholder="请选择" :dropdownStyle="{'z-index':'1000'}" />
           </a-form-item>
         </a-col>
         <a-col :span="6">
@@ -25,6 +26,7 @@
         
         <a-col :span="6">
             <a-button type="primary" @click="submitForm">保存</a-button>
+            <a-button type="primary" @click="ketangFun" style="margin-left: 10px;">生成本学期课堂数据</a-button>
         </a-col>
       </a-row>
     </a-form>
@@ -79,7 +81,8 @@ const queryParam = ref<any>({});
     xsktTitle:'',
     jrktTitle:'',
   });
-  const { createMessage } = useMessage();
+  const { createMessage,createConfirm } = useMessage();
+  
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
   const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 13 } });
   const confirmLoading = ref<boolean>(false);
@@ -102,6 +105,32 @@ const queryParam = ref<any>({});
 
   const list = (queryParam) => defHttp.get({ url: '/kcSysConfig/kcSysConfig/queryById', params:queryParam });
   
+  const listKcxx = (queryParam) => defHttp.get({ url: '/kcSysConfig/kcSysConfig/listKcxx', params:queryParam });
+
+
+
+  function ketangFun(){
+    let startTime = new Date(getSysConfig().bxqkssj);
+    let nowDate = new Date();
+    
+    if(nowDate.getTime()<startTime.getTime()){
+      createConfirm({
+        iconType: 'warning',
+        title: '确认初始化',
+        content: '是否初始化课程数据，若初始化需要大约30分钟，请耐心等待',
+        okText: '确认',
+        cancelText: '取消',
+        onOk: () => {
+          listKcxx(null).then(res=>{
+            createMessage.success(res);
+          })
+        }
+      });
+      
+    }else{
+      createMessage.error("本学期已经开始，不能重复生成课程数据");
+    }
+  }
   //进入就加载
   onMounted(() => {
     queryParam.value.id =  '1';

src/views/site/yuYueKeCheng/more.vue

@@ -15,7 +15,13 @@
       <!-- 查询条件 -->
       <div>
         <a-row style="margin-top:20px;">
-          <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
+          
+          <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }" >
+            <a-form-item label="" style="padding: 10px;">
+                <j-dict-select-tag v-model:value="queryParam.xnxq" dictCode="kc_xqxn_history,title,title,true order by start_time desc" placeholder="请选择学期学年" style="width: 100%;"/>
+              </a-form-item>
+              </a-col>
+          <!-- <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
             <a-form-item label="" style="padding: 10px;">
               <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择开始时间'" style="width:100%;" v-model:value="queryParam.startTime"></a-date-picker>
             </a-form-item>
@@ -24,7 +30,7 @@
             <a-form-item label="" style="padding: 10px;">
               <a-date-picker :showTime="false" valueFormat="YYYY-MM-DD" :placeholder="'请选择结束时间'" style="width:100%;" v-model:value="queryParam.endTime"></a-date-picker>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :xs="{ span: 24 }" :sm="{ span: 8 }" :lg="{ span: 4 }">
             <a-form-item label="" style="padding: 10px;">
               <JDictSelectTag placeholder="请选择院系" v-model:value="queryParam.kkdw" :dictCode="`kc_kkdw_view,kkdw,id`" />
@@ -139,6 +145,7 @@ onMounted(() => {
   queryParam.value.isdeleted = '0'
   queryParam.value.pageSize = -1
   queryParam.value.userid = getUserId()
+  queryParam.value.xnxq = getSysConfig().flag1
   loadData()
 });
 /**