diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/api/ImitationAPI.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/ImitationAPI.java new file mode 100644 index 0000000..08f408e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/api/ImitationAPI.java @@ -0,0 +1,31 @@ +package com.ruoyi.cms.api; + +import com.ruoyi.cms.domain.Imitation; +import com.ruoyi.cms.service.IImitationService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/api/imitation") +public class ImitationAPI extends BaseController { + + @Resource + private IImitationService imitationService; + + @RequestMapping("/list") + public TableDataInfo getImitation(Imitation imitation){ + startPage(); + return getDataTable(imitationService.selectImitationList(imitation)); + } + + @RequestMapping("/{id}") + public AjaxResult getImitationById(@PathVariable Long id){ + return success(imitationService.selectImitationById(id)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/BaseInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/BaseInfoController.java index 574a567..d7c1304 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/BaseInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/BaseInfoController.java @@ -2,16 +2,11 @@ package com.ruoyi.cms.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import org.springframework.data.repository.query.Param; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -23,14 +18,13 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 基础信息Controller - * + * * @author 点亮信息 * @date 2024-07-26 */ @RestController @RequestMapping("/cms/baseInfo") -public class BaseInfoController extends BaseController -{ +public class BaseInfoController extends BaseController { @Autowired private IBaseInfoService baseInfoService; @@ -40,8 +34,7 @@ public class BaseInfoController extends BaseController @PreAuthorize("@ss.hasPermi('cms:baseInfo:edit')") @Log(title = "基础信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody BaseInfo baseInfo) - { + public AjaxResult edit(@RequestBody BaseInfo baseInfo) { return toAjax(baseInfoService.updateBaseInfo(baseInfo)); } @@ -49,7 +42,16 @@ public class BaseInfoController extends BaseController * 查询 */ @GetMapping() - public AjaxResult selectBaseInfo(){ + public AjaxResult selectBaseInfo() { return success(baseInfoService.getBaseInfo()); } + + /** + * 修改报名状态 + */ + @GetMapping("/updateRegister") + public AjaxResult updateStatus(@RequestParam("status") String status) { + baseInfoService.updateRegisterStatus(status); + return success(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/ImitationController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/ImitationController.java new file mode 100644 index 0000000..34738e9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/ImitationController.java @@ -0,0 +1,105 @@ +package com.ruoyi.cms.controller; + +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.cms.domain.Imitation; +import com.ruoyi.cms.service.IImitationService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +import java.util.List; + +/** + * 虚仿真课Controller + * + * @author 点亮信息 + * @date 2024-08-02 + */ +@RestController +@RequestMapping("/hit/imitation") +public class ImitationController extends BaseController +{ + @Autowired + private IImitationService imitationService; + + /** + * 查询虚仿真课列表 + */ + @PreAuthorize("@ss.hasPermi('hit:imitation:list')") + @GetMapping("/list") + public TableDataInfo list(Imitation imitation) + { + startPage(); + List list = imitationService.selectImitationList(imitation); + return getDataTable(list); + } + + /** + * 导出虚仿真课列表 + */ + @PreAuthorize("@ss.hasPermi('hit:imitation:export')") + @Log(title = "虚仿真课", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Imitation imitation) + { + List list = imitationService.selectImitationList(imitation); + ExcelUtil util = new ExcelUtil(Imitation.class); + util.exportExcel(response, list, "虚仿真课数据"); + } + + /** + * 获取虚仿真课详细信息 + */ + @PreAuthorize("@ss.hasPermi('hit:imitation:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(imitationService.selectImitationById(id)); + } + + /** + * 新增虚仿真课 + */ + @PreAuthorize("@ss.hasPermi('hit:imitation:add')") + @Log(title = "虚仿真课", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody Imitation imitation) + { + return toAjax(imitationService.insertImitation(imitation)); + } + + /** + * 修改虚仿真课 + */ + @PreAuthorize("@ss.hasPermi('hit:imitation:edit')") + @Log(title = "虚仿真课", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody Imitation imitation) + { + return toAjax(imitationService.updateImitation(imitation)); + } + + /** + * 删除虚仿真课 + */ + @PreAuthorize("@ss.hasPermi('hit:imitation:remove')") + @Log(title = "虚仿真课", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(imitationService.deleteImitationByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java index 9e26b71..d3b0a43 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/BaseInfo.java @@ -47,4 +47,7 @@ public class BaseInfo extends BaseEntity /** 版权信息 */ @Excel(name = "版权信息") private String copyrightInfo; + + /** 是否可以报名 */ + private String registerStatus; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Imitation.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Imitation.java new file mode 100644 index 0000000..12a4049 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/Imitation.java @@ -0,0 +1,56 @@ +package com.ruoyi.cms.domain; + +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 虚仿真课对象 imitation + * + * @author 点亮信息 + * @date 2024-08-02 + */ +@Data +public class Imitation extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 记录ID */ + private Long id; + + /** 课程标题 */ + @Excel(name = "课程标题") + private String imitationTitle; + + /** 课程简介 */ + @Excel(name = "课程简介") + private String imitationSummary; + + /** 课程老师 */ + @Excel(name = "课程老师") + private String imitationTeach; + + /** 课程学校 */ + @Excel(name = "课程学校") + private String imitationSchool; + + /** 课程链接 */ + @Excel(name = "课程链接") + private String imitationLink; + + /** 课程阅览量 */ + @Excel(name = "课程阅览量") + private Long imitationCount; + + /** 课程类别(0=没有,1=国一流,2=省一流) */ + @Excel(name = "课程类别(0=没有,1=国一流,2=省一流)") + private Integer imitationType; + + /** 逻辑删除0未删除1真删除 */ + private Integer delFlag; + + /** 缩略图 */ + private String imitationImage; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java index 30e94d0..2417e43 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java @@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; +import java.util.Date; import java.util.List; @Data @@ -69,4 +70,7 @@ public class HitRegistrationStudentInfoVo extends BaseEntity { /** 指导老师姓名集合 */ @Excel(name = "指导老师") private List guideNames; + + /** 时间 */ + private Date createTime; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/BaseInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/BaseInfoMapper.java index 6d2b365..bd3ee85 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/BaseInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/BaseInfoMapper.java @@ -28,4 +28,9 @@ public interface BaseInfoMapper extends BaseMapper * @return */ public BaseInfo selectBaseInfo(); + + /** + * 修改报名状态 + */ + public int updateRegisterStatusInt(String status); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/ImitationMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/ImitationMapper.java new file mode 100644 index 0000000..e6d63ed --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/ImitationMapper.java @@ -0,0 +1,68 @@ +package com.ruoyi.cms.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cms.domain.Imitation; + +/** + * 虚仿真课Mapper接口 + * + * @author 点亮信息 + * @date 2024-08-02 + */ +public interface ImitationMapper extends BaseMapper +{ + /** + * 查询虚仿真课 + * + * @param id 虚仿真课主键 + * @return 虚仿真课 + */ + public Imitation selectImitationById(Long id); + + /** + * 查询虚仿真课列表 + * + * @param imitation 虚仿真课 + * @return 虚仿真课集合 + */ + public List selectImitationList(Imitation imitation); + + /** + * 新增虚仿真课 + * + * @param imitation 虚仿真课 + * @return 结果 + */ + public int insertImitation(Imitation imitation); + + /** + * 修改虚仿真课 + * + * @param imitation 虚仿真课 + * @return 结果 + */ + public int updateImitation(Imitation imitation); + + /** + * 删除虚仿真课 + * + * @param id 虚仿真课主键 + * @return 结果 + */ + public int deleteImitationById(Long id); + + /** + * 批量删除虚仿真课 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteImitationByIds(Long[] ids); + + /** + * 计数加1 + */ + public void addCount(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IBaseInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IBaseInfoService.java index 0c638e8..9725432 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IBaseInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IBaseInfoService.java @@ -26,4 +26,9 @@ public interface IBaseInfoService extends IService */ public BaseInfo getBaseInfo(); + /** + * 修改报名状态 + */ + public void updateRegisterStatus(String status); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IImitationService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IImitationService.java new file mode 100644 index 0000000..e621e5e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IImitationService.java @@ -0,0 +1,63 @@ +package com.ruoyi.cms.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cms.domain.Imitation; + +/** + * 虚仿真课Service接口 + * + * @author 点亮信息 + * @date 2024-08-02 + */ +public interface IImitationService extends IService +{ + /** + * 查询虚仿真课 + * + * @param id 虚仿真课主键 + * @return 虚仿真课 + */ + public Imitation selectImitationById(Long id); + + /** + * 查询虚仿真课列表 + * + * @param imitation 虚仿真课 + * @return 虚仿真课集合 + */ + public List selectImitationList(Imitation imitation); + + /** + * 新增虚仿真课 + * + * @param imitation 虚仿真课 + * @return 结果 + */ + public int insertImitation(Imitation imitation); + + /** + * 修改虚仿真课 + * + * @param imitation 虚仿真课 + * @return 结果 + */ + public int updateImitation(Imitation imitation); + + /** + * 批量删除虚仿真课 + * + * @param ids 需要删除的虚仿真课主键集合 + * @return 结果 + */ + public int deleteImitationByIds(Long[] ids); + + /** + * 删除虚仿真课信息 + * + * @param id 虚仿真课主键 + * @return 结果 + */ + public int deleteImitationById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java index 0893be4..d7f61aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/BaseInfoServiceImpl.java @@ -42,4 +42,11 @@ public class BaseInfoServiceImpl extends ServiceImpl i return baseMapper.selectBaseInfo(); } + /** + * 修改报名状态 + */ + @Override + public void updateRegisterStatus(String status){ + baseMapper.updateRegisterStatusInt(status); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/ImitationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/ImitationServiceImpl.java new file mode 100644 index 0000000..83ae1e8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/ImitationServiceImpl.java @@ -0,0 +1,101 @@ +package com.ruoyi.cms.service.impl; + +import java.util.List; + +import cn.hutool.core.lang.Snowflake; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.cms.mapper.ImitationMapper; +import com.ruoyi.cms.domain.Imitation; +import com.ruoyi.cms.service.IImitationService; + +/** + * 虚仿真课Service业务层处理 + * + * @author 点亮信息 + * @date 2024-08-02 + */ +@Service +public class ImitationServiceImpl extends ServiceImpl implements IImitationService +{ + @Autowired + private Snowflake snowflake; + + /** + * 查询虚仿真课 + * + * @param id 虚仿真课主键 + * @return 虚仿真课 + */ + @Override + public Imitation selectImitationById(Long id) + { + baseMapper.addCount(id); + return baseMapper.selectImitationById(id); + } + + /** + * 查询虚仿真课列表 + * + * @param imitation 虚仿真课 + * @return 虚仿真课 + */ + @Override + public List selectImitationList(Imitation imitation) + { + return baseMapper.selectImitationList(imitation); + } + + /** + * 新增虚仿真课 + * + * @param imitation 虚仿真课 + * @return 结果 + */ + @Override + public int insertImitation(Imitation imitation) + { + imitation.setId(snowflake.nextId()); + imitation.setCreateTime(DateUtils.getNowDate()); + return baseMapper.insertImitation(imitation); + } + + /** + * 修改虚仿真课 + * + * @param imitation 虚仿真课 + * @return 结果 + */ + @Override + public int updateImitation(Imitation imitation) + { + imitation.setUpdateTime(DateUtils.getNowDate()); + return baseMapper.updateImitation(imitation); + } + + /** + * 批量删除虚仿真课 + * + * @param ids 需要删除的虚仿真课主键 + * @return 结果 + */ + @Override + public int deleteImitationByIds(Long[] ids) + { + return baseMapper.deleteImitationByIds(ids); + } + + /** + * 删除虚仿真课信息 + * + * @param id 虚仿真课主键 + * @return 结果 + */ + @Override + public int deleteImitationById(Long id) + { + return baseMapper.deleteImitationById(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/cms/BaseInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/BaseInfoMapper.xml index 4cd1bd6..f84ab1c 100644 --- a/ruoyi-admin/src/main/resources/mapper/cms/BaseInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/cms/BaseInfoMapper.xml @@ -13,10 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, web_name, contact_number, contact_email, address, web_img, record_info, copyright_info from base_info + select id, web_name, contact_number, contact_email, address, web_img, record_info, copyright_info, register_status from base_info @@ -35,6 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update base_info set register_status = #{status}; + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/cms/ImitationMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/ImitationMapper.xml new file mode 100644 index 0000000..e11fde2 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/cms/ImitationMapper.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, imitation_image, imitation_title, imitation_summary, imitation_teach, imitation_school, imitation_link, imitation_count, imitation_type, remark, del_flag, create_time, create_by, update_time, update_by from imitation + + + + + + + + insert into imitation + + id, + imitation_title, + imitation_summary, + imitation_teach, + imitation_school, + imitation_link, + imitation_count, + imitation_type, + remark, + del_flag, + create_time, + create_by, + update_time, + update_by, + imitation_image, + + + #{id}, + #{imitationTitle}, + #{imitationSummary}, + #{imitationTeach}, + #{imitationSchool}, + #{imitationLink}, + #{imitationCount}, + #{imitationType}, + #{remark}, + #{delFlag}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{imitationImage}, + + + + update imitation set imitation_count = imitation_count + 1 where id = #{id} + + + + update imitation + + imitation_title = #{imitationTitle}, + imitation_summary = #{imitationSummary}, + imitation_teach = #{imitationTeach}, + imitation_school = #{imitationSchool}, + imitation_link = #{imitationLink}, + imitation_count = #{imitationCount}, + imitation_type = #{imitationType}, + remark = #{remark}, + del_flag = #{delFlag}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + update_by = #{imitationImage}, + + where id = #{id} + + + + delete from imitation where id = #{id} + + + + delete from imitation where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/cms/baseInfo.js b/ruoyi-ui/src/api/cms/baseInfo.js index 16b0d93..4528fa4 100644 --- a/ruoyi-ui/src/api/cms/baseInfo.js +++ b/ruoyi-ui/src/api/cms/baseInfo.js @@ -41,3 +41,9 @@ export function delBaseInfo(id) { method: 'delete' }) } + +export function editStatus(status){ + return request({ + url: "/cms/baseInfo/updateRegister?status=" + status, + }) +} diff --git a/ruoyi-ui/src/api/hit/imitation.js b/ruoyi-ui/src/api/hit/imitation.js new file mode 100644 index 0000000..69d6163 --- /dev/null +++ b/ruoyi-ui/src/api/hit/imitation.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询虚仿真课列表 +export function listImitation(query) { + return request({ + url: '/hit/imitation/list', + method: 'get', + params: query + }) +} + +// 查询虚仿真课详细 +export function getImitation(id) { + return request({ + url: '/hit/imitation/' + id, + method: 'get' + }) +} + +// 新增虚仿真课 +export function addImitation(data) { + return request({ + url: '/hit/imitation', + method: 'post', + data: data + }) +} + +// 修改虚仿真课 +export function updateImitation(data) { + return request({ + url: '/hit/imitation', + method: 'put', + data: data + }) +} + +// 删除虚仿真课 +export function delImitation(id) { + return request({ + url: '/hit/imitation/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/cms/content/contentList.vue b/ruoyi-ui/src/views/cms/content/contentList.vue index 6a36f48..3fba495 100644 --- a/ruoyi-ui/src/views/cms/content/contentList.vue +++ b/ruoyi-ui/src/views/cms/content/contentList.vue @@ -176,11 +176,6 @@ export default { defaultValue: undefined, required: false }, - temp: { - type: String, - defaultValue: undefined, - required: false - } }, data() { return { @@ -198,7 +193,6 @@ export default { delFlag: "0", }, total: 0, - tempType: "0", } }, watch: { @@ -211,9 +205,6 @@ export default { } this.getList() }, - temp(newVal){ - this.tempType = newVal - }, }, created() { if (this.cid === "") { @@ -226,7 +217,7 @@ export default { methods: { /** 新增按钮操作 */ handleAdd() { - this.$router.push({path: '/content/editor', query: {"categoryId": this.queryParams.categoryId, "temp": this.tempType}}) + this.$router.push({path: '/content/editor', query: {"categoryId": this.queryParams.categoryId}}) }, /** 删除按钮操作 */ handleDelete(row) { diff --git a/ruoyi-ui/src/views/cms/content/index.vue b/ruoyi-ui/src/views/cms/content/index.vue index 9dd331b..b3239f6 100644 --- a/ruoyi-ui/src/views/cms/content/index.vue +++ b/ruoyi-ui/src/views/cms/content/index.vue @@ -30,7 +30,7 @@ - + @@ -93,7 +93,6 @@ export default { {key: 3, label: `内容状态`, visible: true}, {key: 4, label: `创建时间`, visible: true}, ], - temp: "0" } }, watch: { @@ -162,7 +161,6 @@ export default { // 节点单击事件 handleNodeClick(data) { this.selectCategoryId = data.id; - this.temp = data.temp; }, /** 查询栏目下拉树结构 */ getCategoryTree() { diff --git a/ruoyi-ui/src/views/cms/editor/index.vue b/ruoyi-ui/src/views/cms/editor/index.vue index d1bb443..8ffd224 100644 --- a/ruoyi-ui/src/views/cms/editor/index.vue +++ b/ruoyi-ui/src/views/cms/editor/index.vue @@ -258,6 +258,7 @@ export default { getCategoryList() { getLeavesCategoryList().then(response => { this.categoryList = response.data + console.log(this.temp) if (!!this.$route.query.categoryId){ let flag = false; this.categoryList.forEach(item => { @@ -313,6 +314,7 @@ export default { } }) } + this.reset(); this.$router.replace('/content/content') this.$modal.closeLoading(); } diff --git a/ruoyi-ui/src/views/hit/imitation/index.vue b/ruoyi-ui/src/views/hit/imitation/index.vue new file mode 100644 index 0000000..b671e22 --- /dev/null +++ b/ruoyi-ui/src/views/hit/imitation/index.vue @@ -0,0 +1,352 @@ + + + diff --git a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue index 98ba646..066321c 100644 --- a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue +++ b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue @@ -93,6 +93,16 @@ @keyup.enter.native="handleQuery" /> + + + + + + 搜索 重置刷新 @@ -121,6 +131,16 @@ v-hasPermi="['hit:hitRegistrationStudentInfo:export']" >导出 + + + + @@ -203,12 +223,15 @@ import { updateHitRegistrationStudentInfo, getTeachInfoByIds } from "@/api/hit/registrationStudentInfo"; +import {selectBaseInfo, editStatus} from '@/api/cms/baseInfo' export default { name: "HitRegistrationStudentInfo", dicts: ['sys_user_sex', 'competition_type'], data() { return { + yearList: [], + registerStatus:"", leaderTeachList:[], guideTeachList:[], // 遮罩层 @@ -244,6 +267,7 @@ export default { leaderIds: null, guideIds: null, teachName:null, + createTime: null }, // 表单参数 form: {}, @@ -278,6 +302,10 @@ export default { }, created() { this.getList(); + selectBaseInfo().then(res => { + this.registerStatus = res.data.registerStatus + }) + this.yearList = this.years(); }, methods: { /** 查询报名信息列表 */ @@ -314,10 +342,10 @@ export default { guideIds: null, remark: null, delFlag: null, - createTime: null, createBy: null, updateTime: null, - updateBy: null + updateBy: null, + createTime: null }; this.resetForm("form"); }, @@ -329,6 +357,7 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.queryParams.createTime = null this.handleQuery(); }, // 多选框选中数据 @@ -401,6 +430,26 @@ export default { }) } }, + updateRegisterStatus(){ + editStatus(this.registerStatus).then(res => { + if (res.code === 200 ){ + this.$modal.msgSuccess(this.registerStatus === "1" ? "报名已开启" : "报名已关闭") + } + }) + }, + years() { + const currentYear = new Date().getFullYear(); + const startYear = currentYear - 40; // 假设从当前年份往前 20 年 + const endYear = currentYear; + const years = []; + for (let year = startYear; year <= endYear; year++) { + years.push({ + label: year, + value: year + "-01-01", + }); + } + return years.sort((a, b) => b.label - a.label); + }, } };