wangjiadong
/
comp
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

能力量化问题修改、功能优化 11.24

Browse Source
main
zhc077 1 year ago
parent dd612eac25
commit 10f558d6ad
9 changed files with 130 additions and 596 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ComputeUtils.java
  2. 74
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/entity/DepartAbilityEvaluation.java
  3. 73
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/entity/PersonalAbilityEvaluationCollect.java
  4. 27
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/DepartAbilityEvaluationServiceImpl.java
  5. 49
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationCollectServiceImpl.java
  6. 64
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationServiceImpl.java
  7. 129
      jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts
  8. 129
      jeecgboot-vue3-master/src/views/abilityEvaluation/persanlCollect/PersonalAbilityEvaluationCollect.data.ts
  9. 119
      jeecgboot-vue3-master/src/views/abilityEvaluation/persoanl/PersonalAbilityEvaluation.data.ts

12
jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ComputeUtils.java
Unescape View File

@ -47,6 +47,18 @@ public class ComputeUtils {
return b1.multiply(b2).doubleValue();
}
/**
* 精确的乘法运算
* @param v1
* @param v2
* @return
*/
public static double mul2(double v1, double v2) {
BigDecimal b1 = BigDecimal.valueOf(v1);
BigDecimal b2 = BigDecimal.valueOf(v2);
return b1.multiply(b2).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
}
/**
//提供（相对）精确的除法运算，当发生除不尽的情况时

74
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/entity/DepartAbilityEvaluation.java
Unescape View File

@ -75,80 +75,6 @@ public class DepartAbilityEvaluation implements Serializable {
@ApiModelProperty(value = "年度")
private String annualId;
/**
* 能力1
*/
@Excel(name = "能力1", width = 15)
@ApiModelProperty(value = "能力1")
private Double soc1;
/**
* 能力2
*/
@Excel(name = "能力2", width = 15)
@ApiModelProperty(value = "能力2")
private Double soc2;
/**
* 能力3
*/
@Excel(name = "能力3", width = 15)
@ApiModelProperty(value = "能力3")
private Double soc3;
/**
* 能力4
*/
@Excel(name = "能力4", width = 15)
@ApiModelProperty(value = "能力4")
private Double soc4;
/**
* 能力5
*/
@Excel(name = "能力5", width = 15)
@ApiModelProperty(value = "能力5")
private Double soc5;
/**
* 能力6
*/
@Excel(name = "能力6", width = 15)
@ApiModelProperty(value = "能力6")
private Double soc6;
/**
* 能力7
*/
@Excel(name = "能力7", width = 15)
@ApiModelProperty(value = "能力7")
private Double soc7;
/**
* 能力8
*/
@Excel(name = "能力8", width = 15)
@ApiModelProperty(value = "能力8")
private Double soc8;
/**
* 能力9
*/
@Excel(name = "能力9", width = 15)
@ApiModelProperty(value = "能力9")
private Double soc9;
/**
* 能力10
*/
@Excel(name = "能力10", width = 15)
@ApiModelProperty(value = "能力10")
private Double soc10;
/**
* 能力11
*/
@Excel(name = "能力11", width = 15)
@ApiModelProperty(value = "能力11")
private Double soc11;
/**
* 能力12
*/
@Excel(name = "能力12", width = 15)
@ApiModelProperty(value = "能力12")
private Double soc12;
/**
* 基础能力id
*/

73
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/entity/PersonalAbilityEvaluationCollect.java
Unescape View File

