diff --git a/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js b/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js
index daaf9c0..a8033bf 100644
--- a/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js
+++ b/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js
@@ -23,7 +23,6 @@ export function healthIndexdata(identity) {
})
}
// 健康处方
-
export function lastrecode(identity) {
return request({
url: '/applet/360/portrait/record/detail/last/'+identity+'/0',
@@ -33,4 +32,25 @@ export function lastrecode(identity) {
}
})
}
+// 处方记录时间表
+export function dayList(identity) {
+ return request({
+ url: '/applet/360/portrait/record/dayList/'+identity,
+ method: 'GET',
+ header: {
+ region: uni.getStorageSync('region'),
+ }
+ })
+}
+
+export function detail(recordCode) {
+ return request({
+ url: '/applet/360/portrait/record/detail/'+recordCode+'/0',
+ method: 'GET',
+ header: {
+ region: uni.getStorageSync('region'),
+ }
+ })
+}
+
diff --git a/pagesB/Healthindex/Healthindex.vue b/pagesB/Healthindex/Healthindex.vue
index 7df7f58..535a111 100644
--- a/pagesB/Healthindex/Healthindex.vue
+++ b/pagesB/Healthindex/Healthindex.vue
@@ -2,10 +2,6 @@
-
-
@@ -33,8 +29,31 @@
+
+ 血脂变化趋势
+
+
+
+ 空腹血糖变化趋势
+
+
+
+
+
+ 体质指数变化趋势
+
+
+
+
+
+ 血脂变化趋势
+
+
+
@@ -46,7 +65,11 @@
export default {
data() {
return {
- datalist: null,
+ datalist: null, //血脂
+ bloodsugar: null, //血糖
+ BMIdata: null, //体脂
+ bloodpressure: null, //血压
+
checked: true,
cardNo: '',
healthdata: {},
@@ -81,16 +104,15 @@
}
}
},
-
+
}
},
onShow() {
// 健康指数
-
+
},
mounted() {
this.infohealths()
- console.log('0000000000')
this.getServerData()
},
methods: {
@@ -102,7 +124,7 @@
this.healthdata = res.data
})
}
-
+
},
getServerData() {
// if (this.healthdata) {
@@ -110,78 +132,69 @@
let res = {
categories: [],
series: [{
- name: "成交量A",
- data: [35, 8, 25, 37, 4, 20]
+ name: "总胆固醇",
+ data: []
},
{
- name: "成交量B",
- data: [70, 40, 65, 100, 44, 68]
+ name: "低密度脂蛋白胆固醇",
+ data: []
},
- {
- name: "成交量C",
- data: [100, 80, 95, 150, 112, 132]
- }, {
- name: "成交量C",
- data: [100, 80, 95, 150, 112, 132]
- }
]
}
- console.log(res, 'res111')
- res.series[0].name = this.healthdata.evaAnalysis.bg.series[0].name
- res.categories = this.healthdata.evaAnalysis.bg.xValue
+ let resbloodsugar = {
+ categories: [],
+ series: [{
+ name: "空腹血糖",
+ data: []
+ },
+
+ ]
+ }
+ let resBMI = {
+ categories: [],
+ series: [{
+ name: "体质指数",
+ data: []
+ },
+
+ ]
+ }
+ let resbloodpressure = {
+ categories: [],
+ series: [{
+ name: "收缩压",
+ data: []
+ },
+ {
+ name: "舒张压",
+ data: []
+ },
+
+ ]
+ }
+ // bf血脂变化趋势
+ res.series[0].data = this.healthdata.evaAnalysis.bf.series[0].data
+ res.series[1].data = this.healthdata.evaAnalysis.bf.series[1].data
+ res.categories = this.healthdata.evaAnalysis.bf.xValue
+ //bg血糖
+ resbloodsugar.series[0].data = this.healthdata.evaAnalysis.bg.series[0].data
+ resbloodsugar.categories = this.healthdata.evaAnalysis.bg.xValue
+ //bmi体脂
+ resBMI.series[0].data = this.healthdata.evaAnalysis.bmi.series[0].data
+ resBMI.categories = this.healthdata.evaAnalysis.bmi.xValue
+ //bp血压
+ resbloodpressure.series[0].data = this.healthdata.evaAnalysis.bp.series[0].data
+ resbloodpressure.series[1].data = this.healthdata.evaAnalysis.bp.series[1].data
+ resbloodpressure.categories = this.healthdata.evaAnalysis.bp.xValue
this.datalist = res
- // res.series[0].data = this.healthdata.physicalSign.bf.xValue
- // res.series[0].name=this.healthdata.evaAnalysis.bp.name
-
- // res.series[1].name=this.healthdata.evaAnalysis.bg.name
- // res.series[2].name=this.healthdata.evaAnalysis.bf.name
- // res.series[3].name=this.healthdata.evaAnalysis.bmi.name
- console.log(res, 'res')
-
- // res.series[0].data = this.healthdata.physicalSign.bf.series.map(e => e.bg)
- // res.categories = this.healthdata.evaAnalysis.map(e => e.timename + e.measureTime)
- // this.datalist = res
- // let restwo = {
- // series: [{
- // data: [{
- // "name": "偏低" + this.healthdata.calc.lowerNum + "次",
- // "value": this.healthdata.calc.lowerNum
- // }, {
- // "name": "正常" + this.healthdata.calc.normalNum + "次",
- // "value": this.healthdata.calc.normalNum
- // }, {
- // "name": "偏高" + this.healthdata.calc.higherNum + "次",
- // "value": this.healthdata.calc.higherNum
- // }]
- // }]
- // };
- // this.datalisttwo = restwo
+ this.bloodsugar = resbloodsugar
+ this.BMIdata = resBMI
+ this.bloodpressure = resbloodpressure
}, 500)
- // }
- // //模拟从服务器获取数据时的延时
- // setTimeout(() => {
- // //模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
- // let res = {
- // categories: ["2018", "2019", "2020", "2021", "2022", "2023"],
- // series: [{
- // name: "成交量A",
- // data: [35, 8, 25, 37, 4, 20]
- // },
- // {
- // name: "成交量B",
- // data: [70, 40, 65, 100, 44, 68]
- // },
- // {
- // name: "成交量C",
- // data: [100, 80, 95, 150, 112, 132]
- // }
- // ]
- // };
- // this.chartData = JSON.parse(JSON.stringify(res));
- // }, 500);
+
},
-
-
+
+
}
}
@@ -193,15 +206,16 @@
// padding: 100rpx 40rpx;
text-align: center;
font-size: 36rpx;
+
// 健康
.health {
width: 100%;
margin: 0 auto;
-
+
// background: red;
.health_top {
width: 100%;
-
+
// height: 100%;
// background: #FBDA81;
.right {
@@ -214,53 +228,58 @@
line-height: 30rpx;
left: 471rpx;
// left: 288rpx;
-
+
}
-
+
image {
width: 230rpx;
height: 230rpx;
}
-
+
.count {
position: relative;
top: -158rpx;
-
+
.numbers {
font-weight: 600;
font-size: 25rpx;
margin-bottom: 10rpx;
}
-
+
.healths {
font-size: 22rpx;
}
}
}
-
+
.health_body {
width: 100%;
-
+
.healthitem {
text-align: left;
padding: 0 0 40rpx 62rpx;
font-size: 29rpx;
-
+
// padding-bottom: 40rpx;
// position: relative;
// left: -53rpx;
-
- }
-
- }
-
- .zx {
- width: 100%;
- height: 300rpx;
- // background: red;
- }
-
- }
- }
-
+ }
+
+ }
+
+ .zx {
+ width: 96%;
+ margin: 33rpx auto;
+ height: 400rpx;
+
+ .title {
+ font-size: 25rpx;
+ text-align: left;
+ margin-left: 30rpx;
+ }
+ }
+
+ }
+ }
+
\ No newline at end of file
diff --git a/pagesB/Precords/Precords.vue b/pagesB/Precords/Precords.vue
index 947a8d6..34ffb3c 100644
--- a/pagesB/Precords/Precords.vue
+++ b/pagesB/Precords/Precords.vue
@@ -5,59 +5,53 @@
处方记录
-
-
+
+
-
+
+ 健康生活方式
+ 治疗与康复
+ 急症处理
-
- {{uitem.formName}}
+
+ {{uitem.content}}
+
+
+ {{uitem.content}}
-
-
+
+
@@ -93,6 +88,8 @@
// padding: 100rpx 40rpx;
text-align: center;
font-size: 36rpx;
+
+
// 健康处方
.prescription {
::v-deep .u-collapse-title {
@@ -100,26 +97,30 @@
font-weight: 600;
padding-left: 10rpx;
}
+
.headcollapse {
::v-deep .u-collapse-head {
border-bottom: 2rpx solid #E6E6E6;
text-align: center !important;
}
-
+
::v-deep .u-collapse-title {
color: #26A888;
}
}
-
-
+ ::v-deep .u-icon--right {
+ color: #26A888 !important;
+ }
+
+
::v-deep .u-collapse-head {
width: 96%;
margin: 0 auto;
- background: #169BD5 !important;
+ background: #26A888 !important;
text-align: center;
color: #fff;
}
-
+
.record {
color: #fff;
width: 250rpx;
@@ -128,16 +129,18 @@
border-radius: 10rpx;
text-align: center;
margin-left: auto;
- background: #169BD5;
+ background: #26A888;
font-size: 27rpx;
-
+
}
-
+
.recorditem {
margin-top: 39rpx;
-
- .itemtext{
- .collapse_top{
+
+
+
+ .itemtext {
+ .collapse_top {
font-size: 30rpx;
font-weight: 500;
color: #000;
@@ -145,22 +148,23 @@
line-height: 40rpx;
margin: 0 auto;
padding: 20rpx 20rpx;
- .itemsdata{
- width: 100%;
- .itemword{
- margin: 15rpx;
-
-
+
+ .itemsdata {
+ width: 100%;
+
+ .itemword {
+ margin: 15rpx;
+
+
+ }
+
}
-
- }
-
+
}
}
-
- }
-
- }
- }
-
+ }
+
+ }
+ }
+
\ No newline at end of file
diff --git a/pagesB/Prescriptionrecords/Prescriptionrecords.vue b/pagesB/Prescriptionrecords/Prescriptionrecords.vue
index 85ebd05..a38339c 100644
--- a/pagesB/Prescriptionrecords/Prescriptionrecords.vue
+++ b/pagesB/Prescriptionrecords/Prescriptionrecords.vue
@@ -2,96 +2,95 @@
-
-
+
-
-
+
- 2222222222
+ {{aitem.recordDate}}
-
-
-
-
+
+ 健康生活方式
+ 治疗与康复
+ 急症处理
-
- {{uitem.formName}}
+
+ {{uitem.content}}
-
-
+
-
-
-
+
\ No newline at end of file
+