Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev
这个提交包含在:
		
						当前提交
						47ee4c4b78
					
				
					共有  2 个文件被更改,包括 6 次插入 和 3 次删除
				
			
		|  | @ -1,5 +1,8 @@ | ||||||
| <script> | <script> | ||||||
| 	var lang_export_cabrillo_proceed = '<?php echo lang('export_cabrillo_proceed') ?>'; | 	var lang_export_cabrillo_proceed = '<?php echo lang('export_cabrillo_proceed') ?>'; | ||||||
|  | 	var lang_export_cabrillo_select_year = '<?php echo lang('export_cabrillo_select_year') ?>'; | ||||||
|  | 	var lang_export_cabrillo_select_contest = '<?php echo lang ('export_cabrillo_select_contest') ?>'; | ||||||
|  | 	var lang_export_cabrillo_select_date_range = '<?php echo lang ('export_cabrillo_select_date_range') ?>';  | ||||||
| 	var lang_export_cabrillo_no_contests_for_stationlocation = '<?php echo lang('export_cabrillo_no_contests_for_stationlocation') ?>'; | 	var lang_export_cabrillo_no_contests_for_stationlocation = '<?php echo lang('export_cabrillo_no_contests_for_stationlocation') ?>'; | ||||||
| </script> | </script> | ||||||
| <div class="container"> | <div class="container"> | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ function loadYears() { | ||||||
|         data: {'station_id': $("#station_id").val()}, |         data: {'station_id': $("#station_id").val()}, | ||||||
|         success: function (data) { |         success: function (data) { | ||||||
|             if (data.length > 0) { |             if (data.length > 0) { | ||||||
|                 $(".contestyear").append('<div class="col-md-3 control-label" for="year">Select year: </div>' + |                 $(".contestyear").append('<div class="col-md-3 control-label" for="year">' + lang_export_cabrillo_select_year + '</div>' + | ||||||
|                 '<select id="year" class="custom-select my-1 mr-sm-2 col-md-2" name="year">' + |                 '<select id="year" class="custom-select my-1 mr-sm-2 col-md-2" name="year">' + | ||||||
|                 '</select>' + |                 '</select>' + | ||||||
|                 '  <button onclick="loadContests();" class="btn btn-sm btn-primary" type="button">' + lang_export_cabrillo_proceed + '</button>');  |                 '  <button onclick="loadContests();" class="btn btn-sm btn-primary" type="button">' + lang_export_cabrillo_proceed + '</button>');  | ||||||
|  | @ -37,7 +37,7 @@ function loadContests() { | ||||||
|                 'station_id': $("#station_id").val() |                 'station_id': $("#station_id").val() | ||||||
|         }, |         }, | ||||||
|         success: function (data) { |         success: function (data) { | ||||||
|                 $(".contestname").append('<div class="col-md-3 control-label" for="contestid">Select contest: </div>' + |                 $(".contestname").append('<div class="col-md-3 control-label" for="contestid">' + lang_export_cabrillo_select_contest + '</div>' + | ||||||
|                 '<select class="custom-select my-1 mr-sm-2 col-md-4" id="contestid" name="contestid">' + |                 '<select class="custom-select my-1 mr-sm-2 col-md-4" id="contestid" name="contestid">' + | ||||||
|                 '</select>' + |                 '</select>' + | ||||||
|                 '  <button onclick="loadContestDates();" class="btn btn-sm btn-primary" type="button">' + lang_export_cabrillo_proceed + '</button>');  |                 '  <button onclick="loadContestDates();" class="btn btn-sm btn-primary" type="button">' + lang_export_cabrillo_proceed + '</button>');  | ||||||
|  | @ -61,7 +61,7 @@ function loadContestDates() { | ||||||
|                 'contestid': $("#contestid").val(), |                 'contestid': $("#contestid").val(), | ||||||
|                 'station_id': $("#station_id").val()}, |                 'station_id': $("#station_id").val()}, | ||||||
|         success: function (data) { |         success: function (data) { | ||||||
|                 $(".contestdates").append('<div class="col-md-3 control-label" for="contestdates">Select date range: </div>' + |                 $(".contestdates").append('<div class="col-md-3 control-label" for="contestdates">' + lang_export_cabrillo_select_date_range + '</div>' + | ||||||
|                 '<select class="custom-select my-1 mr-sm-2 col-md-2" id="contestdatesfrom" name="contestdatesfrom">' + |                 '<select class="custom-select my-1 mr-sm-2 col-md-2" id="contestdatesfrom" name="contestdatesfrom">' + | ||||||
|                 '</select>' + |                 '</select>' + | ||||||
|                 '<select class="custom-select my-1 mr-sm-2 col-md-2" id="contestdatesto" name="contestdatesto">' + |                 '<select class="custom-select my-1 mr-sm-2 col-md-2" id="contestdatesto" name="contestdatesto">' + | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用