Skip to content

M
mes-ui
Commit f978979b authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents 58070a11 bc4b0749
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
components/page/outputTime.vue
View file @ f978979b
......@@ -34,23 +34,23 @@ export default {
let outStr = "";
if (day) {
if (second == 0 && minute > 0 && hour > 0) {
outStr = day + "天" + hour + "时" + minute + "分";
outStr = day + "天" + hour + "小时" + minute + "分";
} else if (second == 0 && minute == 0 && hour > 0) {
outStr = day + "天" + hour + "时";
outStr = day + "天" + hour + "小时";
} else if (second == 0 && minute == 0 && hour == 0) {
outStr = day + "天";
} else {
outStr = day + "天" + hour + "时" + minute + "分" + second + "秒";
outStr = day + "天" + hour + "小时" + minute + "分" + second + "秒";
}
return outStr;
} else {
if (hour) {
if (second == 0 && minute > 0) {
outStr = hour + "时" + minute + "分";
outStr = hour + "小时" + minute + "分";
} else if (second == 0 && minute == 0) {
outStr = hour + "时";
outStr = hour + "小时";
} else {
outStr = hour + "时" + minute + "分" + second + "秒";
outStr = hour + "小时" + minute + "分" + second + "秒";
}
return outStr;
} else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment