From e3e093fa602662d131af12b5429f0d5020b9f572 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 09 二月 2022 16:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitblit/zypms' into zypms
---
src/main/webapp/static/js/tableData.js | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index 3b799e5..5683f92 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -10,7 +10,7 @@
var proData = ["椤圭洰鍚嶇О","寮�濮嬫椂闂�","缁撴潫鏃堕棿",]
var getTheaddData = function(){
$.ajax({
- url:'http://192.168.4.99:8080/pms/projectPlan/flowStatus',
+ url:baseurl+'/pms/projectPlan/flowStatus',
type:'GET',
dataType:'JSON',
data:{},
@@ -35,14 +35,13 @@
/*****************************************************************************************************************************************************************************/
var getThbodyData = function(){
$.ajax({
- url:'http://192.168.4.99:8080/pms/projectPlan/toFront',
+ url:baseurl+'/pms/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
@@ -84,12 +83,10 @@
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()
--
Gitblit v1.9.1