daxi20/xinhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布v2.6.4版本

Browse Source
This commit is contained in:
雨中磐石
2024-07-31 12:54:55 +08:00
parent 3048af398c
commit c75c1e7251
20 changed files with 403 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
webmain/we/ying/tpl_ying_daka.html
View File

@@ -11,14 +11,17 @@
<script type="text/javascript" src="js/js.js"></script>
<script type="text/javascript" src="js/jswx.js"></script>
<script type="text/javascript" src="js/base64-min.js"></script>
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&libraries=convertor,geometry&key=<?=$da['qqmapkey']?>"></script>
<script type="text/javascript" src="js/dingwei.js"></script>
<script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=<?=$da['qqmapkey']?>&libraries=geometry"></script>
<script type="text/javascript" src="js/dingwei.js?<?=time()?>"></script>
<style>
<?php
$maincolor = getconfig('apptheme','#1389D3');
$maincolora= c('image')->colorTorgb($maincolor);
$maincolors= ''.$maincolora[0].','.$maincolora[1].','.$maincolora[2].'';
echo 'body{--main-color:'.$maincolor.'}';
<?php
$colobj = c('image');
if(method_exists($colobj,'colorTorgb')){
$maincolor = getconfig('apptheme','#1389D3');
$maincolora= $colobj->colorTorgb($maincolor);
$maincolors= ''.$maincolora[0].','.$maincolora[1].','.$maincolora[2].'';
echo 'body{--main-color:'.$maincolor.'}';
}
?>
.weui_tabbar_icon{text-align:center;color:#888888;font-size:20px;}
.weui_tabbar_item{padding-top:2px;margin-bottom:5px;position:relative}
@@ -91,19 +94,19 @@ function showkqrswz(){
}
}
}
if(s=='')s='没设置考勤位置';
if(s!='')s=s.substr(1);
if(s=='')s='<font color=red>没设置考勤位置</font>';
$('#weizhi').html(s);
}
js.dw.ondwwait=function(msg){
latitude = '';
//latitude = '';
$('#dwshow').html('<img src="images/loadings.gif" height="14px" align="absmiddle"> '+msg+'');
return true;
}
js.dw.ondwerr=function(msg){
latitude = '';
//latitude = '';
$('#dwshow').html(''+msg+',<a href="javascript:;" onclick="js.dw.start()">[在定位]</a>');
}
@@ -113,28 +116,26 @@ js.dw.ondwcall = function(res){
longitude = res.longitude;
accuracy = res.accuracy;
label = res.address;
var center = res.center;
$('#dwshow').html(''+res.addressinfo+',<a href="javascript:;" onclick="js.dw.start()">[更新]</a>');
var i,kqrsa,enddt,juli;
addbo = true;//可以添加记录
for(i=0;i<kqallrs.length;i++){
kqrsa = kqallrs[i];
enddt = new qq.maps.LatLng(parseFloat(kqrsa.location_x), parseFloat(kqrsa.location_y));
juli = parseInt(qq.maps.geometry.spherical.computeDistanceBetween(center, enddt));
if(juli<0)juli = 0-juli;
if(kqrsa['iswgd']=='1')juli=0; //无固定位置的
kqallrs[i]['kqjuli'] = juli;
kqjuli = juli;
}
if(!isfenwein()){
$('#dkbtnto').addClass('btnwai');
$('#dkbtn').html('外出定位');
}else{
$('#dkbtnto').removeClass('btnwai');
$('#dkbtn').html('第'+dakaci+'次打卡');
}
this.julisuan(latitude,longitude, kqallrs, function(narr){
kqallrs = narr;
for(var i=0;i<narr.length;i++){
var juli = narr[i].kqjuli;
if(juli<0)juli = 0-juli;
if(narr[i]['iswgd']=='1')juli=0; //无固定位置的
kqallrs[i]['kqjuli'] = juli;
kqjuli = juli;
}
if(!isfenwein()){
$('#dkbtnto').addClass('btnwai');
$('#dkbtn').html('外出定位');
}else{
$('#dkbtnto').removeClass('btnwai');
$('#dkbtn').html('第'+dakaci+'次打卡');
}
});
nowtimetime = js.now('time');
}

