From 8bb36ed768729cbf5afb340969980ccfef1c1750 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 21 六月 2023 17:22:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 57 ++++++++++++++++++----------
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html | 4 +-
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html | 14 +++---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java | 2
5 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
index 24d5a39..3d938ae 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java
@@ -81,7 +81,7 @@
model.addAttribute("num2",jsonObject.getInteger("num2"));
model.addAttribute("num3",jsonObject.getInteger("num3"));
model.addAttribute("num4",jsonObject.getInteger("num4"));
- model.addAttribute("num5",jsonObject.getInteger("num5"));
+// model.addAttribute("num5",jsonObject.getInteger("num5"));
return PREFIX + "tSystemConfigDispatchRules.html";
}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
index ae15266..29c98ac 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -421,11 +421,16 @@
selectMonth(value)// change 每点一次都会监听一遍
}
});
+ laydate.render({
+ elem: '#createTime',
+ type: 'date',
+ range: true
+ });
// 进度条加载
function loading(){
var options = $.extend({
- percentage : $('#agentTotal').text(),
+ percentage : $('#agentTotal').text()<100?$('#agentTotal').text():($('#agentTotal').text()>1000?$('#agentTotal').text()/100:$('#agentTotal').text()/10),
ShowProgressCount: false,
duration: 10,
@@ -438,7 +443,7 @@
});
$('#pro1').LineProgressbar(options);
var options = $.extend({
- percentage : $('#agentMonthTotal').text(),
+ percentage : $('#agentMonthTotal').text()<100?$('#agentMonthTotal').text():($('#agentMonthTotal').text()>1000?$('#agentMonthTotal').text()/100:$('#agentMonthTotal').text()/10),
ShowProgressCount: false,
duration: 10,
@@ -451,7 +456,7 @@
});
$('#pro2').LineProgressbar(options);
var options = $.extend({
- percentage : $('#driverTotal').text(),
+ percentage : $('#driverTotal').text()<100?$('#driverTotal').text():($('#driverTotal').text()>1000?$('#driverTotal').text()/100:$('#driverTotal').text()/10),
ShowProgressCount: false,
duration: 10,
@@ -464,7 +469,7 @@
});
$('#pro3').LineProgressbar(options);
var options = $.extend({
- percentage : $('#driverMonthTotal').text(),
+ percentage : $('#driverMonthTotal').text()<100?$('#driverMonthTotal').text():($('#driverMonthTotal').text()>1000?$('#driverMonthTotal').text()/100:$('#driverMonthTotal').text()/10),
ShowProgressCount: false,
duration: 10,
@@ -719,9 +724,9 @@
document.getElementById("serverCount").innerText=data.serverCount
document.getElementById("finishCount").innerText=data.finishCount
document.getElementById("cancelCount").innerText=data.cancelCount
- $('#allList').val(data.allList);
- console.log(data.allList)
- map(data.allList,data.addressLon,data.addressLat)
+ $('#onLineDriver').val(data.onLineDriver);
+ console.log(data.onLineDriver)
+ map(data.onLineDriver,data.addressLon,data.addressLat)
getOrderData()
}, function (data) {
@@ -739,8 +744,8 @@
document.getElementById("serverCount").innerText=data.serverCount
document.getElementById("finishCount").innerText=data.finishCount
document.getElementById("cancelCount").innerText=data.cancelCount
- $('#allList').val(data.allList);
- map(data.allList,data.addressLon,data.addressLat)
+ $('#onLineDriver').val(data.onLineDriver);
+ map(data.onLineDriver,data.addressLon,data.addressLat)
getOrderData()
}, function (data) {
});
@@ -791,11 +796,6 @@
window._AMapSecurityConfig = {
securityJsCode:'b62d9146929db08c4c2f4537d045320d',
};
- laydate.render({
- elem: '#createTime',
- type: 'date',
- range: true
- });
AMapLoader.reset() // 需要把这个reset一下
AMapLoader.load({
@@ -818,13 +818,30 @@
});
// map.clearMap(); // 清除地图覆盖物
// 经纬度坐标数组
- const onLineDriver = $('#onLineDriver').val();
- var list1 = JSON.stringify(onLineDriver)
- const jsonArr = JSON.parse(list1)
- const jsonArr1 = JSON.parse(jsonArr);
- console.log(jsonArr1)
- M = jsonArr1;
+
+ var onLineDriver;
+ if(e==""){
+ onLineDriver = $('#onLineDriver').val();
+ console.log("onLineDriver========================")
+ console.log(onLineDriver)
+ var list1 = JSON.stringify(onLineDriver)
+ console.log("list1========================")
+ console.log(list1)
+ const jsonArr = JSON.parse(list1)
+ console.log("jsonArr========================")
+ console.log(jsonArr)
+ const jsonArr1 = JSON.parse(jsonArr);
+ console.log("jsonArr1========================")
+ console.log(jsonArr1)
+ M = jsonArr1;
+ }else{
+ M=e;
+ }
+ console.log("M =========================")
+ console.log(M)
M.forEach(function(marker) {
+ console.log("========================")
+ console.log(marker)
new AMap.Marker({
map: map,
icon: marker[2]==1?'https://csxdj.obs.cn-south-1.myhuaweicloud.com/c1d2f38187de40daa353fcc70993288e.png':'https://csxdj.obs.cn-south-1.myhuaweicloud.com/c1d2f38187de40daa353fcc70993288e.png',
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
index de4a41c..e04ea70 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html
@@ -52,7 +52,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">优惠券限制数量：</label>
- <input id="couponCount" name="couponCount2" type="number" min="1" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponCount" name="couponCount2" type="number" min="1" placeholder="请输入优惠券限制数量" style="height: 30px" required>
</div>
</div>
@@ -98,7 +98,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label">赠送数量：</label>
- <input id="couponSendQuantity" name="couponSendQuantity" min="1" type="number" maxlength="4" placeholder="最多4位数字" style="height: 30px" required>
+ <input id="couponSendQuantity" name="couponSendQuantity" min="1" type="number" placeholder="请输入赠送数量" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" style="text-align: left" >
<label>张</label>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
index 9d1a791..eb276ca 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html
@@ -51,19 +51,19 @@
</div>
</div>
- <div class="initialLevel col-sm-12 control-label form-group" >
+ <!--<div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >改派设置:</label>
</div>
- </div>
+ </div>-->
- <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
+ <!--<div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
<div class="initialLevel col-sm-2 control-label form-group" >
<span class="control-label" >改派后暂停接单</span>
- <input class="control-label" id="num5" name="num5" value="${num5}" type="number" min="0" style="height: 30px;width: 80px">
+ <input class="control-label" id="num5" name="num5" value="" type="number" min="0" style="height: 30px;width: 80px">
<span class="control-label" >分钟</span>
</div>
- </div>
+ </div>-->
<div class="row btn-group-m-t">
<div class="col-sm-10" style="text-align: center">
@@ -96,10 +96,10 @@
var value = $(this).val()
regexp(value)
})
- $("input[name=num5]").bind('input',function(){
+ /*$("input[name=num5]").bind('input',function(){
var value = $(this).val()
regexp(value)
- })
+ })*/
function regexp(value){
var reg=/^[1-9]\d*$/;//由 1-9开头 的正则表达式
//先判断是否为整数 在判断 是否在 1-总页 整数范围之内
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
index 03ef6e2..3cc7f6e 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
@@ -97,7 +97,7 @@
reqData['num2'] = Number($("#num2").val());
reqData['num3'] = Number($("#num3").val());
reqData['num4'] = Number($("#num4").val());
- reqData['num5'] = Number($("#num5").val());
+ // reqData['num5'] = Number($("#num5").val());
ajax.set("content",JSON.stringify(reqData));
ajax.set("type",1);
ajax.start();
--
Gitblit v1.7.1