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

This commit is contained in:
闫晓茹 2023-11-09 15:55:36 +08:00
commit e550435756
41 changed files with 743 additions and 274 deletions

View File

@ -4,7 +4,8 @@ export function appPersonal(patientId) {
url: `/nurseApp/login/appPersonal?patientId=${patientId}`,
method: 'GET',
header: {
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
region: uni.getStorageSync('region'),
},
})
}

View File

@ -1,8 +1,8 @@
import request from "../../request.js"
// 获取项目
export function projectTypedata(projectType) {
export function projectTypedata(patientId) {
return request({
url: `/nurseApplet/screening/project/list?projectType=${projectType}`,
url: `/nurseApplet/screening/project/list?patientId=${patientId}`,
method: 'GET',
header: {
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')

View File

@ -17,7 +17,8 @@ export function appPersonal(patientId) {
url: `/nurseApp/login/appPersonal?patientId=${patientId}`,
method: 'GET',
header: {
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
region: uni.getStorageSync('region'),
},
})
}

View File

@ -0,0 +1,40 @@
var request = function(config) {
return new Promise((resolve, rejected) => {
if (config.url != '/nurseApplet/chatRecord/updateReadStatus' && config.url !=
"/nurseApplet/chatRecord/sendMessage" && config.url !=
`/applet/sign/apply/checkSignApply/` + uni.getStorageSync('userinfo').cardNo) {
uni.showLoading({
title: ''
});
}
uni.request({
url: config.url,
data: config.data,
method: config.method,
timeout: 60000,
header: config.header,
success(res) {
uni.hideLoading();
resolve(res.data)
},
fail(err) {
uni.hideLoading();
rejected(err)
}
})
})
}
//获取dy报告list
export function dyrecord(identity) {
return request({
url: `http://8.131.93.145:54098/fd/sh05/record/${identity}`,
method: 'get',
})
}
//获取dz报告list
export function dzrecord(identity) {
return request({
url: `http://112.6.122.71:8009/fd/sh05/record/${identity}`,
method: 'get',
})
}

View File

@ -94,8 +94,6 @@
},
],
timeindex: 0,
socketOpen: false,
timer: null,
datalist: null,
datalisttwo: null,
pie_opts: {
@ -156,12 +154,6 @@
// }
this.getServerData()
},
destroyed() {
clearInterval(this.timer);
if (this.socketOpen == true) {
uni.closeSocket();
}
},
watch: {
echartData: {
handler() {
@ -169,18 +161,6 @@
},
deep: true
},
current(newValue, oldValue) {
if (newValue != 0) {
clearInterval(this.timer);
if (this.socketOpen == true) {
uni.closeSocket();
}
} else {
setTimeout(() => {
this.scoket()
}, 800)
}
}
},
methods: {
taptimeindex(index) {
@ -233,78 +213,6 @@
}, 500)
}
},
scoket() {
var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
const that = this
uni.closeSocket()
this.socketOpen = false
try {
uni.connectSocket({
url: SOCKETURL
})
uni.onSocketOpen(res => {
console.log('webScoket连接已打开', res);
that.socketOpen = true
that.reset()
})
uni.onSocketError(err => {
console.log('webScoket连接打开失败', err);
if (err && err.code != 1000) {
setTimeout(() => {
that.socketOpen = true
uni.connectSocket({
url: SOCKETURL
})
}, 3 * 1000)
}
})
uni.onSocketClose(err => {
console.log('webScoket连接关闭', err);
if (err && err.code !== 1000) {
setTimeout(() => {
that.socketOpen = true
uni.connectSocket({
url: SOCKETURL
})
}, 3 * 1000)
}
})
uni.onSocketMessage(res => {
console.log("webScoket监听收到的信息", res);
// that.newsList.push({
// senderName: that.currentItem.senderName,
// content: JSON.parse(res.data).message
// })
this.$emit('websocket-message');
this.$forceUpdate()
})
} catch (e) {
console.log(e);
}
},
//
reset() {
let that = this
var SOCKETURL = 'ws://112.7.50.34:9002/webSocket/' + uni.getStorageSync('userinfo').cardNo
clearInterval(that.timer);
that.timer = setInterval(() => {
uni.sendSocketMessage({
data: 'ping',
success(res) {
console.log('正在发送心跳');
},
fail(err) {
console.log('心跳发送失败,重新连接...');
_socketOpen = true
uni.connectSocket({
url: SOCKETURL
})
}
})
}, 60000)
},
}
}
</script>

View File

@ -41,7 +41,7 @@
</p>
<uni-table border stripe emptyText="暂无更多数据">
<uni-tr>
<uni-th>专病管理服务团队成员</uni-th>
<uni-th>家庭医生服务团队成员</uni-th>
<uni-th>姓名</uni-th>
<uni-th>职称</uni-th>
<uni-th>固定电话</uni-th>

View File

