diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b45d0c..6ed7930 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-12-06)
+# 0.1.0 (2021-12-07)
### 🌟 新功能
范围|描述|commitId
@@ -44,6 +44,7 @@
- | 导入wbs | [1224fcb](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/1224fcb)
- | 导入项目,更新项目 | [5e06adf](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/5e06adf)
- | 导入项目后提示并打开项目详情页 | [410f527](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/410f527)
+ - | 工具箱接口对接 | [4c9c812](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/4c9c812)
- | 引入dayjs | [29b8b93](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/29b8b93)
- | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/9cbe411)
- | 插件参数处理调整 | [a3e68d3](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/a3e68d3)
diff --git a/rest/燕园.http b/rest/燕园.http
index e84c581..d9857de 100644
--- a/rest/燕园.http
+++ b/rest/燕园.http
@@ -7,6 +7,7 @@
@type = content-type: application/json;charset=utf-8
### 登录
+# song 1218763410024566784
# @name login
POST {{test_tall}}/users/signin
{{type}}
@@ -221,7 +222,8 @@ Authorization: Bearer {{login.response.body.$.data.token}}
{
"param":{
- "recordId": "1460549920452513798"
+ # "recordId": "1460549920427347968"
+ "recordId": "1460549920452513797"
}
}
@@ -247,6 +249,16 @@ Authorization: Bearer {{login.response.body.$.data.token}}
"careId": "21"
}
}
+###查询工具箱列表
+POST {{test}}/tool/queryToolList
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+ "param":{
+
+ }
+}
###选择工具箱
POST {{localhost}}/trainPlan/chooseTool
@@ -296,6 +308,58 @@ Authorization: Bearer {{login.response.body.$.data.token}}
}
}
+###查询无主的训练过程
+POST {{test}}/trainBelong/queryUnknown
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+ "param":{
+ "pageNum": 1,
+ "pageSize": 10
+
+ }
+}
+
+###查询关联的使用者信息
+POST {{test}}/trainee/queryRelation
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+ "param":{
+
+ }
+}
+###查询指定日期前后一周的训练计划
+POST {{test}}/trainPlan/queryRecent
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+ "param":{
+ "keyUserId": 1464166326922383360,
+ "time": 1638773109000
+
+ }
+}
+
+###选择老人 (6,1) (3,0)
+POST {{test}}/trainBelong/chooseRecord
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+ "param":{
+ "trainRecordId": 3,
+ "resultType": 0,
+ "recordId": 1465510253751439362
+
+ }
+}
+
+
+
### 导入题目
POST {{test}}/question/importQuestion
Authorization: Bearer {{login.response.body.$.data.token}}
diff --git a/src/apis/yanyuan.js b/src/apis/yanyuan.js
index d10f248..9aa0379 100644
--- a/src/apis/yanyuan.js
+++ b/src/apis/yanyuan.js
@@ -18,6 +18,8 @@ const install = (Vue, vm) => {
vm.$u.api.queryTrainee = param => vm.$u.post(`${yanyuan}/trainee/query`, param);
// 修改用户信息
vm.$u.api.updateTrainee = param => vm.$u.post(`${yanyuan}/trainee/update`, param);
+ // 查询所有关联的用户信息
+ vm.$u.api.queryRelation = param => vm.$u.post(`${yanyuan}/trainee/queryRelation`, param);
// 绑定工具箱
vm.$u.api.bindTool = param => vm.$u.post(`${yanyuan}/tool/bind`, param);
@@ -36,9 +38,6 @@ const install = (Vue, vm) => {
// 选择工具
vm.$u.api.mentalTestCalculate = param => vm.$u.post(`${yanyuan}/mentalTest/calculate`, param);
- // 试题答案保存
- vm.$u.api.chooseTool = param => vm.$u.post(`${yanyuan}/trainPlan/chooseTool`, param);
-
// 添加药物使用
vm.$u.api.addMedicine = param => vm.$u.post(`${yanyuan}/medicine/add`, param);
// 查询药物使用
@@ -57,8 +56,12 @@ const install = (Vue, vm) => {
// 查询家属成员列表
vm.$u.api.queryFamilyList = param => vm.$u.post(`${yanyuan}/family/queryList`, param);
+ // 试题答案保存
+ vm.$u.api.chooseTool = param => vm.$u.post(`${yanyuan}/trainPlan/chooseTool`, param);
// 查询训练计划详情
vm.$u.api.getTrainDetail = param => vm.$u.post(`${yanyuan}/trainPlan/detail`, param);
+ // 查询指定日期前后一周的训练计划
+ vm.$u.api.queryRecent = param => vm.$u.post(`${yanyuan}/trainPlan/queryRecent`, param);
// 添加负担量表
vm.$u.api.addZarit = param => vm.$u.post(`${yanyuan}/zarit/add`, param);
@@ -73,6 +76,11 @@ const install = (Vue, vm) => {
vm.$u.api.queryGuide = param => vm.$u.post(`${yanyuan}/guide/query`, param);
// 修改引导页状态
vm.$u.api.updateGuide = param => vm.$u.post(`${yanyuan}/guide/update`, param);
+
+ // 选择老人
+ vm.$u.api.chooseRecord = param => vm.$u.post(`${yanyuan}/trainBelong/chooseRecord`, param);
+ // 查询无主的训练过程
+ vm.$u.api.queryUnknown = param => vm.$u.post(`${yanyuan}/trainBelong/queryUnknown`, param);
};
export default { install };
diff --git a/src/common/styles/tailwind.scss b/src/common/styles/tailwind.scss
index 53be035..1e489d8 100644
--- a/src/common/styles/tailwind.scss
+++ b/src/common/styles/tailwind.scss
@@ -1126,12 +1126,6 @@
.h-screen {
height: 100vh;
}
-.w-1 {
- width: 0.25rem;
-}
-.w-2 {
- width: 0.5rem;
-}
.w-4 {
width: 1rem !important;
}
diff --git a/src/components/Info/Info.vue b/src/components/Info/Info.vue
index c39df73..d5463d1 100644
--- a/src/components/Info/Info.vue
+++ b/src/components/Info/Info.vue
@@ -326,7 +326,7 @@ import { infoList } from '@/config/yyInfo';
export default {
name: 'Info',
- props: { personalInfo: { type: Object, default: null } },
+ props: { personalInfo: { type: Object, default: () => {} } },
data() {
return {
diff --git a/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
index 341cfd4..b0a764f 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/CaregiverDetail.vue
@@ -95,7 +95,7 @@ import { careInfo } from '@/config/yyInfo';
export default {
name: 'Info',
- props: { detail: { type: Object, default: null }, disabled: { type: Boolean, default: false } },
+ props: { detail: { type: Object, default: () => {} }, disabled: { type: Boolean, default: false } },
data() {
return {
diff --git a/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue
index abe73d5..fcbabc3 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue
@@ -28,7 +28,7 @@ import { familyInfo } from '@/config/yyInfo';
export default {
name: 'Info',
- props: { detail: { type: Object, default: null } },
+ props: { detail: { type: Object, default: () => {} } },
data() {
return { familyInfo };
diff --git a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue
index 308ca39..247aab1 100644
--- a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue
+++ b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue
@@ -97,7 +97,7 @@ import { medicineInfo } from '@/config/yyInfo';
export default {
name: 'Info',
- props: { detail: { type: Object, default: null } },
+ props: { detail: { type: Object, default: () => {} } },
data() {
return {
diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
index 8e627be..343ca10 100644
--- a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
+++ b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue
@@ -49,7 +49,7 @@ import UCharts from './components/UCharts.vue';
export default {
components: { UCharts },
props: {
- task: { type: Object, default: null },
+ task: { type: Object, default: () => {} },
taskId: { type: String, default: '' },
itemIndex: { type: Number, default: 0 },
},
diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedXLJH.vue b/src/pagesProject/project/components/Evaluated/EvaluatedXLJH.vue
index 6ed112d..32aa125 100644
--- a/src/pagesProject/project/components/Evaluated/EvaluatedXLJH.vue
+++ b/src/pagesProject/project/components/Evaluated/EvaluatedXLJH.vue
@@ -24,10 +24,10 @@
>
{{
Math.ceil(task.data.train.finishResult) === 1
- ? '非常困难'
+ ? '轻松完成'
: Math.ceil(task.data.train.finishResult) === 2
? '略有困难'
- : '轻松完成'
+ : '非常困难'
}}
轻松完成
@@ -52,7 +52,7 @@ import EvaluatedDetail from './components/EvaluatedDetail';
export default {
components: { EvaluatedDetail },
props: {
- task: { type: Object, default: null },
+ task: { type: Object, default: () => {} },
taskId: { type: String, default: '' },
itemIndex: { type: Number, default: 0 },
},
diff --git a/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue b/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue
index 01c5b8b..db3ff9a 100644
--- a/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue
+++ b/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue
@@ -56,7 +56,7 @@ import ProcessRestore from './ProcessRestore';
export default {
components: { ResultLevel, ProcessRestore },
- props: { train: { type: Object, default: null }, task: { type: Object, default: null } },
+ props: { train: { type: Object, default: () => {} }, task: { type: Object, default: () => {} } },
data() {
return {
list: [
diff --git a/src/pagesProject/project/components/Evaluated/components/ProcessRestore.vue b/src/pagesProject/project/components/Evaluated/components/ProcessRestore.vue
index 3da68e9..93703c8 100644
--- a/src/pagesProject/project/components/Evaluated/components/ProcessRestore.vue
+++ b/src/pagesProject/project/components/Evaluated/components/ProcessRestore.vue
@@ -6,7 +6,7 @@
+
+
diff --git a/src/pagesYanyuan/ascription/components/ProcessRestore.vue b/src/pagesYanyuan/ascription/components/ProcessRestore.vue
new file mode 100644
index 0000000..47865ef
--- /dev/null
+++ b/src/pagesYanyuan/ascription/components/ProcessRestore.vue
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/pagesYanyuan/ascription/components/ResultLevel.vue b/src/pagesYanyuan/ascription/components/ResultLevel.vue
new file mode 100644
index 0000000..2e2c6b4
--- /dev/null
+++ b/src/pagesYanyuan/ascription/components/ResultLevel.vue
@@ -0,0 +1,170 @@
+
+
+
+
+ {{ finishResult === 1 ? '轻松完成' : finishResult === 2 ? '略有困难' : '非常困难' }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pagesYanyuan/assess/components/Test/answerPage.vue b/src/pagesYanyuan/assess/components/Test/answerPage.vue
index 736d183..fa198c4 100644
--- a/src/pagesYanyuan/assess/components/Test/answerPage.vue
+++ b/src/pagesYanyuan/assess/components/Test/answerPage.vue
@@ -74,7 +74,7 @@ export default {
},
question: {
type: Object,
- default: {},
+ default: () => {},
},
},
diff --git a/src/pagesYanyuan/assess/components/Test/components/TitlePosition.vue b/src/pagesYanyuan/assess/components/Test/components/TitlePosition.vue
index 08913bd..5cf96d1 100644
--- a/src/pagesYanyuan/assess/components/Test/components/TitlePosition.vue
+++ b/src/pagesYanyuan/assess/components/Test/components/TitlePosition.vue
@@ -23,7 +23,7 @@ export default {
props: {
item: {
type: Object,
- default: {},
+ default: () => {},
},
},
};
diff --git a/src/pagesYanyuan/assess/components/Test/promptPage.vue b/src/pagesYanyuan/assess/components/Test/promptPage.vue
index cf3bc9e..25f97a8 100644
--- a/src/pagesYanyuan/assess/components/Test/promptPage.vue
+++ b/src/pagesYanyuan/assess/components/Test/promptPage.vue
@@ -67,7 +67,7 @@ import TitlePosition from './components/TitlePosition';
export default {
components: { TestMain, TitlePosition },
- props: { question: { type: Object, default: {} } },
+ props: { question: { type: Object, default: () => {} } },
computed: mapState('yanyuan', ['questionInfo']),
diff --git a/src/pagesYanyuan/hold-all/hold-all.vue b/src/pagesYanyuan/hold-all/hold-all.vue
index 031741b..a399d50 100644
--- a/src/pagesYanyuan/hold-all/hold-all.vue
+++ b/src/pagesYanyuan/hold-all/hold-all.vue
@@ -145,4 +145,8 @@ page {
--tw-bg-opacity: 1;
background-color: rgba(16, 185, 129, var(--tw-bg-opacity));
}
+
+.w-2 {
+ width: 0.5rem;
+}