43
webmain/we/ying/tpl_ying_location.html
View File

@@ -12,14 +12,18 @@
<script type="text/javascript" src="js/jswx.js"></script>
<script type="text/javascript" src="js/base64-min.js"></script>
<script type="text/javascript" src="web/res/js/jquery-rockupload.js"></script>
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&libraries=convertor,geometry&key=<?=$da['qqmapkey']?>"></script>
<script type="text/javascript" src="js/dingwei.js"></script>
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=<?=$da['qqmapkey']?>"></script>
<script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=<?=$da['qqmapkey']?>&libraries=geometry"></script>
<script type="text/javascript" src="js/dingwei.js?<?=time()?>"></script>
<style>
<?php
$maincolor = getconfig('apptheme','#1389D3');
$maincolora= c('image')->colorTorgb($maincolor);
$maincolors= ''.$maincolora[0].','.$maincolora[1].','.$maincolora[2].'';
echo 'body{--main-color:'.$maincolor.'}';
<?php
$colobj = c('image');
if(method_exists($colobj,'colorTorgb')){
$maincolor = getconfig('apptheme','#1389D3');
$maincolora= $colobj->colorTorgb($maincolor);
$maincolors= ''.$maincolora[0].','.$maincolora[1].','.$maincolora[2].'';
echo 'body{--main-color:'.$maincolor.'}';
}
?>
</style>
<script>
@@ -82,24 +86,25 @@ js.dw.ondwcall = function(res){
latitude = res.latitude;
longitude = res.longitude;
accuracy = res.accuracy;
var center = res.center;
var center = new qq.maps.LatLng(latitude, longitude);
addbo = true;
scale = map.getZoom();
js.setoption('latlongedu',''+latitude+','+longitude+','+scale+'');
map.setCenter(res.center);
map.setCenter(center);
label = res.address;
showinfo(center ,accuracy, '定位成功<br>地址：'+res.addressinfo+'');
var i,kqrsa,enddt,juli;
for(i=0;i<kqallrs.length;i++){
kqrsa = kqallrs[i];
enddt = new qq.maps.LatLng(parseFloat(kqrsa.location_x), parseFloat(kqrsa.location_y));
juli = parseInt(qq.maps.geometry.spherical.computeDistanceBetween(center, enddt));
if(juli<0)juli = 0-juli;
if(kqrsa['iswgd']=='1')juli=0; //无固定位置的
kqallrs[i]['kqjuli'] = juli;
kqjuli = juli;
}
this.julisuan(latitude,longitude, kqallrs, function(narr){
kqallrs = narr;
for(var i=0;i<narr.length;i++){
var juli = narr[i].kqjuli;
if(juli<0)juli = 0-juli;
if(narr[i]['iswgd']=='1')juli=0; //无固定位置的
kqallrs[i]['kqjuli'] = juli;
kqjuli = juli;
}
});
nowtimetime = js.now('time');
}

4
webmain/we/ying/yingAction.php
View File

@@ -170,7 +170,7 @@ class yingClassAction extends ActionNot{
$kqors = m('kqdw')->getrows("id in($dwids) and `id`<>".$kqrs['id']."");
}
$this->assign('kqors', $kqors);
$this->smartydata['qqmapkey'] = getconfig('qqmapkey','55QBZ-JGYLO-BALWX-SZE4H-5SV5K-JCFV7');
$this->smartydata['qqmapkey'] = c('mapqq')->getkey();
}
/**
@@ -195,6 +195,6 @@ class yingClassAction extends ActionNot{
$kqors = m('kqdw')->getrows("id in($dwids) and `id`<>".$kqrs['id']."");
}
$this->assign('kqors', $kqors);
$this->smartydata['qqmapkey'] = getconfig('qqmapkey','55QBZ-JGYLO-BALWX-SZE4H-5SV5K-JCFV7');
$this->smartydata['qqmapkey'] = c('mapqq')->getkey();
}
}