Merge branch 'dev2' of http://110.42.96.64:19890/GoCo/OL-LearnPlatform-Backend into dev2

merge

jeecg-boot/jeecg-boot-module/jeecg-module-aiol/src/main/java/org/jeecg/modules/aiol/entity/AiolQuestion.java

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 题目
  * @Author: jeecg-boot
- * @Date:   2025-08-31
+ * @Date:   2025-09-02
  * @Version: V1.0
  */
 @Data
@@ -63,6 +63,14 @@ public class AiolQuestion implements Serializable {
 	@Excel(name = "分值", width = 15)
     @Schema(description = "分值")
     private java.lang.Integer score;
+	/**程度*/
+	@Excel(name = "程度", width = 15)
+    @Schema(description = "程度")
+    private java.lang.Integer degree;
+	/**能力*/
+	@Excel(name = "能力", width = 15)
+    @Schema(description = "能力")
+    private java.lang.Integer ability;
 	/**创建人*/
     @Schema(description = "创建人")
     private java.lang.String createBy;

jeecgboot-vue3/src/utils/http/axios/index.ts

@@ -276,7 +276,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
         //接口超时设置
-        timeout: 10 * 1000,
+        timeout: 60 * 1000,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
         headers: { 'Content-Type': ContentTypeEnum.JSON },

jeecgboot-vue3/src/views/aiol/AiolQuestion.data.ts

@@ -35,6 +35,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'score'
    },
+   {
+    title: '程度',
+    align:"center",
+    dataIndex: 'degree'
+   },
+   {
+    title: '能力',
+    align:"center",
+    dataIndex: 'ability'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -76,6 +86,16 @@ export const formSchema: FormSchema[] = [
     label: '分值',
     field: 'score',
     component: 'InputNumber',
+  },
+  {
+    label: '程度',
+    field: 'degree',
+    component: 'InputNumber',
+  },
+  {
+    label: '能力',
+    field: 'ability',
+    component: 'InputNumber',
   },
 	// TODO 主键隐藏字段，目前写死为ID
 	{
@@ -94,6 +114,8 @@ export const superQuerySchema = {
   analysis: {title: '题目解析',order: 3,view: 'umeditor', type: 'string',},
   difficulty: {title: '难度',order: 4,view: 'number', type: 'number',dictCode: 'question_difficulty',},
   score: {title: '分值',order: 5,view: 'number', type: 'number',},
+  degree: {title: '程度',order: 6,view: 'number', type: 'number',},
+  ability: {title: '能力',order: 7,view: 'number', type: 'number',},
 };
 
 /**