Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pagesB/threeHundredAndSixty/threeHundredAndSixty.vue
This commit is contained in:
2024-05-08 17:28:48 +08:00
commit 38714d9731
5 changed files with 272 additions and 226 deletions

View File

@ -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'),
}
})
}

View File

@ -2,10 +2,6 @@
<view class="app">
<view class="health">
<view class="health_top">
<!-- <view class="right" @tap="healthtap()">
1
</view> -->
<image image v-if="healthdata.hiEva<650" :src="require('../images/red.png')">
<image image v-if="healthdata.hiEva>850" :src="require('../images/green.png')" image>
<image v-if="healthdata.hiEva > 650" :src="require('../images/yellow.png')" image>
@ -33,8 +29,31 @@
</view>
<!-- 折线图 -->
<view class="zx">
<view class="title">
血脂变化趋势
</view>
<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="datalist" />
</view>
<view class="zx">
<view class="title">
空腹血糖变化趋势
</view>
<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true"
:chartData="bloodsugar" />
</view>
<view class="zx">
<view class="title">
体质指数变化趋势
</view>
<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true" :chartData="BMIdata" />
</view>
<view class="zx">
<view class="title">
血脂变化趋势
</view>
<qiun-data-charts type="line" loadingType="0" :opts="line_opts" :ontouch="true"
:chartData="bloodpressure" />
</view>
</view>
</view>
</template>
@ -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);
},
}
}
</script>
@ -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;
}
}
}
</style>
}
}
.zx {
width: 96%;
margin: 33rpx auto;
height: 400rpx;
.title {
font-size: 25rpx;
text-align: left;
margin-left: 30rpx;
}
}
}
}
</style>

View File

@ -5,59 +5,53 @@
处方记录
</view>
<view class="recorditem">
<u-collapse :item-style="itemStyle" :arrow="false" :accordion='false'>
<u-collapse-item :title="item.tempName" v-for="(item, index) in lastrecodedata.ptList" :key="index" @change='tapcollapse(item)' :class="item.check?'headcollapse':''">
<u-collapse :item-style="itemStyle" :accordion='false' :arrow="false">
<u-collapse-item :title="item.tempName" v-for="(item, index) in lastrecodedata.ptList" :key="index"
@change='tapcollapse(item)' :class="item.check?'headcollapse':''">
<view class="itemtext">
<view class="collapse_top" v-for="uitem in item.ptValList">
<!-- <u-icon name="star-fill" color="#000" size="28"></u-icon>
<span style="margin-left: 10rpx;">健康生活方式</span> -->
<u-icon name="star-fill" color="#000" size="28"
v-if="uitem.itemType=='1' || uitem.itemType=='2' ||uitem.itemType=='3'"></u-icon>
<span style="margin-left: 10rpx;" v-if="uitem.itemType=='1'">健康生活方式 </span>
<span style="margin-left: 10rpx;" v-if="uitem.itemType=='2'">治疗与康复</span>
<span style="margin-left: 10rpx;" v-if="uitem.itemType=='3'">急症处理</span>
<view class="itemsdata">
<view class="itemword">
<u-checkbox v-model="checked" >{{uitem.formName}}</u-checkbox>
<view class="itemword" v-if="uitem.val=='true'">
<u-checkbox active-color="#26A888" v-model="checked"> {{uitem.content}}</u-checkbox>
</view>
<view class="itemword" v-if="uitem.val==null || uitem.val=='false'">
<u-checkbox active-color="#26A888" v-model="checkedfalse">{{uitem.content}}</u-checkbox>
</view>
<!-- <view class="itemword">
<u-checkbox v-model="checked" >测试345353535</u-checkbox>
</view><view class="itemword">
<u-checkbox v-model="checked" >测试345353535</u-checkbox>
</view> -->
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
</view>
</view>
<u-loading :show="show" mode="flower" size="40"></u-loading>
</view>
</template>
<script>
import {lastrecode} from "@/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js"
import {
lastrecode
} from "@/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js"
export default {
data() {
return {
lastrecodedata:null,
cardNo:'',
itemList: [{
head: "赏识在于角度的转换",
body: "只要我们正确择取一个合适的参照物乃至稍降一格去看待他人,值得赏识的东西便会扑面而来",
open: true,
disabled: true
}, {
head: "生活中不是缺少美,而是缺少发现美的眼睛",
body: "学会欣赏,实际是一种积极生活的态度,是生活的调味品,会在欣赏中发现生活的美",
open: false,
}, {
head: "周围一些不起眼的人、事、物,或许都隐藏着不同凡响的智慧",
body: "但是据说雕刻大卫像所用的这块大理石,曾被多位雕刻家批评得一无是处,有些人认为这块大理石采凿得不好,有些人嫌它的纹路不够美",
open: false,
}],
show: true,
checked: true,
lastrecodedata: null,
cardNo: '',
itemList: [],
}
},
mounted() {
this.lastrecodelist()
},
methods: {
tapcollapse(item) {
@ -69,6 +63,7 @@
this.cardNo = '370522196411282177'
lastrecode(this.cardNo).then(res => {
this.lastrecodedata = res.data
this.show = false
})
}
},
@ -77,10 +72,10 @@
uni.navigateTo({
url: "/pagesB/Prescriptionrecords/Prescriptionrecords"
})
},
}
}
</script>
@ -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;
}
}
}
}
}
}
}
}
</style>
}
}
}
</style>

