diff --git a/ruoyi-ui/src/views/kaohe/pingce/index.vue b/ruoyi-ui/src/views/kaohe/pingce/index.vue index 9d0c8f8..8b21d95 100644 --- a/ruoyi-ui/src/views/kaohe/pingce/index.vue +++ b/ruoyi-ui/src/views/kaohe/pingce/index.vue @@ -1180,9 +1180,7 @@ export default { let btTabelTree = JSON.parse(response.rows[0].tableHeader); btTabelTree.forEach(item => { - if(item.prop){ - item.prop = item.name; - } + item.prop = item.name; if(item.children && item.children.length>0){ this.setProp(item.children, item.prop) } diff --git a/ruoyi-ui/src/views/kaohe/totalScore/index.vue b/ruoyi-ui/src/views/kaohe/totalScore/index.vue index 314bbb4..e235f21 100644 --- a/ruoyi-ui/src/views/kaohe/totalScore/index.vue +++ b/ruoyi-ui/src/views/kaohe/totalScore/index.vue @@ -287,907 +287,65 @@ export default { components: { TableColumn }, data() { return { - btTabel:[{ - "name": null, - "label": "民主测评", - "children": [{ - "name": "khdxName", - "label": "单位" - }, - { - "name": "mzcp", - "label": "民主测评", - "children": [{ - "name": "syldbz", - "label": "师院领导班子", - "children": [{ - "name": "optionA", - "label": "优秀" - }, - { - "name": "optionB", - "label": "合格" - }, - { - "name": "optionC", - "label": "基本合格" - }, - { - "name": "optionD", - "label": "不合格" - }, - { - "name": "avgScore", - "label": "得分" - }, - { - "name": "percentage", - "label": "占比" - } - ] - }, - { - "name": "sycjldgb", - "label": "师院处级领导干部", - "children": [{ - "name": "optionA", - "label": "优秀" - }, - { - "name": "optionB", - "label": "合格" - }, - { - "name": "optionC", - "label": "基本合格" - }, - { - "name": "optionD", - "label": "不合格" - }, - { - "name": "avgScore", - "label": "得分" - }, - { - "name": "percentage", - "label": "占比" - } - ] - }, - { - "name": "fwdxdb", - "label": "服务对象代表", - "children": [{ - "name": "optionA", - "label": "优秀" - }, - { - "name": "optionB", - "label": "合格" - }, - { - "name": "optionC", - "label": "基本合格" - }, - { - "name": "optionD", - "label": "不合格" - }, - { - "name": "avgScore", - "label": "得分" - }, - { - "name": "percentage", - "label": "占比" - } - ] - } - ] - }, - { - "name": "df", - "label": "得分" - } - ] - }], - list1:[ + btTabel:[ { - "khdxName": "生命科学系", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "海洋学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "历史文化与法学系", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "物理科学与技术学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "教育学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "资源管理系", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "马克思主义学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "美术学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "计算机科学技术系", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "化学系", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "数学与计算科学学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "继续教育学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "外国语学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "体育系", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - }, - { - "khdxName": "文学院", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 + "name": "khdx", + "label": "单位" }, { - "khdxName": "音乐系", - "mzcp": { - "syldbz": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "sycjldgb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.3 - }, - "fwdxdb": { - "optionA": 0, - "optionB": 0, - "optionC": 0, - "optionD": 0, - "avgScore": 0, - "percentage": 0.4 - } - }, - "df": 0 - } - ], - "data": [ - { - "name": null, - "label": "教学单位领导班子考核总分", + "name": "wlcskhrwmc001", + "label": "wl测试考核任务名称001", "children": [ { - "name": "pm", - "label": "排名", - }, - { - "name": "bumen", - "label": "部门", - }, - { - "name": "ejdw", - "label": "二级单位目标管理与绩效考核成绩", - "children": [ - { - "name": "djyxz", - "label": "党建与行政目标任务", - "children": [ - { - "name": "khx1", - "label": "政治建设", - }, - { - "name": "zb1", - "label": "占比", - }, - { - "name": "khx2", - "label": "宣传与思想政治工作", - }, - { - "name": "zb2", - "label": "占比", - }, - { - "name": "khx3", - "label": "作风纪律", - }, - { - "name": "zb3", - "label": "占比", - }, - { - "name": "khx4", - "label": "安全稳定", - }, - { - "name": "zb4", - "label": "占比", - }, - { - "name": "khx5", - "label": "师资队伍与师德师风", - }, - { - "name": "zb5", - "label": "占比", - }, - { - "name": "khx6", - "label": "财务工作", - }, - { - "name": "zb6", - "label": "占比", - }, - { - "name": "khx7", - "label": "依法治校与综合治理", - }, - { - "name": "zb7", - "label": "占比", - }, - { - "name": "khx8", - "label": "国有资产管理", - }, - { - "name": "zb8", - "label": "占比", - }, - { - "name": "khx9", - "label": "实验室管理", - }, - { - "name": "zb9", - "label": "占比", - }, - { - "name": "khx10", - "label": "招生就业与创新创业工作", - }, - { - "name": "zb10", - "label": "占比", - }, - { - "name": "khx11", - "label": "对外交流与合作", - }, - { - "name": "zb11", - "label": "占比", - } - ] - }, - { - "name": "djyxzdf", - "label": "得分", - }, - { - "name": "djyxzzb", - "label": "占比", - }, - { - "name": "djyxzzsfs", - "label": "折算分数", - }, - { - "name": "syfz", - "label": "事业发展", - "children": [ - { - "name": "khx1", - "label": "教学工作", - }, - { - "name": "zb1", - "label": "占比", - }, - { - "name": "khx2", - "label": "科研工作", - }, - { - "name": "zb2", - "label": "占比", - }, - { - "name": "khx3", - "label": "学生工作", - }, - { - "name": "zb3", - "label": "占比", - }, - ] - }, - { - "name": "syfzdf", - "label": "得分", - }, - { - "name": "syfzzb", - "label": "占比", - }, - { - "name": "syfzzsfs", - "label": "折算分数", - } - ] - }, - { - "name": "ejdwdf", - "label": "得分", + "name": "khx1", + "label": "wl测试占比评分评分主题001" }, { - "name": "ejdwzb", - "label": "占比", + "name": "khx1_zb", + "label": "占比" }, { - "name": "ejdwzsfs", - "label": "折算分数", + "name": "khx2", + "label": "wl测试单独评分评分主题002" }, { - "name": "mzcp", - "label": "民主测评", + "name": "khx3", + "label": "wl测试单独评分评分主题003", "children": [ { - "name": "syldbz", - "label": "师院领导班子", - "children": [ - { - "name": "yx", - "label": "优秀", - }, - { - "name": "hg", - "label": "合格", - }, - { - "name": "jbhg", - "label": "基本合格", - }, - { - "name": "bhg", - "label": "不合格", - } - ] - }, - { - "name": "syldbzdf", - "label": "得分", - }, - { - "name": "syldbzzb", - "label": "占比", - }, - { - "name": "sycjldgb", - "label": "师院处级领导干部", - "children": [ - { - "name": "yx", - "label": "优秀", - }, - { - "name": "hg", - "label": "合格", - }, - { - "name": "jbhg", - "label": "基本合格", - }, - { - "name": "bhg", - "label": "不合格", - } - ] + "name": "optionA", + "label": "优秀" }, { - "name": "sycjldgbdf", - "label": "得分", + "name": "optionB", + "label": "合格" }, { - "name": "sycjldgbzd", - "label": "占比", + "name": "optionC", + "label": "基本合格" }, { - "name": "fwdxdb", - "label": "服务对象代表", - "children": [ - { - "name": "yx", - "label": "优秀", - }, - { - "name": "hg", - "label": "合格", - }, - { - "name": "jbhg", - "label": "基本合格", - }, - { - "name": "bhg", - "label": "不合格", - } - ] + "name": "optionD", + "label": "不合格" }, { - "name": "fwdxdbdf", - "label": "得分", + "name": "avgScore", + "label": "得分" }, { - "name": "fwdxdbzb", - "label": "占比", - } - ] - }, - { - "name": "mzcpdf", - "label": "得分", - }, - { - "name": "mzcpzb", - "label": "占比", - }, - { - "name": "mzcpzsfs", - "label": "折算分数", - }, - { - "name": "tscx", - "label": "特色创新", - "children": [ - { - "name": "ddx", - "label": "分数（满分10分）", - } - ] - }, - { - "name": "zhpj", - "label": "综合评价", - "children": [ - { - "name": "ddx", - "label": "分数（加减分项，值域可以为负）", + "name": "percentage", + "label": "占比" } ] - }, - { - "name": "zf", - "label": "总分", - }, + } ] + }, + { + "name": "df", + "label": "得分" } ], + list1:[{"khdx":"生命科学系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx2":0.0000,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"海洋学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"历史文化与法学系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"物理科学与技术学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"教育学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"资源管理系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"马克思主义学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"美术学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"计算机科学技术系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"化学系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"数学与计算科学学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"继续教育学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":0,"optionB":1,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"外国语学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":0,"optionB":1,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"体育系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":0,"optionB":1,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"文学院","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":0,"optionB":1,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000},{"khdx":"音乐系","wlcskhrwmc001":{"khx1":0.0000,"khx1_zb":0.40,"khx3":{"avgScore":0.0000,"optionA":1,"optionB":0,"optionC":0,"optionD":0,"percentage":0.60}},"df":0.0000}], khdf:{ open: false, idRw: null, @@ -1323,9 +481,7 @@ export default { setTreeData(){ let btTabelTree = this.btTabel; btTabelTree.forEach(item => { - if(item.prop){ - item.prop = item.name; - } + item.prop = item.name; if(item.children && item.children.length>0){ this.setProp(item.children, item.prop) }