From db4180c88d1aa3b410b719ac2710e70eeb9431d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 16:30:34 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 13 ++++++++++---
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 2 +-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
index fad4062..0535dce 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -69,7 +69,7 @@
for (int i=0;i<combList.size();i++) {
Object create_time = combList.get(i).get("create_time");
combList.get(i).put("time", String.valueOf(create_time).substring(5, 16));
- combList.get(i).put("active", i<3?"active":"");
+ combList.get(i).put("active", String.valueOf(combList.get(i).get("io_status")).equals("4")?"":"active");
}
// 鎷ｈ揣鍗�
List<Map<String, Object>> pakoutList = jdbcTemplate.queryForList("select top 5 * from man_pakout where 1=1 order by create_time desc");
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index a488a26..66737a8 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -265,7 +265,12 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md6">
<div class="layui-card">
- <div class="layui-card-header">缁勬墭鍔ㄦ��</div>
+ <div class="layui-card-header">
+ 缁勬墭鍔ㄦ��
+ <span class="icon-text pull-right" lay-tips="钃濊壊浠ｈ〃鏈叆搴�" lay-direction="4" lay-offset="5px,5px">
+ <i class="layui-icon layui-icon-loading-1 layui-anim layui-anim-rotate layui-anim-loop"></i>
+ </span>
+ </div>
<div class="layui-card-body dynamic-card-body mini-bar" style="height: 265px;">
<ul id="combList" class="layui-timeline layui-timeline-dynamic">
</ul>
@@ -485,8 +490,10 @@
<li class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis {{active}}"></i>
<div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">{{matnr}} 骞舵澘 {{zpallet}} 鏁伴噺锛歿{anfme}}
- <span class="pull-right">{{time}} </span></div>
+ <div class="layui-timeline-title">
+ <span title="{{maktx}}">{{matnr}}</span> 骞舵澘 <span>{{zpallet}}</span> 鎵樼洏锛� 鏁伴噺锛歿{anfme}}
+ <span class="pull-right">{{time}} </span>
+ </div>
</div>
</li>
{{/each}}
--
Gitblit v1.9.1