@ -51,7 +51,6 @@
/* */
"mp-weixin": {
"appid": "wxccb16a452ab5e4b4",
"__usePrivacyCheck__": true,
"setting": {
"urlCheck": false,
"postcss": true,

View File

@ -622,6 +622,14 @@
"navigationBarTitleText": "设备列表",
"enablePullDownRefresh": false
}
},
{
"path" : "testreport/testreport",
"style" :
{
"navigationBarTitleText" : "检测报告",
"enablePullDownRefresh" : false
}
}
]
}, {

View File

@ -117,11 +117,16 @@
if (this.userinfo && this.region!="3") {
this.patientName = this.userinfo.patientName
checkSignApply(this.userinfo.cardNo).then(res => {
if (res.data.code != 0) {
this.checkSign = true
} else {
this.checkSign = false
if(res.data){
this.checkSign=res.data.code
this.info=res.data.info
}
// if (res.data.code == 0) {
// this.checkSign = true
// } else {
// this.checkSign = false
// }
})
} else {
this.patientName = ''
@ -169,14 +174,23 @@
this.family()
} else {
if (this.cityCode == "1" || this.cityCode == "2") {
if (!this.checkSign) {
if (this.checkSign=="0") {
this.$refs.uToast.show({
title: '未签约,请先签约',
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
} else {
} else if(this.checkSign=="01"){
this.$refs.uToast.show({
title: this.info,
type: 'error',
duration: '2000',
})
}
else {
uni.navigateTo({
url: "/pagesB/mysigning/mysigning"
})
@ -200,14 +214,33 @@
this.family()
} else {
if (this.cityCode == "1" || this.cityCode == "2") {
if (!this.checkSign) {
if (this.checkSign=="0") {
this.$refs.uToast.show({
title: '未签约,请先签约',
title: this.info,
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
} else {
}
else if(this.checkSign=="01"){
this.$refs.uToast.show({
title: this.info,
type: 'error',
duration: '2000',
})
}
else if(this.checkSign=="01"){
this.$refs.uToast.show({
title: this.info,
type: 'error',
duration: '2000',
})
}
else {
uni.navigateTo({
url: '/pagesB/Behaviorpoints/Behaviorpoints'
})
@ -282,14 +315,24 @@
// this.family()
// } else {
// if (this.cityCode == "1" || this.cityCode == "2") {
if (!this.checkSign) {
if (this.checkSign=="0") {
this.$refs.uToast.show({
title: '未签约,请先签约',
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
} else {
}
else if(this.checkSign=="01"){
this.$refs.uToast.show({
title: this.info,
type: 'error',
duration: '2000',
})
}
else {
uni.navigateTo({
url: "/pagesC/ServiceAppointment/ServiceAppointment"
})
@ -319,9 +362,29 @@
this.family()
} else {
if (this.cityCode == "1" || this.cityCode == "2") {
uni.navigateTo({
url: "/pagesC/servicerecord/servicerecord"
})
if (this.checkSign=="0") {
this.$refs.uToast.show({
title: '未签约,请先签约',
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
}
else if(this.checkSign=="01"){
this.$refs.uToast.show({
title: this.info,
type: 'error',
duration: '2000',
})
}else{
uni.navigateTo({
url: "/pagesC/servicerecord/servicerecord"
})
}
} else {
this.family()
@ -341,14 +404,24 @@
this.family()
} else {
if (this.cityCode == "1" || this.cityCode == "2") {
if (!this.checkSign) {
if (this.checkSign=="0") {
this.$refs.uToast.show({
title: '未签约,请先签约',
type: 'error',
duration: '1000',
url: "/pagesC/Onlinesigning/Onlinesigning"
})
} else {
}
else if(this.checkSign=="01"){
this.$refs.uToast.show({
title: this.info,
type: 'error',
duration: '2000',
})
}
else {
uni.navigateTo({
url: "/pagesC/Myappointment/Myappointment"
})

View File

@ -52,7 +52,7 @@
left: 10%;
width: 80%;
height: 68rpx;
background-color: #55d0df;
background-color: #4AC4AB;
margin: 0 auto;
border-radius: 10rpx;
margin-bottom: 30rpx;

View File

@ -56,7 +56,7 @@
</view>
</view>
<view class="item" @tap='gocoupon'>
<view class="number" v-if="appPersonallist.patientCouponCount==0">
<view class="number" v-if="appPersonallist.patientCouponCount==0 ||appPersonallist.patientCouponCount==undefined">
0
</view>
<view class="number" v-else>

View File

@ -248,10 +248,7 @@
}, {
value: '3',
label: '高血脂'
}, {
value: '0',
label: '无'
}],
},],
arealist: [], //list
list: [{
id: "",
@ -274,7 +271,6 @@
homeLatitude: null,
nurseTypeIdList: [],
diseaseInfoList: [],
diseaseList: [],
patientId: '',
locationName: '',
sex: '',
@ -372,7 +368,6 @@
// console.log(that.query.diseaseList.length,'000')
that.query.openid = uni.getStorageSync('openid');
that.query.cityCode = uni.getStorageSync('region');
if (that.query.sexname == '男') {
that.query.sex = 'MALE';
} else if (that.query.sexname == '女') {
@ -401,23 +396,26 @@
title: '请选择出生日期',
type: 'error'
})
} else if (that.query.diseaseList.length == 0) {
that.$refs.uToast.show({
title: '请选择基础疾病',
type: 'error'
})
} else {
}
// else if (that.query.diseaseList.length == 0) {
// that.$refs.uToast.show({
// title: '',
// type: 'error'
// })
// }
else {
registerdata(that.query).then(res => {
if (res.code == 200) {
getCurrentUser(that.query.openid, that.query.cityCode).then(res => {
uni.setStorageSync('patientId', res.data.id);
uni.setStorageSync('patientName', res.data.patientName);
uni.setStorageSync("userinfo", res.data)
})
that.$refs.uToast.show({
title: '注册成功',
type: 'success',
back: 1,
that.$refs.uToast.show({
title: '注册成功',
type: 'success',
duration: '1000',
back: 1,
})
})
} else {
that.$refs.uToast.show({
@ -576,6 +574,10 @@
justify-content: center;
align-items: center;
background: #fff;
::v-deep .select-modal .select-dialog{
height: 370rpx !important;
}
.Agreement {
width: 100%;

View File

@ -367,7 +367,7 @@
const _this = this
_this.userinfo = uni.getStorageSync('userinfo');
_this.form.openid = uni.getStorageSync('openid');
_this.form.cityCode=_this.userinfo.cityCode
_this.form.cityCode= uni.getStorageSync('region');
console.log(_this.form, '000')
if (_this.form.sexname == '男') {
_this.form.sex = 'MALE';

View File

@ -461,6 +461,11 @@
.paySign,
success: function(
res) {
that.couponId =
null
that.Paidinprice =
null
that.coupon = null
that.goodsDetailsinfo(
that
.goodsInfoId,
@ -731,10 +736,10 @@
if (list.length >= 1) {
this.updata.receiver = list[0].receiveName
var areaName
if(res.data[0].areaName){
areaName=res.data[0].areaName
}else{
areaName=""
if (res.data[0].areaName) {
areaName = res.data[0].areaName
} else {
areaName = ""
}
this.updata.receiveAddress = list[0].areaName + list[0].receiveAddress
this.updata.phone = list[0].receivePhone
@ -743,14 +748,14 @@
this.updata.receiver = res.data[0].receiveName
var areaName
if(res.data[0].areaName){
areaName=res.data[0].areaName
if (res.data[0].areaName) {
areaName = res.data[0].areaName
}else{
areaName=""
} else {
areaName = ""
}
this.updata.receiveAddress =areaName + res.data[0].receiveAddress
this.updata.receiveAddress = areaName + res.data[0].receiveAddress
this.updata.phone = res.data[0].receivePhone
this.userid = res.data[0].id
}
@ -853,4 +858,4 @@
<style lang="scss">
@import "./CommodityDetailsstyle.scss";
</style>
</style>

View File

@ -20,9 +20,7 @@
分类
</view>
</view>
</view>
<!-- <view class="inputs">
<i class="icon"></i>
<input v-model="goodsName" type="text" name="" id="" class="input" placeholder="请输入商品名称">
@ -375,7 +373,7 @@
.productlist {
width: 100%;
margin: 0 auto;
padding: 20rpx 0 0 0;
padding: 100rpx 0 0 0;
display: flex;
flex-wrap: wrap;
justify-content: space-evenly;
@ -426,4 +424,4 @@
}
}
}
</style>
</style>

View File

@ -19,11 +19,14 @@
return {
prejectlist:{},
userinfo:{}
};
},
onShow() {
var projectType=1
projectTypedata(projectType).then(res=>{
this.userinfo=uni.getStorageSync('userinfo');
var patientId=this.userinfo.id
projectTypedata(patientId).then(res=>{
this.prejectlist=res.data
console.log(res)

View File

@ -127,7 +127,7 @@
this.userinfo = uni.getStorageSync('userinfo');
this.cardNo = this.userinfo.cardNo;
this.parentId = this.userinfo.id;
this.region = this.userinfo.cityCode;
this.region = uni.getStorageSync('region');
this.openId = uni.getStorageSync('openid');
// console.log(this.openId, '999')

View File

@ -77,7 +77,7 @@
已签到
</view>
</view>
<view class="item" style="background-color: #F44B2F;">
<!-- <view class="item" style="background-color: #F44B2F;">
<image src="../../static/pagesB/yaoqing.png" mode=""></image>
<view class="titletext">
每邀请
@ -93,7 +93,7 @@
<view class="btn" style="color: #F44B2F;" @tap='yaoqingshowtrue' v-if='list.inviteFriends>0'>
去完成
</view>
</view>
</view> -->
</view>
</view>
</u-mask>
@ -352,34 +352,34 @@
})
})
//
await this.$refs.rCanvas.drawText({
// text: "怀",
x: 150,
y: 300,
font_color: "#444444",
font_size: 12,
font_weight: 600,
text_align: 'center'
}).catch(err_msg => {
uni.showToast({
title: err_msg,
icon: "none"
})
})
await this.$refs.rCanvas.drawText({
// text: "",
x: 150,
y: 320,
font_color: "#444444",
font_size: 12,
font_weight: 600,
text_align: 'center'
}).catch(err_msg => {
uni.showToast({
title: err_msg,
icon: "none"
})
})
// await this.$refs.rCanvas.drawText({
// text: "",
// x: 150,
// y: 300,
// font_color: "#444444",
// font_size: 12,
// font_weight: 600,
// text_align: 'center'
// }).catch(err_msg => {
// uni.showToast({
// title: err_msg,
// icon: "none"
// })
// })
// await this.$refs.rCanvas.drawText({
// text: "",
// x: 150,
// y: 320,
// font_color: "#444444",
// font_size: 12,
// font_weight: 600,
// text_align: 'center'
// }).catch(err_msg => {
// uni.showToast({
// title: err_msg,
// icon: "none"
// })
// })
await this.$refs.rCanvas.drawText({
text: "新医路健康服务平台",
x: 150,

View File

@ -298,7 +298,7 @@
timeout: 5000,
success(res) {
that.appPersonallist.headPictureUrl = JSON.parse(res.data).imgUrl
that.appPersonallist.cityCode = this.value.cityCode
that.appPersonallist.cityCode = uni.getStorageSync('region')
registerdata(that.appPersonallist).then(res => {
if (res.code == 200) {
that.$refs.uToast.show({
@ -325,7 +325,7 @@
}
})
} else {
that.appPersonallist.cityCode = this.value.cityCode
that.appPersonallist.cityCode = uni.getStorageSync('region')
registerdata(that.appPersonallist).then(res => {
if (res.code == 200) {
that.$refs.uToast.show({

View File

@ -60,7 +60,7 @@
this.parentId = this.userinfo.id;
// this.cardNo = '372926199812187720';
// this.parentId = '88';
this.region = this.userinfo.cityCode;
this.region = uni.getStorageSync('region');
this.getlist();
},

View File

@ -76,7 +76,7 @@
.Rescind {
width: 50%;
height: 100rpx;
color: #55d0df;
color: #4AC4AB;
border-left: 0.5rpx solid #f6f6f6;
}
}

View File

@ -159,6 +159,12 @@
url: "/pages/homepage/homepage"
})
}, 2000)
}else{
this.$refs.uToast.show({
title: res.msg,
type: 'error',
})
}
})
},
@ -215,4 +221,4 @@
<style lang="scss">
@import './mysigning.scss';
</style>
</style>

View File

@ -9,14 +9,9 @@
<view style="color: #2968F1;" @click="goToScreeningRecord" v-show="type != '1'">筛查记录</view>
</view>
<view class="tabbarCon">
<view style="text-align: center;
color: #26A888;
border-bottom: 1rpx solid #26A888;
padding-top: 17rpx;
position: relative;
left: 50%;
transform: translate(-50%);
display: inline-block;" v-if="screeningResultData.projectName">
<view
style="text-align: center;color: #26A888;border-bottom: 1rpx solid #26A888;padding-top: 17rpx;position: relative;left: 50%;transform: translate(-50%);display: inline-block;"
v-if="screeningResultData.projectName">
{{screeningResultData.projectName}}
</view>
<uni-segmented-control :current="Inv" :values="items" @clickItem="onClickItem" styleType="text"
@ -48,7 +43,6 @@
</view>
</view>
</view>
<view v-show="Inv == 1">
<view>
<view
@ -175,7 +169,8 @@
methods: {
lookpath() {
var that = this
var url = that.baseurl + `/nurseApplet/screening/record/fileview?filePath=${that.screeningResultData.attachment}`
var url = that.baseurl +
`/nurseApplet/screening/record/fileview?filePath=${that.screeningResultData.attachment}`
console.log(url, '1')
uni.downloadFile({
url: url,

View File

@ -223,7 +223,7 @@
crowdNoList: null,
packageList: null,
packageNoList: null,
signYears: null,
signYears: 1,
BasePackage: null, //
PersonalityPack: null, //
packSignCost: 0, //
@ -314,8 +314,8 @@
title: '签约成功',
type: 'success',
})
uni.redirectTo({
url: "/pagesB/mysigning/mysigning"
uni.switchTab({
url: "/pages/homepage/homepage"
})
} else {
this.$refs.uToast.show({
@ -558,7 +558,7 @@
that.query.userNo = item.userNo
that.query.teamNo = item.teamNo
that.query.teamName = item.teamName
getDoctorListtwo(1, 20, item.teamNo).then(res => {
getDoctorListtwo(1, 20, item.teamNo, '').then(res => {
that.query.DoctorList = res.rows
})
uni.$off('doctordata')
@ -568,4 +568,4 @@
</script>
<style lang="scss">
@import "./Onlinesigning.scss";
</style>
</style>

View File

@ -8,7 +8,7 @@
绑定设备关注健康
</view>
</view>
<view class="device">
<view class="device" @tap='gotestreport'>
<image src="../../static/pageC/report.png" mode=""></image>
<span class="deviceitem">检测报告</span>
<view class="itemdata">
@ -366,8 +366,7 @@
},
methods: {
info() {
// userinfo.cardNo,
recordlast('370882199909092123').then(res => {
recordlast(uni.getStorageSync('userinfo').cardNo).then(res => {
res.data.forEach(e => {
e.type == '1' ? this.dataone = e : ''
e.type == '2' ? this.datatwo = e : ''
@ -395,6 +394,11 @@
url: `/pagesC/healthdata/healthdata?index=${index}`
})
},
gotestreport() {
uni.navigateTo({
url: "/pagesC/testreport/testreport"
})
},
}
}
</script>

View File

@ -13,14 +13,12 @@
筛查机构
<span>{{screeningResultData.hospitalName}}</span>
</view>
<view class="item">
筛查医生
<span>{{screeningResultData.doctorName}}</span>
</view>
<view class="itemend">
筛查结果:
</view>
<view class="image">
<view style="text-align: center;">
@ -57,14 +55,11 @@
<view class="imageitem">
<image src="../../static/pagesB/Behave.png" mode=""></image>
</view> -->
<view class="item">
诊断结果
<span>{{screeningResultData.diagnosticResult}}</span>
</view>
<view class="item">
诊断结果
<span>{{screeningResultData.diagnosticResult}}</span>
</view>
</view>
</view>
</view>
</template>
@ -90,21 +85,15 @@
this.projectId = e.projectId
this.getLastScreeningResult()
console.log(e)
},
onShow() {
this.baseurl = baseurl
},
methods: {
//
getLastScreeningResult() {
lastScreeningResult(this.patientld, this.projectId).then(res => {
this.screeningResultData = res.data
})
},
//

View File

@ -34,14 +34,16 @@
data() {
return {
prejectlist:{},
userinfo:{}
};
},
onShow() {
var projectType=1
projectTypedata(projectType).then(res=>{
this.userinfo=uni.getStorageSync('userinfo');
var patientId=this.userinfo.id
projectTypedata(patientId).then(res=>{
this.prejectlist=res.data
console.log(res)
})
// this.resultstype();
},

View File

@ -89,8 +89,7 @@
bmi: (this.weight / ((this.height / 100) * (this.height / 100))).toFixed(2),
height: this.height,
weight: this.weight,
// identity: uni.getStorageSync('userinfo').cardNo
identity: '370882199909092123',
identity: uni.getStorageSync('userinfo').cardNo,
measureTime: this.timetext,
}
savebmi(data).then(res => {
@ -127,7 +126,7 @@
width: 60%;
height: 98rpx;
margin: 60rpx auto;
background-color: #55d0df;
background-color: #4AC4AB;
border-radius: 10rpx;
border: solid 0rpx #0c0c0c;
color: #ffffff;
@ -233,4 +232,4 @@
}
}
}
</style>
</style>

View File

@ -92,8 +92,7 @@
ldl: this.ldl,
tc: this.tc,
tg: this.tg,
// identity: uni.getStorageSync('userinfo').cardNo
identity: '370882199909092123',
identity: uni.getStorageSync('userinfo').cardNo,
measureTime: this.timetext,
}
savebf(data).then(res => {
@ -138,7 +137,7 @@
width: 60%;
height: 98rpx;
margin: 60rpx auto;
background-color: #55d0df;
background-color: #4AC4AB;
border-radius: 10rpx;
border: solid 0rpx #0c0c0c;
color: #ffffff;
@ -244,4 +243,4 @@
}
}
}
</style>
</style>

View File

@ -70,8 +70,7 @@
let data = {
pulse: this.pulse,
spo2: this.spo2,
// identity: uni.getStorageSync('userinfo').cardNo
identity: '370882199909092123',
identity: uni.getStorageSync('userinfo').cardNo,
measureTime: this.timetext,
}
savebo(data).then(res => {
@ -116,7 +115,7 @@
width: 60%;
height: 98rpx;
margin: 60rpx auto;
background-color: #55d0df;
background-color: #4AC4AB;
border-radius: 10rpx;
border: solid 0rpx #0c0c0c;
color: #ffffff;
@ -222,4 +221,4 @@
}
}
}
</style>
</style>

View File

@ -37,8 +37,24 @@
hr: '',
timetext: this.formatDate(Date.now()),
measureTime: this.formatDate(Date.now()),
uploadType: undefined,
timeoutObj: null,
socketOpen: false,
SOCKETURL: '',
};
},
onLoad(options) {
bound(uni.getStorageSync('userinfo').cardNo).then(res => {
if (res.code == 200) {
res.data.forEach(e => {
if (e.deviceType == 1) {
this.SOCKETURL = `ws://112.6.122.71:8009/fd/webSocket/${e.sn}`
this.scoket();
}
})
}
})
},
methods: {
formatDate(timestamp) {
const now = new Date(parseInt(timestamp))
@ -55,13 +71,79 @@
timeconfirm(time) {
this.timetext = time
},
scoket() {
const that = this
this.socketOpen = false
try {
uni.connectSocket({
url: that.SOCKETURL
})
uni.onSocketOpen(res => {
console.log('webScoket连接已打开', res);
that.socketOpen = true
that.reset()
})
uni.onSocketError(err => {
console.log('webScoket连接打开失败', err);
if (err && err.code != 1000) {
setTimeout(() => {
that.socketOpen = true
uni.connectSocket({
url: that.SOCKETURL
})
}, 3 * 1000)
}
})
uni.onSocketClose(err => {
console.log('webScoket连接关闭', err);
if (err && err.code !== 1000) {
setTimeout(() => {
that.socketOpen = true
uni.connectSocket({
url: that.SOCKETURL
})
}, 3 * 1000)
}
})
uni.onSocketMessage(res => {
console.log("webScoket监听收到的信息", res);
this.uploadType = 2
this.hr = JSON.parse(res.data).pulse
this.$forceUpdate()
})
} catch (e) {
console.log(e);
}
},
//
reset() {
let that = this
clearInterval(that.timeoutObj);
that.timeoutObj = setInterval(() => {
uni.sendSocketMessage({
data: 'ping',
success(res) {
console.log('正在发送心跳');
},
fail(err) {
console.log('心跳发送失败,重新连接...');
console.log(this.SOCKETURL)
that.socketOpen = true
uni.connectSocket({
url: this.SOCKETURL
})
}
})
}, 60000)
},
submit() {
if (this.hr) {
let data = {
hr: this.hr,
uploadType: 1,
// identity: uni.getStorageSync('userinfo').cardNo
identity: '370882199909092123',
uploadType: this.uploadType ? this.uploadType : 1,
identity: uni.getStorageSync('userinfo').cardNo,
measureTime: this.timetext,
}
savehr(data).then(res => {
@ -92,7 +174,12 @@
return true
}
}
}
},
onUnload() {
if (this.socketOpen) {
uni.closeSocket();
}
},
}
</script>
@ -106,7 +193,7 @@
width: 60%;
height: 98rpx;
margin: 60rpx auto;
background-color: #55d0df;
background-color: #4AC4AB;
border-radius: 10rpx;
border: solid 0rpx #0c0c0c;
color: #ffffff;

View File

@ -49,6 +49,9 @@
import {
savebp
} from '@/api/examinationapi/add.js'
import {
bound,
} from '@/api/examinationapi/add.js'
export default {
data() {
return {
@ -57,8 +60,24 @@
hr: '',
timetext: this.formatDate(Date.now()),
measureTime: this.formatDate(Date.now()),
uploadType: undefined,
timeoutObj: null,
socketOpen: false,
SOCKETURL: '',
};
},
onLoad(options) {
bound(uni.getStorageSync('userinfo').cardNo).then(res => {
if (res.code == 200) {
res.data.forEach(e => {
if (e.deviceType == 1) {
this.SOCKETURL = `ws://112.6.122.71:8009/fd/webSocket/${e.sn}`
this.scoket();
}
})
}
})
},
methods: {
formatDate(timestamp) {
const now = new Date(parseInt(timestamp))
@ -75,16 +94,84 @@
timeconfirm(time) {
this.timetext = time
},
scoket() {
const that = this
this.socketOpen = false
try {
uni.connectSocket({
url: that.SOCKETURL
})
uni.onSocketOpen(res => {
console.log('webScoket连接已打开', res);
that.socketOpen = true
that.reset()
})
uni.onSocketError(err => {
console.log('webScoket连接打开失败', err);
if (err && err.code != 1000) {
setTimeout(() => {
that.socketOpen = true
uni.connectSocket({
url: that.SOCKETURL
})
}, 3 * 1000)
}
})
uni.onSocketClose(err => {
console.log('webScoket连接关闭', err);
if (err && err.code !== 1000) {
setTimeout(() => {
that.socketOpen = true
uni.connectSocket({
url: that.SOCKETURL
})
}, 3 * 1000)
}
})
uni.onSocketMessage(res => {
console.log("webScoket监听收到的信息", res);
this.uploadType = 2
this.dbp = JSON.parse(res.data).dbp
this.sbp = JSON.parse(res.data).sbp
this.hr = JSON.parse(res.data).pulse
this.$forceUpdate()
})
} catch (e) {
console.log(e);
}
},
//
reset() {
let that = this
clearInterval(that.timeoutObj);
that.timeoutObj = setInterval(() => {
uni.sendSocketMessage({
data: 'ping',
success(res) {
console.log('正在发送心跳');
},
fail(err) {
console.log('心跳发送失败,重新连接...');
console.log(this.SOCKETURL)
that.socketOpen = true
uni.connectSocket({
url: this.SOCKETURL
})
}
})
}, 60000)
},
submit() {
if (this.ruls(this.dbp) && this.ruls(this.sbp) && this.ruls(this.hr)) {
let data = {
dbp: this.dbp,
sbp: this.sbp,
hr: this.hr,
// identity: uni.getStorageSync('userinfo').cardNo
identity: '370882199909092123',
identity: uni.getStorageSync('userinfo').cardNo,
measureTime: this.timetext,
uploadType: 1,
uploadType: this.uploadType ? this.uploadType : 1,
}
savebp(data).then(res => {
if (res.code == 200) {
@ -113,8 +200,13 @@
} else {
return true
}
},
},
onUnload() {
if (this.socketOpen) {
uni.closeSocket();
}
}
},
}
</script>
@ -128,7 +220,7 @@
width: 60%;
height: 98rpx;
margin: 60rpx auto;
background-color: #55d0df;
background-color: #4AC4AB;
border-radius: 10rpx;
border: solid 0rpx #0c0c0c;
color: #ffffff;
@ -229,4 +321,4 @@
}
}
}
</style>
</style>

View File

@ -58,8 +58,7 @@
submit() {
if (this.timetext && this.temp) {
let data = {
// identity: uni.getStorageSync('userinfo').cardNo
identity: '370882199909092123',
identity: uni.getStorageSync('userinfo').cardNo,
measureTime: this.timetext,
temp: this.temp,
}
@ -105,7 +104,7 @@
width: 60%;
height: 98rpx;
margin: 60rpx auto;
background-color: #55d0df;
background-color: #4AC4AB;
border-radius: 10rpx;
border: solid 0rpx #0c0c0c;
color: #ffffff;
@ -203,4 +202,4 @@
}
}
}
</style>
</style>

View File

@ -39,8 +39,7 @@
return {
data: {
deviceType: undefined,
// identity: uni.getStorageSync('userinfo').cardNo,
identity: '370882199909092123',
identity: uni.getStorageSync('userinfo').cardNo,
sn: '',
bindTime: undefined, //
state: 1,
@ -116,7 +115,7 @@
width: 60%;
height: 98rpx;
margin: 60rpx auto;
background-color: #55d0df;
background-color: #4AC4AB;
border-radius: 10rpx;
border: solid 0rpx #0c0c0c;
color: #ffffff;
@ -150,8 +149,8 @@
height: 60rpx;
background-color: #ffffff;
border-radius: 10rpx;
border: solid 1rpx #55d0df;
color: #55d0df;
border: solid 1rpx #4AC4AB;
color: #4AC4AB;
}
}
@ -191,9 +190,9 @@
.left {
width: 8rpx;
height: 32rpx;
background-color: #55d0df;
background-color: #4AC4AB;
border-radius: 4rpx;
}
}
}
</style>
</style>

View File

@ -45,16 +45,36 @@
import {
savebg
} from '@/api/examinationapi/add.js'
import {
bound,
} from '@/api/examinationapi/add.js'
export default {
data() {
return {
uploadType: undefined,
number: '',
timetext: this.formatDate(Date.now()),
measureTime: this.formatDate(Date.now()),
bucketchoice: 1,
timeoutObj: null,
socketOpen: false,
SOCKETURL: '',
// ws://112.6.122.71:8009/fd/webSocket/{sn}
// ws://218.58.213.15:8009/fd/webSocket/{sn}
};
},
onLoad(options) {},
onLoad(options) {
bound(uni.getStorageSync('userinfo').cardNo).then(res => {
if (res.code == 200) {
res.data.forEach(e => {
if (e.deviceType == 2) {
this.SOCKETURL = `ws://112.6.122.71:8009/fd/webSocket/${e.sn}`
this.scoket();
}
})
}
})
},
methods: {
timeconfirm(time) {
this.timetext = time
@ -83,9 +103,8 @@
bg: this.number,
bucket: this.bucketchoice,
measureTime: this.measureTime,
uploadType: 1,
// identity: uni.getStorageSync('userinfo').cardNo
identity: '370882199909092123'
uploadType: this.uploadType ? this.uploadType : 1,
identity: uni.getStorageSync('userinfo').cardNo
}
savebg(data).then(res => {
if (res.code == 200) {
@ -100,8 +119,80 @@
}, 1000)
}
})
},
scoket() {
const that = this
this.socketOpen = false
try {
uni.connectSocket({
url: that.SOCKETURL
})
uni.onSocketOpen(res => {
console.log('webScoket连接已打开', res);
that.socketOpen = true
that.reset()
})
uni.onSocketError(err => {
console.log('webScoket连接打开失败', err);
if (err && err.code != 1000) {
setTimeout(() => {
that.socketOpen = true
uni.connectSocket({
url: that.SOCKETURL
})
}, 3 * 1000)
}
})
uni.onSocketClose(err => {
console.log('webScoket连接关闭', err);
if (err && err.code !== 1000) {
setTimeout(() => {
that.socketOpen = true
uni.connectSocket({
url: that.SOCKETURL
})
}, 3 * 1000)
}
})
uni.onSocketMessage(res => {
console.log("webScoket监听收到的信息", res);
this.uploadType = 2
this.number = JSON.parse(res.data).fbg
this.$forceUpdate()
})
} catch (e) {
console.log(e);
}
},
//
reset() {
let that = this
clearInterval(that.timeoutObj);
that.timeoutObj = setInterval(() => {
uni.sendSocketMessage({
data: 'ping',
success(res) {
console.log('正在发送心跳');
},
fail(err) {
console.log('心跳发送失败,重新连接...');
console.log(this.SOCKETURL)
that.socketOpen = true
uni.connectSocket({
url: this.SOCKETURL
})
}
})
}, 60000)
},
},
onUnload() {
if (this.socketOpen) {
uni.closeSocket();
}
}
},
}
</script>

View File

@ -35,8 +35,7 @@
},
methods: {
getbindDeviceList() {
// uni.getStorageSync('userinfo').cardNo
bound('370882199909092123').then(res => {
bound(uni.getStorageSync('userinfo').cardNo).then(res => {
if (res.code == 200) {
this.deviceList = res.data
}
@ -53,8 +52,7 @@
remark: e.remark,
id: e.id,
bindTime: e.bindTime,
// identity: uni.getStorageSync('userinfo').cardNo,
identity: '370882199909092123',
identity: uni.getStorageSync('userinfo').cardNo,
sn: e.sn,
unbindTime: that.timeFormat(),
state: 0,
@ -162,4 +160,4 @@
}
}
}
</style>
</style>

View File

@ -93,8 +93,7 @@
let userinfo = uni.getStorageSync('userinfo');
var obj = {
label: Number(this.tabindex) + 1,
// identity: userinfo.cardNo,
identity: '370882199909092123',
identity: userinfo.cardNo,
type: this.type,
}
record(obj).then(res => {
@ -120,4 +119,4 @@
::v-deep .u-tabs {
background-color: #F7F5F5 !important;
}
</style>
</style>

View File

@ -701,7 +701,7 @@
}
.sendBox {
background-color: #55d0df7d;
background-color: #4AC4AB;
padding: 18rpx 20rpx;
border-radius: 0 0 10rpx 10rpx;
font-size: 34rpx;
@ -764,4 +764,4 @@
bottom: 38rpx;
}
}
</style>
</style>

View File

@ -64,6 +64,7 @@
watch: {
'query.orgName': {
handler(newval, oldval) {
this.query.pageNum=1
this.getNearbyOrginfo();
}
}

View File

@ -684,7 +684,7 @@
}
.sendBox {
background-color: #55d0df7d;
background-color: #4AC4AB;
padding: 18rpx 20rpx;
border-radius: 0 0 10rpx 10rpx;
font-size: 34rpx;
@ -747,4 +747,4 @@
bottom: 38rpx;
}
}
</style>
</style>

View File

@ -0,0 +1,172 @@
<template>
<view class="app">
<view class="item" v-for="item in list">
<view class="time">
{{item.date}}
</view>
<view class="name">
{{item.reportId}}
</view>
<view class="btn" v-if="item.existReport==1" @tap='lookReport(item)'>
<span>查看报告</span>
</view>
<view class="btn2" v-if="item.existReport==2">
<span>暂无报告</span>
</view>
</view>
</view>
</template>
<script>
import {
dyrecord,
dzrecord,
dyreport,
dzreport
} from '@/api/pagesC/testreport/index.js'
export default {
data() {
return {
list: [],
region: undefined,
};
},
onLoad() {
this.region = uni.getStorageSync('region')
if (this.region == 1) {
dzrecord('370785199502153071').then(res => {
res.data.forEach(e => {
e.existReport = Number(e.existReport)
})
this.list = res.data
})
} else if (this.region == 2) {
dyrecord('370785199502153071').then(res => {
res.data.forEach(e => {
e.existReport = Number(e.existReport)
})
this.list = res.data
})
}
},
methods: {
// 驿http://218.58.213.15:8009/fd/sh05/report/view/{reportId}
// 驿http://112.6.122.71:8009/fd/sh05/report/view/{reportId}
lookReport(item) {
if (this.region == 1) {
uni.downloadFile({
url: `http://112.6.122.71:8009/fd/sh05/report/download/${item.reportId}`,
success: function(res) {
console.log(res)
var filePath = res.tempFilePath;
uni.openDocument({
filePath: filePath,
showMenu: true,
fileType: 'pdf',
success: function(resp) {
console.log(resp)
console.log('打开文档成功');
}
});
}
});
} else if (this.region == 2) {
uni.downloadFile({
url: `http://8.131.93.145:54098/fd/sh05/report/download/${item.reportId}`,
success: function(res) {
console.log(res)
var filePath = res.tempFilePath;
uni.openDocument({
filePath: filePath,
fileType: 'pdf',
showMenu: true,
success: function(resp) {
console.log(resp)
console.log('打开文档成功');
}
});
}
});
}
},
}
}
</script>
<style lang="scss">
.app {
.item {
height: 200rpx;
width: 96%;
background-color: #fff;
border-radius: 5rpx;
margin: 20rpx auto 0;
position: relative;
overflow: hidden;
.btn2 {
/* 左上角飘带 */
background-color: #A4A0A0;
/* 左上角飘带的背景颜色 */
overflow: hidden;
white-space: nowrap;
/* 文字不换行*/
position: absolute;
/* 绝对定位 */
right: -60rpx;
top: 20rpx;
transform: rotate(45deg);
/* 旋转45°*/
box-shadow: 0 0 10rpx #888;
/* 飘带的阴影*/
}
.btn2 span {
border: 1rpx solid #A4A0A0;
color: #fff;
display: block;
font: bold 100% 'Helvetica Neue', Helvetica, Arial, sans-serif;
margin: 1rpx 0;
padding: 10rpx 50rpx;
text-align: center;
text-shadow: 0 0 5rpx #444;
}
.btn {
/* 左上角飘带 */
background-color: #FFA115;
/* 左上角飘带的背景颜色 */
overflow: hidden;
white-space: nowrap;
/* 文字不换行*/
position: absolute;
/* 绝对定位 */
right: -60rpx;
top: 20rpx;
transform: rotate(45deg);
/* 旋转45°*/
box-shadow: 0 0 10rpx #888;
/* 飘带的阴影*/
}
.btn span {
border: 1rpx solid #FFA115;
color: #fff;
display: block;
font: bold 100% 'Helvetica Neue', Helvetica, Arial, sans-serif;
margin: 1rpx 0;
padding: 10rpx 50rpx;
text-align: center;
text-shadow: 0 0 5rpx #444;
}
.name {
margin: 20rpx 0 0 20rpx;
}
.time {
margin: 20rpx 0 0 20rpx;
}
}
}
</style>