From 327b72e9422a9c2afdfe95d9cfd0b0872c1ab768 Mon Sep 17 00:00:00 2001 From: song Date: Thu, 30 Dec 2021 17:11:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BD=B4=E5=B7=A5=E5=85=B7=E7=AE=B1=E6=8A=98=E5=8F=A0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=202.=E6=B7=BB=E5=8A=A0=E8=81=94=E7=BD=91=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../ConfigInfo/components/Medicine.vue | 4 +-- .../ConfigInfo/components/MedicineDetail.vue | 1 + .../components/Evaluated/EvaluatedNLCP.vue | 2 +- .../Evaluated/components/EvaluatedDetail.vue | 26 ++++++++++++++----- .../Evaluated/components/UCharts.vue | 2 +- src/pagesYanyuan/add-info/add-info.vue | 7 +++++ src/pagesYanyuan/assess/assess.vue | 2 +- src/utils/request.js | 6 +++++ 9 files changed, 40 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1701bb6..8c651b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -161,6 +161,7 @@ - | 修改时间轴bug | [fe08608](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/fe08608) - | 修改样式 | [f0ddc90](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/f0ddc90) - | 修改添加基本信息 压缩代码 | [ce20ff7](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/ce20ff7) + - | 修改照顾着负担量表按钮名字 | [02b001e](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/02b001e) - | 修改脑力测评+选项 展示问题 | [c0ccb4e](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/c0ccb4e) - | 修改药物使用记录验证必填项逻辑 | [14ad8ee](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/14ad8ee) - | 修改角色栏组件 | [a54c601](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/a54c601) diff --git a/src/pagesProject/project/components/ConfigInfo/components/Medicine.vue b/src/pagesProject/project/components/ConfigInfo/components/Medicine.vue index 225c772..2519eeb 100644 --- a/src/pagesProject/project/components/ConfigInfo/components/Medicine.vue +++ b/src/pagesProject/project/components/ConfigInfo/components/Medicine.vue @@ -15,7 +15,7 @@ - + @@ -106,7 +106,7 @@ export default { item.open = false; } }); - this.itemList = date; + this.itemList = [...date]; } } catch (error) { console.error('error: ', error); diff --git a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue index a023c88..df555b3 100644 --- a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue +++ b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue @@ -376,6 +376,7 @@ export default { params[item.label] = '未服用'; } await this.$u.api.updateMedicine(params); + this.$emit('queryMedicine'); this.$emit('showToast', 'success', '修改成功'); } catch (error) { console.error('error: ', error); diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue index 3929d47..70119b7 100644 --- a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue +++ b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue @@ -77,7 +77,7 @@ export default { }) .exec(); - this.cHeight = uni.upx2px(400); + this.cHeight = uni.upx2px(420); setTimeout(() => { this.getData(); }, 1000); diff --git a/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue b/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue index 6480f94..cff5e29 100644 --- a/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue +++ b/src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue @@ -2,11 +2,16 @@ - - - {{ tool.toolCode }} - - + + + + {{ tool.toolCode }} + + + + + {{ showMore ? '查看更多' : '收起' }} + @@ -80,6 +85,7 @@ export default { ], // u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中 value: 'orange', + showMore: true, }; }, @@ -109,8 +115,16 @@ export default { console.error('error: ', error); } }, + + checkShowMore() { + this.showMore = !this.showMore; + }, }, }; - + diff --git a/src/pagesProject/project/components/Evaluated/components/UCharts.vue b/src/pagesProject/project/components/Evaluated/components/UCharts.vue index 2396480..8e805a6 100644 --- a/src/pagesProject/project/components/Evaluated/components/UCharts.vue +++ b/src/pagesProject/project/components/Evaluated/components/UCharts.vue @@ -71,7 +71,7 @@ export default { context: uni.createCanvasContext(this.canvasId, this), type: 'radar', fontSize: 11, - padding: [-20, -15, -40, -10], + padding: [-10, -10, -40, -10], legend: { show: false }, background: '#FFFFFF', pixelRatio: this.pixelRatio, diff --git a/src/pagesYanyuan/add-info/add-info.vue b/src/pagesYanyuan/add-info/add-info.vue index d25d74c..2331a3a 100644 --- a/src/pagesYanyuan/add-info/add-info.vue +++ b/src/pagesYanyuan/add-info/add-info.vue @@ -113,6 +113,13 @@ export default { if (item.frequencyValue) { item.frequencyValue = null; } + if (item.showClasses) { + item.showClasses = false; + item.showOther = false; + item.classesValue = null; + item.frequencyValue = null; + item.otherValue = null; + } }); }); this.infoList = [...array]; diff --git a/src/pagesYanyuan/assess/assess.vue b/src/pagesYanyuan/assess/assess.vue index 20f1762..2b8917f 100644 --- a/src/pagesYanyuan/assess/assess.vue +++ b/src/pagesYanyuan/assess/assess.vue @@ -131,7 +131,7 @@ export default { setTimeout(() => { this.backProject(); this.setTimeNode(Date.now()); - }, 3000); + }, 1000); } catch (error) { console.error('error: ', error); this.$t.ui.showToast(error.msg || '提交失败'); diff --git a/src/utils/request.js b/src/utils/request.js index 2cf5374..a87b0a2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,6 +7,12 @@ const install = (Vue, vm) => { loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透 // 配置请求头信息 header: { 'content-type': 'application/json;charset=UTF-8' }, + getTask: task => { + // 相当于设置了请求超时时间20s + setTimeout(() => { + task.abort(); + }, 20000); + }, }); // 请求拦截部分，如配置，每次请求前都会执行