Browse Source

机器设备修改

pangjl 5 năm trước cách đây
mục cha
commit
7243203379

+ 4 - 0
src/main/webapp/admin/machineManage/addEquproduct.html

@@ -14,6 +14,9 @@
     </fieldset>
     
 	<form class="layui-form" action="javascript:void(0)" id = "form2">
+		<fieldset class="layui-elem-field layui-field-title" style="margin-top: 40px;">
+			<legend style="color: #1b9eff" id="row"></legend>
+		</fieldset>
 		<div class="layui-form-item">
 		 	<label class="layui-form-label">*商品:</label>
 		    <div class="layui-input-inline">
@@ -104,6 +107,7 @@
     $("#perRow").val(perRow);
     $("#perLine").val(perLine);
     $("#equId").val(equId);
+	$("#row").html("第"+accAdd(perRow,1)+"层,"+"第"+accAdd(perLine,1)+"列");
         layui.use('form', function(){
        		var form = layui.form;
        			$('#game').hide();

+ 2 - 2
src/main/webapp/admin/machineManage/deleteMachine.html

@@ -19,13 +19,13 @@
 		<div style="padding-bottom:60px; ">
          <div class="layui-form-item">
             <div class="layui-inline">
-                <label class="layui-form-label">*解绑起始机台号:</label>
+                <label class="layui-form-label">*起始机台号:</label>
                 <div class="layui-input-inline">
                     <input type="tel" name="startEquCode" id = "startEquCode" lay-verify="startEquCode"  placeholder="请输入解绑开始机台号"autocomplete="off" class="layui-input">
                 </div>
             </div>
              <div class="layui-inline">
-                 <label class="layui-form-label">解绑结束机台号:</label>
+                 <label class="layui-form-label">结束机台号:</label>
                  <div class="layui-input-inline">
                      <input type="tel" name="endEquCode" id = "endEquCode" lay-verify="endEquCode"  placeholder="请输入解绑结束机台号"autocomplete="off" class="layui-input">
                  </div>

+ 4 - 0
src/main/webapp/admin/machineManage/editEquproduct.html

@@ -13,6 +13,9 @@
     </fieldset>
     
 	<form class="layui-form" action="javascript:void(0)" id = "form2">
+		<fieldset class="layui-elem-field layui-field-title" style="margin-top: 40px;">
+			<legend style="color: #1b9eff" id="row"></legend>
+		</fieldset>
 		<div class="layui-form-item">
 		 	<label class="layui-form-label">*商品:</label>
 		    <div class="layui-input-inline">
@@ -106,6 +109,7 @@
     $("#equId").val(equId);
     $("#proId").val(proId);
     $("#perId").val(perId);
+	$("#row").html("第"+accAdd(perRow,1)+"层,"+"第"+accAdd(perLine,1)+"列");
         layui.use('form', function(){
        		var form = layui.form;
        		$('#game').hide();

+ 5 - 5
src/main/webapp/admin/machineManage/editmachine.html

@@ -104,7 +104,7 @@
             </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">手续费:</label>
+                    <label class="layui-form-label" style="width: 105px;">手续费:</label>
                     <div class="layui-input-inline">
                         <input type="tel" name="charge" id = "charge" lay-verify="charge"  placeholder="请输入手续费"autocomplete="off" class="layui-input">
                     </div>
@@ -121,12 +121,12 @@
                 <legend style="color: #1b9eff">幸运购信息</legend>
             </fieldset>
             <div class="layui-form-item">
-                <label class="layui-form-label" style = "width: 150px;">支付金额:</label>
+                <label class="layui-form-label" style = "width: 120px;">支付金额:</label>
                 <div class="layui-input-inline" id ="payment">
                 </div>
             </div>
             <div class="layui-form-item">
-                <label class="layui-form-label fap-form-item fap-form-item-require" >支付金额类型:</label>
+                <label class="layui-form-label fap-form-item fap-form-item-require" style="margin-left: 25px">支付金额类型:</label>
                 <div class="layui-input-block" >
                     <input type="radio" name="paymentType" value="00" title="随机" checked="" onclick="one(0)" lay-filter="sss">
                     <input type="radio" name="paymentType" value="01" title="固定" onclick="one(1)" lay-filter="sss">
@@ -134,14 +134,14 @@
             </div>
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">汇率:</label>
+                    <label class="layui-form-label" style = "width: 120px;">汇率:</label>
                     <div class="layui-input-inline">
                         <input type="tel" name="exchangeRate" id = "exchangeRate" lay-verify="exchangeRate"  placeholder="请输入汇率"autocomplete="off" class="layui-input">
                     </div>
                 </div>
             </div>
             <div class="layui-form-item">
-                <label class="layui-form-label fap-form-item fap-form-item-require" >是否支持余额:</label>
+                <label class="layui-form-label fap-form-item fap-form-item-require" style="margin-left: 25px">是否支持余额:</label>
                 <div class="layui-input-block" >
                     <input type="radio" name="supportBalance" value="00" title="支持" checked="" onclick="one(0)" lay-filter="sss">
                     <input type="radio" name="supportBalance" value="01" title="不支持" onclick="one(1)" lay-filter="sss">

+ 1 - 1
src/main/webapp/css/master.css

@@ -886,7 +886,7 @@ iframe {
     padding-bottom: 6px;
 }
 .layui-form-checkbox i{
-	height: 30px !important;
+	height: 15px !important;
 }
 .tan{
 	width: 336px;

+ 64 - 0
src/main/webapp/js/min.js

@@ -1084,4 +1084,68 @@ function getParam(param) {
    var reg = new RegExp("(^|&)"+param+"=([^&]*)(&|$)");
    var r = window.location.search.substr(1).match(reg);
    if (r != null) return unescape(r[2]); return null;
+}
+// 加法
+function accAdd(arg1, arg2,pointWs) {
+	var r1, r2, max;
+	try { r1 = arg1.toString().split(".")[1].length } catch (e) { r1 = 0 }
+	try { r2 = arg2.toString().split(".")[1].length } catch (e) { r2 = 0 }
+	max = Math.pow(10, Math.max(r1, r2))
+	if (isEmpty(pointWs)) {
+		return ((arg1 * max + arg2 * max) / max);
+	} else {
+//    	return ((arg1 * max + arg2 * max) / max).toFixed(pointWs);
+		return Math.round(((arg1 * max + arg2 * max) / max)*Math.pow(10, pointWs))/Math.pow(10, pointWs);
+	}
+
+}
+
+// 减法
+function accSub(arg1, arg2,pointWs) {
+	var r1, r2, max, min;
+	try { r1 = arg1.toString().split(".")[1].length } catch (e) { r1 = 0 }
+	try { r2 = arg2.toString().split(".")[1].length } catch (e) { r2 = 0 }
+	max = Math.pow(10, Math.max(r1, r2));
+	//动态控制精度长度
+	min = (r1 >= r2) ? r1 : r2;
+	if (isEmpty(pointWs)) {
+		return ((arg1 * max - arg2 * max) / max).toFixed(min);
+	} else {
+//    	return ((arg1 * max - arg2 * max) / max).toFixed(pointWs);
+		return Math.round(((arg1 * max - arg2 * max) / max)*Math.pow(10, pointWs))/Math.pow(10, pointWs);
+	}
+}
+
+// 乘法
+// pointWs:小数点位数
+function accMul(arg1, arg2, pointWs) {
+	var max = 0, s1 = arg1.toString(), s2 = arg2.toString();
+	try { max += s1.split(".")[1].length } catch (e) { }
+	try { max += s2.split(".")[1].length } catch (e) { }
+	var resData = Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, max);
+	if(!isEmpty(pointWs)) {
+		// 四舍五入
+//    	return resData.toFixed(pointWs);
+		return Math.round(resData*Math.pow(10, pointWs))/Math.pow(10, pointWs);
+	}
+	return resData;
+}
+
+// 除法
+//pointWs:小数点位数
+function accDivFun(arg1, arg2, pointWs) {
+	var t1 = 0, t2 = 0, r1, r2;
+	try { t1 = arg1.toString().split(".")[1].length } catch (e) { }
+	try { t2 = arg2.toString().split(".")[1].length } catch (e) { }
+	with (Math) {
+		r1 = Number(arg1.toString().replace(".", ""))
+		r2 = Number(arg2.toString().replace(".", ""))
+		var resData = (r1 / r2) * pow(10, t2 - t1);
+		if(!isEmpty(pointWs)) {
+			// 四舍五入
+//        	return resData.toFixed(pointWs);
+			return Math.round(resData*Math.pow(10, pointWs))/Math.pow(10, pointWs);
+		}
+		return resData;
+	}
 }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
src/main/webapp/plugins/layui/css/layui.css