diff --git a/ruoyi-ui/src/api/benyi/assessmentchild.js b/ruoyi-ui/src/api/benyi/assessmentchild.js index 52868d190..697100387 100644 --- a/ruoyi-ui/src/api/benyi/assessmentchild.js +++ b/ruoyi-ui/src/api/benyi/assessmentchild.js @@ -17,6 +17,14 @@ export function getAssessmentchild(id) { }) } +// 查询幼儿评估字典 +export function getAssessmentDictData(id) { + return request({ + url: '/benyi/assessmentchild/getdicdata/' + id, + method: 'get' + }) +} + // 新增幼儿评估 export function addAssessmentchild(data) { return request({ diff --git a/ruoyi-ui/src/api/benyi/assessmentcontent.js b/ruoyi-ui/src/api/benyi/assessmentcontent.js index f1a2b2988..62bec1ddd 100644 --- a/ruoyi-ui/src/api/benyi/assessmentcontent.js +++ b/ruoyi-ui/src/api/benyi/assessmentcontent.js @@ -2,78 +2,86 @@ import request from '@/utils/request' // 查询评估内容列表 export function listAssessmentcontent(query) { - return request({ - url: '/benyi/assessmentcontent/list', - method: 'get', - params: query - }) + return request({ + url: '/benyi/assessmentcontent/list', + method: 'get', + params: query + }) } // 查询部门下拉树结构 export function treeselect() { - return request({ - url: '/benyi/assessmentcontent/treeselect', - method: 'get' - }) + return request({ + url: '/benyi/assessmentcontent/treeselect', + method: 'get' + }) } // 查询流程下拉树结构 export function treeselectstudy() { - return request({ - url: '/benyi/assessmentcontent/treeselectstudy', - method: 'get' - }) + return request({ + url: '/benyi/assessmentcontent/treeselectstudy', + method: 'get' + }) } // 查询评估内容详细 export function getAssessmentcontent(id) { - return request({ - url: '/benyi/assessmentcontent/' + id, - method: 'get' - }) + return request({ + url: '/benyi/assessmentcontent/' + id, + method: 'get' + }) } // 查询评估内容详细 export function getAssessmentcontentbyparentid(id) { - return request({ - url: '/benyi/assessmentcontent/byparentid/' + id, - method: 'get' - }) + return request({ + url: '/benyi/assessmentcontent/byparentid/' + id, + method: 'get' + }) } // 新增评估内容 export function addAssessmentcontent(data) { - return request({ - url: '/benyi/assessmentcontent', - method: 'post', - data: data - }) + return request({ + url: '/benyi/assessmentcontent', + method: 'post', + data: data + }) } // 修改评估内容 export function updateAssessmentcontent(data) { - return request({ - url: '/benyi/assessmentcontent', - method: 'put', - data: data - }) + return request({ + url: '/benyi/assessmentcontent', + method: 'put', + data: data + }) } // 删除评估内容 export function delAssessmentcontent(id) { - return request({ - url: '/benyi/assessmentcontent/' + id, - method: 'delete' - }) + return request({ + url: '/benyi/assessmentcontent/' + id, + method: 'delete' + }) } // 导出评估内容 export function exportAssessmentcontent(query) { - return request({ - url: '/benyi/assessmentcontent/export', - method: 'get', - params: query - }) -} \ No newline at end of file + return request({ + url: '/benyi/assessmentcontent/export', + method: 'get', + params: query + }) +} + +// 查询评估统计 +export function getAssessmentStatistics(childid, scope) { + return request({ + url: '/benyi/assessmentcontent/getassessmentstatistics/' + childid + '/' + scope, + method: 'get' + }) +} diff --git a/ruoyi-ui/src/views/benyi/assessment/history.vue b/ruoyi-ui/src/views/benyi/assessment/history.vue index 4e9ab7339..d3039c4ac 100644 --- a/ruoyi-ui/src/views/benyi/assessment/history.vue +++ b/ruoyi-ui/src/views/benyi/assessment/history.vue @@ -2,17 +2,22 @@

- {{ this.childName }}同学，评估结果图表 + 幼儿：{{ this.childName }} 评估结果图表

- +
- +

评估建议

-
    +
