From 739cae529f06e4be0fd437f11a974b9824a97f56 Mon Sep 17 00:00:00 2001 From: Gitea Date: Wed, 20 Nov 2024 18:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=83=BD=E5=8A=9B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CompskillController.java | 265 ------------------ .../demo/compskill/entity/Compskill.java | 71 ----- .../demo/compskill/entity/Compskillvo.java | 53 ---- .../compskill/mapper/CompskillMapper.java | 17 -- .../compskill/mapper/xml/CompskillMapper.xml | 5 - .../compskill/service/ICompskillService.java | 14 - .../service/impl/CompskillServiceImpl.java | 19 -- .../src/views/compskill/Compskill.api.ts | 68 ----- .../src/views/compskill/Compskill.data.ts | 109 ------- .../src/views/compskill/CompskillList.vue | 167 ----------- .../compskill/components/CompskillForm.vue | 70 ----- .../compskill/components/CompskillModal.vue | 67 ----- 12 files changed, 925 deletions(-) delete mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java delete mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/entity/Compskill.java delete mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/entity/Compskillvo.java delete mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/mapper/CompskillMapper.java delete mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/mapper/xml/CompskillMapper.xml delete mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/service/ICompskillService.java delete mode 100644 jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/service/impl/CompskillServiceImpl.java delete mode 100644 jeecgboot-vue3-master/src/views/compskill/Compskill.api.ts delete mode 100644 jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts delete mode 100644 jeecgboot-vue3-master/src/views/compskill/CompskillList.vue delete mode 100644 jeecgboot-vue3-master/src/views/compskill/components/CompskillForm.vue delete mode 100644 jeecgboot-vue3-master/src/views/compskill/components/CompskillModal.vue diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java deleted file mode 100644 index 2d20780a..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java +++ /dev/null @@ -1,265 +0,0 @@ -package org.jeecg.modules.demo.compskill.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.subject.Subject; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.modules.demo.annual.entity.Annual; -import org.jeecg.modules.demo.annual.service.IAnnualService; -import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; -import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; -import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; -import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; -import org.jeecg.modules.demo.basicsskill.entity.Basicsskill; -import org.jeecg.modules.demo.basicsskill.service.IBasicsskillService; -import org.jeecg.modules.demo.comp.entity.Comp; -import org.jeecg.modules.demo.comp.service.ICompService; -import org.jeecg.modules.demo.compskill.entity.Compskill; -import org.jeecg.modules.demo.compskill.entity.Compskillvo; -import org.jeecg.modules.demo.compskill.service.ICompskillService; -import org.jeecg.modules.system.entity.SysRole; -import org.jeecg.modules.system.service.ISysUserRoleService; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.ObjectUtils; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.*; -import java.util.stream.Collectors; - -/** - * @Description: 项目能力设置 - * @Author: jeecg-boot - * @Date: 2023-08-17 - * @Version: V1.0 - */ -@Api(tags = "项目能力设置") -@RestController -@RequestMapping("/compskill/compskill") -@Slf4j -public class CompskillController extends JeecgController { - @Autowired - private ICompskillService compskillService; - @Autowired - private IAnnualCompPointService annualCompPointService; - @Autowired - private IBasicsskillService basicsskillService; - @Autowired - private IAnnualService annualService; - @Autowired - private IAnnualCompService annualCompService; - - @Autowired - private ICompService iCompService; - - @Autowired - private ISysUserRoleService iSysUserRoleService; - - - /** - * 分页列表查询 - * - * @param compskill - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "项目能力设置-分页列表查询") - @ApiOperation(value = "项目能力设置-分页列表查询", notes = "项目能力设置-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(Compskill compskill, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - - Subject subject = SecurityUtils.getSubject(); - // 获取当前登录用户 - LoginUser loginUser = (LoginUser) subject.getPrincipal(); - List roleList = iSysUserRoleService.getUserRoleByUserId(loginUser.getId()); - Map roleMap = Optional.ofNullable(roleList).orElse(new LinkedList<>()).stream().collect(Collectors.toMap(SysRole::getRoleCode, SysRole::getRoleCode)); - //角色编码 管理员&组委会&学校管理员 可以看到所有，其它用户可见到所属自己数据 - Map efficientRoleMap = new LinkedHashMap<>(); - efficientRoleMap.put("admin", "admin"); - efficientRoleMap.put("committee", "committee"); - efficientRoleMap.put("superAdmin", "superAdmin"); - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - // 查询所属当前登录用户数据 - if (efficientRoleMap.containsValue(roleMap.get("admin")) - || efficientRoleMap.containsValue(roleMap.get("committee")) - || efficientRoleMap.containsValue(roleMap.get("superAdmin"))) { - List compList = iCompService.list(new LambdaQueryWrapper().eq(Comp::getCompAdmin, loginUser.getUsername())); - if (!ObjectUtils.isEmpty(compList)) { - Set compIds = compList.stream().map(c -> c.getId()).collect(Collectors.toSet()); - List annualCompList = annualCompService.list(new LambdaQueryWrapper().in(AnnualComp::getCompid, compIds)); - if (!ObjectUtils.isEmpty(annualCompList)) { - Set annualCompIds = annualCompList.stream().map(d -> d.getId()).collect(Collectors.toSet()); - List annualCompPointList = annualCompPointService.list(new LambdaQueryWrapper().in(AnnualCompPoint::getAnnualCompId, annualCompIds)); - if (!ObjectUtils.isEmpty(annualCompPointList)) { - Set annualCompPointIds = annualCompPointList.stream().map(e -> e.getId()).collect(Collectors.toSet()); - queryWrapper.in(Compskill::getAnnucompid, annualCompPointIds); - } - } - } - } - - - Page page = new Page(pageNo, pageSize); - Page page1 = new Page<>(); - compskillService.page(page, queryWrapper); - BeanUtils.copyProperties(page, page1, "records"); - List list = page.getRecords().stream().map((item) -> { - Compskillvo compskill1 = new Compskillvo(); - BeanUtils.copyProperties(item, compskill1); - AnnualCompPoint annualCompPoint = annualCompPointService.query().eq("id", compskill1.getAnnucompid()).one(); - AnnualComp annualComp = null; - Annual annual = null; - if (annualCompPoint != null) { - annualComp = annualCompService.query().eq("id", annualCompPoint.getAnnualCompId()).one(); - } - if (annualComp != null) { - annual = annualService.query().eq("id", annualComp.getAnnualid()).one(); - } - List basicsskillList= basicsskillService.query().eq("id", compskill1.getCapacityid()).list(); - Basicsskill basicsskill=null; - if(basicsskillList.size()>0) - { - basicsskill=basicsskillList.get(0); - } - - if (annualCompPoint != null && basicsskill != null && annualComp != null && annual != null) { - compskill1.setAnnucompid(annualCompPoint.getObjName()); - compskill1.setCapacityid(basicsskill.getName()); - compskill1.setComp(annualComp.getName()); - compskill1.setAnnual(annual.getAnnualName()); - } - return compskill1; - }).collect(Collectors.toList()); - page1.setRecords(list); - return Result.OK(page1); - } - - /** - * 添加 - * - * @param compskill - * @return - */ - @AutoLog(value = "项目能力设置-添加") - @ApiOperation(value = "项目能力设置-添加", notes = "项目能力设置-添加") - //@RequiresPermissions("compskill:compskill:add") - @PostMapping(value = "/add") - public Result add(@RequestBody Compskill compskill) { - /* if (compskill != null) { - AnnualCompPoint annualCompPoint = annualCompPointService.query().eq("obj_name", compskill.getAnnucompid()).one(); - Basicsskill basicsskill = basicsskillService.query().eq("name", compskill.getCapacityid()).one(); - if (annualCompPoint != null && basicsskill != null) { - compskill.setAnnucompid(annualCompPoint.getId()); - compskill.setCapacityid(basicsskill.getId()); - } - }*/ - compskillService.save(compskill); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param compskill - * @return - */ - @AutoLog(value = "项目能力设置-编辑") - @ApiOperation(value = "项目能力设置-编辑", notes = "项目能力设置-编辑") - //@RequiresPermissions("compskill:compskill:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result edit(@RequestBody Compskill compskill) { - compskillService.updateById(compskill); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "项目能力设置-通过id删除") - @ApiOperation(value = "项目能力设置-通过id删除", notes = "项目能力设置-通过id删除") - //@RequiresPermissions("compskill:compskill:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { - compskillService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "项目能力设置-批量删除") - @ApiOperation(value = "项目能力设置-批量删除", notes = "项目能力设置-批量删除") - //@RequiresPermissions("compskill:compskill:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - this.compskillService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "项目能力设置-通过id查询") - @ApiOperation(value = "项目能力设置-通过id查询", notes = "项目能力设置-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - Compskill compskill = compskillService.getById(id); - if (compskill == null) { - return Result.error("未找到对应数据"); - } - return Result.OK(compskill); - } - - /** - * 导出excel - * - * @param request - * @param compskill - */ -// @RequiresPermissions("compskill:compskill:exportXls") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, Compskill compskill) { - return super.exportXls(request, compskill, Compskill.class, "项目能力设置"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequiresPermissions("compskill:compskill:importExcel") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, Compskill.class); - } - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/entity/Compskill.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/entity/Compskill.java deleted file mode 100644 index 43c0e2cc..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/entity/Compskill.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.jeecg.modules.demo.compskill.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 项目能力设置 - * @Author: jeecg-boot - * @Date: 2023-08-17 - * @Version: V1.0 - */ -@Data -@TableName("compskill") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="compskill对象", description="项目能力设置") -public class Compskill implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - /**年度比赛项目id*/ - @Excel(name = "年度比赛项目id", width = 15) - @ApiModelProperty(value = "年度比赛项目id") - private String annucompid; - /**能力id*/ - @Excel(name = "能力id", width = 15) - @ApiModelProperty(value = "能力id") - private String capacityid; - /**权值*/ - @Excel(name = "权值", width = 15) - @ApiModelProperty(value = "权值") - private Integer weight; - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/entity/Compskillvo.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/entity/Compskillvo.java deleted file mode 100644 index 3e924da3..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/entity/Compskillvo.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.jeecg.modules.demo.compskill.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; -@Data -public class Compskillvo { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建日期") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新日期") - private Date updateTime; - /**所属部门*/ - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - /**年度比赛项目id*/ - @Excel(name = "年度比赛项目id", width = 15) - @ApiModelProperty(value = "年度比赛项目id") - private String annucompid; - /**能力id*/ - @Excel(name = "能力id", width = 15) - @ApiModelProperty(value = "能力id") - private String capacityid; - /**权值*/ - @Excel(name = "权值", width = 15) - @ApiModelProperty(value = "权值") - private Integer weight; - private String annual; - private String comp; -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/mapper/CompskillMapper.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/mapper/CompskillMapper.java deleted file mode 100644 index 703846d5..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/mapper/CompskillMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.demo.compskill.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.compskill.entity.Compskill; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 项目能力设置 - * @Author: jeecg-boot - * @Date: 2023-08-17 - * @Version: V1.0 - */ -public interface CompskillMapper extends BaseMapper { - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/mapper/xml/CompskillMapper.xml b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/mapper/xml/CompskillMapper.xml deleted file mode 100644 index 82cca4e6..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/mapper/xml/CompskillMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/service/ICompskillService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/service/ICompskillService.java deleted file mode 100644 index 1dbf8882..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/service/ICompskillService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.demo.compskill.service; - -import org.jeecg.modules.demo.compskill.entity.Compskill; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 项目能力设置 - * @Author: jeecg-boot - * @Date: 2023-08-17 - * @Version: V1.0 - */ -public interface ICompskillService extends IService { - -} diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/service/impl/CompskillServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/service/impl/CompskillServiceImpl.java deleted file mode 100644 index 6854e321..00000000 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/service/impl/CompskillServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.demo.compskill.service.impl; - -import org.jeecg.modules.demo.compskill.entity.Compskill; -import org.jeecg.modules.demo.compskill.mapper.CompskillMapper; -import org.jeecg.modules.demo.compskill.service.ICompskillService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 项目能力设置 - * @Author: jeecg-boot - * @Date: 2023-08-17 - * @Version: V1.0 - */ -@Service -public class CompskillServiceImpl extends ServiceImpl implements ICompskillService { - -} diff --git a/jeecgboot-vue3-master/src/views/compskill/Compskill.api.ts b/jeecgboot-vue3-master/src/views/compskill/Compskill.api.ts deleted file mode 100644 index a8b8ee47..00000000 --- a/jeecgboot-vue3-master/src/views/compskill/Compskill.api.ts +++ /dev/null @@ -1,68 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import {useMessage} from "/@/hooks/web/useMessage"; - -const {createConfirm} = useMessage(); - -enum Api { - list = '/compskill/compskill/list', - save = '/compskill/compskill/add', - edit = '/compskill/compskill/edit', - deleteOne = '/compskill/compskill/delete', - deleteBatch = '/compskill/compskill/deleteBatch', - importExcel = '/compskill/compskill/importExcel', - exportXls = '/compskill/compskill/exportXls', -} - -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params, handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - createConfirm({ - iconType: 'warning', - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({ - url: Api.deleteBatch, - data: params - }, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} diff --git a/jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts b/jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts deleted file mode 100644 index d80c9e2b..00000000 --- a/jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts +++ /dev/null @@ -1,109 +0,0 @@ -import { BasicColumn } from '/@/components/Table'; -import { FormSchema } from '/@/components/Table'; -import { rules } from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '年度', - align: 'center', - dataIndex: 'annual', - }, - { - title: '年度比赛', - align: 'center', - dataIndex: 'comp', - }, - { - title: '年度比赛项目名称', - align: 'center', - dataIndex: 'annucompid', - }, - { - title: '能力名称', - align: 'center', - dataIndex: 'capacityid', - }, - { - title: '权值', - align: 'center', - dataIndex: 'weight', - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = []; -//表单数据 -export const formSchema: FormSchema[] = [ -/* { - label: '年度比赛项目项目', - field: 'annucompid', - component: 'JPopup', - componentProps: ({ formActionType }) => { - const { setFieldsValue } = formActionType; - return { - setFieldsValue: setFieldsValue, - code: 'bsxm', - fieldConfig: [{ source: 'obj_name', target: 'annucompid' }], - multi: true, - }; - }, - - dynamicRules: ({ model, schema }) => { - return [{ required: true, message: '请输入年度比赛项目id!' }]; - }, - },*/ - { - label: '', - field: 'annucompid', - component: 'Input', - show: false, - }, - { - label: '能力名称', - field: 'capacityname', - component: 'JPopup', - componentProps: ({ formActionType }) => { - const { setFieldsValue } = formActionType; - return { - setFieldsValue: setFieldsValue, - code: 'jcnlmc', - fieldConfig: [{ source: 'name', target: 'capacityname' },{ source: 'id', target: 'capacityid' }], - multi: true, - }; - }, - - dynamicRules: ({ model, schema }) => { - return [{ required: true, message: '请选择能力!' }]; - }, - }, - { - label: '', - field: 'capacityid', - component: 'Input', - show: false, - }, - { - label: '权值', - field: 'weight', - component: 'InputNumber', - dynamicRules: ({ model, schema }) => { - return [{ required: true, message: '请输入权值!' }]; - }, - }, - // TODO 主键隐藏字段，目前写死为ID - { - label: '', - field: 'id', - component: 'Input', - show: false, - }, -]; - -/** - * 流程表单调用这个方法获取formSchema - * @param param - */ -export function getBpmFormSchema(_formData): FormSchema[] { - // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema - return formSchema; -} diff --git a/jeecgboot-vue3-master/src/views/compskill/CompskillList.vue b/jeecgboot-vue3-master/src/views/compskill/CompskillList.vue deleted file mode 100644 index f763cf7e..00000000 --- a/jeecgboot-vue3-master/src/views/compskill/CompskillList.vue +++ /dev/null @@ -1,167 +0,0 @@ - - - - - diff --git a/jeecgboot-vue3-master/src/views/compskill/components/CompskillForm.vue b/jeecgboot-vue3-master/src/views/compskill/components/CompskillForm.vue deleted file mode 100644 index d071733a..00000000 --- a/jeecgboot-vue3-master/src/views/compskill/components/CompskillForm.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecgboot-vue3-master/src/views/compskill/components/CompskillModal.vue b/jeecgboot-vue3-master/src/views/compskill/components/CompskillModal.vue deleted file mode 100644 index 99c0fb95..00000000 --- a/jeecgboot-vue3-master/src/views/compskill/components/CompskillModal.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - -