From a92b36fd8b8df7a90a546c28d7770d5d6febbe38 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Mon, 15 Nov 2021 10:57:29 +0800 Subject: [PATCH] 1 --- web/src/x.min.js | 14 +++++++++++--- web/srczip/logic/dashboard.js | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/web/src/x.min.js b/web/src/x.min.js index eca7065..22809c8 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -5702,19 +5702,27 @@ var X = window.X || { var modelsize = obj.attr('data-modelsize'); var modeltype = obj.attr('data-modeltype'); var name = obj.attr('data-name'); + + var timetxtid = 'times'+id; + var timetxt = $("#"+timetxtid).html(); + var timetxtarr = timetxt.split(" - "); + var startTime = timetxtarr[0]; + var endTime = timetxtarr[1]; X.open({ type: 1, title: false, closeBtn: 0, - shade:0, - shadeClose: false, + // shade:0, + shadeClose: true, offset: [120,270], url: "screen", extData : id, callback : function(d){ var dataArr = { report_id : id, - ext_filter : d + ext_filter : d, + startTime: startTime, + endTime:endTime } X.api("ck/"+ cat +"_model","post",dataArr,function(vals){ if(vals == null){ diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 9996e1f..719b52d 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -166,19 +166,27 @@ var modelsize = obj.attr('data-modelsize'); var modeltype = obj.attr('data-modeltype'); var name = obj.attr('data-name'); + + var timetxtid = 'times'+id; + var timetxt = $("#"+timetxtid).html(); + var timetxtarr = timetxt.split(" - "); + var startTime = timetxtarr[0]; + var endTime = timetxtarr[1]; X.open({ type: 1, title: false, closeBtn: 0, - shade:0, - shadeClose: false, + // shade:0, + shadeClose: true, offset: [120,270], url: "screen", extData : id, callback : function(d){ var dataArr = { report_id : id, - ext_filter : d + ext_filter : d, + startTime: startTime, + endTime:endTime } X.api("ck/"+ cat +"_model","post",dataArr,function(vals){ if(vals == null){