diff --git a/CHANGELOG.md b/CHANGELOG.md index 42e97ca..7360b4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-11-12) +# 0.1.0 (2021-11-15) ### 🌟 新功能 范围|描述|commitId @@ -230,6 +230,7 @@ - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/17bb8c9) - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/1421504) - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/215c6b3) + - | 解决error | [cacbe7f](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/cacbe7f) - | 解决error | [1a6e513](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/1a6e513) - | 解决警告 | [c932b09](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/c932b09) diff --git a/rest/http-client.env.json b/rest/http-client.env.json new file mode 100644 index 0000000..34ce0f9 --- /dev/null +++ b/rest/http-client.env.json @@ -0,0 +1,15 @@ +{ + "$shared": { + "version": "v1", + "identifier": "wally", + "credential": "111111" + }, + "dev": { + "name": "dev", + "url": "http://192.168.0.99/gateway" + }, + "local": { + "version": "v2", + "url": "http://192.168.0.99/gateway" + } +} diff --git a/rest/project.http b/rest/project.http new file mode 100644 index 0000000..7d68ac6 --- /dev/null +++ b/rest/project.http @@ -0,0 +1,201 @@ +@localhost = http://localhost:7260/v2.0 +@localhost_tall = http://localhost:7130/v3.0 +@test_tall = http://192.168.0.99:7130/v3.0 +@test = https://test.tall.wiki/gateway/yanyuan/v2.0/ +@www_tall = http://www.tall.wiki:7130/v3.0 +@www = http://www.tall.wiki/gateway/yanyuan/v2.0/ +@type = content-type: application/json;charset=utf-8 + +### 登录 +# @name login +POST {{test_tall}}/users/signin +{{type}} + +{ + "client": 1, + "type": 3, + "data": { + "identifier": "song", + "credential": "999999" + } +} + +### debug +GET {{test}}/debug +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +###绑定工具箱 +POST {{test}}/tool/bind +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "toolCode":"0000000003" + } +} +###查询登录用户身份 +POST {{test}}/userPower/identity +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ +} +###添加用户信息 +POST {{test}}/trainee/add +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "userName":"李四", + "sex":"1", + "clinicHospital":"就诊医院", + "hospitalProvinceId":"1", + "hospitalCityId":"2", + "hospitalAddress":"迎泽区XXX", + "clinicOffice":"神经内科", + "clinicDoctor":"赵医生", + "birthDate":"1965-08-01", + "height":"170", + "weight":"66", + "jobTitle":"农林渔牧", + "educateStatus":"小学", + "educateDate":"6", + "abodePlace":"太原市小店区", + "appearTime":"2021-01-01", + "diagnoseTime":"2021-02-01", + "diagnoseResult":"轻度痴呆", + "minBloodPressure":"90", + "maxBloodPressure":"120", + "bloodFat":"80", + "physicalAct":"中", + "apoeGene":"1", + "diseasesRecord":"没有疾病史", + "relativeDiseasesRecord":"亲属均无老年痴呆", + "isInsomnic":0, + "insomnicPeriod":"8", + "isSmoke":1, + "quitPeriod":2, + "sustainPeriod":3, + "averageNum":5, + "isDrink":2, + "abstinencePeriod":"2年", + "drinkType":"啤酒", + "isTea":"3", + "quitTea":"", + "continuePeriod":"1年", + "teaType":"绿茶", + "teaPeriod":"每天一杯", + "isStrongFlavour":1, + "isLikeMeat":1, + "isMoreOil":0 + } +} + +###查询绑定者创建的患者信息(申请成为家属前调用) +POST {{test}}/trainee/create +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "bindUserId":"1218025249493356544" + } +} + +###绑定手机号后,关联用户原有的使用者 +POST {{test}}/trainee/relation +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ +} + +###生成二维码 +POST {{test}}/tool/qrCode +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "id":"1" + } +} +###体验账号升级 +POST {{test}}/trainee/upgrade +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "keyUserIds":[ + "1456525052375470081" + ] + } +} + +###查询个人信息 +POST {{test}}/family/personal +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ +} +###申请成为家属 +POST {{test}}/family/apply +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "keyUserIds":[ + "1456525052375470080", + "1456525052375470081" + ], + "age":25, + "educateLevel": "本科", + "jobTitle": "码农", + "name": "小伙伴", + "sex": 1 + } +} + +###查询试题 +POST {{test}}/question/get +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "code":"NLCP", + "reportId": "1458968153773838336", + "num": "1" + } +} + +###保存答案 +POST {{localhost}}/question/saveAnswer +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "code":"NLCP", + "reportId": "1459057596971094016", + "questionId": "21", + "optionId": "1" + } +} + +###脑力测评结果计算 +POST {{localhost}}/mentalTest/calculate +{{type}} +Authorization: Bearer {{login.response.body.$.data.token}} + +{ + "param":{ + "mentalTestId": "1459057596971094016" + } +} diff --git a/src/apis/yanyuan.js b/src/apis/yanyuan.js index 5c576d0..8c2c8f4 100644 --- a/src/apis/yanyuan.js +++ b/src/apis/yanyuan.js @@ -19,12 +19,15 @@ const install = (Vue, vm) => { vm.$u.api.applyFamily = param => vm.$u.post(`${yanyuan}/family/apply`, param); // 查询个人信息 vm.$u.api.getPersonalInfo = () => vm.$u.post(`${yanyuan}/family/personal`); - // 绑定工具箱 vm.$u.api.bindTool = param => vm.$u.post(`${yanyuan}/tool/bind`, param); - // 用户身份判断 vm.$u.api.identityUserPower = param => vm.$u.post(`${yanyuan}/userPower/identity`, param); + + // 试题查询 + vm.$u.api.getQuestion = param => vm.$u.post(`${yanyuan}/question/get`, param); + // 试题答案保存 + vm.$u.api.saveAnswer = param => vm.$u.post(`${yanyuan}/question/saveAnswer`, param); }; export default { install }; diff --git a/src/components/NotEvaluated/NotEvaluated.vue b/src/components/NotEvaluated/NotEvaluated.vue index b6579a0..cfb468b 100644 --- a/src/components/NotEvaluated/NotEvaluated.vue +++ b/src/components/NotEvaluated/NotEvaluated.vue @@ -18,10 +18,31 @@ - - diff --git a/src/components/Test/TestTitle.vue b/src/components/Test/TestTitle.vue deleted file mode 100644 index eaaa8e8..0000000 --- a/src/components/Test/TestTitle.vue +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/src/components/Test/answerPage.vue b/src/components/Test/answerPage.vue new file mode 100644 index 0000000..465062d --- /dev/null +++ b/src/components/Test/answerPage.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/components/Test/components/TestMain.vue b/src/components/Test/components/TestMain.vue new file mode 100644 index 0000000..11e712f --- /dev/null +++ b/src/components/Test/components/TestMain.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/components/Test/components/TitlePosition.vue b/src/components/Test/components/TitlePosition.vue new file mode 100644 index 0000000..1e8dc49 --- /dev/null +++ b/src/components/Test/components/TitlePosition.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/components/Test/promptPage.vue b/src/components/Test/promptPage.vue new file mode 100644 index 0000000..bc817e6 --- /dev/null +++ b/src/components/Test/promptPage.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue index 21739c3..fdb80fd 100644 --- a/src/components/TimeLine/TimeLine.vue +++ b/src/components/TimeLine/TimeLine.vue @@ -45,7 +45,6 @@ export default { // 滚动 scroll(e) { - console.log('e: ', e); this.top = e.detail.scrollTop; this.setShrink(this.top > this.scrollTop); this.setScrollTop(this.top); diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index ac1416a..1715763 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -4,7 +4,7 @@ - + diff --git a/src/pagesYanyuan/assess/assess.vue b/src/pagesYanyuan/assess/assess.vue index 4c5416c..745fdc6 100644 --- a/src/pagesYanyuan/assess/assess.vue +++ b/src/pagesYanyuan/assess/assess.vue @@ -1,29 +1,73 @@