Browse Source

提交

master
主管理员 6 months ago
parent
commit
e02060e2b5
11 changed files with 82 additions and 8 deletions
  1. +1
    -1
      admin-pc/.env.development
  2. +1
    -1
      admin-pc/.env.production
  3. +0
    -1
      applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java
  4. +1
    -1
      applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/controller/AnswerTopicController.java
  5. +13
    -1
      applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/entity/AnswerTopic.java
  6. +1
    -1
      applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/mapper/AnswerTopicMapper.java
  7. +1
    -1
      applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/IAnswerTopicService.java
  8. +1
    -1
      applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/impl/AnswerTopicServiceImpl.java
  9. +18
    -0
      applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/AnswerTopicList.vue
  10. +15
    -0
      applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/modules/AnswerTopicForm.vue
  11. +30
    -0
      applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue3/AnswerTopic.data.ts

+ 1
- 1
admin-pc/.env.development View File

@ -1,5 +1,5 @@
NODE_ENV=development 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_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview


+ 1
- 1
admin-pc/.env.production View File

@ -1,4 +1,4 @@
NODE_ENV=production 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_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

+ 0
- 1
applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java View File

@ -61,7 +61,6 @@ public class AnswerAppletIndexServiceImpl implements AnswerAppletIndexService {
public Result<?> problemList(){ public Result<?> problemList(){
List<AnswerTopic> list = answerTopicService List<AnswerTopic> list = answerTopicService
.lambdaQuery() .lambdaQuery()
.select(AnswerTopic::getId,AnswerTopic::getTitle)
.orderByDesc(AnswerTopic::getSort) .orderByDesc(AnswerTopic::getSort)
.eq(AnswerTopic::getIsOpen, "Y") .eq(AnswerTopic::getIsOpen, "Y")
.list(); .list();


+ 1
- 1
applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/controller/AnswerTopicController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/** /**
* @Description: 问答题目表 * @Description: 问答题目表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-19
* @Date: 2024-11-23
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags="问答题目表") @Api(tags="问答题目表")


+ 13
- 1
applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/entity/AnswerTopic.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/** /**
* @Description: 问答题目表 * @Description: 问答题目表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-19
* @Date: 2024-11-23
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@ -59,4 +59,16 @@ public class AnswerTopic implements Serializable {
@Excel(name = "是否启用", width = 15) @Excel(name = "是否启用", width = 15)
@ApiModelProperty(value = "是否启用") @ApiModelProperty(value = "是否启用")
private java.lang.String isOpen; 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;
} }

+ 1
- 1
applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/mapper/AnswerTopicMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @Description: 问答题目表 * @Description: 问答题目表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-19
* @Date: 2024-11-23
* @Version: V1.0 * @Version: V1.0
*/ */
public interface AnswerTopicMapper extends BaseMapper<AnswerTopic> { public interface AnswerTopicMapper extends BaseMapper<AnswerTopic> {


+ 1
- 1
applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/IAnswerTopicService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* @Description: 问答题目表 * @Description: 问答题目表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-19
* @Date: 2024-11-23
* @Version: V1.0 * @Version: V1.0
*/ */
public interface IAnswerTopicService extends IService<AnswerTopic> { public interface IAnswerTopicService extends IService<AnswerTopic> {


+ 1
- 1
applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/service/impl/AnswerTopicServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/** /**
* @Description: 问答题目表 * @Description: 问答题目表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-11-19
* @Date: 2024-11-23
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service


+ 18
- 0
applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/AnswerTopicList.vue View File

@ -159,6 +159,21 @@
dataIndex: 'isOpen', dataIndex: 'isOpen',
customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''), customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''),
}, },
{
title:'是',
align:"center",
dataIndex: 'yesNo'
},
{
title:'否',
align:"center",
dataIndex: 'noNo'
},
{
title:'分割答案',
align:"center",
dataIndex: 'danan'
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
@ -197,6 +212,9 @@
fieldList.push({type:'Text',value:'title',text:'问题',dictCode:''}) fieldList.push({type:'Text',value:'title',text:'问题',dictCode:''})
fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''}) fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
fieldList.push({type:'switch',value:'isOpen',text:'是否启用'}) 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 this.superFieldList = fieldList
} }
} }


+ 15
- 0
applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue/modules/AnswerTopicForm.vue View File

@ -18,6 +18,21 @@
<j-switch v-model="model.isOpen" ></j-switch> <j-switch v-model="model.isOpen" ></j-switch>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-model-item label="是" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yesNo">
<a-input v-model="model.yesNo" placeholder="请输入是" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="否" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noNo">
<a-input v-model="model.noNo" placeholder="请输入否" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="分割答案" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="danan">
<a-input v-model="model.danan" placeholder="请输入分割答案" ></a-input>
</a-form-model-item>
</a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>


+ 30
- 0
applet-answer-api/src/main/java/org/jeecg/modules/answerTopic/vue3/AnswerTopic.data.ts View File

@ -23,6 +23,21 @@ export const columns: BasicColumn[] = [
return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) 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[] = [ export const searchFormSchema: FormSchema[] = [
@ -60,4 +75,19 @@ export const formSchema: FormSchema[] = [
componentProps:{ componentProps:{
}, },
}, },
{
label: '是',
field: 'yesNo',
component: 'Input',
},
{
label: '否',
field: 'noNo',
component: 'Input',
},
{
label: '分割答案',
field: 'danan',
component: 'Input',
},
]; ];

Loading…
Cancel
Save