@ -87,79 +87,6 @@ public class PersonalAbilityEvaluationCollect implements Serializable {
@ApiModelProperty(value = "姓名")
private String name;
/**
* 能力1
*/
@Excel(name = "能力1", width = 15)
@ApiModelProperty(value = "能力1")
private Double soc1;
/**
* 能力2
*/
@Excel(name = "能力2", width = 15)
@ApiModelProperty(value = "能力2")
private Double soc2;
/**
* 能力3
*/
@Excel(name = "能力3", width = 15)
@ApiModelProperty(value = "能力3")
private Double soc3;
/**
* 能力4
*/
@Excel(name = "能力4", width = 15)
@ApiModelProperty(value = "能力4")
private Double soc4;
/**
* 能力5
*/
@Excel(name = "能力5", width = 15)
@ApiModelProperty(value = "能力5")
private Double soc5;
/**
* 能力6
*/
@Excel(name = "能力6", width = 15)
@ApiModelProperty(value = "能力6")
private Double soc6;
/**
* 能力7
*/
@Excel(name = "能力7", width = 15)
@ApiModelProperty(value = "能力7")
private Double soc7;
/**
* 能力8
*/
@Excel(name = "能力8", width = 15)
@ApiModelProperty(value = "能力8")
private Double soc8;
/**
* 能力9
*/
@Excel(name = "能力9", width = 15)
@ApiModelProperty(value = "能力9")
private Double soc9;
/**
* 能力10
*/
@Excel(name = "能力10", width = 15)
@ApiModelProperty(value = "能力10")
private Double soc10;
/**
* 能力11
*/
@Excel(name = "能力11", width = 15)
@ApiModelProperty(value = "能力11")
private Double soc11;
/**
* 能力12
*/
@Excel(name = "能力12", width = 15)
@ApiModelProperty(value = "能力12")
private Double soc12;
/**
* 基础能力id
*/

27
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/DepartAbilityEvaluationServiceImpl.java
Unescape View File

@ -8,15 +8,15 @@ import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation
import org.jeecg.modules.demo.abilityEvaluation.mapper.DepartAbilityEvaluationMapper;
import org.jeecg.modules.demo.abilityEvaluation.service.IDepartAbilityEvaluationService;
import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationService;
import org.jeecg.modules.demo.basicsskill.entity.Basicsskill;
import org.jeecg.modules.demo.basicsskill.service.IBasicsskillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Description: 院系年度能力评价
@ -30,9 +30,6 @@ public class DepartAbilityEvaluationServiceImpl extends ServiceImpl<DepartAbilit
@Autowired
private IPersonalAbilityEvaluationService iPersonalAbilityEvaluationService;
@Autowired
private IBasicsskillService iBasicsskillService;
@Override
public void collectAbilityEvaluation(DepartAbilityEvaluation departAbilityEvaluation) {
@ -45,24 +42,26 @@ public class DepartAbilityEvaluationServiceImpl extends ServiceImpl<DepartAbilit
);
}
List<PersonalAbilityEvaluation> abilityEvaluationList = iPersonalAbilityEvaluationService.list(new LambdaQueryWrapper<PersonalAbilityEvaluation>()
List<PersonalAbilityEvaluation> abilityEvaluationList4Depet = iPersonalAbilityEvaluationService.list(new LambdaQueryWrapper<PersonalAbilityEvaluation>()
.eq(PersonalAbilityEvaluation::getAnnualId, departAbilityEvaluation.getAnnualId())
.eq(PersonalAbilityEvaluation::getDepetId, departAbilityEvaluation.getDepetId())
.groupBy(PersonalAbilityEvaluation::getCapacityId)
);
Map<String, List<PersonalAbilityEvaluation>> depetListMap = abilityEvaluationList4Depet.stream()
.collect(Collectors.groupingBy(PersonalAbilityEvaluation::getCapacityId));
List<DepartAbilityEvaluation> saveList = new LinkedList<>();
if (!ObjectUtils.isEmpty(abilityEvaluationList)) {
abilityEvaluationList.stream().forEach(e -> {
depetListMap.keySet().stream().forEach(k -> {
List<PersonalAbilityEvaluation> evaluationList = depetListMap.get(k);
DepartAbilityEvaluation bean = new DepartAbilityEvaluation();
Basicsskill basicsskill = iBasicsskillService.getById(e.getCapacityId());
bean.setCapacityId(e.getCapacityId());
bean.setCapacityName(basicsskill.getName());
bean.setValue(abilityEvaluationList.stream().mapToDouble(b -> b.getValue()).sum());
bean.setAnnualId(departAbilityEvaluation.getAnnualId());
bean.setDepetId(departAbilityEvaluation.getDepetId());
bean.setCapacityId(evaluationList.get(0).getCapacityId());
bean.setCapacityName(evaluationList.get(0).getCapacityName());
bean.setValue(evaluationList.stream().mapToDouble(b -> b.getValue()).sum());
bean.setCreateTime(new Date());
saveList.add(bean);
});
}
this.saveBatch(saveList);
}
}

49
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationCollectServiceImpl.java
Unescape View File

@ -7,17 +7,15 @@ import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation
import org.jeecg.modules.demo.abilityEvaluation.mapper.PersonalAbilityEvaluationCollectMapper;
import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService;
import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationService;
import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.TeamManagement;
import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.ITeamManagementService;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@ -34,12 +32,6 @@ public class PersonalAbilityEvaluationCollectServiceImpl extends ServiceImpl<Per
@Autowired
private IPersonalAbilityEvaluationService iPersonalAbilityEvaluationService;
@Autowired
private ISysDepartService iSysDepartService;
@Autowired
private ITeamManagementService iTeamManagementService;
@Autowired
private ISysUserService iSysUserService;
@ -55,40 +47,49 @@ public class PersonalAbilityEvaluationCollectServiceImpl extends ServiceImpl<Per
@Override
public void batchSave(String projectId) {
List<PersonalAbilityEvaluationCollect> evaluationCollects = this.list(new LambdaQueryWrapper<PersonalAbilityEvaluationCollect>()
.eq(PersonalAbilityEvaluationCollect::getAnnualCompP, projectId));
List<PersonalAbilityEvaluation> evaluations = iPersonalAbilityEvaluationService.list(new LambdaQueryWrapper<PersonalAbilityEvaluation>()
.eq(PersonalAbilityEvaluation::getAnnualCompP, projectId));
//该项目下参赛者们学号列表
Set<String> workNoSet = evaluationCollects.stream().map(en -> en.getWorkOn()).collect(Collectors.toSet());
Set<String> workNoSet = evaluations.stream().map(en -> en.getWorkOn()).collect(Collectors.toSet());
if (!ObjectUtils.isEmpty(workNoSet)) {
//删除该项目下参赛者们的能力量化汇总数据，用于重新汇总
this.remove(new LambdaQueryWrapper<PersonalAbilityEvaluationCollect>()
.in(PersonalAbilityEvaluationCollect::getWorkOn, workNoSet));
}
List<PersonalAbilityEvaluationCollect> saveList = new LinkedList<>();
DecimalFormat decimalFormat = new DecimalFormat();
decimalFormat.setMaximumFractionDigits(2); // 保留两位小数
decimalFormat.setRoundingMode(RoundingMode.HALF_UP); // 设置具体的进位机制
//根据学号重新汇总
Optional.ofNullable(workNoSet).orElse(new LinkedHashSet<>()).stream().forEach(workNo -> {
// TeamManagement management = iTeamManagementService.getOne(new LambdaQueryWrapper<TeamManagement>()
// .eq(TeamManagement::getEnrollCode, enrollCode));
SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getWorkNo, workNo));
// SysDepart sysDepart = iSysDepartService.getDepartByOrgCode(sysUser.getOrgCode());
//每个学生同一类型能力指标分组查询
List<PersonalAbilityEvaluation> evaluationList4User = iPersonalAbilityEvaluationService.list(new LambdaQueryWrapper<PersonalAbilityEvaluation>()
.eq(PersonalAbilityEvaluation::getWorkOn, workNo)
.groupBy(PersonalAbilityEvaluation::getCapacityId));
Optional.ofNullable(evaluationList4User).orElse(new LinkedList<>()).stream().forEach(en -> {
.eq(PersonalAbilityEvaluation::getWorkOn, workNo));
Map<String, List<PersonalAbilityEvaluation>> capacityListMap = evaluationList4User.stream()
.collect(Collectors.groupingBy(PersonalAbilityEvaluation::getCapacityId));
capacityListMap.keySet().stream().forEach(k -> {
List<PersonalAbilityEvaluation> list = capacityListMap.get(k);
PersonalAbilityEvaluationCollect person = new PersonalAbilityEvaluationCollect();
person.setAnnualCompP(projectId);
person.setDepetId(sysUser.getDepartIds());
person.setWorkOn(workNo);
person.setName(sysUser.getRealname());
double sum = evaluationList4User.stream().mapToDouble(e -> e.getValue()).sum();
person.setValue(sum);
person.setCapacityId(en.getCapacityId());
person.setCapacityName(en.getCapacityName());
person.setCapacityId(list.get(0).getCapacityId());
person.setCapacityName(list.get(0).getCapacityName());
double sum = list.stream().mapToDouble(e -> e.getValue()).sum();
Double aDouble = Double.valueOf(decimalFormat.format(sum));
person.setValue(aDouble);
saveList.add(person);
});
});

64
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationServiceImpl.java
Unescape View File

@ -2,7 +2,6 @@ package org.jeecg.modules.demo.abilityEvaluation.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.util.ComputeUtils;
import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation;
import org.jeecg.modules.demo.abilityEvaluation.mapper.PersonalAbilityEvaluationMapper;
@ -10,27 +9,23 @@ import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluati
import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationService;
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService;
import org.jeecg.modules.demo.annualScore.entity.PersonalCompScore;
import org.jeecg.modules.demo.annualScore.service.IPersonalCompScoreService;
import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.TeamManagement;
import org.jeecg.modules.demo.annualcompetitionprojectregistration.service.ITeamManagementService;
import org.jeecg.modules.demo.awardpersion.entity.AwardPersion;
import org.jeecg.modules.demo.awardpersion.service.IAwardPersionService;
import org.jeecg.modules.demo.basicsskill.entity.Basicsskill;
import org.jeecg.modules.demo.basicsskill.service.IBasicsskillService;
import org.jeecg.modules.demo.compskill.entity.Compskill;
import org.jeecg.modules.demo.compskill.service.ICompskillService;
import org.jeecg.modules.demo.scorepersion.entity.ScorePersion;
import org.jeecg.modules.demo.scorepersion.service.IScorePersionService;
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
@ -47,11 +42,11 @@ public class PersonalAbilityEvaluationServiceImpl extends ServiceImpl<PersonalAb
@Autowired
private IAnnualCompPointService iAnnualCompPointService;
@Autowired
private IAwardPersionService iAwardPersionService;
@Autowired
private IScorePersionService iScorePersionService;
// @Autowired
// private IAwardPersionService iAwardPersionService;
//
// @Autowired
// private IScorePersionService iScorePersionService;
@Autowired
private ICompskillService iCompskillService;
@ -60,13 +55,13 @@ public class PersonalAbilityEvaluationServiceImpl extends ServiceImpl<PersonalAb
private IBasicsskillService iBasicsskillService;
@Autowired
private ISysDepartService iSysDepartService;
private IPersonalCompScoreService iPersonalCompScoreService;
@Autowired
private ISysUserService iSysUserService;
@Autowired
private ITeamManagementService iTeamManagementService;
// @Autowired
// private ITeamManagementService iTeamManagementService;
@Autowired
private IAnnualCompService iAnnualCompService;
@ -107,33 +102,25 @@ public class PersonalAbilityEvaluationServiceImpl extends ServiceImpl<PersonalAb
List<Compskill> compskillList = iCompskillService.list(new LambdaQueryWrapper<Compskill>().eq(Compskill::getAnnucompid, projectId));
if (ObjectUtils.isEmpty(compskillList)) return;
//根据年度比赛项目查询个人获奖表
List<AwardPersion> awardPersionList = iAwardPersionService.list(new LambdaQueryWrapper<AwardPersion>().eq(AwardPersion::getAnnualCompP, projectId));
List<PersonalCompScore> personalCompScoreList = iPersonalCompScoreService.list(new LambdaQueryWrapper<PersonalCompScore>().eq(PersonalCompScore::getAnnualCompP, projectId));
List<PersonalAbilityEvaluation> saveList = new LinkedList<>();
Optional.ofNullable(awardPersionList).orElse(new LinkedList<>()).forEach(e -> {
//查询获奖个人对应的分数
ScorePersion scorePersion = iScorePersionService.getOne(new LambdaQueryWrapper<ScorePersion>()
.eq(ScorePersion::getEnrollCode, e.getEnrollCode())
.eq(ScorePersion::getAnnualCompP, projectId)
.last("limit 1"));
Optional.ofNullable(personalCompScoreList).orElse(new LinkedList<>()).stream().forEach(en -> {
if (!ObjectUtils.isEmpty(scorePersion) && StringUtils.isNotBlank(scorePersion.getScore())) {
TeamManagement management = iTeamManagementService.getOne(new LambdaQueryWrapper<TeamManagement>()
.eq(TeamManagement::getEnrollCode, e.getEnrollCode()));
SysUser sysUser = iSysUserService.getById(management.getUserId());
// SysDepart sysDepart = iSysDepartService.getDepartByOrgCode(sysUser.getOrgCode());
//在lambda中，使用return时并不会直接返回，而是进行相当于普通for里的continue操作。所以直接使用return即可。
//分数为空时，继续下一条
if (ObjectUtils.isEmpty(en.getScore())) return;
SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getWorkNo, en.getWorkOn()));
//遍历每一类能力指标
compskillList.forEach(compskill -> {
PersonalAbilityEvaluation person = new PersonalAbilityEvaluation();
person.setAnnualId(annualComp.getAnnualid());
person.setAnnualCompId(annualCompPoint.getAnnualCompId());
person.setAnnualCompP(projectId);
person.setWorkOn(sysUser.getWorkNo());
person.setWorkOn(en.getWorkOn());
person.setName(sysUser.getRealname());
person.setDepetId(sysUser.getDepartIds());
person.setDepetId(en.getDepet());
Basicsskill basicsskill = iBasicsskillService.getById(compskill.getCapacityid());
person.setCapacityId(compskill.getCapacityid());
@ -141,10 +128,10 @@ public class PersonalAbilityEvaluationServiceImpl extends ServiceImpl<PersonalAb
//计算能力量化各类指标 能力量化值 = 直接按项目的能力权值和项目奖项得分算
//能力量化值 = 项目得分*项目的能力权值/100
this.convertScore(compskill.getWeight(), person, Double.valueOf(scorePersion.getScore()));
this.convertScore(compskill.getWeight(), person, en.getScore());
saveList.add(person);
});
}
});
//删除该项目下所有人的能力量化数据
@ -153,13 +140,18 @@ public class PersonalAbilityEvaluationServiceImpl extends ServiceImpl<PersonalAb
//新增个人能力量化
this.saveBatch(saveList);
//新增个人能力量化汇总
iPersonalAbilityEvaluationCollectService.batchSave(projectId);
}
PersonalAbilityEvaluation convertScore(double weight, PersonalAbilityEvaluation person, final double score_d) {
person.setValue(ComputeUtils.mul(score_d, ComputeUtils.div2(weight, ONE_HUNDRED)));
DecimalFormat decimalFormat = new DecimalFormat();
decimalFormat.setMaximumFractionDigits(2); // 保留两位小数
decimalFormat.setRoundingMode(RoundingMode.HALF_UP); // 设置具体的进位机制
double val = ComputeUtils.mul2(score_d, ComputeUtils.div2(weight, ONE_HUNDRED));
person.setValue(Double.valueOf(decimalFormat.format(val)));
return person;
}
}