- 配置管理 - 角色管理
@@ -62,17 +65,9 @@ import { listAssessmentcontent, getAssessmentcontent, - delAssessmentcontent, - addAssessmentcontent, - updateAssessmentcontent, - exportAssessmentcontent, } from "@/api/benyi/assessmentcontent"; - import { getChildByAssessment } from "@/api/benyi/child"; -import { - addAssessmentchild, - updateAssessmentchild, -} from "@/api/benyi/assessmentchild"; +import { getAssessmentDictData } from "@/api/benyi/assessmentchild"; import RadarChart from "@/views/dashboard/RadarChart"; export default { @@ -84,31 +79,13 @@ export default { return { childId: "", childName: "", - childCsrq: "", - bjmc: "", classid: "", - trem: "", - zbjsxm: "", assessmentscope: "", + // tabs列表 + tabsList: [], // 遮罩层 loading: true, - // 选中数组 - ids: [], - // 评估内容表格数据 - assessmentcontentList: [], - // 表单参数 - form: {}, - // 查询参数 - queryParams: { - parentid: undefined, - name: undefined, - iselement: undefined, - scope: undefined, - sort: undefined, - }, - activeName: "first", - checked: false, - checkList: [], + activeName: "", }; }, created() { @@ -117,6 +94,7 @@ export default { this.childId = childId; // console.log("childId:" + childId); this.getChild(childId); + this.getList(childId); }, methods: { getChild(childId) { @@ -124,45 +102,25 @@ export default { // console.log(response); if (response.code == "200") { this.childName = response.data.name; - this.childCsrq = response.data.csrq; - this.trem = response.trem; - this.bjmc = response.data.bjmc; this.classid = response.data.classid; - this.zbjsxm = response.data.zbjsmc; - response.ByAssessmentchild.forEach((item) => - this.checkList.push(item.contentid) - ); - if (response.isAssessment == "0") { - this.msgError( - "当前幼儿出生日期不符合评估范围，幼儿评估范围为36-72个月" - ); - } else { - this.assessmentscope = response.isAssessment; - - this.getList(); - } } }); }, /** 查询评估内容列表 */ - getList() { - this.loading = true; - listAssessmentcontent(this.queryParams).then((response) => { - // console.log("rows:" + response.rows); - this.assessmentcontentList = response.rows; - this.loading = false; + getList(childId) { + getAssessmentDictData(childId).then((response) => { + // console.log("rows:" + response.dictdata.length); + if (response.dictdata.length > 0) { + this.activeName = response.dictdata[0].dictLabel; + this.tabsList = response.dictdata; + } else { + this.msgError("该幼儿尚未提交评估数据，无法展示数据"); + } }); }, handleClick(tab) { - // this.activeName = tab - }, - handlecheckedItemsChange(value) { - // var items = ""; - // this.checkList.forEach((item) => { - // //当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去 - // items = items + item + ","; - // }); - // console.log(items); + // this.activeName = tab.name; + // console.log(tab.name); }, }, }; diff --git a/ruoyi-ui/src/views/dashboard/RadarChart.vue b/ruoyi-ui/src/views/dashboard/RadarChart.vue index 37d62d616..35cd7982f 100644 --- a/ruoyi-ui/src/views/dashboard/RadarChart.vue +++ b/ruoyi-ui/src/views/dashboard/RadarChart.vue @@ -1,111 +1,274 @@ diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentchildController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentchildController.java index 16e20b162..eb688e38f 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentchildController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentchildController.java @@ -4,6 +4,8 @@ import java.util.List; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.project.common.SchoolCommon; +import com.ruoyi.project.system.domain.SysDictData; +import com.ruoyi.project.system.service.ISysDictDataService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -36,6 +38,8 @@ public class ByAssessmentchildController extends BaseController { private IByAssessmentchildService byAssessmentchildService; @Autowired private SchoolCommon schoolCommon; + @Autowired + private ISysDictDataService dictDataService; /** * 查询幼儿评估列表 @@ -48,6 +52,14 @@ public class ByAssessmentchildController extends BaseController { return getDataTable(list); } + @GetMapping(value = "/getdicdata/{id}") + public AjaxResult getListDicData(@PathVariable("id") Long id) { + AjaxResult ajaxResult = AjaxResult.success(); + List list = dictDataService.selectDictDataByChildId(id); + ajaxResult.put("dictdata", list); + return ajaxResult; + } + /** * 导出幼儿评估列表 */ diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java index 552176c22..c0c815afa 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByAssessmentcontentController.java @@ -1,5 +1,6 @@ package com.ruoyi.project.benyi.controller; +import java.util.ArrayList; import java.util.List; import com.ruoyi.common.utils.ServletUtils; @@ -65,8 +66,8 @@ public class ByAssessmentcontentController extends BaseController { @PreAuthorize("@ss.hasPermi('benyi:assessmentcontent:query')") @GetMapping(value = "/byparentid/{id}") public AjaxResult getInfobyparentId(@PathVariable("id") Long id) { - System.out.println("start:"+id); - ByAssessmentcontent byAssessmentcontent=new ByAssessmentcontent(); + System.out.println("start:" + id); + ByAssessmentcontent byAssessmentcontent = new ByAssessmentcontent(); byAssessmentcontent.setParentId(id); return AjaxResult.success(byAssessmentcontentService.selectByAssessmentcontentList(byAssessmentcontent)); } @@ -144,4 +145,35 @@ public class ByAssessmentcontentController extends BaseController { } return toAjax(byAssessmentcontentService.deleteByAssessmentcontentById(id)); } + + @GetMapping(value = "/getassessmentstatistics/{childid}/{scope}") + public AjaxResult getAssessmentStatistics(@PathVariable("childid") Long childid, @PathVariable("scope") String scope) { + AjaxResult ajaxResult = AjaxResult.success(); + String[] strArr = new String[]{"健康", "语言", "社会", "科学", "艺术"}; + List douArr = new ArrayList(); + for (int i = 0; i < strArr.length; i++) { + ByAssessmentcontent byAssessmentcontent = new ByAssessmentcontent(); + byAssessmentcontent.setScope(scope); + byAssessmentcontent.setName(strArr[i]); + //获取{"健康", "语言", "社会", "科学", "艺术"} 对应的值 + List list = byAssessmentcontentService.selectByAssessmentcontentList(byAssessmentcontent); + if (list != null && list.size() > 0) { + Long id = list.get(0).getId(); + byAssessmentcontent.setId(id); + byAssessmentcontent.setSort(childid); + int count = byAssessmentcontentService.selectCountElement(byAssessmentcontent); + int countChild = byAssessmentcontentService.selectCountElementByChild(byAssessmentcontent); + if (scope.equals("1")) { + douArr.add((((double) 48 / count) * countChild)); + } else if (scope.equals("2")) { + douArr.add((((double) 60 / count) * countChild)); + } else if (scope.equals("3")) { + douArr.add((((double) 72 / count) * countChild)); + } + } + } + ajaxResult.put("statistics", douArr); + return ajaxResult; + } + } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java index fd9018f7f..e5a4d0776 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByAssessmentcontentMapper.java @@ -74,4 +74,20 @@ public interface ByAssessmentcontentMapper { * @return 结果 */ public int hasChildByAssessmentcontentId(Long id); + + /** + * 节点元素个数 + * + * @param byAssessmentcontent 内容ID + * @return 结果 + */ + public int selectCountElement(ByAssessmentcontent byAssessmentcontent); + + /** + * 节点元素个数根据child + * + * @param byAssessmentcontent 内容ID + * @return 结果 + */ + public int selectCountElementByChild(ByAssessmentcontent byAssessmentcontent); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java index 97d19c388..446cd7ddd 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByAssessmentcontentService.java @@ -91,4 +91,20 @@ public interface IByAssessmentcontentService { * @return 结果 */ public int deleteByAssessmentcontentById(Long id); + + /** + * 节点元素个数 + * + * @param byAssessmentcontent 内容ID + * @return 结果 + */ + public int selectCountElement(ByAssessmentcontent byAssessmentcontent); + + /** + * 节点元素个数根据child + * + * @param byAssessmentcontent 内容ID + * @return 结果 + */ + public int selectCountElementByChild(ByAssessmentcontent byAssessmentcontent); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java index e1a7b8f2c..30da75430 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByAssessmentcontentServiceImpl.java @@ -202,4 +202,26 @@ public class ByAssessmentcontentServiceImpl implements IByAssessmentcontentServi return getChildList(list, t).size() > 0 ? true : false; } + /** + * 节点元素个数 + * + * @param byAssessmentcontent 内容ID + * @return 结果 + */ + @Override + public int selectCountElement(ByAssessmentcontent byAssessmentcontent){ + return byAssessmentcontentMapper.selectCountElement(byAssessmentcontent); + } + + /** + * 节点元素个数根据child + * + * @param byAssessmentcontent 内容ID + * @return 结果 + */ + @Override + public int selectCountElementByChild(ByAssessmentcontent byAssessmentcontent){ + return byAssessmentcontentMapper.selectCountElementByChild(byAssessmentcontent); + } + } diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java index c938d884f..8a1a864bb 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java @@ -44,6 +44,14 @@ public interface SysDictDataMapper */ public SysDictData selectDictDataById(Long dictCode); + /** + * 根据条件分页查询字典数据 + * + * @param childId 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataByChildId(Long childId); + /** * 查询字典数据 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java index 870f35792..69a9310ee 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java @@ -43,6 +43,14 @@ public interface ISysDictDataService */ public SysDictData selectDictDataById(Long dictCode); + /** + * 根据条件分页查询字典数据 + * + * @param childId 字典数据信息 + * @return 字典数据集合信息 + */ + public List selectDictDataByChildId(Long childId); + /** * 通过字典ID删除字典数据信息 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java index e8475dc4a..53ca05112 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java @@ -67,6 +67,17 @@ public class SysDictDataServiceImpl implements ISysDictDataService return dictDataMapper.selectDictDataById(dictCode); } + /** + * 根据条件分页查询字典数据 + * + * @param childId 字典数据信息 + * @return 字典数据集合信息 + */ + @Override + public List selectDictDataByChildId(Long childId){ + return dictDataMapper.selectDictDataByChildId(childId); + } + /** * 通过字典ID删除字典数据信息 * diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml index 214bdd250..3f6f42df5 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByAssessmentcontentMapper.xml @@ -57,6 +57,18 @@ order by t.sort where parentId = #{id} + + + + + insert into by_assessmentcontent diff --git a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml index b610053a8..12482ed23 100644 --- a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml +++ b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml @@ -54,6 +54,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dict_code = #{dictCode} + + +