From 7ea9e40063bb40954b1c73675e2ed1963df99c4d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 14 一月 2022 08:57:23 +0800
Subject: [PATCH] 更新baseurl地址
---
src/main/webapp/static/js/tableData.js | 19 ++++++++++---------
src/main/webapp/static/css/style.css | 6 +++---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 1 +
src/main/webapp/views/index_datashow.html | 2 ++
src/main/webapp/static/js/item/item.js | 5 +++--
5 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index a85c32d..8c21370 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -47,6 +47,7 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<Item> wrapper = new EntityWrapper<>();
+// allLike(Item,null,wrapper,param.get("id"));
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css
index 3b06d42..ecbd5f2 100644
--- a/src/main/webapp/static/css/style.css
+++ b/src/main/webapp/static/css/style.css
@@ -69,9 +69,9 @@
text-align: center;
}
-.normal {
- background-color: #009966;
-}
+/*.normal {*/
+/* background-color: #009966;*/
+/*}*/
.nor-mal {
background-color: #3a4a5a;
}
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index 8ca9f62..15ee0ef 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -72,7 +72,7 @@
statusCode: 200
},
done: function(res, curr, count) {
- console.log(res.data)
+
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -177,7 +177,7 @@
success: function (layero, dIndex) {
layDateRender();
form.val('detail', mData);
- console.log(mData)
+
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
@@ -287,6 +287,7 @@
function tableReload(child) {
var searchData = {};
+
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index a44abfb..2511f97 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -1,7 +1,7 @@
var proData = ["椤圭洰鍚嶇О","寮�濮嬫椂闂�","缁撴潫鏃堕棿",]
var getTheaddData = function(){
$.ajax({
- url:'http://192.168.4.99:8080/wms/projectPlan/flowStatus',
+ url:baseUrl + '/projectPlan/flowStatus',
type:'GET',
dataType:'JSON',
data:{},
@@ -22,17 +22,19 @@
},
})
}
- setInterval(getTheaddData(),10000)
+ setTimeout(getTheaddData(),1000)
+
+
var getThbodyData = function(){
$.ajax({
- url:'http://192.168.4.99:8080/wms/projectPlan/toFront',
+ url:baseUrl+'/projectPlan/toFront',
type:'GET',
dataType:'JSON',
data:{},
success:function(res){
if(res.code==200){
data=res.data
- console.log(data)
+
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for(var i = 0;i<data.length;i++){
var dataNode = data[i].nodes
@@ -74,12 +76,12 @@
var realEndTime$ = data[t].nodes[k].realEndTime$.substring(0,10)
// 椤圭洰鑺傜偣璁″垝缁撴潫鏃堕棿
var endTime$ = data[t].nodes[k].endTime$.substring(0,10)
- console.log(endTime$)
+
var myDate = new Date()
var nowDay = myDate.getFullYear()+"-"+(myDate.getMonth()+1)+"-"+myDate.getDate()
var eDay = new Date(endTime$)
// 鍒ゆ柇realEndTime$.substring(0,10) 鏄惁涓虹┖
- console.log(realEndTime$)
+
if(realEndTime$ === ""){
// 璁″垝鏃ユ湡涓庣郴缁熸棩鏈熸瘮杈�
var ExDay = eDay.getTime()-myDate.getTime()
@@ -115,7 +117,6 @@
}
})
- }
- setInterval(getThbodyData(),10000)
-
+ }
+ setInterval(getThbodyData(),2000)
diff --git a/src/main/webapp/views/index_datashow.html b/src/main/webapp/views/index_datashow.html
index 69b60c7..25dcc75 100644
--- a/src/main/webapp/views/index_datashow.html
+++ b/src/main/webapp/views/index_datashow.html
@@ -4,7 +4,9 @@
<meta charset="UTF-8">
<title>椤圭洰杩涘害琛�</title>
<link rel="stylesheet" href="../static/css/style.css">
+
<script src="../static/js/jquery-3.3.1.min.js"></script>
+ <script src="../static/js/common.js"></script>
<!-- <script src="../static/js/index.js" type="text/javascript" charset="utf-8"></script>-->
<script src="../static/js/clock.js"></script>
<script src="../static/js/tableData.js"></script>
--
Gitblit v1.9.1