From 98ee58ef9407dd7577e4f4e37730453a5beb6fd1 Mon Sep 17 00:00:00 2001 From: song Date: Mon, 22 Nov 2021 15:45:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/apis/yanyuan.js | 5 +- .../components/Evaluated/EvaluatedXLJH.vue | 2 +- .../Evaluated/components/EvaluatedDetail.vue | 48 ++++++++++++++----- 4 files changed, 42 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9360982..cbe18d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -140,6 +140,7 @@ - | 修改小红点传参 | [87b20fd](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/87b20fd) - | 修改报错 | [531c14d](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/531c14d) - | 修改接口路径 | [df6acf2](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/df6acf2) + - | 修改时间轴bug | [fe08608](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/fe08608) - | 修改样式 | [f0ddc90](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/f0ddc90) - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/a54c601) - | 切换到默认项目角色没有激活状态的bug | [438d448](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/438d448) diff --git a/src/apis/yanyuan.js b/src/apis/yanyuan.js index 51e23c8..b3bbd29 100644 --- a/src/apis/yanyuan.js +++ b/src/apis/yanyuan.js @@ -28,8 +28,11 @@ const install = (Vue, vm) => { vm.$u.api.getQuestion = param => vm.$u.post(`${yanyuan}/question/get`, param); // 试题答案保存 vm.$u.api.saveAnswer = param => vm.$u.post(`${yanyuan}/question/saveAnswer`, param); - // 脑力测评结果计算 + // 选择工具 vm.$u.api.mentalTestCalculate = param => vm.$u.post(`${yanyuan}/mentalTest/calculate`, param); + + // 试题答案保存 + vm.$u.api.chooseTool = param => vm.$u.post(`${yanyuan}/trainPlan/chooseTool`, param); }; export default { install }; diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedXLJH.vue b/src/pagesProject/project/components/Evaluated/EvaluatedXLJH.vue index ea98dc9..1525182 100644 --- a/src/pagesProject/project/components/Evaluated/EvaluatedXLJH.vue +++ b/src/pagesProject/project/components/Evaluated/EvaluatedXLJH.vue @@ -37,7 +37,7 @@ - + diff --git a/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue b/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue index 0b211d5..7e31ec0 100644 --- a/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue +++ b/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue @@ -2,9 +2,8 @@ - - - + + {{ item.toolCode }} @@ -57,9 +56,29 @@ import ProcessRestore from './ProcessRestore'; export default { components: { ResultLevel, ProcessRestore }, - props: { train: { type: Object, default: null } }, + props: { train: { type: Object, default: null }, task: { type: Object, default: null } }, data() { - return {}; + return { + list: [ + { + id: '1', + name: 'apple', + disabled: false, + }, + { + id: '2', + name: 'banner', + disabled: false, + }, + { + id: '3', + name: 'orange', + disabled: false, + }, + ], + // u-radio-group的v-model绑定的值如果设置为某个radio的name,就会被默认选中 + value: 'orange', + }; }, computed: { @@ -76,13 +95,18 @@ export default { }, methods: { - // 选中某个单选框时,由radio时触发 - radioChange(e) { - console.log(e); - }, - // 选中任一radio时,由radio-group触发 - radioGroupChange(e) { - console.log(e); + /** + * 选择工具 + * @param { String } equipmentId 设备ID + * @param { String } recordId 训练计划ID + */ + async radioChange(item) { + try { + const params = { equipmentId: item.equipmentId, recordId: this.task.id }; + await this.$u.api.chooseTool(params); + } catch (error) { + console.error('error: ', error); + } }, }, };