From be47638f60bc2efbbe98b3debb854a5fcd4fc9b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期六, 03 十一月 2018 16:54:46 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/pages/js/common.js | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 4e407d3..2708ce0 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -456,7 +456,8 @@
gl.namespace('BMap');
// 鍦板浘鍙鍖哄煙瀹氫箟
var mapViewArea = [
- {name: '涓浗',area:'涓浗' ,left: {lng:71.3822, lat:0.6212}, right: {lng: 139.526,lat:54.3093}},
+ {name: '涓浗',area:'涓浗', left: {lng:71.3822, lat:0.6212}, right: {lng: 139.526,lat:54.3093}},
+ {name: '涓浗-骞胯タ',area: '骞胯タ鐪�' ,left: {lng:104.45675, lat:20.8744}, right: {lng: 112.068,lat:26.391}}
];
// 灏嗗彉閲弇apView缁戝畾鍒癎LOBAL.BMap涓�
@@ -480,6 +481,7 @@
var outerHTML = i[0].outerHTML;
return outerHTML;
}
+
//鐢熸垚闃块噷鍥炬爣鐨勫厓绱�
function create_fa_font(cla, color, data) {
var i = $('<i class="fa"></i>');
@@ -495,3 +497,42 @@
var outerHTML = i[0].outerHTML;
return outerHTML;
}
+
+// 鐢熸垚璺宠浆鐨勯摼鎺�
+function skipUrl(page, province, city, county, home,battid,monnum) {
+ var str = page+'?';
+ if(province){
+ str += '&province='+province;
+ }
+ if(city){
+ str +='&city='+city;
+ }
+ if(county){
+ str += '&county='+county;
+ }
+ if(home){
+ str += '&home='+home;
+ }
+ if(battid){
+ str += '&battid='+battid;
+ }
+ if(monnum){
+ str += '&monnum'+monnum;
+ }
+ //var str = page+'?province='+province+'&city='+city+'&county='+county+'&home='+home;
+ return str;
+}
+
+// 妫�娴嬬敤鎴锋槸鍚︽湁鏉冮檺
+function checkUserPermit(permits, name) {
+ var rs = false;
+ // 閬嶅巻permits
+ for(var i=0; i<permits.length; i++) {
+ var _permit = permits[i];
+ if(_permit.permit_item_name == name && _permit.permit_item_value==1) {
+ rs = true;
+ break;
+ }
+ }
+ return rs;
+}
\ No newline at end of file
--
Gitblit v1.9.1