From 66a27714119e5e9e92cbbd1de0e2205ae9433695 Mon Sep 17 00:00:00 2001 From: wangweidong <850489345@qq.com> Date: Tue, 7 Apr 2026 17:20:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/zy-upgrade/zy-upgrade.vue | 47 ++++++- manifest.json | 4 +- pages/NursingNew/component/index.vue | 1 - .../component/leftcontent/serveswipe.vue | 116 +++++++++++------- .../component/leftcontent/swipecard.vue | 1 + pages/NursingNew/component/nurse/newindex.vue | 13 +- pages/NursingNew/index.vue | 27 ++-- pages/login/newanimationpage.vue | 10 +- 8 files changed, 147 insertions(+), 72 deletions(-) diff --git a/component/zy-upgrade/zy-upgrade.vue b/component/zy-upgrade/zy-upgrade.vue index 3a510bb..df27cab 100644 --- a/component/zy-upgrade/zy-upgrade.vue +++ b/component/zy-upgrade/zy-upgrade.vue @@ -141,14 +141,27 @@ method: 'GET', dataType:'json', 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) if(res.statusCode===404){ return } 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.update_tips = res.data.data.update_tips; @@ -182,9 +195,15 @@ }, //点击开始升级按钮，开始升级 upgrade_checked:function(){ - uni.removeStorageSync('token') - this.update_flag = true - this.updateversion() + if(this.wgt_flag==2){ + this.dshow = false + this.updateversion() + }else{ + uni.removeStorageSync('token') + this.update_flag = true + this.updateversion() + } + }, //点击取消升级按钮，取消升级 upgrade_cancel:function(){ @@ -201,6 +220,23 @@ let platform = uni.getSystemInfoSync().platform let that = this //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){ //如果启用ios appstore升级，则打开appstore that.dshow = false @@ -214,6 +250,7 @@ }); }); }else{ + let that = this let downloadurl = that.wgt_flag==1?that.wgt_url:that.version_url; let targetUrl = "https://www.focusnu.com/devopsapi/sys/common/static/" + downloadurl diff --git a/manifest.json b/manifest.json index 83c4686..f82e002 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "护理单元", "appid" : "__UNI__FB2D473", "description" : "护理单元", - "versionName" : "1.0.040", - "versionCode" : 10040, + "versionName" : "1.0.041", + "versionCode" : 10041, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue index 661991b..ee6a2f0 100644 --- a/pages/NursingNew/component/index.vue +++ b/pages/NursingNew/component/index.vue @@ -619,7 +619,6 @@ queryPadPageList().then((res => { if(props.kf=='0'){ leftMenuArray.value = res.result.records; - console.log(res.result.records) filteredMenu('izHldy').forEach((element : any, index : number) => { if (element.nuId === uni.getStorageSync('NUall').nuId) { menutarget.value = index; diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue index 36d32ef..5122fc0 100644 --- a/pages/NursingNew/component/leftcontent/serveswipe.vue +++ b/pages/NursingNew/component/leftcontent/serveswipe.vue @@ -264,7 +264,7 @@ - + 转单执行 @@ -273,7 +273,7 @@ - + 协助执行 @@ -455,6 +455,7 @@ if(e.detail.key==1){ current2.value = a } + swipdcurrent.value = 0; botleft.value = (a-4)*20; if (plsbuy.value[a]?.izStart == 'Y' && plsbuy.value[a]?.izFinish == 'N') { timeacde(1) @@ -470,14 +471,18 @@ const djstinme = ref(0) const timeacde = (e) => { let obj = plsbuy.value[current.value]; + 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 djs = timestampMs - times; djstinme.value = Math.round(djs / 1000); + console.log(djstinme.value,timestampMs) if (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{ let timestampMs = new Date(obj.servEndTime).getTime(); @@ -695,8 +700,12 @@ if (res.result.length > 0) { res.result.forEach((item, l) => { item.flag = false; - item.servebao = []; - let timestampMs = new Date(item.servEndTime).getTime(); + let timestampMs = null; + 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 djs = timestampMs - times; if (djs < 0) { @@ -871,8 +880,13 @@ const cshigb = () => { 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) - let timestampMs = new Date(obj.servEndTime).getTime(); let times = new Date().getTime(); let djs = timestampMs - times; // let timeendamp = timestampMs + (Number(plsbuy.value[current.value].timeoutDuration)*60); @@ -887,25 +901,47 @@ } else { 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()) { // errmsg.value = "服务已超时，不能开始服务！" // openerror.value = true; // firstgetqueryCgdList(form.nuId); // return // } - console.log(v) + // console.log(v) if (v.izStart != 'N') { return } startOrder({ id: v.id }).then(res => { - console.log(res) - if (res.success) { - v.izStart = "Y"; - timeacde() + if (res.result.success) { + 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" + // console.log(item) + // }) + firstgetqueryCgdList(uni.getStorageSync('nuId')) + timeacde(2) + }else{ + v.izStart = "Y"; + timeacde(1) + } } else { - - + errmsg.value = res.message + openerror.value = true; } }) } @@ -919,7 +955,7 @@ // return // } if (v.izStart == 'Y' && v.izFinish == 'N') { - // console.log("aaaaa",v) + console.log("aaaaa",v) endobj.value = v; open.value = 3; } else { @@ -932,12 +968,13 @@ // console.log("看看传的", { id: endobj.value.id }) endOrder({ id: endobj.value.id }).then(res => { console.log(res) - if (res.success) { + if (res.result.success) { open.value = 0; endobj.value = {}; firstgetqueryCgdList(uni.getStorageSync('nuId')) } else { - + errmsg.value = res.result.message + openerror.value = true; } }) @@ -949,10 +986,9 @@ // open.value = 3 // return // 打包过不了校验 - // console.log(e, k, indexmessage) + console.log(e, k, indexmessage) if (k == 1) { // if(indexmessage.izPackage=='Y'&&e==0){ - // if(indexmessage.flag||indexmessage.izStart == 'Y'){ // let last = indexmessage.servebao.find(item => item.last === true); // console.log(last) @@ -967,29 +1003,25 @@ // errmsg.value = indexmessage?.serviceContent // openerror.value = true; // } - // } - // if (indexmessage?.izStart == 'Y'&&indexmessage.izPackage!='Y') { - // switch (e) { - // case 0: - // if (indexmessage?.serviceContent == '') { return } - // errmsg.value = indexmessage?.serviceContent - // break; - // case 1: - // if (indexmessage?.mp3File == '') { return } - // errmsg.value = indexmessage?.mp3File - // break; - // case 2: - // if (indexmessage?.mp4File == '') { return } - // errmsg.value = indexmessage?.mp4File - // break; + switch (e) { + case 0: + errmsg.value = !indexmessage?.serviceContent?'暂无数据':indexmessage?.serviceContent + openerror.value = true; + break; + case 1: + errmsg.value = !indexmessage?.mp3File?'暂无数据':indexmessage?.mp3File + openerror.value = true; + break; + case 2: + errmsg.value = !indexmessage?.mp4File?'暂无数据':indexmessage?.mp4File + openerror.value = true; + break; - // default: - // break; - // } - // openerror.value = true; - // } + default: + break; + } } else { if (indexmessage?.izStart == 'Y') { @@ -1271,7 +1303,7 @@ .timedjs { position: absolute; width: 7vw; - right: 2.8vw; + right: 3.4vw; top: 0vw; display: flex; flex-direction: column; diff --git a/pages/NursingNew/component/leftcontent/swipecard.vue b/pages/NursingNew/component/leftcontent/swipecard.vue index 41d1963..0a3345c 100644 --- a/pages/NursingNew/component/leftcontent/swipecard.vue +++ b/pages/NursingNew/component/leftcontent/swipecard.vue @@ -30,6 +30,7 @@ }, methods:{ cardSwiper(e) { + // console.log(this.indexmessage.directiveList[e.detail.current]) this.cardCur = e.detail.current; this.$emit('current',e.detail.current) }, diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue index 68c97f3..ee5fcc4 100644 --- a/pages/NursingNew/component/nurse/newindex.vue +++ b/pages/NursingNew/component/nurse/newindex.vue @@ -810,11 +810,11 @@ - {{ postitem.startTime }} + {{ postitem.startTime.slice(11, 16) }} - - {{ postitem.endTime }} + {{ postitem.endTime.slice(11, 16) }} @@ -1058,8 +1058,9 @@ optTime: ts, instructionTagId:typearray.value[whitchtype.value]?.instructionType } + console.log("啥情况data", data) editDirective(data).then((res) => { - // console.log("啥情况1111", res) + console.log("啥情况1111", res) if (res.success) { geteverything() setTimeout(() => { @@ -1280,7 +1281,7 @@ 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 positioning = timearr.value[indexsave.value[0]].positioning; - + console.log(endTime,11111111111111111111) // 解析原始时间（健壮地 trim） const parseTime = (t) => { const parts = String(t || '').split(':').map(s => s.trim()); @@ -1869,10 +1870,10 @@ const emotionTagList = ref([]); const bodyTagList = ref([]); const geteverything = () => { - // console.log("有老人吗",uni.getStorageSync('elderId')) + console.log("有老人吗",uni.getStorageSync('elderId'),uni.getStorageSync('nuId')) if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) { 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) => ({ positioning: hour.toString(), children: minuteArr.map(time => ({ diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index 5a95ee7..569ce81 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -16,8 +16,8 @@ - - 包 + + 指令集合 @@ -228,10 +228,11 @@ arrlist.value = [ { name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', menuCode: 'jcgn_sy' }, ]; - - let result = getIntersection(arrs, arr); - let results = getIntersection( tabbrarr.value,result); - arrlist.value.push(...results); + if(arr){ + let result = getIntersection(arrs, arr); + let results = getIntersection( tabbrarr.value,result); + arrlist.value.push(...results); + } let back = [ { name: '返回', url: '/static/shouye/sy/f0.png', urls: '/static/shouye/sy/f1.png', menuCode: 'back' } ] @@ -323,7 +324,7 @@ startTime: "", endTime: "", directiveName: "", - izPackage: '', + includesarray: [], }) function handsend(look : any) { @@ -349,11 +350,12 @@ } else { + console.log(look) whoisit.value = 1; - simpleobj.value.startTime = look.startTime; - simpleobj.value.endTime = look.endTime; + simpleobj.value.startTime = look.startTime?look.startTime.slice(11, 16):''; + simpleobj.value.endTime = look.endTime?look.endTime.slice(11, 16):''; simpleobj.value.directiveName = look.directiveName; - simpleobj.value.izPackage = look.izPackage; + simpleobj.value.includesarray = look.includesarray; startmoveit.value = false } } @@ -664,7 +666,6 @@ position: absolute; left: 35rpx; top: 110rpx; - width: 32rpx; height: 32rpx; font-size: 24rpx; display: flex; @@ -673,6 +674,10 @@ background-color: #4690FF; color: #fff; border-radius: 5rpx; + white-space: nowrap; + padding: 5rpx; + overflow: hidden; + white-space: nowrap; } .title-time-border-hisOk { diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue index e942842..92ba119 100644 --- a/pages/login/newanimationpage.vue +++ b/pages/login/newanimationpage.vue @@ -160,7 +160,7 @@ playall.value = true; }, 500) - zyupgrade.value?.check_update(); + // zyupgrade.value?.check_update(); queryPadPageList().then((res => { leftMenuArray.value = res.result.records; })) @@ -371,10 +371,10 @@ const ceshijump = () => { // ceshiopen.value = true - uni.navigateTo({ - url:"/pages/login/ceshi" - }) - // console.log("wtf") + // uni.navigateTo({ + // url:"/pages/login/ceshi" + // }) + console.log("wtf") // try { // const Intent = plus.android.importClass('android.content.Intent') // const Uri = plus.android.importClass('android.net.Uri')