Merge pull request #1015 from AndreasK79/was_map_more_tweaks
[WAS Map] Added JS from this fork https://github.com/kcaran/us-map to…
这个提交包含在：
Peter Goodhall
GitHub
当前提交
141f3243d1
共有 3 个文件被更改，包括 99 次插入 和 30 次删除
|
|
@ -346,12 +346,14 @@ class Logbook_model extends CI_Model {
|
||||||
$this->db->where('station_id', $station_id);
|
$this->db->where('station_id', $station_id);
|
||||||
$this->db->where('COL_STATE', $state);
|
$this->db->where('COL_STATE', $state);
|
||||||
$this->db->where_in('COL_DXCC', ['291', '6', '110']);
|
$this->db->where_in('COL_DXCC', ['291', '6', '110']);
|
||||||
if($band != "SAT") {
|
if($band != 'All') {
|
||||||
$this->db->where('COL_PROP_MODE !=', 'SAT');
|
if($band != "SAT") {
|
||||||
$this->db->where('COL_BAND', $band);
|
$this->db->where('COL_PROP_MODE !=', 'SAT');
|
||||||
} else {
|
$this->db->where('COL_BAND', $band);
|
||||||
$this->db->where('COL_PROP_MODE', "SAT");
|
} else {
|
||||||
}
|
$this->db->where('COL_PROP_MODE', "SAT");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $this->db->get($this->config->item('table_name'));
|
return $this->db->get($this->config->item('table_name'));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>US Map Demo</title>
|
<title>US Map Demo</title>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
#alert {
|
#alert {
|
||||||
font-family: Arial, Helvetica, sans-serif;
|
font-family: Arial, Helvetica, sans-serif;
|
||||||
|
|
@ -13,18 +13,18 @@
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script src="<?php echo base_url(); ?>assets/js/raphael.js"></script>
|
<script src="<?php echo base_url(); ?>assets/js/raphael.js"></script>
|
||||||
<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
|
<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
|
||||||
<script src="<?php echo base_url(); ?>assets/js/color.jquery.js"></script>
|
<script src="<?php echo base_url(); ?>assets/js/color.jquery.js"></script>
|
||||||
<script src="<?php echo base_url(); ?>assets/js/jquery.usmap.js"></script>
|
<script src="<?php echo base_url(); ?>assets/js/jquery.usmap.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
$('#map').usmap({
|
$('#map').usmap({
|
||||||
showLabels: false,
|
showLabels: true,
|
||||||
'stateStyles': {
|
'stateStyles': {
|
||||||
fill: '#4ECDC4',
|
fill: '#4ECDC4',
|
||||||
"stroke-width": 1,
|
"stroke-width": 1,
|
||||||
'stroke' : '#036'
|
'stroke' : '#036'
|
||||||
},
|
},
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
'stateSpecificStyles': {
|
'stateSpecificStyles': {
|
||||||
<?php foreach ($was_array as $was => $value) { ?>
|
<?php foreach ($was_array as $was => $value) { ?>
|
||||||
'<?php echo $was; ?>' :
|
'<?php echo $was; ?>' :
|
||||||
<?php
|
<?php
|
||||||
foreach ($value as $key) {
|
foreach ($value as $key) {
|
||||||
if($key != "") {
|
if($key != "") {
|
||||||
if (strpos($key, '>W<') !== false) {
|
if (strpos($key, '>W<') !== false) {
|
||||||
|
|
@ -54,31 +54,97 @@
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
},
|
},
|
||||||
'stateSpecificHoverStyles': {
|
// Show tooltip when hovering over state
|
||||||
'HI' : {fill: '#ff0'}
|
mouseover: function(event, data) {
|
||||||
},
|
let nameList = {
|
||||||
|
"AL":"Alabama",
|
||||||
'mouseoverState': {
|
"AK":"Alaska",
|
||||||
'HI' : function(event, data) {
|
"AZ":"Arizona",
|
||||||
//return false;
|
"AR":"Arkansas",
|
||||||
}
|
"CA":"California",
|
||||||
},
|
"CO":"Colorado",
|
||||||
|
"CT":"Connecticut",
|
||||||
|
"DE":"Delaware",
|
||||||
|
"DC":"District Of Columbia",
|
||||||
|
"FL":"Florida",
|
||||||
|
"GA":"Georgia",
|
||||||
|
"HI":"Hawaii",
|
||||||
|
"ID":"Idaho",
|
||||||
|
"IL":"Illinois",
|
||||||
|
"IN":"Indiana",
|
||||||
|
"IA":"Iowa",
|
||||||
|
"KS":"Kansas",
|
||||||
|
"KY":"Kentucky",
|
||||||
|
"LA":"Louisiana",
|
||||||
|
"ME":"Maine",
|
||||||
|
"MD":"Maryland",
|
||||||
|
"MA":"Massachusetts",
|
||||||
|
"MI":"Michigan",
|
||||||
|
"MN":"Minnesota",
|
||||||
|
"MS":"Mississippi",
|
||||||
|
"MO":"Missouri",
|
||||||
|
"MT":"Montana",
|
||||||
|
"NE":"Nebraska",
|
||||||
|
"NV":"Nevada",
|
||||||
|
"NH":"New Hampshire",
|
||||||
|
"NJ":"New Jersey",
|
||||||
|
"NM":"New Mexico",
|
||||||
|
"NY":"New York",
|
||||||
|
"NC":"North Carolina",
|
||||||
|
"ND":"North Dakota",
|
||||||
|
"OH":"Ohio",
|
||||||
|
"OK":"Oklahoma",
|
||||||
|
"OR":"Oregon",
|
||||||
|
"PA":"Pennsylvania",
|
||||||
|
"RI":"Rhode Island",
|
||||||
|
"SC":"South Carolina",
|
||||||
|
"SD":"South Dakota",
|
||||||
|
"TN":"Tennessee",
|
||||||
|
"TX":"Texas",
|
||||||
|
"UT":"Utah",
|
||||||
|
"VT":"Vermont",
|
||||||
|
"VA":"Virginia",
|
||||||
|
"WA":"Washington",
|
||||||
|
"WV":"West Virginia",
|
||||||
|
"WI":"Wisconsin",
|
||||||
|
"WY":"Wyoming"
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#tooltip').text(nameList[data.name]).show();
|
||||||
|
$('#map').mousemove(function(e){
|
||||||
|
var mouseX = e.pageX - 350;
|
||||||
|
var mouseY = e.pageY - 90;
|
||||||
|
$('#tooltip').css({
|
||||||
|
top:mouseY,
|
||||||
|
left:mouseX,
|
||||||
|
'position': 'absolute',
|
||||||
|
'border':'1px solid black',
|
||||||
|
'background': '#fff',
|
||||||
|
'color': '#000',
|
||||||
|
'font-size': '1.5 em',
|
||||||
|
'padding': '5px',
|
||||||
|
'opacity': '1',
|
||||||
|
'border-radius': '2px'
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// Hide tooltip when not hovering over state
|
||||||
|
mouseout: function(event, data){
|
||||||
|
$('#tooltip').hide();
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
'click' : function(event, data) {
|
'click' : function(event, data) {
|
||||||
$('#alert')
|
displayWasContacts(data.name,$('#band2').val());
|
||||||
.text('Click '+data.name+' on map 1')
|
|
||||||
.stop()
|
|
||||||
.css('backgroundColor', '#ff0')
|
|
||||||
.animate({backgroundColor: '#ddd'}, 1000);
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="map" style="width: 930px; height: 630px;"></div>
|
<div id="map" style="width: 930px; height: 630px;"></div>
|
||||||
|
<div id="tooltip2"></div>
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>Red - Not Worked</li>
|
<li>Red - Not Worked</li>
|
||||||
|
|
|
||||||
1
assets/js/jquery.usmap.min.js
vendored
普通文件
1
assets/js/jquery.usmap.min.js
vendored
普通文件
文件差异因一行或多行过长而隐藏
正在加载…
在新工单中引用