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

7
webmain/main/flow/flowAction.php
View File

@@ -94,16 +94,23 @@ class flowClassAction extends Action
$num = strtolower($cans['num']);
$cobj= c('check');
if(!$cobj->iszgen($tab))return '表名格式不对';
$bobg = preg_replace("/[a-zA-Z0-9_]/",'', $tab);
if($bobg)return '表名禁用:'.$bobg.'';
if($cobj->isnumber($num))return '编号不能为数字';
if(strlen($num)<4)return '编号至少要4位';
if($cobj->isincn($num))return '编号不能包含中文';
if(contain($num,'-'))return '编号不能有-';
$bobg = preg_replace("/[a-zA-Z0-9_]/",'', $num);
if($bobg)return '模块编号禁用:'.$bobg.'';
if($cans['isflow']>0 && isempt($cans['sericnum'])) return '有流程必须有写编号规则，请参考其他模块填写';
$rows['num']= $this->rock->xssrepstr($num);
$rows['name']= $name;
if(!isempt($tabs)){
if($cobj->isincn($tabs))return '多行子表名不能包含中文';
$bobg = preg_replace("/[a-zA-Z0-9_,]/",'', $tabs);
if($bobg)return '子表名禁用:'.$bobg.'';
$tabsa = explode(',', $tabs);
$namea = explode(',', $names);
foreach($tabsa as $k1=>$tabsas){

4
webmain/main/kaoqin/kaoqinAction.php
View File

@@ -664,7 +664,7 @@ class kaoqinClassAction extends Action
}
if($this->rock->ismobile())$rs['type'] = 1;
$this->smartydata['rs'] = $rs;
$this->smartydata['qqmapkey'] = getconfig('qqmapkey','55QBZ-JGYLO-BALWX-SZE4H-5SV5K-JCFV7');
$this->smartydata['qqmapkey'] = c('mapqq')->getkey();
}
public function locationchangeAction()
@@ -677,7 +677,7 @@ class kaoqinClassAction extends Action
$this->assign('location_x', $location_x);
$this->assign('location_y', $location_y);
$this->assign('scale', $scale);
$this->smartydata['qqmapkey'] = getconfig('qqmapkey','55QBZ-JGYLO-BALWX-SZE4H-5SV5K-JCFV7');
$this->smartydata['qqmapkey'] = c('mapqq')->getkey();
}
//删除打卡记录

43
webmain/main/kaoqin/tpl_kaoqin_locationchange.html
View File

@@ -14,6 +14,8 @@ body, button, input, select, textarea {
</style>
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=<?=$da['qqmapkey']?>"></script>
<script src="js/jquery.js"></script>
<script src="js/base64-min.js"></script>
<script>
var callback = '<?=$callback?>'; //回调函数
@@ -59,22 +61,41 @@ function qudong(){
}
var citylocation = false;
function dingwei(){
if(!citylocation)citylocation = new qq.maps.CityService({
complete : function(result){
map.setCenter(result.detail.latLng);
}
});
var quhao = prompt('请输入城市区号如：0592');
if(isNaN(quhao)){
if(quhao)citylocation.searchLocalCity();
}else{
if(quhao)citylocation.searchCityByAreaCode(quhao);
var key = prompt('请输入格式(地址 城市)如：鼓浪屿 厦门');
if(key){
$.ajax({
url:'api.php?m=kaoqin&a=suggestion',
data:{key:jm.base64encode(key)},
dataType:'json',
success:function(ret){
if(ret.status==0){
var res = ret.data[0];
var center = new qq.maps.LatLng(res.location.lat,res.location.lng);
map.setCenter(center);
marker.setPosition(center);
showinfoWin(res.title+'<br>'+res.address);
}else{
alert(ret.message);
}
}
});
}
}
var infoWin = false;
function showinfoWin(msg){
if(!infoWin){
infoWin = new qq.maps.InfoWindow({
map: map
});
infoWin.open();
}
infoWin.setContent(msg);
infoWin.setPosition(map.getCenter());
}
</script>
</head>
<body onload="init()">
<div style="position:absolute;top:0px;left:40%;z-index:99;padding:5px 20px; background-color:white"><button style="background:#1389D3;color:white;border:none;padding:5px 8px;cursor:pointer" onclick="qudong()">确定</button>&nbsp;点地图确定位置，<a href="javascript:;" onclick="dingwei()">[定位]</a></div>
<div style="position:absolute;top:0px;left:40%;z-index:99;padding:5px 20px; background-color:white"><button style="background:#1389D3;color:white;border:none;padding:5px 8px;cursor:pointer" onclick="qudong()">确定</button>&nbsp;点地图确定位置，<a href="javascript:;" onclick="dingwei()">[定位搜索]</a></div>
<div style="width:100%;height:100%" id="container"></div>
</body>
</html>