diff --git a/component/public/newgame/sxy-Timeing.vue b/component/public/newgame/sxy-Timeing.vue
index 8bee83e..891c9ec 100644
--- a/component/public/newgame/sxy-Timeing.vue
+++ b/component/public/newgame/sxy-Timeing.vue
@@ -7,10 +7,14 @@
{{ Math.floor(bottomTime / 60) }}
- {{ Math.floor(topTime / 60) }}
+ {{ Math.floor(topTime / 60) }}
+ MIN
+
+
+
+ {{ Math.floor(bottomTime / 60) }}
+ MIN
-
- {{ Math.floor(bottomTime / 60) }}
:
@@ -21,9 +25,13 @@
{{ (topTime % 60)<10?'0'+(topTime % 60) : (topTime % 60) }}
+ SEC
- {{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60) }}
+
+ {{ (bottomTime % 60)<10? '0'+(bottomTime % 60) : (bottomTime % 60) }}
+ SEC
+
@@ -36,21 +44,21 @@ export default {
type: Number,
default:185,
},
- // isDown: {
- // // 是否是倒计时
- // type: Boolean,
- // default: true,
- // },
threshold: {
// 阈值
type: Number,
default: 0,
},
+ timeoutDuration:{
+ // 超时时间多少停止
+ type: Number,
+ default: 0,
+ }
},
data() {
return {
- topTime: this.initTime,
- bottomTime: this.initTime,
+ topTime: Math.abs(this.initTime),
+ bottomTime: Math.abs(this.initTime),
faceZindex: 1,
backZindex: 0,
transformInfo: "perspective(500rpx) rotateX(0deg)",
@@ -85,12 +93,11 @@ export default {
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 ){
+ if(minutes != this.mintime &&!this.transformInfomin){
this.transformInfomin = true;
}else{
this.transformInfomin = false;
@@ -98,7 +105,7 @@ export default {
} else {
this.topTime = n + 1 > this.threshold ? n : n + 1;
this.mintime = Math.floor(this.topTime / 60)
- if(minutes != this.mintime ){
+ if(minutes != this.mintime &&!this.transformInfomin){
this.transformInfomin = true;
}else{
this.transformInfomin = false;
@@ -106,16 +113,17 @@ export default {
}
}
- this.faceZindex = num <= 10 ? 1 : 0;
- this.backZindex = num <= 10 ? 0 : 1;
+ this.faceZindex = num <= 25? 1 : 0;
+ this.backZindex = num <= 25? 0 : 1;
this.transformInfo = `perspective(500rpx) rotateX(-${(180 * num) / 50}deg)`;
- },5); // 将一秒钟分成50份。
+ },10); // 将一秒钟分成50份。
},
cycle() {
let minutes = Math.floor(this.initTime / 60);
- let time = this.initTime;
+ this.isDown = this.initTime>0?true:false
+ let time = Math.abs(this.initTime);
// console.log(minutes,time)
this.timerTwo = setInterval(() => {
const flag = this.isDown ? time - 1 : time + 1;
@@ -124,6 +132,11 @@ export default {
// clearInterval(this.timerTwo);
// clearInterval(this.timer);
}
+ if(flag == this.timeoutDuration){
+ clearInterval(this.timerTwo);
+ clearInterval(this.timer);
+ this.$emit('timeend')
+ }
this.OneCycle(time);
this.isDown ? time-- : time++;
}, 1000);
@@ -145,14 +158,14 @@ export default {
}
.box .child {
- width: 3.4vw;
- height: 1.6vw;
+ min-width: 3.4vw;
+ height: 2vw;
overflow: hidden;
}
.box > .top {
background-color: #DCDCDC;
- line-height: 3.2vw;
+ line-height: 4vw;
border-bottom: 2rpx solid #fff;
border-radius: 4rpx 4rpx 0 0;
}
@@ -168,7 +181,7 @@ export default {
.box .flip .flip_face {
position: absolute;
background-color: #DCDCDC;
- line-height: 3.2vw;
+ line-height: 4vw;
z-index: 1;
border-bottom: 2rpx solid #fff;
}
@@ -193,5 +206,15 @@ export default {
font-size: 2.2vw;
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.3vw;
+ }
}
diff --git a/component/public/severcard.vue b/component/public/severcard.vue
index 845e60f..61608fb 100644
--- a/component/public/severcard.vue
+++ b/component/public/severcard.vue
@@ -1,149 +1,212 @@
-
-
-
-
-
- {{qcobj.directiveName}}
-
+
+
+
+
-
-
-
- {{qcobj.startTime?.slice(11, 16) }}
-
-
-
-
-
-
-
- {{ qcobj?.directiveName }}
-
-
-
- 单人执行
- 协助执行
-
-
-
- {{qcobj.employeeName}}
- {{qcobj.optNames}}
-
-
-
- 开始服务
-
-
- 结束服务
-
-
+ 1" >
+
+
+
+
+
+
+
+
+
+
+ {{qcobj.directiveName}}
+
+
+
+
+
+ {{qcobj.startTime?.slice(11, 16) }}
+
+
+
+
+
+
+
+ {{ qcobj?.directiveName }}
+
+
+
+ 单人执行
+ 协助执行
+
+
+
+ {{qcobj.employeeName}}
+ {{qcobj.optNames}}
+
+
+
+ 开始服务
+
+
+ 结束服务
+
+
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index fa23e39..2f7b35d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "护理单元",
"appid" : "__UNI__FB2D473",
"description" : "护理单元",
- "versionName" : "1.0.026",
- "versionCode" : 10026,
+ "versionName" : "1.0.027",
+ "versionCode" : 10027,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue
index c62c6a6..2d8ff36 100644
--- a/pages/NursingNew/component/leftcontent/serveswipe.vue
+++ b/pages/NursingNew/component/leftcontent/serveswipe.vue
@@ -17,17 +17,19 @@
-
服务倒计时
-
+
{{ indexmessage?.startTime.slice(11, 16) }}
- | 30分钟
+
+ | {{indexmessage?.serviceDuration}}分钟
+
@@ -98,28 +100,28 @@