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

components/page/outputTime.vue

@@ -34,36 +34,36 @@ 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 + "小时";
         } 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 + "小时";
           } else {
-            outStr = hour + "小时" + minute + "分" + second + "秒";
+            outStr = hour + "小时" + minute + "分钟" + second + "秒钟";
           }
           return outStr;
         } else {
           if (minute) {
             if (second == 0) {
-              outStr = minute + "分";
+              outStr = minute + "分钟";
             } else {
-              outStr = minute + "分" + second + "秒";
+              outStr = minute + "分钟" + second + "秒钟";
             }
             return outStr;
           } else {
             if (second) {
-              return second + "秒";
+              return second + "秒钟";
             }
           }
         }