From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
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 a48a2a9..09d9ef3 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
@@ -372,11 +372,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,
@@ -389,7 +394,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,
@@ -402,7 +407,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,
@@ -415,7 +420,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,
@@ -670,9 +675,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) {
@@ -690,8 +695,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) {
});
--
Gitblit v1.7.1