From 402435f45d53be25a856882277d04b1b2c9a6c3c Mon Sep 17 00:00:00 2001
From: wangrong <wangrong@shsening.com>
Date: 星期一, 20 十二月 2021 18:31:12 +0800
Subject: [PATCH] fix mobile query bug
---
mobile/road_show.html | 3
mobile/css/widget_search.css | 4
mobile/js/widget_search_view.js | 113 ++++++++++---------------------------
mobile/index.html | 5 +
mobile/road_search.html | 9 ++-
5 files changed, 42 insertions(+), 92 deletions(-)
diff --git a/mobile/css/widget_search.css b/mobile/css/widget_search.css
index f2adef3..0c8a8fb 100644
--- a/mobile/css/widget_search.css
+++ b/mobile/css/widget_search.css
@@ -142,8 +142,8 @@
padding: 0 10px;
}
.am-cf{
- float: left;
- line-height: 50px;
+ text-align: center;
+ line-height: 40px;
color: #fff;
}
diff --git a/mobile/index.html b/mobile/index.html
index 26e83df..230c3cd 100644
--- a/mobile/index.html
+++ b/mobile/index.html
@@ -129,9 +129,10 @@
</form>
<script>
function DoAjax() {
+ debugger;
$.ajax({
type: "get",
- url: "http://58.246.27.194:7012/dataapi/Bdata?bid=mobile_login",
+ url: default_system_params.nodejs_url_predix+"dataapi/Bdata?bid=mobile_login",
data: {"username":$("#username").val(),"password":$("#password").val()},
async: true,
error: function (request) {
@@ -165,4 +166,4 @@
</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/mobile/js/widget_search_view.js b/mobile/js/widget_search_view.js
index 83ed7ef..66afbe9 100644
--- a/mobile/js/widget_search_view.js
+++ b/mobile/js/widget_search_view.js
@@ -112,8 +112,7 @@
}
var newsTotalNum = data.data.counter.counter; //璁板綍鐨勬�绘潯鏁�
var pageNum = Math.ceil(newsTotalNum / avgnam); //鍒嗛〉鐨勬�婚〉鏁�
-
- for (var i = 0; i < avgnam; i++) {
+ for (var i = 0; i < tableData.length; i++) {
var j = (page-1)*avgnam + i + 1;
var topObj = tableData[i];
for (var key in topObj) {
@@ -124,91 +123,18 @@
var content = "<tr _siteid='" + topObj.code + "' _lon='" + topObj.lon + "' _lat='" + topObj.lat + "' onmouseover='over(this)' onmouseout='out(this)' ><td>" + j + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.code + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.name + "</td><td><font color='" + getLayerPointColorByQindexandValue(current_selected_monitor_type, current_selected_monitor_qindex, topObj[current_selected_monitor_qindex]) + "'>" + topObj[current_selected_monitor_qindex] + "</font></td></tr>"
$("#searchInfo").append(content);
}
- var content1 = '<div class="am-cf">' +
- '鍏� ' + newsTotalNum + ' 鏉¤褰� / ' + pageNum + '椤�' +
- '</div>';
+ $("#pageID").empty();
+ $("#page").empty();
+ var content1 = '<div class="am-cf">' + '鍏� ' + newsTotalNum + ' 鏉¤褰� / ' + pageNum + '椤�' + '</div>';
var content2 = '<div class="pageDiv">' +
'<ul class="am-pagination">';
- // 鍒ゆ柇鍓嶉潰鏄惁杩樻湁椤甸潰
- if (page == 1) {
- content2 += '<li class="am-disabled"><a href="#" rel="external nofollow" rel="external nofollow" rel="external nofollow" >芦</a></li>';
- } else {
- content2 += '<li><a href="javascript:reloadData(' + (page - 1) + ')" rel="external nofollow" >芦</a></li>';
- }
- if (pageNum <= 3) {//鎬婚〉鏁板皬浜庝簲椤碉紝鍒欏姞杞芥墍鏈夐〉
- for (var i = 1; i <= pageNum; i++) {
- if (i == page) {
- content2 += '<li class="am-active"><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
- } else {
- content2 += '<li><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
- }
- };
- $('#page').append(content2);
- // return;
- } else if (pageNum > 3) {//鎬婚〉鏁板ぇ浜庝簲椤碉紝鍒欏姞杞戒簲椤�
- if (page < 3) {//褰撳墠椤靛皬浜�3锛屽姞杞�1-3椤�
- for (var i = 1; i <= 3; i++) {
- if (i == page) {
- content2 += '<li class="am-active"><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
-
- } else {
- content2 += '<li><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
- }
- };
- if (page <= pageNum - 2) {//鏈�鍚庝竴椤佃拷鍔犫��...鈥濅唬琛ㄧ渷鐣ョ殑椤�
- content2 += "<li><a>...</a></li>";
- }
- $('#page').append(content2);
- // return;
- } else if (page >= 3) {//褰撳墠椤靛ぇ浜�3椤�
- for (var i = 1; i <= 2; i++) {//1,2椤电爜濮嬬粓鏄剧ず
- content2 += '<li><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
- }
- content2 += "<li><a>...</a></li>";//2椤电爜鍚庨潰鐢�...浠ｆ浛閮ㄥ垎鏈樉绀虹殑椤电爜
- if (page + 1 == pageNum) {//褰撳墠椤�+1绛変簬鎬婚〉鐮�
- for (i = page - 1; i <= pageNum; i++) {//鈥�...鈥濆悗闈㈣窡涓変釜椤电爜褰撳墠椤靛眳涓樉绀�
- if (i == page) {
- content2 += '<li class="am-active"><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
-
- } else {
- content2 += '<li><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
- }
- }
- } else if (page == pageNum) {//褰撳墠椤垫暟绛変簬鎬婚〉鏁板垯鏄渶鍚庝竴椤甸〉鐮佹樉绀哄湪鏈�鍚�
- for (var i = page - 2; i <= pageNum; i++) {//...鍚庨潰璺熶笁涓〉鐮佸綋鍓嶉〉灞呬腑鏄剧ず
- if (i == page) {
- content2 += '<li class="am-active"><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
-
- } else {
- content2 += '<li><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
- }
- }
- } else {//褰撳墠椤靛皬浜庢�婚〉鏁帮紝鍒欐渶鍚庝竴椤靛悗闈㈣窡...
- for (var i = page - 1; i <= page + 1; i++) {//dqPage+1椤靛悗闈�...
- if (i == page) {
- content2 += '<li class="am-active"><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
-
- } else {
- content2 += '<li><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
- }
- }
- content2 += "<li><a>...</a></li>";
- }
- $('#page').append(content2);
- // return;
- }
- }
- // 鍒ゆ柇鍚庨潰鏄惁杩樻湁椤甸潰
- if (page == pageNum) {
- content2 += '<li class="am-disabled"><a href="#" rel="external nofollow" rel="external nofollow" rel="external nofollow" >禄</a></li>';
- } else {
- content2 += '<li><a href="javascript:reloadData(' + (page + 1) + ')" rel="external nofollow" >禄</a></li>';
- }
+ for (var i = 1; i <= pageNum; i++) {
+ let pagestr_ = addPageItem(pageNum,page,i);
+ content2 += pagestr_;
+ };
content2 += '</ul>' +
'</div>';
- $("#pageID").empty();
$("#pageID").append(content1);
- $("#page").empty();
$("#page").append(content2);
}
});
@@ -220,7 +146,6 @@
}
function out(obj) {
-
$(obj).removeClass("over_tr");
}
@@ -244,5 +169,27 @@
function setTopNname(count) {
$("#topN_name").html("Top" + count);
+}
+function addPageItem(pageNum,currpage,i) {
+ let html = "";
+ // 鍒ゆ柇鍓嶉潰鏄惁杩樻湁椤甸潰
+ if (i == 1) {
+ html += '<li><a href="javascript:reloadData(' + (currpage>1 ? currpage-1 : 1) + ')" rel="external nofollow" ><</a></li>';
+ }
+ if (i == currpage) {
+ html += '<li class="am-active"><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
+ } else {
+ let dis_ = Math.abs(i-currpage);
+ if (dis_<3 || i<3 || i==pageNum){
+ html += '<li><a href="javascript:reloadData(' + i + ')" rel="external nofollow" rel="external nofollow" >' + i + '</a></li>';
+ } else if (dis_==3 && i>2) {
+ html += "<li><a>...</a></li>";
+ }
+ }
+ // 鍒ゆ柇鍚庨潰鏄惁杩樻湁椤甸潰
+ if (i == pageNum) {
+ html += '<li><a href="javascript:reloadData(' + (currpage < pageNum ? currpage + 1 : pageNum ) + ')" rel="external nofollow" >></a></li>';
+ }
+ return html;
}
\ No newline at end of file
diff --git a/mobile/road_search.html b/mobile/road_search.html
index 3bf84d1..1990c2b 100644
--- a/mobile/road_search.html
+++ b/mobile/road_search.html
@@ -44,6 +44,11 @@
.datetimepicker table {
width: 100%;
}
+
+.pageDiv{
+ float: none!important;
+ text-align: center;
+ }
</style>
</head>
@@ -107,9 +112,7 @@
<div class="page">
<div id="pageID">
</div>
- <div class="pageDiv">
- <ul id="page"></ul>
- </div>
+ <ul id="page" style="padding: 0;"></ul>
</div>
</div>
<script type="text/javascript" src="js/widget_search_view.js"></script>
diff --git a/mobile/road_show.html b/mobile/road_show.html
index a04557e..289241b 100644
--- a/mobile/road_show.html
+++ b/mobile/road_show.html
@@ -21,8 +21,7 @@
<meta name="apple-mobile-web-app-title" content="MarsGIS" />
<!--绗笁鏂筶ib-->
- <script type="text/javascript" src="../lib/include-lib.js?time=20210803" libpath="../lib/"
- include="jquery,jquery.range,bootstrap,bootstrap-checkbox,font-awesome,web-icons,layer,haoutil,localforage,nprogress,toastr,admui,turf,mars3d,mars3d-widget,mars3d-wind"></script>
+ <script type="text/javascript" src="../lib/include-lib.js?time=20210803" libpath="../lib/" include="jquery,bootstrap-checkbox"></script>
<link href="../css/style.css?time=20210803" rel="stylesheet" />
<link href="../lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<link href="../lib/bootstrap/bootstrap-datepicker/bootstrap-datetimepicker.css" rel="stylesheet" />
--
Gitblit v1.9.1