From cc4bba079da1ebeae53f3d546a7469e1bca6f998 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 10 一月 2023 10:32:23 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 104 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 97 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index cd91d26..a17558c 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -31,11 +31,15 @@
display: inline-block;
width: 49%;
}
+ .chart-elem div {
+ padding-top: 15px;
+ padding-bottom: 5px;
+ }
.chart-elem:first-child {
padding: 0 50px;
}
.chart-elem:last-child {
- padding-left: 20px;
+ padding: 0 50px;
border-left: 1px solid rgba(0,0,0,.1);
}
/*琛ㄦ牸宸ュ叿鏍�*/
@@ -81,6 +85,12 @@
.layui-form.layui-border-box.layui-table-view {
border-top: 1px solid rgba(0,0,0,.1);
}
+ #search-box {
+ margin-left: 10px;
+ z-index: 999;
+ position: relative;
+ padding: 0 30px 10px 30px;
+ }
</style>
</head>
<body>
@@ -99,6 +109,39 @@
<div class="home-elem loc-retention">
<div class="layui-form">
<div id="form-header">搴撳瓨婊炵暀鏃堕棿缁熻琛�</div>
+ <div class="layui-card" style="padding: 0 20px 20px 20px;">
+ <fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+ <legend>鎼滅储鏍�</legend>
+ <div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ </div>
+ </div>
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ </div>
+ </div>
+ </fieldset>
+
+ </div>
<table class="layui-hide" id="stayTime" lay-filter="stayTime"></table>
</div>
</div>
@@ -127,7 +170,7 @@
text: '搴撲綅浣跨敤姣斾緥',
margin:1,
style: {fontSize: '18px',color: '#777',fontWeight: 'bold'},
- y: 20
+ y: 5
};
var tooltip = {
pointFormat: '{series.name}: <b>{point.percentage:.1f}%</b>'
@@ -185,7 +228,7 @@
text: '鏃ュ叆鍑哄簱鏁伴噺',
margin: 1,
style: {fontSize: '18px',color: '#777',fontWeight: 'bold'},
- y: 20
+ y: 5
};
var xAxis = {
categories: [getDate(-11), getDate(-10), getDate(-9), getDate(-8), getDate(-7), getDate(-6),
@@ -231,11 +274,17 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'appe_time', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
- ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
+ //{field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 165}
+ {field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟',width: 90}
+ ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺',width: 90}
+ ,{field: 'store_min', title: '搴撳瓨涓嬮檺', align: 'center'}
+ ,{field: 'sum_qty', title: '搴撳瓨鎬绘暟', align: 'center'}
+ ,{field: 'store_max', title: '搴撳瓨涓婇檺', align: 'center'}
+ ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�',width: 90}
+
];
cols.push.apply(cols, detlCols);
+ //cols.push({field: 'sum_qty', title: '搴撳瓨鎬绘暟', align: 'center'})
return cols;
}
layui.use(['table','laydate', 'form'], function() {
@@ -271,6 +320,37 @@
statusCode: 200
},
done: function(res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
+ if (item.store_max_date != null) {
+ if (item.stay_time > item.store_max_date) {
+ tr.css("background-color", "#ff6f00");
+ tr.css("color", "white");
+ tr.children()[1].style.backgroundColor="#ff0000"
+ }
+ }
+ //浣庝簬涓嬮檺
+ if (item.sum_qty < item.store_min) {
+ tr.css("background-color", "#ff6f00");
+ tr.css("color", "white");
+ tr.children()[2].style.backgroundColor="rgb(255,0,0)"
+ tr.children()[2].style.color="white"
+ tr.children()[3].style.backgroundColor="#ff0000"
+ tr.children()[3].style.color="white"
+ }
+ //楂樹簬涓婇檺
+ if(item.store_max != null) {
+ if (item.sum_qty > item.store_max) {
+ tr.css("background-color", "#ff6f00");
+ tr.css("color", "white");
+ tr.children()[3].style.backgroundColor="#009c04"
+ tr.children()[3].style.color="white"
+ tr.children()[4].style.backgroundColor="#3da83f"
+ tr.children()[4].style.color="white"
+ }
+ }
+ });
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -292,6 +372,16 @@
curr: 1
},
done: function (res, curr, count) {
+ var that = this.elem.next();
+ res.data.forEach(function (item, index) {
+ if (item.store_max_date != null) {
+ if (item.stay_time > item.store_max_date) {
+ var tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
+ tr.css("background-color", "#FF5722");
+ tr.css("color", "white");
+ }
+ }
+ });
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -326,4 +416,4 @@
return fmt;
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1