yangjun
/
hldy_app_mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

This commit is contained in:
wangweidong 2026-04-07 17:20:59 +08:00
parent c5fe2ea1d5
commit 66a2771411
8 changed files with 147 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
component/zy-upgrade/zy-upgrade.vue
View File

@ -141,14 +141,27 @@
method: 'GET', method: 'GET',
dataType:'json', dataType:'json',
success: (res) => { success: (res) => {
// console.log("?????",res) // console.log("?????",`https://www.focusnu.com/devopsapi/api/pad/versionUpdate?platform=1&version=${that.currentversion}`)
// this.$emit('chuandinew',this.updated2version) // this.$emit('chuandinew',this.updated2version)
if(res.statusCode===404){ if(res.statusCode===404){
return return
} }
if(res.data.code==100){ if(res.data.code==100){
//提示升级 //提示升级
if(res.data.data.update_url){ console.log(res.data.data,111111111)
if(res.data.data.wgt_flag=='2'){
that.wgt_flag = res.data.data.wgt_flag;
that.updated2version = res.data.data.version;
that.update_tips = res.data.data.update_tips;
that.forceupgrade = res.data.data.forceupdate==1;
that.version_url = res.data.data.update_url;
that.updated2version = res.data.data.version;
that.wgt_flag = res.data.data.wgt_flag;
that.wgt_url = res.data.data.wgt_url;
that.size = res.data.data.size;
that.dshow = true;
}else if(res.data.data.update_url){
that.dshow = true; that.dshow = true;
that.update_tips = res.data.data.update_tips; that.update_tips = res.data.data.update_tips;
@ -182,9 +195,15 @@
}, },
//点击开始升级按钮，开始升级 //点击开始升级按钮，开始升级
upgrade_checked:function(){ upgrade_checked:function(){
if(this.wgt_flag==2){
this.dshow = false
this.updateversion()
}else{
uni.removeStorageSync('token') uni.removeStorageSync('token')
this.update_flag = true this.update_flag = true
this.updateversion() this.updateversion()
}
}, },
//点击取消升级按钮，取消升级 //点击取消升级按钮，取消升级
upgrade_cancel:function(){ upgrade_cancel:function(){
@ -201,6 +220,23 @@
let platform = uni.getSystemInfoSync().platform let platform = uni.getSystemInfoSync().platform
let that = this let that = this
//console.log("操作系统：",platform) //console.log("操作系统：",platform)
if(that.wgt_flag==2){
try {
const Intent = plus.android.importClass('android.content.Intent')
const Uri = plus.android.importClass('android.net.Uri')
const main = plus.android.runtimeMainActivity()
const intent = new Intent(Intent.ACTION_VIEW)
intent.setData(Uri.parse('mimarket://details?id=com.android.hldy'))
// 强制使用小米应用商店
intent.setPackage('com.xiaomi.market')
main.startActivity(intent)
} catch (e) {
// 小米商店不存在 or 被禁用
console.log('打开小米应用商店失败', e)
}
return
}
if(platform == 'ios' && this.appstoreflag && that.wgt_flag!=1){ if(platform == 'ios' && this.appstoreflag && that.wgt_flag!=1){
//如果启用ios appstore升级，则打开appstore //如果启用ios appstore升级，则打开appstore
that.dshow = false that.dshow = false
@ -214,6 +250,7 @@
}); });
}); });
}else{ }else{
let that = this let that = this
let downloadurl = that.wgt_flag==1?that.wgt_url:that.version_url; let downloadurl = that.wgt_flag==1?that.wgt_url:that.version_url;
let targetUrl = "https://www.focusnu.com/devopsapi/sys/common/static/" + downloadurl let targetUrl = "https://www.focusnu.com/devopsapi/sys/common/static/" + downloadurl

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "护理单元", "name" : "护理单元",
"appid" : "__UNI__FB2D473", "appid" : "__UNI__FB2D473",
"description" : "护理单元", "description" : "护理单元",
"versionName" : "1.0.040", "versionName" : "1.0.041",
"versionCode" : 10040, "versionCode" : 10041,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {

1
pages/NursingNew/component/index.vue
View File

@ -619,7 +619,6 @@
queryPadPageList().then((res => { queryPadPageList().then((res => {
if(props.kf=='0'){ if(props.kf=='0'){
leftMenuArray.value = res.result.records; leftMenuArray.value = res.result.records;
console.log(res.result.records)
filteredMenu('izHldy').forEach((element : any, index : number) => { filteredMenu('izHldy').forEach((element : any, index : number) => {
if (element.nuId === uni.getStorageSync('NUall').nuId) { if (element.nuId === uni.getStorageSync('NUall').nuId) {
menutarget.value = index; menutarget.value = index;

116
pages/NursingNew/component/leftcontent/serveswipe.vue
View File

@ -264,7 +264,7 @@
<view class="right-scroll"> <view class="right-scroll">
<view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;" <view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;"
@click="zhixing(1,indexmessage?.directiveList[swipdcurrent])"> @click="zhixing(1,indexmessage?.directiveList[swipdcurrent])">
<view class="white-circle" :style="indexmessage?.directiveList[swipdcurrent]?.izStart=='Y'||indexmessage?.directiveList[swipdcurrent].employeeIds?'opacity: 0.4' : ''"> <view class="white-circle" :style="indexmessage?.directiveList[swipdcurrent]?.izStart=='Y'||indexmessage?.directiveList[swipdcurrent]?.employeeIds?'opacity: 0.4' : ''">
<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/1.png'" /> <image class="right-menu-img" :src="'/static/index/newindex/rightmenu/1.png'" />
<view class="right-menu-name"> <view class="right-menu-name">
转单执行 转单执行
@ -273,7 +273,7 @@
</view> </view>
<view style="margin:1.5vw 0;width:4vw;margin-left: 20rpx;" <view style="margin:1.5vw 0;width:4vw;margin-left: 20rpx;"
@click="zhixing(2,indexmessage?.directiveList[swipdcurrent])"> @click="zhixing(2,indexmessage?.directiveList[swipdcurrent])">
<view class="white-circle" :style="indexmessage?.directiveList[swipdcurrent]?.izStart=='Y'||indexmessage?.directiveList[swipdcurrent].employeeIds?'opacity: 0.4' : ''"> <view class="white-circle" :style="indexmessage?.directiveList[swipdcurrent]?.izStart=='Y'||indexmessage?.directiveList[swipdcurrent]?.employeeIds?'opacity: 0.4' : ''">
<image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" /> <image class="right-menu-img" :src="'/static/index/newindex/rightmenu/2.png'" />
<view class="right-menu-name"> <view class="right-menu-name">
协助执行 协助执行
@ -455,6 +455,7 @@
if(e.detail.key==1){ if(e.detail.key==1){
current2.value = a current2.value = a
} }
swipdcurrent.value = 0;
botleft.value = (a-4)*20; botleft.value = (a-4)*20;
if (plsbuy.value[a]?.izStart == 'Y' && plsbuy.value[a]?.izFinish == 'N') { if (plsbuy.value[a]?.izStart == 'Y' && plsbuy.value[a]?.izFinish == 'N') {
timeacde(1) timeacde(1)
@ -470,14 +471,18 @@
const djstinme = ref(0) const djstinme = ref(0)
const timeacde = (e) => { const timeacde = (e) => {
let obj = plsbuy.value[current.value]; let obj = plsbuy.value[current.value];
if(e==2){ if(e==2){
let timestampMs = new Date(obj.directiveList[swipdcurrent.value].servEndTime).getTime(); let timestampMs = new Date(obj.directiveList[0].servEndTime).getTime();
let times = new Date().getTime(); let times = new Date().getTime();
let djs = timestampMs - times; let djs = timestampMs - times;
djstinme.value = Math.round(djs / 1000); djstinme.value = Math.round(djs / 1000);
console.log(djstinme.value,timestampMs)
if (djstinme.value < 0) { if (djstinme.value < 0) {
djstinme.value = 0; djstinme.value = 0;
plsbuy.value[current.value].directiveList[swipdcurrent.value].chaoshitime = true plsbuy.value[current.value].chaoshitime = true
}else{
plsbuy.value[current.value].chaoshitime = false
} }
}else{ }else{
let timestampMs = new Date(obj.servEndTime).getTime(); let timestampMs = new Date(obj.servEndTime).getTime();
@ -695,8 +700,12 @@
if (res.result.length > 0) { if (res.result.length > 0) {
res.result.forEach((item, l) => { res.result.forEach((item, l) => {
item.flag = false; item.flag = false;
item.servebao = []; let timestampMs = null;
let timestampMs = new Date(item.servEndTime).getTime(); if(item.izMulti == "Y"){
timestampMs = new Date(item.directiveList[0].servEndTime).getTime();
}else{
timestampMs = new Date(item.servEndTime).getTime();
}
let times = new Date().getTime(); let times = new Date().getTime();
let djs = timestampMs - times; let djs = timestampMs - times;
if (djs < 0) { if (djs < 0) {
@ -871,8 +880,13 @@
const cshigb = () => { const cshigb = () => {
let obj = plsbuy.value[current.value]; let obj = plsbuy.value[current.value];
let timestampMs = null
if(obj.izMulti=="Y"){
timestampMs = new Date(obj.directiveList[swipdcurrent.value].servEndTime).getTime();
}else{
timestampMs = new Date(obj.servEndTime).getTime();
}
// console.log("啥啊",current.value) // console.log("啥啊",current.value)
let timestampMs = new Date(obj.servEndTime).getTime();
let times = new Date().getTime(); let times = new Date().getTime();
let djs = timestampMs - times; let djs = timestampMs - times;
// let timeendamp = timestampMs + (Number(plsbuy.value[current.value].timeoutDuration)*60); // let timeendamp = timestampMs + (Number(plsbuy.value[current.value].timeoutDuration)*60);
@ -887,25 +901,47 @@
} else { } else {
return true return true
} }
} }
const start = (v) => { const start = async (v) => {
// if(v.izMulti == "Y"){
// console.log(1111111111)
// plsbuy.value[current2.value].directiveList.map((item,i)=>{
// console.log(2222222222222)
// plsbuy.value[current2.value].directiveList[i].izStart = "Y"
// Object.assign(plsbuy.value[current2.value].directiveList[i], { izStart: 'Y' })
// console.log(item)
// })
// await nextTick()
// timeacde(2)
// }
// return
// console.log(v.izMulti)
// if (!cshigb()) { // if (!cshigb()) {
// errmsg.value = "服务已超时，不能开始服务！" // errmsg.value = "服务已超时，不能开始服务！"
// openerror.value = true; // openerror.value = true;
// firstgetqueryCgdList(form.nuId); // firstgetqueryCgdList(form.nuId);
// return // return
// } // }
console.log(v) // console.log(v)
if (v.izStart != 'N') { return } if (v.izStart != 'N') { return }
startOrder({ id: v.id }).then(res => { startOrder({ id: v.id }).then(res => {
console.log(res) if (res.result.success) {
if (res.success) { if(v.izMulti == "Y"){
v.izStart = "Y"; // console.log(1111111111)
timeacde() // plsbuy.value[current2.value].directiveList.map((item,i)=>{
// console.log(2222222222222)
// plsbuy.value[current2.value].directiveList[i].izStart = "Y"
// console.log(item)
// })
firstgetqueryCgdList(uni.getStorageSync('nuId'))
timeacde(2)
}else{ }else{
v.izStart = "Y";
timeacde(1)
}
} else {
errmsg.value = res.message
openerror.value = true;
} }
}) })
} }
@ -919,7 +955,7 @@
// return // return
// } // }
if (v.izStart == 'Y' && v.izFinish == 'N') { if (v.izStart == 'Y' && v.izFinish == 'N') {
// console.log("aaaaa",v) console.log("aaaaa",v)
endobj.value = v; endobj.value = v;
open.value = 3; open.value = 3;
} else { } else {
@ -932,12 +968,13 @@
// console.log("看看传的", { id: endobj.value.id }) // console.log("看看传的", { id: endobj.value.id })
endOrder({ id: endobj.value.id }).then(res => { endOrder({ id: endobj.value.id }).then(res => {
console.log(res) console.log(res)
if (res.success) { if (res.result.success) {
open.value = 0; open.value = 0;
endobj.value = {}; endobj.value = {};
firstgetqueryCgdList(uni.getStorageSync('nuId')) firstgetqueryCgdList(uni.getStorageSync('nuId'))
} else { } else {
errmsg.value = res.result.message
openerror.value = true;
} }
}) })
@ -949,10 +986,9 @@
// open.value = 3 // open.value = 3
// return // return
// 打包过不了校验 // 打包过不了校验
// console.log(e, k, indexmessage) console.log(e, k, indexmessage)
if (k == 1) { if (k == 1) {
// if(indexmessage.izPackage=='Y'&&e==0){ // if(indexmessage.izPackage=='Y'&&e==0){
// if(indexmessage.flag||indexmessage.izStart == 'Y'){ // if(indexmessage.flag||indexmessage.izStart == 'Y'){
// let last = indexmessage.servebao.find(item => item.last === true); // let last = indexmessage.servebao.find(item => item.last === true);
// console.log(last) // console.log(last)
@ -967,29 +1003,25 @@
// errmsg.value = indexmessage?.serviceContent // errmsg.value = indexmessage?.serviceContent
// openerror.value = true; // openerror.value = true;
// } // }
// } // }
// if (indexmessage?.izStart == 'Y'&&indexmessage.izPackage!='Y') { switch (e) {
// switch (e) { case 0:
// case 0: errmsg.value = !indexmessage?.serviceContent?'暂无数据':indexmessage?.serviceContent
// if (indexmessage?.serviceContent == '') { return } openerror.value = true;
// errmsg.value = indexmessage?.serviceContent break;
// break; case 1:
// case 1: errmsg.value = !indexmessage?.mp3File?'暂无数据':indexmessage?.mp3File
// if (indexmessage?.mp3File == '') { return } openerror.value = true;
// errmsg.value = indexmessage?.mp3File break;
// break; case 2:
// case 2: errmsg.value = !indexmessage?.mp4File?'暂无数据':indexmessage?.mp4File
// if (indexmessage?.mp4File == '') { return } openerror.value = true;
// errmsg.value = indexmessage?.mp4File break;
// break;
// default: default:
// break; break;
// } }
// openerror.value = true;
// }
} else { } else {
if (indexmessage?.izStart == 'Y') { if (indexmessage?.izStart == 'Y') {
@ -1271,7 +1303,7 @@
.timedjs { .timedjs {
position: absolute; position: absolute;
width: 7vw; width: 7vw;
right: 2.8vw; right: 3.4vw;
top: 0vw; top: 0vw;
display: flex; display: flex;
flex-direction: column; flex-direction: column;

1
pages/NursingNew/component/leftcontent/swipecard.vue
View File

@ -30,6 +30,7 @@
}, },
methods:{ methods:{
cardSwiper(e) { cardSwiper(e) {
// console.log(this.indexmessage.directiveList[e.detail.current])
this.cardCur = e.detail.current; this.cardCur = e.detail.current;
this.$emit('current',e.detail.current) this.$emit('current',e.detail.current)
}, },

13
pages/NursingNew/component/nurse/newindex.vue
View File

@ -810,11 +810,11 @@
</view> </view>
<view class="card-time"> <view class="card-time">
<view class="weight-time"> <view class="weight-time">
{{ postitem.startTime }} {{ postitem.startTime.slice(11, 16) }}
<text style="margin: 0 3rpx;"> <text style="margin: 0 3rpx;">
- -
</text> </text>
{{ postitem.endTime }} {{ postitem.endTime.slice(11, 16) }}
</view> </view>
</view> </view>
</view> </view>
@ -1058,8 +1058,9 @@
optTime: ts, optTime: ts,
instructionTagId:typearray.value[whitchtype.value]?.instructionType instructionTagId:typearray.value[whitchtype.value]?.instructionType
} }
console.log("啥情况data", data)
editDirective(data).then((res) => { editDirective(data).then((res) => {
// console.log("啥情况1111", res) console.log("啥情况1111", res)
if (res.success) { if (res.success) {
geteverything() geteverything()
setTimeout(() => { setTimeout(() => {
@ -1280,7 +1281,7 @@
let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime; let startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime; let endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
let positioning = timearr.value[indexsave.value[0]].positioning; let positioning = timearr.value[indexsave.value[0]].positioning;
console.log(endTime,11111111111111111111)
// 解析原始时间（健壮地 trim） // 解析原始时间（健壮地 trim）
const parseTime = (t) => { const parseTime = (t) => {
const parts = String(t || '').split(':').map(s => s.trim()); const parts = String(t || '').split(':').map(s => s.trim());
@ -1869,10 +1870,10 @@
const emotionTagList = ref([]); const emotionTagList = ref([]);
const bodyTagList = ref([]); const bodyTagList = ref([]);
const geteverything = () => { const geteverything = () => {
// console.log("有老人吗",uni.getStorageSync('elderId')) console.log("有老人吗",uni.getStorageSync('elderId'),uni.getStorageSync('nuId'))
if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) { if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId'),typearray.value[whitchtype.value]?.instructionType).then((res : any) => { getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId'),typearray.value[whitchtype.value]?.instructionType).then((res : any) => {
// console.log( res ) console.log( res )
timearr.value = Array.from({ length: 24 }, (_, hour) => ({ timearr.value = Array.from({ length: 24 }, (_, hour) => ({
positioning: hour.toString(), positioning: hour.toString(),
children: minuteArr.map(time => ({ children: minuteArr.map(time => ({

21
pages/NursingNew/index.vue
View File

@ -16,8 +16,8 @@
<view class="title-time-blue-card"> <view class="title-time-blue-card">
<image class="blue-img" src="/static/index/bluetarget.png" /> <image class="blue-img" src="/static/index/bluetarget.png" />
</view> </view>
<view class="card-bao" v-if="simpleobj.izPackage==`Y`"> <view class="card-bao" v-if="simpleobj.includesarray.length>1">
包 指令集合
</view> </view>
<view class="title-time-border-hisOk"> <view class="title-time-border-hisOk">
<view class="title-time"> <view class="title-time">
@ -228,10 +228,11 @@
arrlist.value = [ arrlist.value = [
{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', menuCode: 'jcgn_sy' }, { name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', menuCode: 'jcgn_sy' },
]; ];
if(arr){
let result = getIntersection(arrs, arr); let result = getIntersection(arrs, arr);
let results = getIntersection( tabbrarr.value,result); let results = getIntersection( tabbrarr.value,result);
arrlist.value.push(...results); arrlist.value.push(...results);
}
let back = [ let back = [
{ name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png', menuCode: 'back' } { name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png', menuCode: 'back' }
] ]
@ -323,7 +324,7 @@
startTime: "", startTime: "",
endTime: "", endTime: "",
directiveName: "", directiveName: "",
izPackage: '', includesarray: [],
}) })
function handsend(look : any) { function handsend(look : any) {
@ -349,11 +350,12 @@
} }
else { else {
console.log(look)
whoisit.value = 1; whoisit.value = 1;
simpleobj.value.startTime = look.startTime; simpleobj.value.startTime = look.startTime?look.startTime.slice(11, 16):'';
simpleobj.value.endTime = look.endTime; simpleobj.value.endTime = look.endTime?look.endTime.slice(11, 16):'';
simpleobj.value.directiveName = look.directiveName; simpleobj.value.directiveName = look.directiveName;
simpleobj.value.izPackage = look.izPackage; simpleobj.value.includesarray = look.includesarray;
startmoveit.value = false startmoveit.value = false
} }
} }
@ -664,7 +666,6 @@
position: absolute; position: absolute;
left: 35rpx; left: 35rpx;
top: 110rpx; top: 110rpx;
width: 32rpx;
height: 32rpx; height: 32rpx;
font-size: 24rpx; font-size: 24rpx;
display: flex; display: flex;
@ -673,6 +674,10 @@
background-color: #4690FF; background-color: #4690FF;
color: #fff; color: #fff;
border-radius: 5rpx; border-radius: 5rpx;
white-space: nowrap;
padding: 5rpx;
overflow: hidden;
white-space: nowrap;
} }
.title-time-border-hisOk { .title-time-border-hisOk {

10
pages/login/newanimationpage.vue
View File

@ -160,7 +160,7 @@
playall.value = true; playall.value = true;
}, 500) }, 500)
zyupgrade.value?.check_update(); // zyupgrade.value?.check_update();
queryPadPageList().then((res => { queryPadPageList().then((res => {
leftMenuArray.value = res.result.records; leftMenuArray.value = res.result.records;
})) }))
@ -371,10 +371,10 @@
const ceshijump = () => { const ceshijump = () => {
// ceshiopen.value = true // ceshiopen.value = true
uni.navigateTo({ // uni.navigateTo({
url:"/pages/login/ceshi" // url:"/pages/login/ceshi"
}) // })
// console.log("wtf") console.log("wtf")
// try { // try {
// const Intent = plus.android.importClass('android.content.Intent') // const Intent = plus.android.importClass('android.content.Intent')
// const Uri = plus.android.importClass('android.net.Uri') // const Uri = plus.android.importClass('android.net.Uri')