View File

@ -2,96 +2,95 @@
<view class="app">
<view class="body">
<view class="left">
<u-collapse :accordion='false' :arrow="false">
<u-collapse-item :title="item.head" v-for="(item, index) in itemlistleft" :key="index"
<u-collapse :accordion='false'>
<u-collapse-item :title="item.year" v-for="(item, index) in itemlistleft" :key="index"
:class="item.check?'headcollapse':''" @change='tapcollapseleft(item)'>
<!-- {{item.body}} -->
<view class="itemtext">
<view class="itemtext" v-for="aitem in item.list" @tap="dataies(aitem)">
<view class="left">
2222222222
{{aitem.recordDate}}
</view>
</view>
<!-- <view class="itemtext" v-for="uitem in item.list">
<view class="left">
{{uitem.happentime}}
</view>
</view> -->
</u-collapse-item>
</u-collapse>
</view>
<view class="right">
<u-collapse :item-style="itemStyle" :arrow="false" :accordion='false'>
<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index"
<u-collapse-item :title="item.tempName" v-for="(item, index) in itemList.ptList" :key="index"
@change='tapcollapse(item)' :class="item.check?'headcollapse':''">
<!-- {{item.body}} -->
<view class="itemtext">
<view class="collapse_top" v-for="uitem in item.ptValList">
<!-- <u-icon name="star-fill" color="#000" size="28"></u-icon>
<span style="margin-left: 10rpx;">健康生活方式</span> -->
<u-icon name="star-fill" color="#000" size="28" v-if="uitem.itemType=='1' || uitem.itemType=='2' ||uitem.itemType=='3'"></u-icon>
<span style="margin-left: 10rpx;" v-if="uitem.itemType=='1'">健康生活方式 </span>
<span style="margin-left: 10rpx;" v-if="uitem.itemType=='2'">治疗与康复</span>
<span style="margin-left: 10rpx;" v-if="uitem.itemType=='3'">急症处理</span>
<view class="itemsdata">
<view class="itemword">
<u-checkbox v-model="checked"> {{uitem.formName}}</u-checkbox>
<view class="itemword" v-if="uitem.val=='true'">
<u-checkbox active-color="#26A888" v-model="checked"> {{uitem.content}}</u-checkbox>
</view>
<!-- <view class="itemword">
<u-checkbox v-model="checked">测试345353535</u-checkbox>
<view class="itemword" v-if="uitem.val==null || uitem.val=='false'">
<u-checkbox active-color="#26A888" v-model="checkedfalse">{{uitem.content}}</u-checkbox>
</view>
<view class="itemword">
<u-checkbox v-model="checked">测试345353535</u-checkbox>
</view> -->
</view>
</view>
</view>
</u-collapse-item>
</u-collapse>
</view>
</view>
<u-loading :show="show" mode="flower" size="40"></u-loading>
</view>
</template>
<script>
import {dayList,detail} from "@/api/pagesB/threeHundredAndSixty/threeHundredAndSixty.js"
export default {
data() {
return {
checked: true,
itemlistleft: [{
head: "赏识在于角度的转换",
body: "只要我们正确择取一个合适的参照物乃至稍降一格去看待他人,值得赏识的东西便会扑面而来",
open: true,
disabled: true
}, {
head: "生活中不是缺少美,而是缺少发现美的眼睛",
body: "学会欣赏,实际是一种积极生活的态度,是生活的调味品,会在欣赏中发现生活的美",
open: false,
}],
itemList: [{
head: "赏识在于角度的转换",
body: "只要我们正确择取一个合适的参照物乃至稍降一格去看待他人,值得赏识的东西便会扑面而来",
open: true,
disabled: true
}, {
head: "生活中不是缺少美,而是缺少发现美的眼睛",
body: "学会欣赏,实际是一种积极生活的态度,是生活的调味品,会在欣赏中发现生活的美",
open: false,
}, {
head: "周围一些不起眼的人、事、物,或许都隐藏着不同凡响的智慧",
body: "但是据说雕刻大卫像所用的这块大理石,曾被多位雕刻家批评得一无是处,有些人认为这块大理石采凿得不好,有些人嫌它的纹路不够美",
open: false,
}],
show:true,
checked:true,
checkedfalse:false,
lastrecodedata:null,
cardNo:'',
itemlistleft: [],
itemList: [],
recordCode:'',
}
},
mounted() {
this.lastrecodelist()
},
methods: {
lastrecodelist() {
if (uni.getStorageSync("userinfo").cardNo) {
// this.cardNo=uni.getStorageSync("userinfo").cardNo
this.cardNo = '370522196411282177'
dayList(this.cardNo).then(res => {
this.itemlistleft = res.data
this.recordCode=res.data[0].list[0].recordCode
console.log(this.recordCode)
detail(this.recordCode).then(res => {
this.itemList = res.data
this.show=false
})
})
}
},
tapcollapse(item) {
item.check = !item.check
},
dataies(aitem){
console.log(aitem,'aitem')
this.recordCode=aitem.recordCode
detail(this.recordCode).then(res => {
this.itemList = res.data
})
},
tapcollapseleft(item){
console.log(item)
item.check = !item.check
}
@ -101,21 +100,22 @@
</script>
<style lang="scss">
.app {
height: 100vh;
page {
background-color: #fff;
// padding: 100rpx 40rpx;
}
.app {
// height: 100vh;
padding: 32rpx 10rpx;
text-align: center;
font-size: 36rpx;
.body {
width: 100%;
height: 100vh;
// height: 100vh;
display: flex;
.left {
height: 100vh;
width: 30%;
// height: 100vh;
// background: aliceblue;
::v-deep .u-collapse-title {
font-size: 26rpx;
@ -125,7 +125,6 @@
padding-left: 10rpx;
font-weight: 600;
}
::v-deep .u-collapse-head {
width: 96%;
margin: 0 auto;
@ -155,6 +154,7 @@
padding-bottom: 4rpx;
}
}
::v-deep .u-collapse-head {
width: 96%;
@ -171,15 +171,16 @@
}
.right {
height: 100vh;
width: 70%;
// height: 100vh;
width: 77%;
::v-deep .u-collapse-title {
font-size: 30rpx;
font-weight: 600;
padding-left: 10rpx;
}
::v-deep .u-icon--right {
color: #26A888 !important;
}
.headcollapse {
::v-deep .u-collapse-head {
border-bottom: 2rpx solid #E6E6E6;
@ -194,7 +195,7 @@
::v-deep .u-collapse-head {
width: 96%;
margin: 0 auto;
background: #169BD5 !important;
background: #26A888 !important;
text-align: center;
color: #fff;
}

View File

@ -329,7 +329,6 @@
name: '健康处方',
orderStatus: 'WAIT_RECEIVED_GOODS',
}],
activebgk: {},
datalist: null,
identity: '',
cvdEvaRecord: {},
@ -480,6 +479,9 @@
</script>
<style lang="scss">
page {
background-color: #fff;
}
::v-deep .u-mode-center-box {
width: 94% !important;
padding: 40rpx 0;
@ -587,4 +589,4 @@
}
}
}
</style>
</style>