合并代码
This commit is contained in:
parent
163fd78ac1
commit
068018786e
|
|
@ -92,7 +92,7 @@
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
employeeId: uni.getStorageSync('userInfo').employessId,
|
employeeId: uni.getStorageSync('userInfo').employeesId,
|
||||||
nuId: uni.getStorageSync('nuId'),
|
nuId: uni.getStorageSync('nuId'),
|
||||||
workType: 2
|
workType: 2
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@
|
||||||
"name" : "护理单元",
|
"name" : "护理单元",
|
||||||
"appid" : "__UNI__FB2D473",
|
"appid" : "__UNI__FB2D473",
|
||||||
"description" : "护理单元",
|
"description" : "护理单元",
|
||||||
"versionName" : "1.0.030",
|
"versionName" : "1.0.031",
|
||||||
"versionCode" : 10030,
|
"versionCode" : 10031,
|
||||||
"transformPx" : false,
|
"transformPx" : false,
|
||||||
/* 5+App特有相关 */
|
/* 5+App特有相关 */
|
||||||
"app-plus" : {
|
"app-plus" : {
|
||||||
|
|
|
||||||
|
|
@ -198,7 +198,7 @@
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
employeeId:uni.getStorageSync('userInfo').employessId,
|
employeeId:uni.getStorageSync('userInfo').employeesId,
|
||||||
nuId:uni.getStorageSync('nuId')
|
nuId:uni.getStorageSync('nuId')
|
||||||
})
|
})
|
||||||
const open = ref(0)
|
const open = ref(0)
|
||||||
|
|
|
||||||
|
|
@ -297,7 +297,7 @@
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
employeeId:uni.getStorageSync('userInfo').employessId,
|
employeeId:uni.getStorageSync('userInfo').employeesId,
|
||||||
nuId:uni.getStorageSync('nuId'),
|
nuId:uni.getStorageSync('nuId'),
|
||||||
workType:5
|
workType:5
|
||||||
})
|
})
|
||||||
|
|
@ -444,6 +444,7 @@
|
||||||
ilanarr.value = v.manuallyPicPath.split(",");
|
ilanarr.value = v.manuallyPicPath.split(",");
|
||||||
ilanarr.value = ilanarr.value.filter(item => item !== '');
|
ilanarr.value = ilanarr.value.filter(item => item !== '');
|
||||||
}else if(r == 2&&v.manuallyMp4Path){
|
}else if(r == 2&&v.manuallyMp4Path){
|
||||||
|
|
||||||
ilanarr.value = v.manuallyMp4Path.split(",");
|
ilanarr.value = v.manuallyMp4Path.split(",");
|
||||||
ilanarr.value = ilanarr.value.filter(item => item !== '');
|
ilanarr.value = ilanarr.value.filter(item => item !== '');
|
||||||
}else if(r == 3&&v.tplinkPath){
|
}else if(r == 3&&v.tplinkPath){
|
||||||
|
|
@ -663,10 +664,10 @@
|
||||||
nuId:nuId,
|
nuId:nuId,
|
||||||
elderId:elderId
|
elderId:elderId
|
||||||
}
|
}
|
||||||
queryAll(data).then(res=>{
|
// queryAll(data).then(res=>{
|
||||||
zlarr.value = res.result;
|
// zlarr.value = res.result;
|
||||||
shtab(fwzlindex.value)
|
// shtab(fwzlindex.value)
|
||||||
})
|
// })
|
||||||
}
|
}
|
||||||
const shtab = (e)=>{
|
const shtab = (e)=>{
|
||||||
fwzlindex.value = e;
|
fwzlindex.value = e;
|
||||||
|
|
@ -892,7 +893,7 @@
|
||||||
|
|
||||||
// let data = {
|
// let data = {
|
||||||
// nuId: uni.getStorageSync('NUall').nuId,
|
// nuId: uni.getStorageSync('NUall').nuId,
|
||||||
// employeeId: uni.getStorageSync('userInfo').employessId,
|
// employeeId: uni.getStorageSync('userInfo').employeesId,
|
||||||
// workType: 5
|
// workType: 5
|
||||||
// }
|
// }
|
||||||
// queryWorkOrderList(data).then((res : any) => {
|
// queryWorkOrderList(data).then((res : any) => {
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,9 @@
|
||||||
<view class="swipeservwe">
|
<view class="swipeservwe">
|
||||||
<view class="swper" v-if="plsbuy.length==0">
|
<view class="swper" v-if="plsbuy.length==0">
|
||||||
<view class="photo-father">
|
<view class="photo-father">
|
||||||
<image class="big-img" style="width: 550rpx;top:30%;" :src="`/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
|
<image class="big-img" style="width: 550rpx;top:30%;" :src="`/static/index/newindex/wendu/2.png`"
|
||||||
<view class="juzhong" style=" filter:grayscale(60%)" >
|
mode="aspectFill" />
|
||||||
|
<view class="juzhong" style=" filter:grayscale(60%)">
|
||||||
<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="true" :loop="true"
|
<donghua :width="`1300rpx`" :height="`900rpx`" :links="blueArray" :playing="true" :loop="true"
|
||||||
:interval="120" />
|
:interval="120" />
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -18,10 +19,11 @@
|
||||||
<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
|
<image class="pao-img" :src="`/static/index/newindex/states/ris.png`" />
|
||||||
</view>
|
</view>
|
||||||
<view class="bots" v-if="plsbuy.length>1">
|
<view class="bots" v-if="plsbuy.length>1">
|
||||||
<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''" :style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view>
|
<view v-for="(v,i) in plsbuy" :key='i' :class="current==i?'dot':''"
|
||||||
|
:style="v?.chaoshitime?'background:red':''" @click="change({'detail':{'current':i}})"></view>
|
||||||
</view>
|
</view>
|
||||||
<swiper class="swiper" :circular="true" :indicator-dots="false"
|
<swiper class="swiper" :circular="true" :indicator-dots="false" :autoplay="autoplay" :interval="3000"
|
||||||
:autoplay="autoplay" :interval="3000" :duration="500" :current="current2" @change="change">
|
:duration="500" :current="current2" @change="change">
|
||||||
<swiper-item v-for="(indexmessage,i) in plsbuy" :key="i" class="swper">
|
<swiper-item v-for="(indexmessage,i) in plsbuy" :key="i" class="swper">
|
||||||
<view class="photo-father">
|
<view class="photo-father">
|
||||||
<!-- {filter: `grayscale(60%)`} -->
|
<!-- {filter: `grayscale(60%)`} -->
|
||||||
|
|
@ -29,15 +31,32 @@
|
||||||
<donghua :width="`1000rpx`" :height="`700rpx`" :links="blueArray" :playing="current==i"
|
<donghua :width="`1000rpx`" :height="`700rpx`" :links="blueArray" :playing="current==i"
|
||||||
:loop="true" :interval="120" />
|
:loop="true" :interval="120" />
|
||||||
</view>
|
</view>
|
||||||
<view class="timedjs" v-if="current==i&&indexmessage?.izStart=='Y'" >
|
<view class="timedjs" v-if="current==i&&indexmessage?.izStart=='Y'">
|
||||||
<text>服务倒计时</text>
|
<text>服务倒计时</text>
|
||||||
<timeing :initTime="djstinme" :timeoutDuration="Number(indexmessage.timeoutDuration)*60" @timeend="timeend"></timeing>
|
<timeing v-if="indexmessage?.serviceDuration" :initTime="djstinme"
|
||||||
|
:timeoutDuration="Number(indexmessage.timeoutDuration)*60" @timeend="timeend"></timeing>
|
||||||
|
<view class="no-time-all" v-else>
|
||||||
|
<view class="no-time-view">
|
||||||
|
<image class="no-time" src="/static/index/newindex/states/always.png" />
|
||||||
|
<view class="no-text">
|
||||||
|
MIN
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<text style="color: #959595;font-size: 1.9vw;padding: 0 5rpx;">:</text>
|
||||||
|
<view class="no-time-view">
|
||||||
|
<image class="no-time" src="/static/index/newindex/states/always.png" />
|
||||||
|
<view class="no-text">
|
||||||
|
SEC
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="weight-time">
|
<view class="weight-time">
|
||||||
<view>
|
<view>
|
||||||
{{ indexmessage?.startTime.slice(11, 16) }}
|
{{ indexmessage?.startTime.slice(11, 16) }}
|
||||||
<text style="font-size: 1.8vw;font-weight: 500;" v-if="indexmessage?.serviceDuration">
|
<text style="font-size: 1.8vw;font-weight: 500;" v-if="indexmessage?.serviceDuration">
|
||||||
| {{indexmessage?.serviceDuration}}分钟
|
| {{indexmessage?.serviceDuration ?indexmessage?.serviceDuration: `∞`}}分钟
|
||||||
</text>
|
</text>
|
||||||
</view>
|
</view>
|
||||||
<view style="height: 4vw;"> </view>
|
<view style="height: 4vw;"> </view>
|
||||||
|
|
@ -48,21 +67,28 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="big-img" v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='N'&&!indexmessage.flag" @click="indexmessage.flag = true">
|
<view class="big-img"
|
||||||
|
v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='N'&&!indexmessage.flag"
|
||||||
|
@click="indexmessage.flag = true">
|
||||||
<image :src="`/static/zlb.png`" :style=" 'width: 450rpx' " mode="aspectFill" />
|
<image :src="`/static/zlb.png`" :style=" 'width: 450rpx' " mode="aspectFill" />
|
||||||
</view>
|
</view>
|
||||||
<view class="cardbox" v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='Y'||indexmessage.flag">
|
<view class="cardbox"
|
||||||
|
v-if="indexmessage.izPackage=='Y'&&indexmessage?.izStart=='Y'||indexmessage.flag">
|
||||||
<scroll-view scroll-y="true" class="scrollcard" @touchmove.stop>
|
<scroll-view scroll-y="true" class="scrollcard" @touchmove.stop>
|
||||||
<view class="itemcard" v-for="(v,s) in indexmessage.servebao" :class="{'act':v.flag,'last':v.last}" :key='s' @click="zldex(v,indexmessage.servebao,s)">
|
<view class="itemcard" v-for="(v,s) in indexmessage.servebao"
|
||||||
|
:class="{'act':v.flag,'last':v.last}" :key='s'
|
||||||
|
@click="zldex(v,indexmessage.servebao,s)">
|
||||||
<view class="brcard">
|
<view class="brcard">
|
||||||
<view class="bgs" v-if="v.last">
|
<view class="bgs" v-if="v.last">
|
||||||
<image src="/static/index/newtarget.png" mode=""></image>
|
<image src="/static/index/newtarget.png" mode=""></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<image :src="!v.flag? (v.immediateFile?serverUrl + v.immediateFile:'/static/logo.png'): ( v.immediateFileFocus?serverUrl + v.immediateFileFocus:'/static/logotarget.png')" />
|
<image
|
||||||
|
:src="!v.flag? (v.immediateFile?serverUrl + v.immediateFile:'/static/logo.png'): ( v.immediateFileFocus?serverUrl + v.immediateFileFocus:'/static/logotarget.png')" />
|
||||||
<text>{{v.match[0]}}</text>
|
<text>{{v.match[0]}}</text>
|
||||||
<view v-if="v.match[1]" style="position: relative;z-index: 2;">({{v.match[1]}})</view>
|
<view v-if="v.match[1]" style="position: relative;z-index: 2;">({{v.match[1]}})
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -107,8 +133,7 @@
|
||||||
|
|
||||||
<view class="left-menu">
|
<view class="left-menu">
|
||||||
<view @click="errmsgclk(0,1,indexmessage)">
|
<view @click="errmsgclk(0,1,indexmessage)">
|
||||||
<view class="left-ball"
|
<view class="left-ball" :style="indexmessage?.serviceContent!=''?' ':'opacity: 0.4'">
|
||||||
:style="indexmessage?.serviceContent!=''?' ':'opacity: 0.4'">
|
|
||||||
<image class="left-menu-img"
|
<image class="left-menu-img"
|
||||||
:src="'/static/index/newindex/leftmenu/left'+0+'.png'" />
|
:src="'/static/index/newindex/leftmenu/left'+0+'.png'" />
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -120,16 +145,15 @@
|
||||||
:src="'/static/index/newindex/leftmenu/left'+1+'.png'" />
|
:src="'/static/index/newindex/leftmenu/left'+1+'.png'" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view @click="errmsgclk(2,1,indexmessage)" >
|
<view @click="errmsgclk(2,1,indexmessage)">
|
||||||
<view class="left-ball"
|
<view class="left-ball"
|
||||||
:style="indexmessage?.mp4File!=''&&indexmessage.izPackage!='Y'?' ':'opacity: 0.4'">
|
:style="indexmessage?.mp4File!=''&&indexmessage.izPackage!='Y'?' ':'opacity: 0.4'">
|
||||||
<image class="left-menu-img"
|
<image class="left-menu-img"
|
||||||
:src="'/static/index/newindex/leftmenu/left'+2+'.png'" />
|
:src="'/static/index/newindex/leftmenu/left'+2+'.png'" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-for="(item,index) in [3,4]" :key="index" @click="errmsgclk(item,2,indexmessage)">
|
<view v-for="(item,index) in [3,4]" :key="index" @click="errmsgclk(item,2,indexmessage)">
|
||||||
<view class="left-ball"
|
<view class="left-ball" :style="indexmessage?.izStart=='Y'?' ':'opacity: 0.4'">
|
||||||
:style="indexmessage?.izStart=='Y'?' ':'opacity: 0.4'">
|
|
||||||
<image class="left-menu-img"
|
<image class="left-menu-img"
|
||||||
:src="'/static/index/newindex/leftmenu/left'+item+'.png'" />
|
:src="'/static/index/newindex/leftmenu/left'+item+'.png'" />
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -138,7 +162,8 @@
|
||||||
<view class="right-menu">
|
<view class="right-menu">
|
||||||
<!-- <image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`" /> -->
|
<!-- <image class="top-img" :src="`/static/index/newindex/rightmenu/top.png`" /> -->
|
||||||
<view class="right-scroll">
|
<view class="right-scroll">
|
||||||
<view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;" @click="zhixing(1,indexmessage)">
|
<view style="margin:1.5vw 0;width: 4vw;margin-left: 20rpx;"
|
||||||
|
@click="zhixing(1,indexmessage)">
|
||||||
<view class="white-circle" :style="indexmessage?.izStart=='Y'?'opacity: 0.4' : ''">
|
<view class="white-circle" :style="indexmessage?.izStart=='Y'?'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">
|
||||||
|
|
@ -146,7 +171,8 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view style="margin:1.5vw 0;width:4vw;margin-left: 20rpx;" @click="zhixing(2,indexmessage)">
|
<view style="margin:1.5vw 0;width:4vw;margin-left: 20rpx;"
|
||||||
|
@click="zhixing(2,indexmessage)">
|
||||||
<view class="white-circle" :style="indexmessage?.izStart=='Y'?'opacity: 0.4' : ''">
|
<view class="white-circle" :style="indexmessage?.izStart=='Y'?'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">
|
||||||
|
|
@ -219,7 +245,8 @@
|
||||||
<image style="width: 100%;height: 100%;border-radius: 30rpx;"
|
<image style="width: 100%;height: 100%;border-radius: 30rpx;"
|
||||||
:src="item?serverpicUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill"
|
:src="item?serverpicUrl + item:'/static/ceshiyaoshan.png'" mode="aspectFill"
|
||||||
:lazy-load="true" />
|
:lazy-load="true" />
|
||||||
<view @click.stop="open=1;del(item,index)" class="del" v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
|
<view @click.stop="open=1;del(item,index)" class="del"
|
||||||
|
v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')">
|
||||||
<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
|
<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
|
||||||
height: 1.4vw;"></image>
|
height: 1.4vw;"></image>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -229,7 +256,8 @@
|
||||||
<video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index"
|
<video style="width: 100%;height: 100%;border-radius: 30rpx;" :id="'myVideo'+index"
|
||||||
:src="servervideoUrl+item" direction="180" mode="aspectFill"></video>
|
:src="servervideoUrl+item" direction="180" mode="aspectFill"></video>
|
||||||
<view @click.stop="ilanarr.splice(index,1)"
|
<view @click.stop="ilanarr.splice(index,1)"
|
||||||
v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')" class="shanchu">
|
v-if="topbuttontarget>0&&(listobj.izStart=='Y'&& listobj.izFinish=='N')"
|
||||||
|
class="shanchu">
|
||||||
<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
|
<image src="/static/index/warehouse/procurement/x.png" mode="aspectFill" style="width: 1.4vw;
|
||||||
height: 1.4vw;"></image>
|
height: 1.4vw;"></image>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -261,10 +289,11 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
|
<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
|
||||||
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;"/>
|
<errorshow :show="openerror" :font="errmsg" @close="openerror=false" style="left: 44%;" />
|
||||||
<tanchuang :show="open==3" :font="font" @back="open = 0" @right="del1()" fontsize="font-size:2.2vw" :close="false"> </tanchuang>
|
<tanchuang :show="open==3" :font="font" @back="open = 0" @right="del1()" fontsize="font-size:2.2vw"
|
||||||
|
:close="false"> </tanchuang>
|
||||||
|
|
||||||
<severcard ref="severcards" ></severcard>
|
<severcard ref="severcards"></severcard>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -289,9 +318,9 @@
|
||||||
const severcards = ref<InstanceType<typeof ChildComponent>>()
|
const severcards = ref<InstanceType<typeof ChildComponent>>()
|
||||||
const init = (e) => {
|
const init = (e) => {
|
||||||
firstgetqueryCgdList(e);
|
firstgetqueryCgdList(e);
|
||||||
setTimeout(()=>{
|
setTimeout(() => {
|
||||||
severcards.value.firstgetqueryCgdList()
|
severcards.value.firstgetqueryCgdList()
|
||||||
},120)
|
}, 120)
|
||||||
}
|
}
|
||||||
defineExpose({
|
defineExpose({
|
||||||
init
|
init
|
||||||
|
|
@ -299,54 +328,54 @@
|
||||||
const change = (e) => {
|
const change = (e) => {
|
||||||
current.value = e.detail.current;
|
current.value = e.detail.current;
|
||||||
let a = e.detail.current;
|
let a = e.detail.current;
|
||||||
plsbuy.value.forEach((v,i)=>{
|
plsbuy.value.forEach((v, i) => {
|
||||||
if(i!=a&&v.izPackage=='Y'){
|
if (i != a && v.izPackage == 'Y') {
|
||||||
v.flag = false
|
v.flag = false
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
if(plsbuy.value[a].izStart=='Y'&&plsbuy.value[a].izFinish=='N'){
|
if (plsbuy.value[a].izStart == 'Y' && plsbuy.value[a].izFinish == 'N') {
|
||||||
timeacde()
|
timeacde()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const djstinme = ref(0)
|
const djstinme = ref(0)
|
||||||
const timeacde = ()=>{
|
const timeacde = () => {
|
||||||
let obj = plsbuy.value[current.value];
|
let obj = plsbuy.value[current.value];
|
||||||
let timestampMs = new Date(obj.endTime).getTime();
|
let timestampMs = new Date(obj.endTime).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);
|
||||||
console.log(timestampMs,'结束时间戳')
|
console.log(timestampMs, '结束时间戳')
|
||||||
console.log(times,'当前时间戳')
|
console.log(times, '当前时间戳')
|
||||||
console.log(Math.round(djs/1000),'倒计时时间戳')
|
console.log(Math.round(djs / 1000), '倒计时时间戳')
|
||||||
djstinme.value = Math.round(djs/1000);
|
djstinme.value = Math.round(djs / 1000);
|
||||||
if(djstinme.value<0){
|
if (djstinme.value < 0) {
|
||||||
plsbuy.value[current.value].chaoshitime = true
|
plsbuy.value[current.value].chaoshitime = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const timeend = () =>{
|
const timeend = () => {
|
||||||
// 结束超时
|
// 结束超时
|
||||||
plsbuy.value.splice(current.value,1)
|
plsbuy.value.splice(current.value, 1)
|
||||||
firstgetqueryCgdList(form.nuId)
|
firstgetqueryCgdList(form.nuId)
|
||||||
}
|
}
|
||||||
const swip = (e) => {
|
const swip = (e) => {
|
||||||
if (current.value == 0 && e == -1) {
|
if (current.value == 0 && e == -1) {
|
||||||
current.value = plsbuy.value.length-1;
|
current.value = plsbuy.value.length - 1;
|
||||||
current2.value = current.value
|
current2.value = current.value
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (current.value == plsbuy.value.length-1 && e == 1) {
|
if (current.value == plsbuy.value.length - 1 && e == 1) {
|
||||||
current.value = 0;
|
current.value = 0;
|
||||||
current2.value = current.value
|
current2.value = current.value
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
current.value += e;
|
current.value += e;
|
||||||
current2.value = current.value
|
current2.value = current.value
|
||||||
console.log(current.value,current.value)
|
console.log(current.value, current.value)
|
||||||
}
|
}
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
employeeId: uni.getStorageSync('userInfo').employessId,
|
employeeId: uni.getStorageSync('userInfo').employeesId,
|
||||||
nuId: uni.getStorageSync('nuId'),
|
nuId: uni.getStorageSync('nuId'),
|
||||||
workType: 5
|
workType: 5
|
||||||
})
|
})
|
||||||
|
|
@ -357,82 +386,83 @@
|
||||||
})
|
})
|
||||||
const zdxzdex = ref(0)
|
const zdxzdex = ref(0)
|
||||||
const zdxzarr = ref(0)
|
const zdxzarr = ref(0)
|
||||||
const zhixing = (e,indexmessage) => {
|
const zhixing = (e, indexmessage) => {
|
||||||
if (indexmessage?.izStart == 'Y' ) {
|
if (indexmessage?.izStart == 'Y') {
|
||||||
errmsg.value = (e==1?"服务中不能转单执行！":'服务中不能协助执行！')
|
errmsg.value = (e == 1 ? "服务中不能转单执行！" : '服务中不能协助执行！')
|
||||||
openerror.value = true
|
openerror.value = true
|
||||||
return
|
return
|
||||||
}else{
|
} else {
|
||||||
font.value ='敬请期待~'
|
font.value = '敬请期待~'
|
||||||
open.value = 3
|
open.value = 3
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => {
|
// 打包过不了校验
|
||||||
console.log(res)
|
// queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => {
|
||||||
zdxzarr.value = res.result;
|
// console.log(res)
|
||||||
zdxzarr.value.forEach(item => {
|
// zdxzarr.value = res.result;
|
||||||
item.flag = false
|
// zdxzarr.value.forEach(item => {
|
||||||
console.log(item.headPath)
|
// item.flag = false
|
||||||
})
|
// console.log(item.headPath)
|
||||||
zdxzdex.value = e;
|
// })
|
||||||
})
|
// zdxzdex.value = e;
|
||||||
|
// })
|
||||||
}
|
}
|
||||||
const plsbuy = ref([])
|
const plsbuy = ref([])
|
||||||
const flag = ref(false)
|
const flag = ref(false)
|
||||||
const zdwu = (e,k)=>{
|
const zdwu = (e, k) => {
|
||||||
if(zdxzdex.value==1){
|
if (zdxzdex.value == 1) {
|
||||||
e.flag = !e.flag;
|
e.flag = !e.flag;
|
||||||
zdxzarr.value.forEach((item,i)=>{
|
zdxzarr.value.forEach((item, i) => {
|
||||||
if(i!=k){
|
if (i != k) {
|
||||||
item.flag = false
|
item.flag = false
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
flag.value = e.flag
|
flag.value = e.flag
|
||||||
}
|
}
|
||||||
if(zdxzdex.value==2){
|
if (zdxzdex.value == 2) {
|
||||||
e.flag = !e.flag;
|
e.flag = !e.flag;
|
||||||
let arr = [];
|
let arr = [];
|
||||||
zdxzarr.value.forEach((item,i)=>{
|
zdxzarr.value.forEach((item, i) => {
|
||||||
if(item.flag){
|
if (item.flag) {
|
||||||
arr.push(1)
|
arr.push(1)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
if(arr.length==0){
|
if (arr.length == 0) {
|
||||||
flag.value = false;
|
flag.value = false;
|
||||||
}else{
|
} else {
|
||||||
flag.value = true;
|
flag.value = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const zhixingsub = ()=>{
|
const zhixingsub = () => {
|
||||||
zxzd.value = zdxzdex.value
|
zxzd.value = zdxzdex.value
|
||||||
if(zdxzdex.value==1){
|
if (zdxzdex.value == 1) {
|
||||||
zdcont.value = "确认转单执行？"
|
zdcont.value = "确认转单执行？"
|
||||||
}
|
}
|
||||||
if(zdxzdex.value==2){
|
if (zdxzdex.value == 2) {
|
||||||
zdcont.value = "确认协助执行？"
|
zdcont.value = "确认协助执行？"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const zxzd = ref(0);
|
const zxzd = ref(0);
|
||||||
const zdcont = ref('');
|
const zdcont = ref('');
|
||||||
const tijiaozx = ()=>{
|
const tijiaozx = () => {
|
||||||
if(zxzd.value == 1){
|
if (zxzd.value == 1) {
|
||||||
let s = {}
|
let s = {}
|
||||||
zdxzarr.value.forEach((item,i)=>{
|
zdxzarr.value.forEach((item, i) => {
|
||||||
if(item.flag){
|
if (item.flag) {
|
||||||
s = item;
|
s = item;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
let obj = {
|
let obj = {
|
||||||
mainId:indexmessage.value.mainId,
|
mainId: indexmessage.value.mainId,
|
||||||
employeeId:s.id,
|
employeeId: s.id,
|
||||||
employeeName:s.name,
|
employeeName: s.name,
|
||||||
beforeBy:indexmessage.value.employeeId,
|
beforeBy: indexmessage.value.employeeId,
|
||||||
beforeByName:indexmessage.value.employeeName
|
beforeByName: indexmessage.value.employeeName
|
||||||
}
|
}
|
||||||
let nuId = uni.getStorageSync('nuId');
|
let nuId = uni.getStorageSync('nuId');
|
||||||
transferOrder(obj).then(res=>{
|
transferOrder(obj).then(res => {
|
||||||
if(res.success){
|
if (res.success) {
|
||||||
firstgetqueryCgdList(nuId);
|
firstgetqueryCgdList(nuId);
|
||||||
flag.value = false;
|
flag.value = false;
|
||||||
zxzd.value = 0;
|
zxzd.value = 0;
|
||||||
|
|
@ -440,27 +470,27 @@
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if(zxzd.value == 2){
|
if (zxzd.value == 2) {
|
||||||
let userinfo = uni.getStorageSync('userInfo')
|
let userinfo = uni.getStorageSync('userInfo')
|
||||||
let id = userinfo.id+',';
|
let id = userinfo.id + ',';
|
||||||
let name = userinfo.realname+',';
|
let name = userinfo.realname + ',';
|
||||||
zdxzarr.value.forEach((item,i)=>{
|
zdxzarr.value.forEach((item, i) => {
|
||||||
if(item.flag){
|
if (item.flag) {
|
||||||
id+=item.id+','
|
id += item.id + ','
|
||||||
name+=item.name+','
|
name += item.name + ','
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
id = id.slice(0, -1);
|
id = id.slice(0, -1);
|
||||||
name = name.slice(0, -1);
|
name = name.slice(0, -1);
|
||||||
let obj = {
|
let obj = {
|
||||||
mainId:indexmessage.value.mainId,
|
mainId: indexmessage.value.mainId,
|
||||||
optIds:id,
|
optIds: id,
|
||||||
optNames:name,
|
optNames: name,
|
||||||
beforeBy:indexmessage.value.employeeId,
|
beforeBy: indexmessage.value.employeeId,
|
||||||
beforeByName:indexmessage.value.employeeName
|
beforeByName: indexmessage.value.employeeName
|
||||||
}
|
}
|
||||||
assistOrder(obj).then(res=>{
|
assistOrder(obj).then(res => {
|
||||||
if(res.success){
|
if (res.success) {
|
||||||
firstgetqueryCgdList(form.nuId)
|
firstgetqueryCgdList(form.nuId)
|
||||||
// clickLeftMenu(0,{id:indexmessage.value.mainId})
|
// clickLeftMenu(0,{id:indexmessage.value.mainId})
|
||||||
flag.value = false;
|
flag.value = false;
|
||||||
|
|
@ -470,36 +500,36 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function splitString(str) {
|
function splitString(str) {
|
||||||
let result = [];
|
let result = [];
|
||||||
let remainingStr = str;
|
let remainingStr = str;
|
||||||
let regex = /([^（(]*)[（(]([^）)]+)[）)]/;
|
let regex = /([^（(]*)[（(]([^）)]+)[）)]/;
|
||||||
while (regex.test(remainingStr)) {
|
while (regex.test(remainingStr)) {
|
||||||
let match = remainingStr.match(regex);
|
let match = remainingStr.match(regex);
|
||||||
if (match) {
|
if (match) {
|
||||||
// 添加括号前的部分（去掉空白）
|
// 添加括号前的部分（去掉空白）
|
||||||
if (match[1]?.trim()) {
|
if (match[1]?.trim()) {
|
||||||
result.push(match[1].trim());
|
result.push(match[1].trim());
|
||||||
}
|
|
||||||
if (match[2]?.trim()) {
|
|
||||||
result.push(match[2].trim());
|
|
||||||
}
|
|
||||||
remainingStr = remainingStr.replace(match[0], '')?.trim();
|
|
||||||
}
|
}
|
||||||
|
if (match[2]?.trim()) {
|
||||||
|
result.push(match[2].trim());
|
||||||
|
}
|
||||||
|
remainingStr = remainingStr.replace(match[0], '')?.trim();
|
||||||
}
|
}
|
||||||
if (remainingStr?.trim()) {
|
|
||||||
result.push(remainingStr?.trim());
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
if (remainingStr?.trim()) {
|
||||||
|
result.push(remainingStr?.trim());
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
const clickLeftMenu = (index : any, item : object) => {
|
const clickLeftMenu = (index : any, item : object) => {
|
||||||
queryOrderInfoList({ mainId: item.id }).then(res => {
|
queryOrderInfoList({ mainId: item.id }).then(res => {
|
||||||
if (res.result.length > 0) {
|
if (res.result.length > 0) {
|
||||||
res.result.forEach((item,i)=>{
|
res.result.forEach((item, i) => {
|
||||||
item.flag = false;
|
item.flag = false;
|
||||||
item.match = splitString(item.directiveName)
|
item.match = splitString(item.directiveName)
|
||||||
})
|
})
|
||||||
plsbuy.value[index].servebao = res.result
|
plsbuy.value[index].servebao = res.result
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -509,21 +539,21 @@
|
||||||
queryOrderList(form).then(res => {
|
queryOrderList(form).then(res => {
|
||||||
console.log(res.result.records)
|
console.log(res.result.records)
|
||||||
if (res.result.records.length > 0) {
|
if (res.result.records.length > 0) {
|
||||||
res.result.records.forEach((item,l)=>{
|
res.result.records.forEach((item, l) => {
|
||||||
item.flag = false ;
|
item.flag = false;
|
||||||
item.servebao = [];
|
item.servebao = [];
|
||||||
let timestampMs = new Date(item.endTime).getTime();
|
let timestampMs = new Date(item.endTime).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) {
|
||||||
item.chaoshitime = true
|
item.chaoshitime = true
|
||||||
}
|
}
|
||||||
if(item.izPackage=='Y'){
|
if (item.izPackage == 'Y') {
|
||||||
clickLeftMenu(l,item)
|
clickLeftMenu(l, item)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
plsbuy.value = res.result.records;
|
plsbuy.value = res.result.records;
|
||||||
change({detail:{current:current.value}})
|
change({ detail: { current: current.value } })
|
||||||
} else {
|
} else {
|
||||||
plsbuy.value = [];
|
plsbuy.value = [];
|
||||||
}
|
}
|
||||||
|
|
@ -578,11 +608,11 @@
|
||||||
videoContext.value.play()
|
videoContext.value.play()
|
||||||
}
|
}
|
||||||
const pici = ref(0);
|
const pici = ref(0);
|
||||||
const del = (v,i) =>{
|
const del = (v, i) => {
|
||||||
pici.value = i;
|
pici.value = i;
|
||||||
}
|
}
|
||||||
const del1=()=>{
|
const del1 = () => {
|
||||||
ilanarr.value.splice(pici.value,1);
|
ilanarr.value.splice(pici.value, 1);
|
||||||
open.value = 0
|
open.value = 0
|
||||||
}
|
}
|
||||||
const sxdupld = (e) => {
|
const sxdupld = (e) => {
|
||||||
|
|
@ -649,27 +679,27 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const cshigb = ()=>{
|
const cshigb = () => {
|
||||||
let obj = plsbuy.value[current.value];
|
let obj = plsbuy.value[current.value];
|
||||||
let timestampMs = new Date(obj.endTime).getTime();
|
let timestampMs = new Date(obj.endTime).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);
|
||||||
console.log(timestampMs,'结束时间戳')
|
console.log(timestampMs, '结束时间戳')
|
||||||
console.log(times,'当前时间戳')
|
console.log(times, '当前时间戳')
|
||||||
console.log(Math.round(djs/1000),'倒计时时间戳')
|
console.log(Math.round(djs / 1000), '倒计时时间戳')
|
||||||
djstinme.value = Math.round(djs/1000);
|
djstinme.value = Math.round(djs / 1000);
|
||||||
let timeoutDuration = Number(obj.timeoutDuration)*60
|
let timeoutDuration = Number(obj.timeoutDuration) * 60
|
||||||
|
|
||||||
if(times > timestampMs+(timeoutDuration*1000)){
|
if (times > timestampMs + (timeoutDuration * 1000)) {
|
||||||
return false
|
return false
|
||||||
}else{
|
} else {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
const start = (v) => {
|
const start = (v) => {
|
||||||
if(!cshigb()){
|
if (!cshigb()) {
|
||||||
errmsg.value = "服务已超时，不能开始服务！"
|
errmsg.value = "服务已超时，不能开始服务！"
|
||||||
openerror.value = true;
|
openerror.value = true;
|
||||||
firstgetqueryCgdList(form.nuId);
|
firstgetqueryCgdList(form.nuId);
|
||||||
|
|
@ -690,7 +720,7 @@
|
||||||
}
|
}
|
||||||
const endobj = ref({})
|
const endobj = ref({})
|
||||||
const end = (v) => {
|
const end = (v) => {
|
||||||
if(!cshigb()){
|
if (!cshigb()) {
|
||||||
errmsg.value = "服务已超时，不能结束服务指令！"
|
errmsg.value = "服务已超时，不能结束服务指令！"
|
||||||
openerror.value = true;
|
openerror.value = true;
|
||||||
firstgetqueryCgdList(form.nuId);
|
firstgetqueryCgdList(form.nuId);
|
||||||
|
|
@ -718,67 +748,68 @@
|
||||||
const errmsg = ref('')
|
const errmsg = ref('')
|
||||||
const openerror = ref(false);
|
const openerror = ref(false);
|
||||||
const errmsgclk = (e, k, indexmessage) => {
|
const errmsgclk = (e, k, indexmessage) => {
|
||||||
font.value ='敬请期待~'
|
font.value = '敬请期待~'
|
||||||
open.value = 3
|
open.value = 3
|
||||||
return
|
return
|
||||||
console.log(e, k, indexmessage)
|
// 打包过不了校验
|
||||||
if (k == 1) {
|
// console.log(e, k, indexmessage)
|
||||||
if(indexmessage.izPackage=='Y'&&e==0){
|
// if (k == 1) {
|
||||||
|
// 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)
|
||||||
if(!!last){
|
// if(!!last){
|
||||||
errmsg.value = last?.serviceContent==''?'暂无数据':last?.serviceContent
|
// errmsg.value = last?.serviceContent==''?'暂无数据':last?.serviceContent
|
||||||
openerror.value = true;
|
// openerror.value = true;
|
||||||
}else{
|
// }else{
|
||||||
errmsg.value = indexmessage?.serviceContent
|
// errmsg.value = indexmessage?.serviceContent
|
||||||
openerror.value = true;
|
// openerror.value = true;
|
||||||
}
|
// }
|
||||||
}else{
|
// }else{
|
||||||
errmsg.value = indexmessage?.serviceContent
|
// errmsg.value = indexmessage?.serviceContent
|
||||||
openerror.value = true;
|
// openerror.value = true;
|
||||||
}
|
// }
|
||||||
|
|
||||||
}
|
// }
|
||||||
|
|
||||||
if (indexmessage?.izStart == 'Y'&&indexmessage.izPackage!='Y') {
|
// if (indexmessage?.izStart == 'Y'&&indexmessage.izPackage!='Y') {
|
||||||
switch (e) {
|
// switch (e) {
|
||||||
case 0:
|
// case 0:
|
||||||
if (indexmessage?.serviceContent == '') { return }
|
// if (indexmessage?.serviceContent == '') { return }
|
||||||
errmsg.value = indexmessage?.serviceContent
|
// errmsg.value = indexmessage?.serviceContent
|
||||||
break;
|
// break;
|
||||||
case 1:
|
// case 1:
|
||||||
if (indexmessage?.mp3File == '') { return }
|
// if (indexmessage?.mp3File == '') { return }
|
||||||
errmsg.value = indexmessage?.mp3File
|
// errmsg.value = indexmessage?.mp3File
|
||||||
break;
|
// break;
|
||||||
case 2:
|
// case 2:
|
||||||
if (indexmessage?.mp4File == '') { return }
|
// if (indexmessage?.mp4File == '') { return }
|
||||||
errmsg.value = indexmessage?.mp4File
|
// errmsg.value = indexmessage?.mp4File
|
||||||
break;
|
// break;
|
||||||
|
|
||||||
default:
|
// default:
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
openerror.value = true;
|
// openerror.value = true;
|
||||||
}
|
// }
|
||||||
} else {
|
// } else {
|
||||||
if (indexmessage?.izStart == 'Y') {
|
// if (indexmessage?.izStart == 'Y') {
|
||||||
|
|
||||||
switch (e) {
|
// switch (e) {
|
||||||
case 3:
|
// case 3:
|
||||||
ysptp(indexmessage, 0, 1)
|
// ysptp(indexmessage, 0, 1)
|
||||||
break;
|
// break;
|
||||||
case 4:
|
// case 4:
|
||||||
ysptp(indexmessage, 0, 2)
|
// ysptp(indexmessage, 0, 2)
|
||||||
break;
|
// break;
|
||||||
|
|
||||||
default:
|
// default:
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
const ysptp = (v, i, r) => {
|
const ysptp = (v, i, r) => {
|
||||||
// v.manuallyPicPath
|
// v.manuallyPicPath
|
||||||
|
|
@ -805,29 +836,29 @@
|
||||||
const fwzldex = ref(-1);
|
const fwzldex = ref(-1);
|
||||||
const fwzlarr = ref(0);
|
const fwzlarr = ref(0);
|
||||||
const fwzlbobj = ref({})
|
const fwzlbobj = ref({})
|
||||||
const zldex = (e,f,k) => {
|
const zldex = (e, f, k) => {
|
||||||
e.flag = !e.flag
|
e.flag = !e.flag
|
||||||
if(e.flag){
|
if (e.flag) {
|
||||||
e.last = true;
|
e.last = true;
|
||||||
f.forEach((item,i)=>{
|
f.forEach((item, i) => {
|
||||||
if(k!=i){
|
if (k != i) {
|
||||||
item.last = false;
|
item.last = false;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}else{
|
} else {
|
||||||
if(e.last == false){return}
|
if (e.last == false) { return }
|
||||||
e.last = false;
|
e.last = false;
|
||||||
let arr = []
|
let arr = []
|
||||||
f.forEach((item,i)=>{
|
f.forEach((item, i) => {
|
||||||
if(item.flag){
|
if (item.flag) {
|
||||||
arr.push(i)
|
arr.push(i)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
if(arr.length==0){
|
if (arr.length == 0) {
|
||||||
|
|
||||||
}else{
|
} else {
|
||||||
f[arr[arr.length-1]].last = true;
|
f[arr[arr.length - 1]].last = true;
|
||||||
fwzlbobj.value = f[arr.length-1]
|
fwzlbobj.value = f[arr.length - 1]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -868,7 +899,7 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
.shanchu{
|
.shanchu {
|
||||||
width: 1.6vw;
|
width: 1.6vw;
|
||||||
height: 1.6vw;
|
height: 1.6vw;
|
||||||
z-index: 20;
|
z-index: 20;
|
||||||
|
|
@ -881,7 +912,8 @@
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.del{
|
|
||||||
|
.del {
|
||||||
width: 1.6vw;
|
width: 1.6vw;
|
||||||
height: 1.6vw;
|
height: 1.6vw;
|
||||||
z-index: 20;
|
z-index: 20;
|
||||||
|
|
@ -894,6 +926,7 @@
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.uplods {
|
.uplods {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 71%;
|
height: 71%;
|
||||||
|
|
@ -934,6 +967,7 @@
|
||||||
border-radius: 1.6vw;
|
border-radius: 1.6vw;
|
||||||
margin-top: 0.5vw;
|
margin-top: 0.5vw;
|
||||||
padding: 3vw 0 0;
|
padding: 3vw 0 0;
|
||||||
|
|
||||||
.bots {
|
.bots {
|
||||||
width: 60%;
|
width: 60%;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
@ -985,10 +1019,12 @@
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.swiper {
|
.swiper {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.swper {
|
.swper {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
@ -1129,33 +1165,38 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
.brcard{
|
|
||||||
|
.brcard {
|
||||||
width: 11.2vw;
|
width: 11.2vw;
|
||||||
height: 8vw;
|
height: 8vw;
|
||||||
border-radius: 1.6vw;
|
border-radius: 1.6vw;
|
||||||
border: 2rpx solid #DCDCDC;
|
border: 2rpx solid #DCDCDC;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0vw;
|
top: 0vw;
|
||||||
bottom:0vw;
|
bottom: 0vw;
|
||||||
background: rgba(255,255,255,0.5);
|
background: rgba(255, 255, 255, 0.5);
|
||||||
z-index: 0;
|
z-index: 0;
|
||||||
}
|
}
|
||||||
.bgs{
|
|
||||||
|
.bgs {
|
||||||
width: 11.2vw;
|
width: 11.2vw;
|
||||||
height: 8vw;
|
height: 8vw;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: -1.05vw;
|
top: -1.05vw;
|
||||||
left:-0.15vw;
|
left: -0.15vw;
|
||||||
image{
|
|
||||||
|
image {
|
||||||
width: 103%;
|
width: 103%;
|
||||||
height: 105%;
|
height: 105%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.act {
|
.act {
|
||||||
.brcard{
|
.brcard {
|
||||||
background: rgba(255,255,255,0.6);
|
background: rgba(255, 255, 255, 0.6);
|
||||||
border: 2rpx dashed #0089FE;
|
border: 2rpx dashed #0089FE;
|
||||||
}
|
}
|
||||||
|
|
||||||
text,
|
text,
|
||||||
view {
|
view {
|
||||||
color: #017DE9;
|
color: #017DE9;
|
||||||
|
|
@ -1263,12 +1304,14 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.left-menu {
|
.left-menu {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 37%;
|
top: 37%;
|
||||||
left:5.3vw;
|
left: 5.3vw;
|
||||||
transform: translateY(-50%);
|
transform: translateY(-50%);
|
||||||
>view{
|
|
||||||
|
>view {
|
||||||
margin: 0.8vw 0;
|
margin: 0.8vw 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1286,7 +1329,7 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
background: #F1F2F3;
|
background: #F1F2F3;
|
||||||
|
|
||||||
|
|
||||||
.left-menu-img {
|
.left-menu-img {
|
||||||
|
|
@ -1307,7 +1350,7 @@
|
||||||
|
|
||||||
.top-img {
|
.top-img {
|
||||||
width: 4.9vw;
|
width: 4.9vw;
|
||||||
height:4.9vw;
|
height: 4.9vw;
|
||||||
padding: 0 50rpx;
|
padding: 0 50rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1929,4 +1972,36 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.no-time-all {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
.no-time-view {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: 110rpx;
|
||||||
|
height: 100rpx;
|
||||||
|
background-color: #eaeaea;
|
||||||
|
position: relative;
|
||||||
|
border-radius: 10rpx;
|
||||||
|
|
||||||
|
.no-text {
|
||||||
|
position: absolute;
|
||||||
|
bottom: 2rpx;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
// font-size: 23rpx;
|
||||||
|
font-size: 0.7vw;
|
||||||
|
font-weight: 600;
|
||||||
|
// color: #666;
|
||||||
|
}
|
||||||
|
|
||||||
|
.no-time {
|
||||||
|
width: 70%;
|
||||||
|
height: 70%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
@ -1,226 +1,233 @@
|
||||||
<template>
|
<template>
|
||||||
<view style="display: flex;align-items: center;" :class="!isDown?'red':''">
|
<view style="display: flex;align-items: center;" :class="!isDown?'red':''">
|
||||||
<view class="box" id="box_minute" @click="chongzhi()">
|
<view class="box" id="box_minute" @click="chongzhi()">
|
||||||
<view class="top child text" id="top" >{{ Math.floor(topTime / 60) }}</view>
|
<view class="top child text" id="top">{{ Math.floor(topTime / 60) }}</view>
|
||||||
<view class="flip child" id="flip" :style="{ transform: transformInfomin?transformInfo:'' }">
|
<view class="flip child" id="flip" :style="{ transform: transformInfomin?transformInfo:'' }">
|
||||||
<view class="flip_face child text" :style="{ zIndex: faceZindexmin || 0 }" id="flip_face" >
|
<view class="flip_face child text" :style="{ zIndex: faceZindexmin || 0 }" id="flip_face">
|
||||||
{{ Math.floor(bottomTime / 60) }}
|
{{ Math.floor(bottomTime / 60) }}
|
||||||
</view>
|
</view>
|
||||||
<view class="flip_back child text" :style="backZindex&&transformInfomin ? { zIndex: backZindex } : {}" id="flip_back" >
|
|
||||||
{{ Math.floor(topTime / 60) }}
|
<view class="flip_back child text" :style="backZindex&&transformInfomin ? { zIndex: backZindex } : {}"
|
||||||
<text>MIN</text>
|
id="flip_back">
|
||||||
</view>
|
{{ Math.floor(topTime / 60) }}
|
||||||
</view>
|
<text>MIN</text>
|
||||||
<view class="bottom child text" id="bottom" >
|
</view>
|
||||||
{{ Math.floor(bottomTime / 60) }}
|
</view>
|
||||||
<text>MIN</text>
|
<view class="bottom child text" id="bottom">
|
||||||
</view>
|
{{ Math.floor(bottomTime / 60) }}
|
||||||
|
<text>MIN</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<text style="color: #959595;font-size: 1.9vw;padding: 0 5rpx;">:</text>
|
<text style="color: #959595;font-size: 1.9vw;padding: 0 5rpx;">:</text>
|
||||||
<view class="box" id="box_minute" :class="!isDown?'red':''">
|
<view class="box" id="box_minute" :class="!isDown?'red':''">
|
||||||
<view class="top child text" id="top">{{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }}</view>
|
<view class="top child text" id="top">{{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }}</view>
|
||||||
<view class="flip child" id="flip" :style="{ transform: transformInfo }" >
|
<view class="flip child" id="flip" :style="{ transform: transformInfo }">
|
||||||
<view class="flip_face child text" :style="{ zIndex: faceZindex || 0 }" id="flip_face" >
|
<view class="flip_face child text" :style="{ zIndex: faceZindex || 0 }" id="flip_face">
|
||||||
{{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60)}}
|
{{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60)}}
|
||||||
</view>
|
</view>
|
||||||
<view class="flip_back child text" :style="backZindex ? { zIndex: backZindex } : {}" id="flip_back" >
|
|
||||||
{{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }}
|
<view class="flip_back child text" :style="backZindex ? { zIndex: backZindex } : {}" id="flip_back">
|
||||||
<text >SEC</text>
|
{{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }}
|
||||||
</view>
|
<text>SEC</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="bottom child text" id="bottom">
|
</view>
|
||||||
{{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60) }}
|
<view class="bottom child text" id="bottom">
|
||||||
<text >SEC</text>
|
{{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60) }}
|
||||||
</view>
|
<text>SEC</text>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
props: {
|
props: {
|
||||||
initTime: {
|
initTime: {
|
||||||
// 初始时间
|
// 初始时间
|
||||||
type: Number,
|
type: Number,
|
||||||
default:185,
|
default: 185,
|
||||||
},
|
},
|
||||||
// isDown: {
|
// isDown: {
|
||||||
// // 是否是倒计时
|
// // 是否是倒计时
|
||||||
// type: Boolean,
|
// type: Boolean,
|
||||||
// default: true,
|
// default: true,
|
||||||
// },
|
// },
|
||||||
threshold: {
|
threshold: {
|
||||||
// 阈值
|
// 阈值
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 0,
|
default: 0,
|
||||||
},
|
},
|
||||||
timeoutDuration:{
|
timeoutDuration: {
|
||||||
// 超时时间多少停止
|
// 超时时间多少停止
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 0,
|
default: 0,
|
||||||
}
|
|
||||||
},
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
topTime: Math.abs(this.initTime),
|
|
||||||
bottomTime: Math.abs(this.initTime),
|
|
||||||
faceZindex: 1,
|
|
||||||
backZindex: 0,
|
|
||||||
transformInfo: "perspective(500rpx) rotateX(0deg)",
|
|
||||||
transformInfomin: false,
|
|
||||||
faceZindexmin: 1,
|
|
||||||
backZindexmin: 0,
|
|
||||||
mintime:0,
|
|
||||||
timer: null,
|
|
||||||
timerTwo: null,
|
|
||||||
isDown:true
|
|
||||||
};
|
|
||||||
},
|
|
||||||
mounted() {
|
|
||||||
this.cycle();
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
OneCycle(n) {
|
|
||||||
// 一次翻页的周期
|
|
||||||
let num = 0;
|
|
||||||
this.transformInfo = "perspective(500rpx) rotateX(0deg)";
|
|
||||||
this.faceZindex = 1;
|
|
||||||
this.backZindex = 0;
|
|
||||||
this.bottomTime = this.isDown? n : n-1;
|
|
||||||
let minutes = Math.floor(n / 60);
|
|
||||||
if (this.timer) {
|
|
||||||
clearInterval(this.timer);
|
|
||||||
}
|
|
||||||
this.timer = setInterval(() => {
|
|
||||||
num++;
|
|
||||||
if (num > 50) {
|
|
||||||
num = 0;
|
|
||||||
clearInterval(this.timer);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (num === 1) {
|
|
||||||
if (this.isDown) {
|
|
||||||
this.topTime = n - 1 < this.threshold ? n : n - 1; // 60 和 0 在时间里，其实是一样的
|
|
||||||
this.mintime = Math.floor(this.topTime / 60)
|
|
||||||
if(minutes != this.mintime &&!this.transformInfomin){
|
|
||||||
this.transformInfomin = true;
|
|
||||||
}else{
|
|
||||||
this.transformInfomin = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.topTime = n + 1 > this.threshold ? n : n + 1;
|
|
||||||
this.mintime = Math.floor(this.topTime / 60)
|
|
||||||
if(minutes != this.mintime &&!this.transformInfomin){
|
|
||||||
this.transformInfomin = true;
|
|
||||||
}else{
|
|
||||||
this.transformInfomin = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
topTime: Math.abs(this.initTime),
|
||||||
|
bottomTime: Math.abs(this.initTime),
|
||||||
|
faceZindex: 1,
|
||||||
|
backZindex: 0,
|
||||||
|
transformInfo: "perspective(500rpx) rotateX(0deg)",
|
||||||
|
transformInfomin: false,
|
||||||
|
faceZindexmin: 1,
|
||||||
|
backZindexmin: 0,
|
||||||
|
mintime: 0,
|
||||||
|
timer: null,
|
||||||
|
timerTwo: null,
|
||||||
|
isDown: true
|
||||||
|
};
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.cycle();
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
OneCycle(n) {
|
||||||
|
// 一次翻页的周期
|
||||||
|
let num = 0;
|
||||||
|
this.transformInfo = "perspective(500rpx) rotateX(0deg)";
|
||||||
|
this.faceZindex = 1;
|
||||||
|
this.backZindex = 0;
|
||||||
|
this.bottomTime = this.isDown ? n : n - 1;
|
||||||
|
let minutes = Math.floor(n / 60);
|
||||||
|
if (this.timer) {
|
||||||
|
clearInterval(this.timer);
|
||||||
|
}
|
||||||
|
this.timer = setInterval(() => {
|
||||||
|
num++;
|
||||||
|
if (num > 50) {
|
||||||
|
num = 0;
|
||||||
|
clearInterval(this.timer);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (num === 1) {
|
||||||
|
if (this.isDown) {
|
||||||
|
this.topTime = n - 1 < this.threshold ? n : n - 1; // 60 和 0 在时间里，其实是一样的
|
||||||
|
this.mintime = Math.floor(this.topTime / 60)
|
||||||
|
if (minutes != this.mintime && !this.transformInfomin) {
|
||||||
|
this.transformInfomin = true;
|
||||||
|
} else {
|
||||||
|
this.transformInfomin = false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.topTime = n + 1 > this.threshold ? n : n + 1;
|
||||||
|
this.mintime = Math.floor(this.topTime / 60)
|
||||||
|
if (minutes != this.mintime && !this.transformInfomin) {
|
||||||
|
this.transformInfomin = true;
|
||||||
|
} else {
|
||||||
|
this.transformInfomin = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.faceZindex = num <= 25? 1 : 0;
|
this.faceZindex = num <= 25 ? 1 : 0;
|
||||||
this.backZindex = num <= 25? 0 : 1;
|
this.backZindex = num <= 25 ? 0 : 1;
|
||||||
|
|
||||||
this.transformInfo = `perspective(500rpx) rotateX(-${(180 * num) / 50}deg)`;
|
this.transformInfo = `perspective(500rpx) rotateX(-${(180 * num) / 50}deg)`;
|
||||||
|
|
||||||
},10); // 将一秒钟分成50份。
|
}, 10); // 将一秒钟分成50份。
|
||||||
},
|
},
|
||||||
cycle() {
|
cycle() {
|
||||||
console.log(this.initTime)
|
console.log(this.initTime)
|
||||||
let minutes = Math.floor(this.initTime / 60);
|
let minutes = Math.floor(this.initTime / 60);
|
||||||
this.isDown = this.initTime>0?true:false
|
this.isDown = this.initTime > 0 ? true : false
|
||||||
let time = Math.abs(this.initTime);
|
let time = Math.abs(this.initTime);
|
||||||
// console.log(minutes,time)
|
// console.log(minutes,time)
|
||||||
this.timerTwo = setInterval(() => {
|
this.timerTwo = setInterval(() => {
|
||||||
const flag = this.isDown ? time - 1 : time + 1;
|
const flag = this.isDown ? time - 1 : time + 1;
|
||||||
if (flag === this.threshold) {
|
if (flag === this.threshold) {
|
||||||
this.isDown = false
|
this.isDown = false
|
||||||
// clearInterval(this.timerTwo);
|
// clearInterval(this.timerTwo);
|
||||||
// clearInterval(this.timer);
|
// clearInterval(this.timer);
|
||||||
}
|
}
|
||||||
if(flag >= this.timeoutDuration+2 && this.isDown == false){
|
if (flag >= this.timeoutDuration + 2 && this.isDown == false) {
|
||||||
clearInterval(this.timerTwo);
|
clearInterval(this.timerTwo);
|
||||||
clearInterval(this.timer);
|
clearInterval(this.timer);
|
||||||
this.$emit('timeend')
|
this.$emit('timeend')
|
||||||
}
|
}
|
||||||
this.OneCycle(time);
|
this.OneCycle(time);
|
||||||
this.isDown ? time-- : time++;
|
this.isDown ? time-- : time++;
|
||||||
}, 1000);
|
}, 1000);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
.red{
|
.red {
|
||||||
color: red !important;
|
|
||||||
view{
|
|
||||||
color: red !important;
|
color: red !important;
|
||||||
|
|
||||||
|
view {
|
||||||
|
color: red !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
.box {
|
|
||||||
position: relative;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
.box .child {
|
.box {
|
||||||
min-width: 5.1vw;
|
position: relative;
|
||||||
height: 2.5vw;
|
box-sizing: border-box;
|
||||||
overflow: hidden;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.box > .top {
|
.box .child {
|
||||||
background-color: #eaeaea;
|
min-width: 5.1vw;
|
||||||
line-height: 5vw;
|
height: 2.5vw;
|
||||||
border-bottom: 2rpx solid #fff;
|
overflow: hidden;
|
||||||
border-radius: 4px 4px 0 0;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.box .flip {
|
.box>.top {
|
||||||
position: absolute;
|
background-color: #eaeaea;
|
||||||
top: 0rpx;
|
line-height: 5vw;
|
||||||
z-index: 1;
|
border-bottom: 2rpx solid #fff;
|
||||||
transform-origin: bottom;
|
border-radius: 8px 8px 0 0;
|
||||||
border-radius: 4rpx 4rpx 0 0;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.box .flip .flip_face {
|
.box .flip {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background: #eaeaea;
|
top: 0rpx;
|
||||||
line-height: 5vw;
|
z-index: 1;
|
||||||
z-index: 1;
|
transform-origin: bottom;
|
||||||
border-bottom: 2rpx solid #fff;
|
border-radius: 8rpx 8rpx 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box .flip .flip_back {
|
.box .flip .flip_face {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background-color: #eaeaea;
|
background: #eaeaea;
|
||||||
line-height: 0rpx;
|
line-height: 5vw;
|
||||||
transform: perspective(500rpx) rotateX(0deg) rotateY(-180deg) rotate(180deg);
|
z-index: 1;
|
||||||
border-top: 2rpx solid #fff;
|
border-bottom: 2rpx solid #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.box .bottom {
|
.box .flip .flip_back {
|
||||||
background-color: #f4f4f4;
|
position: absolute;
|
||||||
line-height: 0rpx;
|
background-color: #eaeaea;
|
||||||
border-top: 1rpx solid #fff;
|
line-height: 0rpx;
|
||||||
border-radius: 0 0 4px 4px;
|
transform: perspective(500rpx) rotateX(0deg) rotateY(-180deg) rotate(180deg);
|
||||||
}
|
border-top: 2rpx solid #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box .bottom {
|
||||||
|
background-color: #f4f4f4;
|
||||||
|
line-height: 0rpx;
|
||||||
|
border-top: 1rpx solid #fff;
|
||||||
|
border-radius: 0 0 8px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.text {
|
||||||
|
text-align: center;
|
||||||
|
font-size: 3.4vw;
|
||||||
|
font-weight: 900;
|
||||||
|
color: #666;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
>text {
|
||||||
|
position: absolute;
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
bottom: 0vw;
|
||||||
|
line-height: 1vw;
|
||||||
|
left: 0;
|
||||||
|
font-size: 0.7vw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.text {
|
|
||||||
text-align: center;
|
|
||||||
font-size: 3.4vw;
|
|
||||||
font-weight: 900;
|
|
||||||
color: #666;
|
|
||||||
position: relative;
|
|
||||||
>text{
|
|
||||||
position: absolute;
|
|
||||||
width: 100%;
|
|
||||||
text-align: center;
|
|
||||||
bottom: 0vw;
|
|
||||||
line-height:1vw;
|
|
||||||
left: 0;
|
|
||||||
font-size: 0.7vw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<!-- 护嘱 -->
|
<!-- 护嘱 -->
|
||||||
<template>
|
<template>
|
||||||
<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}"
|
<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}" @click="bottomisShaking=false;">
|
||||||
@click="bottomisShaking=false;">
|
|
||||||
<severcard></severcard>
|
<severcard></severcard>
|
||||||
<view class="doctorsay-container-view">
|
<view class="doctorsay-container-view">
|
||||||
<view class="doctorsay-container-container">
|
<view class="doctorsay-container-container">
|
||||||
|
|
@ -14,7 +13,6 @@
|
||||||
<text class="boom-text">
|
<text class="boom-text">
|
||||||
{{item.tagName}}
|
{{item.tagName}}
|
||||||
</text>
|
</text>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -64,7 +62,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view :class="getClass(item1,index0,index1)"
|
<view :class="getClass(item1,index0,index1)"
|
||||||
style="font-size: 30rpx;overflow: hidden;"
|
style="font-size: 30rpx;overflow: hidden;"
|
||||||
:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s`,border:saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && !isTuoing? `2rpx solid #46B2F6`:'' }">
|
:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s`,border:saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && !isTuoing && item1.startTime? `2rpx solid #46B2F6`:'' }">
|
||||||
|
|
||||||
<view class="title-time" v-if="item1.startTime"
|
<view class="title-time" v-if="item1.startTime"
|
||||||
style="flex-direction: column;">
|
style="flex-direction: column;">
|
||||||
|
|
@ -135,7 +133,6 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<image class="haven-img" v-if="!bodyTagListLook.length"
|
<image class="haven-img" v-if="!bodyTagListLook.length"
|
||||||
src="/static/index/procurement/haven.png" mode="aspectFill"></image>
|
src="/static/index/procurement/haven.png" mode="aspectFill"></image>
|
||||||
|
|
||||||
|
|
@ -329,7 +326,6 @@
|
||||||
<view class="servers-heng" :style="ruleritem.izPackage==`Y`?{left:`114rpx`}:{}"
|
<view class="servers-heng" :style="ruleritem.izPackage==`Y`?{left:`114rpx`}:{}"
|
||||||
v-show="ruleritem.directiveName"></view>
|
v-show="ruleritem.directiveName"></view>
|
||||||
|
|
||||||
|
|
||||||
<image class="explain-icon" @click="explainopen=!explainopen" style="top: 0;"
|
<image class="explain-icon" @click="explainopen=!explainopen" style="top: 0;"
|
||||||
src="/static/index/procurement/explain.png" mode="aspectFill"></image>
|
src="/static/index/procurement/explain.png" mode="aspectFill"></image>
|
||||||
|
|
||||||
|
|
@ -409,9 +405,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
<view class="pack-heng">
|
<view class="pack-heng"></view>
|
||||||
|
|
||||||
</view>
|
|
||||||
<scroll-view class="pack-detail" scroll-with-animation :scroll-y="canmovechange">
|
<scroll-view class="pack-detail" scroll-with-animation :scroll-y="canmovechange">
|
||||||
<view class="detail-father">
|
<view class="detail-father">
|
||||||
<view class="details"
|
<view class="details"
|
||||||
|
|
@ -798,10 +792,33 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const canmovechange = ref(true)
|
const canmovechange = ref(true);
|
||||||
|
const nextpageing = ref(false)
|
||||||
|
let nextPageTimer = null
|
||||||
|
|
||||||
|
|
||||||
|
// 组件卸载时清理
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
if (nextPageTimer) {
|
||||||
|
clearTimeout(nextPageTimer)
|
||||||
|
nextPageTimer = null
|
||||||
|
}
|
||||||
|
})
|
||||||
watch(() => props.howtomove, (newVal : [number, number], oldVal : [number, number]) => {
|
watch(() => props.howtomove, (newVal : [number, number], oldVal : [number, number]) => {
|
||||||
if (oldVal[0] === 2) {
|
if (oldVal[0] === 2) {
|
||||||
|
// 每次触发都立即设为 true
|
||||||
|
nextpageing.value = true
|
||||||
|
|
||||||
|
// 重置定时器（如果已有）
|
||||||
|
if (nextPageTimer) {
|
||||||
|
clearTimeout(nextPageTimer)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1 秒后如果未再次触发则设为 false
|
||||||
|
nextPageTimer = setTimeout(() => {
|
||||||
|
nextpageing.value = false
|
||||||
|
nextPageTimer = null
|
||||||
|
}, 1000)
|
||||||
const nextX = notrelxy.value[0] + newVal[0]
|
const nextX = notrelxy.value[0] + newVal[0]
|
||||||
if (nextX >= 0 && nextX <= 23) {
|
if (nextX >= 0 && nextX <= 23) {
|
||||||
notrelxy.value[0] = nextX
|
notrelxy.value[0] = nextX
|
||||||
|
|
@ -1005,7 +1022,7 @@
|
||||||
const openerror = ref(false)
|
const openerror = ref(false)
|
||||||
const errshow = ref("")
|
const errshow = ref("")
|
||||||
|
|
||||||
const emit = defineEmits(['handsend', `rulepush`])
|
const emit = defineEmits(['handsend', `rulepush`, `cleanall`])
|
||||||
|
|
||||||
const serverUrl = ref(uni.getStorageSync('imagebase'))
|
const serverUrl = ref(uni.getStorageSync('imagebase'))
|
||||||
const bodystatus = ref(false);
|
const bodystatus = ref(false);
|
||||||
|
|
@ -1208,6 +1225,11 @@
|
||||||
: (cb) => setTimeout(cb, 16);
|
: (cb) => setTimeout(cb, 16);
|
||||||
|
|
||||||
function handleScrolltime(e) {
|
function handleScrolltime(e) {
|
||||||
|
// 核心代码，双重拦截
|
||||||
|
if (killbaddata.value && !canmovechange.value && !nextpageing.value) {
|
||||||
|
emit('cleanall')
|
||||||
|
// console.log("上下移动")
|
||||||
|
}
|
||||||
killbaddata.value = true
|
killbaddata.value = true
|
||||||
// 为保险，先做容错判断
|
// 为保险，先做容错判断
|
||||||
const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0;
|
const scrollTop = (e && e.detail && (e.detail.scrollTop ?? e.detail.scrollY)) || 0;
|
||||||
|
|
@ -1229,6 +1251,12 @@
|
||||||
const killbaddata = ref(true)
|
const killbaddata = ref(true)
|
||||||
|
|
||||||
function handleTop(e) {
|
function handleTop(e) {
|
||||||
|
// 核心代码，双重拦截
|
||||||
|
if (killbaddata.value && !canmovechange.value && !nextpageing.value) {
|
||||||
|
emit('cleanall')
|
||||||
|
// console.log("左右移动")
|
||||||
|
}
|
||||||
|
|
||||||
killbaddata.value = true
|
killbaddata.value = true
|
||||||
leftIn.value = e.detail.scrollLeft
|
leftIn.value = e.detail.scrollLeft
|
||||||
}
|
}
|
||||||
|
|
@ -1938,6 +1966,7 @@
|
||||||
})
|
})
|
||||||
.exec()
|
.exec()
|
||||||
canmovechange.value = false;
|
canmovechange.value = false;
|
||||||
|
// nextpageing.value = false
|
||||||
}, 300)
|
}, 300)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -1996,7 +2025,7 @@
|
||||||
})
|
})
|
||||||
.exec()
|
.exec()
|
||||||
}
|
}
|
||||||
}, 800)
|
}, 500)
|
||||||
|
|
||||||
}
|
}
|
||||||
const handleTouchStart = (item : any, e : any) => {
|
const handleTouchStart = (item : any, e : any) => {
|
||||||
|
|
@ -2012,7 +2041,7 @@
|
||||||
isTuoing.value = true;
|
isTuoing.value = true;
|
||||||
emit('handsend', item)
|
emit('handsend', item)
|
||||||
postitem.value = item
|
postitem.value = item
|
||||||
}, 800)
|
}, 500)
|
||||||
}
|
}
|
||||||
const isScrolling = ref(false)
|
const isScrolling = ref(false)
|
||||||
//长按计时器
|
//长按计时器
|
||||||
|
|
|
||||||
|
|
@ -197,7 +197,7 @@
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
employeeId:uni.getStorageSync('userInfo').employessId,
|
employeeId:uni.getStorageSync('userInfo').employeesId,
|
||||||
nuId:uni.getStorageSync('nuId')
|
nuId:uni.getStorageSync('nuId')
|
||||||
})
|
})
|
||||||
const open = ref(0)
|
const open = ref(0)
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<image class="card-icon" :src="movelook.url" mode="aspectFill"></image>
|
<image class="card-icon" :src="movelook.url" mode="aspectFill"></image>
|
||||||
<view class="card-text" style="margin-top: 0;" :style="movelook.title.length>6?{fontSize:`24rpx`}:{}">
|
<view class="card-text" style="margin-top: 0;" :style="movelook.title.length>6?{fontSize:`24rpx`}:{}">
|
||||||
{{ movelook.title }}
|
{{ movelook.title }}
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
@ -40,7 +40,8 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="delete-view" :style="isblue==`3`?{backgroundColor: `rgba(255, 239, 239, 0.8)`}:{}" v-if="!startmoveit&&whoisit">
|
<view class="delete-view" :style="isblue==`3`?{backgroundColor: `rgba(255, 239, 239, 0.8)`}:{}"
|
||||||
|
v-if="!startmoveit&&whoisit">
|
||||||
<image class="delete-img" :src="`/static/index/trash${isblue==`3`?`target`:``}.png`" />
|
<image class="delete-img" :src="`/static/index/trash${isblue==`3`?`target`:``}.png`" />
|
||||||
</view>
|
</view>
|
||||||
<!-- 左侧菜单 -->
|
<!-- 左侧菜单 -->
|
||||||
|
|
@ -53,8 +54,8 @@
|
||||||
<bignurse :isshow="menuIndex==0"
|
<bignurse :isshow="menuIndex==0"
|
||||||
v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
|
v-if="swipedex==0&&specialPage==1&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
|
||||||
<!-- 户嘱页 -->
|
<!-- 户嘱页 -->
|
||||||
<newnurse :isshow="menuIndex==1" v-if="swipedex==1" :canmove="startmoveit" :sendxy="targetrule" :isblue='isblue' :howtomove="howtomove"
|
<newnurse :isshow="menuIndex==1" v-if="swipedex==1" :canmove="startmoveit" :sendxy="targetrule" :isblue='isblue'
|
||||||
:targetrule="targetrule" @handsend="handsend" @rulepush="rulepush" />
|
:howtomove="howtomove" :targetrule="targetrule" @handsend="handsend" @rulepush="rulepush" @cleanall="cleanall" />
|
||||||
<!-- 医嘱 -->
|
<!-- 医嘱 -->
|
||||||
<doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
|
<doctorask v-if="swipedex==2&&uni.getStorageSync('elderId')&&uni.getStorageSync('nuId')" />
|
||||||
<logistics :isshow="menuIndex==3"
|
<logistics :isshow="menuIndex==3"
|
||||||
|
|
@ -114,9 +115,9 @@
|
||||||
// console.log("缓存指令包", res)
|
// console.log("缓存指令包", res)
|
||||||
uni.setStorageSync("Packagelist", res.result)
|
uni.setStorageSync("Packagelist", res.result)
|
||||||
})
|
})
|
||||||
getPermissionList({ employessId: uni.getStorageSync('userInfo').employessId }).then(res => {
|
getPermissionList({ employeesId: uni.getStorageSync('userInfo').employeesId }).then(res => {
|
||||||
listarr.value = res.result;
|
listarr.value = res.result;
|
||||||
// console.log("这个是啥", listarr.value)
|
console.log("这个是啥", listarr.value)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
const gospecial = (index : number) => {
|
const gospecial = (index : number) => {
|
||||||
|
|
@ -233,6 +234,7 @@
|
||||||
queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => {
|
queryPadPageList({ 'pageNo': -1, 'nuName': nuName }).then((res => {
|
||||||
|
|
||||||
let arr = res.result.records[0].permissionList;
|
let arr = res.result.records[0].permissionList;
|
||||||
|
|
||||||
arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }];
|
arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }];
|
||||||
let tbr = [];
|
let tbr = [];
|
||||||
// console.log("xxxx",arr)
|
// console.log("xxxx",arr)
|
||||||
|
|
@ -245,6 +247,7 @@
|
||||||
tbr.push(v);
|
tbr.push(v);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
// console.log("是不是没了啊",tbr)
|
||||||
tbr.forEach(item => {
|
tbr.forEach(item => {
|
||||||
let obj = tabbrarr.value.find(r =>
|
let obj = tabbrarr.value.find(r =>
|
||||||
r.type == item.menuCode
|
r.type == item.menuCode
|
||||||
|
|
@ -369,7 +372,7 @@
|
||||||
const movelook = ref({
|
const movelook = ref({
|
||||||
url: "",
|
url: "",
|
||||||
title: "",
|
title: "",
|
||||||
type:0
|
type: 0
|
||||||
})
|
})
|
||||||
const startmoveit = ref(true)
|
const startmoveit = ref(true)
|
||||||
const whoisit = ref(0);
|
const whoisit = ref(0);
|
||||||
|
|
@ -392,7 +395,7 @@
|
||||||
movelook.value.title = look.title;
|
movelook.value.title = look.title;
|
||||||
movelook.value.type = 0;
|
movelook.value.type = 0;
|
||||||
startmoveit.value = false
|
startmoveit.value = false
|
||||||
} else if(look.packageName){
|
} else if (look.packageName) {
|
||||||
whoisit.value = 0;
|
whoisit.value = 0;
|
||||||
movelook.value.url = `/static/index/packtarget.png`
|
movelook.value.url = `/static/index/packtarget.png`
|
||||||
movelook.value.title = look.packageName;
|
movelook.value.title = look.packageName;
|
||||||
|
|
@ -495,13 +498,13 @@
|
||||||
}
|
}
|
||||||
const getxy = throttle(getxyrel, 40);
|
const getxy = throttle(getxyrel, 40);
|
||||||
const cleanall = (event) => {
|
const cleanall = (event) => {
|
||||||
setTimeout(()=>{
|
// setTimeout(()=>{
|
||||||
if (whoisit.value) {
|
if (whoisit.value) {
|
||||||
detectorEnd(); // ← 替换原来的 handmove([a,b])
|
detectorEnd(); // ← 替换原来的 handmove([a,b])
|
||||||
}
|
}
|
||||||
handmove([-200, -200])
|
handmove([-200, -200])
|
||||||
startmoveit.value = true;
|
startmoveit.value = true;
|
||||||
},100)
|
// },100)
|
||||||
}
|
}
|
||||||
// 切割bigArray
|
// 切割bigArray
|
||||||
function splitString(str) {
|
function splitString(str) {
|
||||||
|
|
@ -537,12 +540,12 @@
|
||||||
|
|
||||||
// 判断方向（返回 [-1/0/1, -1/0/1]：x方向, y方向）
|
// 判断方向（返回 [-1/0/1, -1/0/1]：x方向, y方向）
|
||||||
function getDir(x, y) {
|
function getDir(x, y) {
|
||||||
const dx = (x <= 150 ? -1 : (x >= 710 && x < 825? 1 : 0));
|
const dx = (x <= 150 ? -1 : (x >= 710 && x < 825 ? 1 : 0));
|
||||||
const dy = (y <= 80 ? -1 : (y >= 550 ? 1 : 0));
|
const dy = (y <= 80 ? -1 : (y >= 550 ? 1 : 0));
|
||||||
return [dx, dy];
|
return [dx, dy];
|
||||||
}
|
}
|
||||||
|
|
||||||
const howtomove = ref([2,2])
|
const howtomove = ref([2, 2])
|
||||||
|
|
||||||
// ---------- 状态 ----------
|
// ---------- 状态 ----------
|
||||||
let windowTimer = null; // 500ms 的计时器 id
|
let windowTimer = null; // 500ms 的计时器 id
|
||||||
|
|
|
||||||
|
|
@ -222,7 +222,7 @@
|
||||||
const form = reactive({
|
const form = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
employeeId:uni.getStorageSync('userInfo').employessId,
|
employeeId:uni.getStorageSync('userInfo').employeesId,
|
||||||
nuId:uni.getStorageSync('nuId'),
|
nuId:uni.getStorageSync('nuId'),
|
||||||
workType:5
|
workType:5
|
||||||
})
|
})
|
||||||
|
|
@ -273,10 +273,10 @@
|
||||||
nuId:nuId,
|
nuId:nuId,
|
||||||
// elderId:elderId
|
// elderId:elderId
|
||||||
}
|
}
|
||||||
queryAll(data).then(res=>{
|
// queryAll(data).then(res=>{
|
||||||
console.log(res)
|
// console.log(res)
|
||||||
zlarr.value = res.result.invoicing;
|
// zlarr.value = res.result.invoicing;
|
||||||
})
|
// })
|
||||||
}
|
}
|
||||||
const zldex = (e) =>{
|
const zldex = (e) =>{
|
||||||
if(e>-1&&e==fwzldex.value){
|
if(e>-1&&e==fwzldex.value){
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@
|
||||||
const listarr = ref([])
|
const listarr = ref([])
|
||||||
const swip = ()=>{
|
const swip = ()=>{
|
||||||
let nuId = uni.getStorageSync('nuId');
|
let nuId = uni.getStorageSync('nuId');
|
||||||
getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{
|
getPermissionList({employeesId:uni.getStorageSync('userInfo').employeesId}).then(res=>{
|
||||||
res.result.forEach(item=>{
|
res.result.forEach(item=>{
|
||||||
if(item.nuId == nuId){
|
if(item.nuId == nuId){
|
||||||
listarr.value = item.dataList
|
listarr.value = item.dataList
|
||||||
|
|
|
||||||
|
|
@ -399,7 +399,7 @@
|
||||||
}
|
}
|
||||||
const gotoindex = () => {
|
const gotoindex = () => {
|
||||||
if (uni.getStorageSync('userInfo')) {
|
if (uni.getStorageSync('userInfo')) {
|
||||||
initWs(`wss://www.focusnu.com/ws101/sdWebsocket/${uni.getStorageSync('userInfo').employessId}`, {
|
initWs(`wss://www.focusnu.com/ws101/sdWebsocket/${uni.getStorageSync('userInfo').employeesId}`, {
|
||||||
debug: true,
|
debug: true,
|
||||||
heartbeatInterval: 25000,
|
heartbeatInterval: 25000,
|
||||||
autoConnect: false, // 不自动连接
|
autoConnect: false, // 不自动连接
|
||||||
|
|
|
||||||
|
|
@ -121,11 +121,12 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick } from 'vue';
|
import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick } from 'vue';
|
||||||
import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js'
|
import { getServiceTree0, getServiceTree1, getServiceTree2 } from '@/pages/NursingNew/component/nurse/api.js'
|
||||||
import { onBackPress, onShow, onHide } from "@dcloudio/uni-app"
|
import { onBackPress, onShow, onHide,onUnload } from "@dcloudio/uni-app"
|
||||||
import { queryPadPageList, queryDepartTreeSync } from '@/pages/watch/api/lunpan.js'
|
import { queryPadPageList, queryDepartTreeSync } from '@/pages/watch/api/lunpan.js'
|
||||||
import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
|
import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
|
||||||
import exit from "@/component/public/exit.vue"
|
import exit from "@/component/public/exit.vue"
|
||||||
|
|
||||||
|
|
||||||
onBackPress(() => {
|
onBackPress(() => {
|
||||||
return true; // 禁止返回手势返回
|
return true; // 禁止返回手势返回
|
||||||
})
|
})
|
||||||
|
|
@ -159,7 +160,7 @@
|
||||||
// console.log("zzzzzzzzzzzzzzzzzzzzzzzzzzzz")
|
// console.log("zzzzzzzzzzzzzzzzzzzzzzzzzzzz")
|
||||||
queryPadPageList().then((res => {
|
queryPadPageList().then((res => {
|
||||||
leftMenuArray.value = res.result.records;
|
leftMenuArray.value = res.result.records;
|
||||||
console.log("????111111111111", leftMenuArray.value)
|
// console.log("????111111111111", leftMenuArray.value)
|
||||||
}))
|
}))
|
||||||
fontnumber.value = uni.getStorageSync('orgListName');
|
fontnumber.value = uni.getStorageSync('orgListName');
|
||||||
queryDepartTreeSync().then(res => {
|
queryDepartTreeSync().then(res => {
|
||||||
|
|
@ -379,6 +380,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
const ceshijump = () => {
|
const ceshijump = () => {
|
||||||
|
|
||||||
// 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')
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
库存预警
|
库存预警
|
||||||
</view>
|
</view>
|
||||||
<scroll-view scroll-x="true" class="kcscrol guodu"
|
<scroll-view scroll-x="true" class="kcscrol guodu"
|
||||||
:style="tx?(qb?'width:38.2vw':'width:47.2vw') : (qb?'width:71.2vw':'width:80.2vw') "
|
:style="tx?(qb?'width:39.2vw':'width:48.2vw') : (qb?'width:72.2vw':'width:81.2vw') "
|
||||||
scroll-with-animation :scroll-left="scrollleft" @scroll="onScroll" @scrolltolower="scrolltolower(1)">
|
scroll-with-animation :scroll-left="scrollleft" @scroll="onScroll" @scrolltolower="scrolltolower(1)">
|
||||||
<view class="yjbox" v-for="(v,i) in Material" :key="i" @click="clickaddcar(v,i)">
|
<view class="yjbox" v-for="(v,i) in Material" :key="i" @click="clickaddcar(v,i)">
|
||||||
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
|
<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ export const queryPadPageList = (params) => {
|
||||||
|
|
||||||
export const getPermissionList = (params) => {
|
export const getPermissionList = (params) => {
|
||||||
return request({
|
return request({
|
||||||
url: `${uni.getStorageSync('serverUrl')}/api/employessInfo/getPermissionList`,
|
url: `${uni.getStorageSync('serverUrl')}/api/employeesInfo/getPermissionList`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
data: params,
|
data: params,
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -188,7 +188,7 @@
|
||||||
userInfo.value = uni.getStorageSync('userInfo');
|
userInfo.value = uni.getStorageSync('userInfo');
|
||||||
}
|
}
|
||||||
const avaxg = () =>{
|
const avaxg = () =>{
|
||||||
editAvatar({avatar:userInfo.value.avatar,id:userInfo.value.id,employessId:userInfo.value.employessId}).then(res=>{
|
editAvatar({avatar:userInfo.value.avatar,id:userInfo.value.id,employeesId:userInfo.value.employeesId}).then(res=>{
|
||||||
if(res.success){
|
if(res.success){
|
||||||
uni.setStorageSync('userInfo', userInfo.value);
|
uni.setStorageSync('userInfo', userInfo.value);
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
|
|
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -7,8 +7,8 @@
|
||||||
"id": "__UNI__FB2D473",
|
"id": "__UNI__FB2D473",
|
||||||
"name": "护理单元",
|
"name": "护理单元",
|
||||||
"version": {
|
"version": {
|
||||||
"name": "1.0.030",
|
"name": "1.0.031",
|
||||||
"code": 10030
|
"code": 10031
|
||||||
},
|
},
|
||||||
"description": "护理单元",
|
"description": "护理单元",
|
||||||
"developer": {
|
"developer": {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 858 B After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1 +1 @@
|
||||||
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.030","code":10030},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
|
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__FB2D473","name":"护理单元","version":{"name":"1.0.031","code":10031},"description":"护理单元","developer":{"name":"","email":"","url":""},"permissions":{"Share":{},"VideoPlayer":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"render":"always","id":"1","kernel":"WKWebview"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"nativePlugins":{"MonitorModule":{"__plugin_info__":{"name":"MonitorModule","description":"bugly升级","platforms":"Android","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#000000"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"uni-app":{"control":"uni-v3","vueVersion":"3","compilerVersion":"4.76","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal","webView":{"minUserAgentVersion":"49.0"}}},"app-harmony":{"useragent":{"value":"uni-app","concatenate":true},"uniStatistics":{"enable":false}},"screenOrientation":["landscape-primary","landscape-secondary"],"launch_path":"__uniappview.html"}
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 858 B After Width: | Height: | Size: 3.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
Loading…
Reference in New Issue