|
@@ -131,8 +131,8 @@
|
|
|
<div style="width:100%;float: left;">
|
|
|
<div class="c1 label"> 粒度:</div>
|
|
|
<div class="timeTypeDiv c1" style="width: 10%;">
|
|
|
- <select name="timeType" id="timeType" onChange="handleChange(this.options[this.selectedIndex].value)">
|
|
|
- <option value="QUATER">15分钟</option>
|
|
|
+ <select name="timeType" id="timeType" lay-filter="timeType" onchange="console.log('555555555555555555')">
|
|
|
+ <option value="QUATER" selected>15分钟</option>
|
|
|
<option value="HOUR">小时</option>
|
|
|
<option value="DAY">天</option>
|
|
|
<!--<option value="week">星期</option>-->
|
|
@@ -234,59 +234,95 @@
|
|
|
dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '00:15:00';
|
|
|
console.log('dateArray: ', dateArray);
|
|
|
}
|
|
|
- if(timeType == 'HOUR'){
|
|
|
- console.log('xiaoshi')
|
|
|
- // dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '00:15:00';
|
|
|
- // console.log('dateArray: ', dateArray);
|
|
|
- }
|
|
|
- laydate.render({
|
|
|
- elem: '#time1',
|
|
|
- type: 'datetime',
|
|
|
- range: true,
|
|
|
- value: dateArray,
|
|
|
- ready: function(date){
|
|
|
- console.log(date); //得到初始的日期时间对象:{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
|
|
|
- }
|
|
|
- });
|
|
|
+
|
|
|
initTreeCity(tree)
|
|
|
initTreeIndicator(tree)
|
|
|
initAllIndicator(tree)
|
|
|
initTreeIndicatorTemplate(tree)
|
|
|
// console.log(window.sessionStorage.getItem('userName'))
|
|
|
$("#userName").text(window.sessionStorage.getItem('userName'))
|
|
|
- })
|
|
|
- function handleChange(val){
|
|
|
- console.log('val: ', val);
|
|
|
- let timeType = $('#timeType').val()
|
|
|
- console.log('timeType: ', timeType);
|
|
|
- let date = new Date();
|
|
|
- if(timeType == 'QUATER'){
|
|
|
+ form.on('select(timeType)', function(data){
|
|
|
+ // console.log('data: ', data);
|
|
|
+ // console.log('ooooo')
|
|
|
+ // handleChange(data.value)
|
|
|
+ form.render('select'); // 渲染select,固定写法
|
|
|
+ if(data.value == 'QUATER'){
|
|
|
dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '00:15:00';
|
|
|
- console.log('dateArray: ', dateArray);
|
|
|
+ // console.log('dateArray: ', dateArray);
|
|
|
+ laydate.render({
|
|
|
+ elem: '#time1',
|
|
|
+ type: 'datetime',
|
|
|
+ range: true,
|
|
|
+ value: dateArray,
|
|
|
+ ready: function(date){
|
|
|
+ console.log(date); //得到初始的日期时间对象:{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
|
|
|
+ },
|
|
|
+ });
|
|
|
}
|
|
|
- if(timeType == 'HOUR'){
|
|
|
- console.log('xiaoshi')
|
|
|
+ if(data.value == 'HOUR'){
|
|
|
+ // console.log('xiaoshi')
|
|
|
dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '01:00:00';
|
|
|
- console.log('dateArray: ', dateArray);
|
|
|
+ // console.log('dateArray: ', dateArray);
|
|
|
+ laydate.render({
|
|
|
+ elem: '#time1',
|
|
|
+ type: 'datetime',
|
|
|
+ range: true,
|
|
|
+ value: dateArray,
|
|
|
+ ready: function(date){
|
|
|
+ console.log(date); //得到初始的日期时间对象:{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
|
|
|
+ },
|
|
|
+ });
|
|
|
}
|
|
|
- if(timeType == 'DAY'){
|
|
|
- console.log('xiaoshi')
|
|
|
+ if(data.value == 'DAY'){
|
|
|
+ // console.log('xiaoshi')
|
|
|
dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '23:59:59';
|
|
|
- console.log('dateArray: ', dateArray);
|
|
|
+ // console.log('dateArray: ', dateArray);
|
|
|
+ laydate.render({
|
|
|
+ elem: '#time1',
|
|
|
+ type: 'datetime',
|
|
|
+ range: true,
|
|
|
+ value: dateArray,
|
|
|
+ ready: function(date){
|
|
|
+ console.log(date); //得到初始的日期时间对象:{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
|
|
|
+ },
|
|
|
+ });
|
|
|
}
|
|
|
- }
|
|
|
- // $('#timeType').first().change(function(){
|
|
|
- // handleChange()
|
|
|
- // })
|
|
|
- // $(document).on('change','#timeType',function(){
|
|
|
- // console.log('55556666')
|
|
|
- // handleChange()
|
|
|
- // })
|
|
|
- $('#timeType').on('change',function(){
|
|
|
- console.log('change: ', change);
|
|
|
- handleChange()
|
|
|
});
|
|
|
|
|
|
+ laydate.render({
|
|
|
+ elem: '#time1',
|
|
|
+ type: 'datetime',
|
|
|
+ range: true,
|
|
|
+ value: dateArray,
|
|
|
+ ready: function(date){
|
|
|
+ console.log(date); //得到初始的日期时间对象:{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
|
|
|
+ },
|
|
|
+ change: function(value, date){
|
|
|
+ console.log('date: ', date);
|
|
|
+
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ })
|
|
|
+ // function handleChange(val){
|
|
|
+ // console.log('val: ', val);
|
|
|
+ // let date = new Date();
|
|
|
+ // if(val == 'QUATER'){
|
|
|
+ // dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '00:15:00';
|
|
|
+ // // console.log('dateArray: ', dateArray);
|
|
|
+ // }
|
|
|
+ // if(val == 'HOUR'){
|
|
|
+ // console.log('xiaoshi')
|
|
|
+ // dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '01:00:00';
|
|
|
+ // // console.log('dateArray: ', dateArray);
|
|
|
+ // }
|
|
|
+ // if(val == 'DAY'){
|
|
|
+ // console.log('xiaoshi')
|
|
|
+ // dateArray= formatDate(date) + ' ' + '00:00:00' + ' - ' + formatDate(date) + ' ' + '23:59:59';
|
|
|
+ // // console.log('dateArray: ', dateArray);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
function formatDate (date) {
|
|
|
var y = date.getFullYear();
|
|
|
var m = date.getMonth() + 1;
|
|
@@ -504,8 +540,8 @@
|
|
|
// console.log('0000000', tree.getChecked('Id4')[0]);
|
|
|
|
|
|
let checkData2 ;
|
|
|
- console.log('3333 ', tree.getChecked('Id3')[0]?.children);
|
|
|
- console.log('4444 ', tree.getChecked('Id4')[0]?.children);
|
|
|
+ // console.log('3333 ', tree.getChecked('Id3')[0]?.children);
|
|
|
+ // console.log('4444 ', tree.getChecked('Id4')[0]?.children);
|
|
|
if(tree.getChecked('Id3')[0]?.children){
|
|
|
checkData2= tree.getChecked('Id3')[0].children ;
|
|
|
}
|