diff --git a/admin-pc/.env.development b/admin-pc/.env.development index a81911b..274c43f 100644 --- a/admin-pc/.env.development +++ b/admin-pc/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8000/answer-api/ +VUE_APP_API_BASE_URL=https://admin.geniusjourneyclub.com/answer-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-pc/.env.production b/admin-pc/.env.production index 4824211..3bd9afe 100644 --- a/admin-pc/.env.production +++ b/admin-pc/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8000/answer-api/ +VUE_APP_API_BASE_URL=https://admin.geniusjourneyclub.com/answer-api/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java b/applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java index 544eeba..c7e97d3 100644 --- a/applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java +++ b/applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java @@ -61,7 +61,6 @@ public class AnswerAppletIndexServiceImpl implements AnswerAppletIndexService { public Result problemList(){ List list = answerTopicService .lambdaQuery() - .select(AnswerTopic::getId,AnswerTopic::getTitle) .orderByDesc(AnswerTopic::getSort) .eq(AnswerTopic::getIsOpen, "Y") .list(); diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/controller/AnswerTopicController.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/controller/AnswerTopicController.java index d6f1454..01deaf4 100644 --- a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/controller/AnswerTopicController.java +++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/controller/AnswerTopicController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 问答题目表 * @Author: jeecg-boot - * @Date: 2024-11-19 + * @Date: 2024-11-23 * @Version: V1.0 */ @Api(tags="问答题目表") diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/entity/AnswerTopic.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/entity/AnswerTopic.java index 7a0721c..ad0baf9 100644 --- a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/entity/AnswerTopic.java +++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/entity/AnswerTopic.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 问答题目表 * @Author: jeecg-boot - * @Date: 2024-11-19 + * @Date: 2024-11-23 * @Version: V1.0 */ @Data @@ -59,4 +59,16 @@ public class AnswerTopic implements Serializable { @Excel(name = "是否启用", width = 15) @ApiModelProperty(value = "是否启用") private java.lang.String isOpen; + /**是*/ + @Excel(name = "是", width = 15) + @ApiModelProperty(value = "是") + private java.lang.String yesNo; + /**否*/ + @Excel(name = "否", width = 15) + @ApiModelProperty(value = "否") + private java.lang.String noNo; + /**分割答案*/ + @Excel(name = "分割答案", width = 15) + @ApiModelProperty(value = "分割答案") + private java.lang.String danan; } diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/mapper/AnswerTopicMapper.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/mapper/AnswerTopicMapper.java index 4caa701..7ebbb3c 100644 --- a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/mapper/AnswerTopicMapper.java +++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/mapper/AnswerTopicMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 问答题目表 * @Author: jeecg-boot - * @Date: 2024-11-19 + * @Date: 2024-11-23 * @Version: V1.0 */ public interface AnswerTopicMapper extends BaseMapper { diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/IAnswerTopicService.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/IAnswerTopicService.java index 92b4523..792404b 100644 --- a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/IAnswerTopicService.java +++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/IAnswerTopicService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 问答题目表 * @Author: jeecg-boot - * @Date: 2024-11-19 + * @Date: 2024-11-23 * @Version: V1.0 */ public interface IAnswerTopicService extends IService { diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/impl/AnswerTopicServiceImpl.java b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/impl/AnswerTopicServiceImpl.java index bb7e502..c3d7948 100644 --- a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/impl/AnswerTopicServiceImpl.java +++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/impl/AnswerTopicServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 问答题目表 * @Author: jeecg-boot - * @Date: 2024-11-19 + * @Date: 2024-11-23 * @Version: V1.0 */ @Service diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/AnswerTopicList.vue b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/AnswerTopicList.vue index 5031702..e369cf8 100644 --- a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/AnswerTopicList.vue +++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/AnswerTopicList.vue @@ -159,6 +159,21 @@ dataIndex: 'isOpen', customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''), }, + { + title:'是', + align:"center", + dataIndex: 'yesNo' + }, + { + title:'否', + align:"center", + dataIndex: 'noNo' + }, + { + title:'分割答案', + align:"center", + dataIndex: 'danan' + }, { title: '操作', dataIndex: 'action', @@ -197,6 +212,9 @@ fieldList.push({type:'Text',value:'title',text:'问题',dictCode:''}) fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''}) fieldList.push({type:'switch',value:'isOpen',text:'是否启用'}) + fieldList.push({type:'string',value:'yesNo',text:'是',dictCode:''}) + fieldList.push({type:'string',value:'noNo',text:'否',dictCode:''}) + fieldList.push({type:'Text',value:'danan',text:'分割答案',dictCode:''}) this.superFieldList = fieldList } } diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/modules/AnswerTopicForm.vue b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/modules/AnswerTopicForm.vue index 74c5d54..1c3ca3d 100644 --- a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/modules/AnswerTopicForm.vue +++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/modules/AnswerTopicForm.vue @@ -18,6 +18,21 @@ + + + + + + + + + + + + + + + diff --git a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue3/AnswerTopic.data.ts b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue3/AnswerTopic.data.ts index d48c501..c9f7b5e 100644 --- a/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue3/AnswerTopic.data.ts +++ b/applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue3/AnswerTopic.data.ts @@ -23,6 +23,21 @@ export const columns: BasicColumn[] = [ return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) }, }, + { + title: '是', + align:"center", + dataIndex: 'yesNo' + }, + { + title: '否', + align:"center", + dataIndex: 'noNo' + }, + { + title: '分割答案', + align:"center", + dataIndex: 'danan' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -60,4 +75,19 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '是', + field: 'yesNo', + component: 'Input', + }, + { + label: '否', + field: 'noNo', + component: 'Input', + }, + { + label: '分割答案', + field: 'danan', + component: 'Input', + }, ];