From 88ff10d665806961c13cb411921052db42183281 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 11 Jun 2021 15:12:30 +0800
Subject: [PATCH] 图表默认时间7天内
---
widgets/searchTabaPopup/Widget.js | 9 +++++++--
widgets/searchL/Widget.js | 36 +++++++++++++++++++++++++++++++++---
2 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/widgets/searchL/Widget.js b/widgets/searchL/Widget.js
index 6a3e36b..1229485 100644
--- a/widgets/searchL/Widget.js
+++ b/widgets/searchL/Widget.js
@@ -317,7 +317,7 @@
dom.append(str);
if (obj.data.flv) {
var dom = $('#poput-m-t-video'),
- // <div id="poput-m-t-video-login"><i class="layui-icon"></i></div>
+ // <div id="poput-m-t-video-login"><i class="layui-icon"></i></div>
str = `
<video id="poput-m-t-video-video" ></video>
`;
@@ -326,7 +326,7 @@
// console.log(obj.data.name);
// console.log(obj.data.flv);
-
+
if (flvjs.isSupported()) {
var videoElement = document.getElementById('poput-m-t-video-video');
var flvPlayer = flvjs.createPlayer({
@@ -339,7 +339,7 @@
}
window.$myVideoFlvplayer = flvPlayer;
// var time = setTimeout(() => {
-
+
// }, 2000);
} else {
var dom = $('#poput-m-t-video'),
@@ -412,6 +412,20 @@
//…
});
},
+ setdefaultTime: function () {
+ //获取当前时间7天前
+ var date = new Date();
+ var date1 = new Date(+new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '');
+ var myDate = date.setDate(date.getDate() - 7);
+ var date2 = new Date(+new Date(myDate) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '');
+ console.log([date1, date2], 123456789);
+ //设置value
+ $('#test-startDate-1').val(date1);
+ $('#test-endDate-1').val(date2);
+ that.times = [date1, date2];
+ var stcd = $('.jimu-widget-searchTabaPopup').find('#userMyStcd').val();
+ // that.getOurData(that.times, stcd);//默认7天时间完成
+ },
setXiangqing(obj) {
var str = '';
var XQDom = $('.jimu-widget-searchTabaPopup').find('.xiangqing');
@@ -479,6 +493,22 @@
})
},
setshishidata: function (data, stcd, id = '#shuiwenshishi') {
+ //给默认时间
+ var date = new Date();
+ var date1 = new Date(+new Date() + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '');
+ var myDate = date.setDate(date.getDate() - 7);
+ var date2 = new Date(+new Date(myDate) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '');
+ // console.log([date1, date2], 123456789);
+ //设置value
+ $('#test-startDate-1').val(date2);
+ $('#test-endDate-1').val(date1);
+ window.defultEchartsTimes = [date2, date1];
+ // var time = setTimeout(() => {
+ $('.jimu-widget-searchTabaPopup').find('#query').click();
+ // clearTimeout(time);
+ // time = null;
+ // }, 500);
+
var str = '',
shuiwenDom = $('.jimu-widget-searchTabaPopup').find(id)
shuiwenDom.empty();
diff --git a/widgets/searchTabaPopup/Widget.js b/widgets/searchTabaPopup/Widget.js
index 6203bb9..a51f42a 100644
--- a/widgets/searchTabaPopup/Widget.js
+++ b/widgets/searchTabaPopup/Widget.js
@@ -49,8 +49,9 @@
})
$('.jimu-widget-searchTabaPopup').find('#query').click(() => {
- if (that.times[0] != 1) {
- var stcd = $('.jimu-widget-searchTabaPopup').find('#userMyStcd').val()
+ if (that.times[0] != 1 || window.defultEchartsTimes[0] != 1) {
+ that.times = window.defultEchartsTimes;
+ var stcd = $('.jimu-widget-searchTabaPopup').find('#userMyStcd').val();
that.getOurData(that.times, stcd);
} else {
layui.use(function () { //亦可加载特定模块:layui.use(['layer', 'laydate', function(){
@@ -67,6 +68,7 @@
$('.jimu-widget-searchTabaPopup').find('#empty').click(() => {
$('.myCHosetimeinput').val("");
that.times = [1];
+ window.defultEchartsTimes = [1];
})
},
@@ -79,6 +81,8 @@
onOpen: function () {
var that = this;
+
+
// $('.jimu-widget-searchTabaPopup').css({ 'display': 'block' });
// $('.jimu-widget-searchTabaPopup').find('.p-main').eq(1).css({ 'display': 'block' }).siblings().css({ 'display': 'none' });
this.creMyEcharts();
@@ -118,6 +122,7 @@
this.myChart2 = echarts.init(dom);
},
getOurData: function (time, stcd) {
+ // console.log(time,stcd,55555555555555)
var that = this
, url = `http://171.34.76.171:8880/pyh-station/monitorData/queryStationHistoryMonitorData?stcd=${stcd}&startTime=${time[0]}&endTime=${time[1]}`,
token = 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJlY2hpc2FuIiwic3ViIjoiYWRtaW4iLCJpYXQiOjE2MjMyNDQxNDQsImV4cCI6MTYyNTgzNjE0NH0.wjtMw7hv8IYGxFKI9b1vo2ozMXD1pE0-02HinfPl-r8l0TYVg1YvMBxW_VzzFKoY1jeC6XByQQT-aC_mAvBnWA';
--
Gitblit v1.9.3