浏览代码

优化前台显示

wuxw 6 年之前
父节点
当前提交
2b0fbb9ae2

+ 2 - 2
Api/src/main/java/com/java110/api/listener/machineTranslate/MachineRoadGateOpenListener.java

@@ -256,8 +256,8 @@ public class MachineRoadGateOpenListener extends BaseMachineListener {
 
         JSONObject data = new JSONObject();
         data.put("money", money);//缴费金额
-        data.put("hour", hour);//停车时间
-        data.put("min", min);//停车时间
+        data.put("hour", new Double(hour).intValue());//停车时间
+        data.put("min", new Double(min).intValue());//停车时间
 
         context.setResponseEntity(MachineResDataVo.getResData(MachineResDataVo.CODE_ERROR, "车辆未支付,请先支付", data));
     }

+ 9 - 12
WebService/src/main/resources/components/carInoutPackage/carIn-manage/carInManage.js

@@ -58,19 +58,16 @@
                         var _tmpInTime = new Date(_tmpCarIn.inTime);
                         var _tmpNow = new Date();
                         var diff = _tmpNow - _tmpInTime;
-                        var nd = 1000 * 24 * 60 * 60;// 一天的毫秒数
-                        var nh = 1000 * 60 * 60;// 一小时的毫秒数
-                        var nm = 1000 * 60;// 一分钟的毫秒数
-                        var day = 0;
-                        var hour = 0;
-                        var min = 0;
-                        day = diff / nd;// 计算差多少天
-                        hour = diff % nd / nh + day * 24;// 计算差多少小时
-                        min = diff % nd % nh / nm + day * 24 * 60;// 计算差多少分钟
-                        if (isNaN(hour)) {
-                         _tmpCarIn.continueHours = hour;
+                        //计算出小时数
+                        var leave1=diff%(24*3600*1000)    //计算天数后剩余的毫秒数
+                        var hours=Math.floor(leave1/(3600*1000))
+                        //计算相差分钟数
+                        var leave2=leave1%(3600*1000)        //计算小时数后剩余的毫秒数
+                        var minutes=Math.floor(leave2/(60*1000))
+                        if (isNaN(hours)) {
+                         _tmpCarIn.continueHours = hours;
                         }else{
-                          var newHours = hour+":"+min;
+                          var newHours = hours+":"+minutes;
                           _tmpCarIn.continueHours = newHours;
                         }
                         _tmpCarIns.push(_tmpCarIn);