129
jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts
Unescape View File

@ -21,66 +21,6 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'value'
},
// {
// title: '能力1',
// align: "center",
// dataIndex: 'soc1'
// },
// {
// title: '能力2',
// align: "center",
// dataIndex: 'soc2'
// },
// {
// title: '能力3',
// align: "center",
// dataIndex: 'soc3'
// },
// {
// title: '能力4',
// align: "center",
// dataIndex: 'soc4'
// },
// {
// title: '能力5',
// align: "center",
// dataIndex: 'soc5'
// },
// {
// title: '能力6',
// align: "center",
// dataIndex: 'soc6'
// },
// {
// title: '能力7',
// align: "center",
// dataIndex: 'soc7'
// },
// {
// title: '能力8',
// align: "center",
// dataIndex: 'soc8'
// },
// {
// title: '能力9',
// align: "center",
// dataIndex: 'soc9'
// },
// {
// title: '能力10',
// align: "center",
// dataIndex: 'soc10'
// },
// {
// title: '能力11',
// align: "center",
// dataIndex: 'soc11'
// },
// {
// title: '能力12',
// align: "center",
// dataIndex: 'soc12'
// },
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@ -102,6 +42,15 @@ export const searchFormSchema: FormSchema[] = [
},
colProps: {span: 6},
},
{
label: "能力名称",
field: 'capacityId',
component: 'JDictSelectTag',
componentProps:{
dictCode:"basicsskill,name,id"
},
colProps: {span: 6},
},
];
//表单数据
export const formSchema: FormSchema[] = [
@ -147,66 +96,6 @@ export const formSchema: FormSchema[] = [
disabled: true,
}
},
// {
// label: '能力1',
// field: 'soc1',
// component: 'InputNumber',
// },
// {
// label: '能力2',
// field: 'soc2',
// component: 'InputNumber',
// },
// {
// label: '能力3',
// field: 'soc3',
// component: 'InputNumber',
// },
// {
// label: '能力4',
// field: 'soc4',
// component: 'InputNumber',
// },
// {
// label: '能力5',
// field: 'soc5',
// component: 'InputNumber',
// },
// {
// label: '能力6',
// field: 'soc6',
// component: 'InputNumber',
// },
// {
// label: '能力7',
// field: 'soc7',
// component: 'InputNumber',
// },
// {
// label: '能力8',
// field: 'soc8',
// component: 'InputNumber',
// },
// {
// label: '能力9',
// field: 'soc9',
// component: 'InputNumber',
// },
// {
// label: '能力10',
// field: 'soc10',
// component: 'InputNumber',
// },
// {
// label: '能力11',
// field: 'soc11',
// component: 'InputNumber',
// },
// {
// label: '能力12',
// field: 'soc12',
// component: 'InputNumber',
// },
// TODO 主键隐藏字段，目前写死为ID
{

129
jeecgboot-vue3-master/src/views/abilityEvaluation/persanlCollect/PersonalAbilityEvaluationCollect.data.ts
Unescape View File

@ -26,66 +26,6 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'value'
},
// {
// title: '能力1',
// align: "center",
// dataIndex: 'soc1'
// },
// {
// title: '能力2',
// align: "center",
// dataIndex: 'soc2'
// },
// {
// title: '能力3',
// align: "center",
// dataIndex: 'soc3'
// },
// {
// title: '能力4',
// align: "center",
// dataIndex: 'soc4'
// },
// {
// title: '能力5',
// align: "center",
// dataIndex: 'soc5'
// },
// {
// title: '能力6',
// align: "center",
// dataIndex: 'soc6'
// },
// {
// title: '能力7',
// align: "center",
// dataIndex: 'soc7'
// },
// {
// title: '能力8',
// align: "center",
// dataIndex: 'soc8'
// },
// {
// title: '能力9',
// align: "center",
// dataIndex: 'soc9'
// },
// {
// title: '能力10',
// align: "center",
// dataIndex: 'soc10'
// },
// {
// title: '能力11',
// align: "center",
// dataIndex: 'soc11'
// },
// {
// title: '能力12',
// align: "center",
// dataIndex: 'soc12'
// },
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@ -98,6 +38,15 @@ export const searchFormSchema: FormSchema[] = [
},
colProps: {span: 6},
},
{
label: "能力名称",
field: 'capacityId',
component: 'JDictSelectTag',
componentProps:{
dictCode:"basicsskill,name,id"
},
colProps: {span: 6},
},
{
label: "学号",
field: 'workOn',
@ -141,66 +90,6 @@ export const formSchema: FormSchema[] = [
field: 'value',
component: 'InputNumber',
},
// {
// label: '能力1',
// field: 'soc1',
// component: 'InputNumber',
// },
// {
// label: '能力2',
// field: 'soc2',
// component: 'InputNumber',
// },
// {
// label: '能力3',
// field: 'soc3',
// component: 'InputNumber',
// },
// {
// label: '能力4',
// field: 'soc4',
// component: 'InputNumber',
// },
// {
// label: '能力5',
// field: 'soc5',
// component: 'InputNumber',
// },
// {
// label: '能力6',
// field: 'soc6',
// component: 'InputNumber',
// },
// {
// label: '能力7',
// field: 'soc7',
// component: 'InputNumber',
// },
// {
// label: '能力8',
// field: 'soc8',
// component: 'InputNumber',
// },
// {
// label: '能力9',
// field: 'soc9',
// component: 'InputNumber',
// },
// {
// label: '能力10',
// field: 'soc10',
// component: 'InputNumber',
// },
// {
// label: '能力11',
// field: 'soc11',
// component: 'InputNumber',
// },
// {
// label: '能力12',
// field: 'soc12',
// component: 'InputNumber',
// },
// TODO 主键隐藏字段，目前写死为ID
{

119
jeecgboot-vue3-master/src/views/abilityEvaluation/persoanl/PersonalAbilityEvaluation.data.ts
Unescape View File

@ -44,66 +44,6 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'value'
},
// {
// title: '能力1',
// align:"center",
// dataIndex: 'soc1'
// },
// {
// title: '能力2',
// align:"center",
// dataIndex: 'soc2'
// },
// {
// title: '能力3',
// align:"center",
// dataIndex: 'soc3'
// },
// {
// title: '能力4',
// align:"center",
// dataIndex: 'soc4'
// },
// {
// title: '能力5',
// align:"center",
// dataIndex: 'soc5'
// },
// {
// title: '能力6',
// align:"center",
// dataIndex: 'soc6'
// },
// {
// title: '能力7',
// align:"center",
// dataIndex: 'soc7'
// },
// {
// title: '能力8',
// align:"center",
// dataIndex: 'soc8'
// },
// {
// title: '能力9',
// align:"center",
// dataIndex: 'soc9'
// },
// {
// title: '能力10',
// align:"center",
// dataIndex: 'soc10'
// },
// {
// title: '能力11',
// align:"center",
// dataIndex: 'soc11'
// },
// {
// title: '能力12',
// align:"center",
// dataIndex: 'soc12'
// },
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@ -134,6 +74,15 @@ export const searchFormSchema: FormSchema[] = [
},
colProps: {span: 6},
},
{
label: "能力名称",
field: 'capacityId',
component: 'JDictSelectTag',
componentProps:{
dictCode:"basicsskill,name,id"
},
colProps: {span: 6},
},
{
label: "学号",
field: 'workOn',
@ -201,56 +150,6 @@ export const formSchema: FormSchema[] = [
field: 'value',
component: 'InputNumber',
},
// {
// label: '能力3',
// field: 'soc3',
// component: 'InputNumber',
// },
// {
// label: '能力4',
// field: 'soc4',
// component: 'InputNumber',
// },
// {
// label: '能力5',
// field: 'soc5',
// component: 'InputNumber',
// },
// {
// label: '能力6',
// field: 'soc6',
// component: 'InputNumber',
// },
// {
// label: '能力7',
// field: 'soc7',
// component: 'InputNumber',
// },
// {
// label: '能力8',
// field: 'soc8',
// component: 'InputNumber',
// },
// {
// label: '能力9',
// field: 'soc9',
// component: 'InputNumber',
// },
// {
// label: '能力10',
// field: 'soc10',
// component: 'InputNumber',
// },
// {
// label: '能力11',
// field: 'soc11',
// component: 'InputNumber',
// },
// {
// label: '能力12',
// field: 'soc12',
// component: 'InputNumber',
// },
// TODO 主键隐藏字段，目前写死为ID
{
label: '',

Write Preview
Loading…
Cancel
Save