From ccec42747e299b3f58cafbff31430c3b6521a442 Mon Sep 17 00:00:00 2001
From: cshenfu <men883234@gmail.com>
Date: 星期五, 04 十一月 2022 10:56:04 +0800
Subject: [PATCH] 更改分类查询下数据条数显示BUG以及十五分钟查询提示BUG
---
js/function.js | 1 -
widgetsTS/dataTime/widget.js | 10 ++++++++++
js/function_1001.js | 21 +++++++++------------
widgetsTS/widget_search/view.js | 3 ++-
4 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/js/function.js b/js/function.js
index 9ae44a2..3ea4d1b 100644
--- a/js/function.js
+++ b/js/function.js
@@ -58,7 +58,6 @@
} else {
min = 45
}
-
return year + "-" +
((month + 1) > 9 ? (month + 1) : "0" + (month + 1)) + "-" +
(day > 9 ? day : ("0" + day)) + " " +
diff --git a/js/function_1001.js b/js/function_1001.js
index c0b3282..a2600a8 100644
--- a/js/function_1001.js
+++ b/js/function_1001.js
@@ -194,24 +194,21 @@
function timetype_change1(){
if(mars3d.global_variables.timetype == "min"){
- $(".menu1").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
- haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ $(".menu1").attr('onclick',"minClick()");
}else{
$(".menu1").attr('onclick',"javascript:activateWidget('widgetsTS/widget_summary/widget.js')"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
}
}
function timetype_change2(){
if(mars3d.global_variables.timetype == "min"){
- $(".menu2").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
- haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ $(".menu2").attr('onclick',"minClick()");
}else{
$(".menu2").attr('onclick',"javascript:activateWidget('widgetsTS/widget_search/widget.js')"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
}
}
function timetype_change3(){
if(mars3d.global_variables.timetype == "min"){
- $(".menu3").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
- haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ $(".menu3").attr('onclick',"minClick()");
}else{
$(".menu3").attr('onclick',"javascript:activateWidget('widgetsTS/widget_grid/widget.js')"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
}
@@ -219,18 +216,18 @@
function timetype_change4(){
if(mars3d.global_variables.timetype == "min"){
- $(".menu4-Wind").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
- haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
+ $(".menu4-Wind").attr('onclick',"minClick()");
}else{
$(".menu4-Wind").attr('onclick',"javascript:activateWidget('widgetsTS/windsetting/widget.js');javascript:$('#menu4Child').toggle()"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
}
}
function timetype_change5(){
- // if(mars3d.global_variables.timetype == "min"){
- // $(".menu5-Taxirouter").attr('onclick'," "); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
- // haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒");
- // }else{
$(".menu5-Taxirouter").attr('onclick',"javascript:activateWidget('widgetsTS/taxiRouteReplay2/widget.js');javascript:$('#menu4Child').toggle()"); //$("#鍚嶇О").attr("灞炴�у悕","灞炴�у��");
// }
}
+
+
+function minClick(){
+ haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒")
+}
diff --git a/widgetsTS/dataTime/widget.js b/widgetsTS/dataTime/widget.js
index 710b4c5..85a5923 100644
--- a/widgetsTS/dataTime/widget.js
+++ b/widgetsTS/dataTime/widget.js
@@ -146,6 +146,16 @@
mars3d.global_variables.DefaultDateTimeStart = $('#appDateMin').val().substring(0,11)+"00:00:00";
mars3d.global_variables.timetype = "min";
console.log($('#appDateMin').val(),mars3d.global_variables.queryDataTEnd,mars3d.global_variables.DefaultDateTimeStart)
+
+ let change1 = mars3d.widget.getClass('widgetsTS/widget_summary/widget.js');
+ let change2 = mars3d.widget.getClass('widgetsTS/widget_search/widget.js');
+ let change3 = mars3d.widget.getClass('widgetsTS/widget_grid/widget.js');
+ let change4 = mars3d.widget.getClass('widgetsTS/windsetting/widget.js');
+ if(change1 != undefined||change2 != undefined||change3 != undefined||change4 != undefined){
+ haoutil.msg("璇峰垏鎹㈣嚦澶╂垨鏃舵煡鐪嬫暟鎹紒锛侊紒")
+ }
+
+
taxi_reLoadLayers();
timetype_change1();
timetype_change2();
diff --git a/widgetsTS/widget_search/view.js b/widgetsTS/widget_search/view.js
index e28f03e..63ced06 100644
--- a/widgetsTS/widget_search/view.js
+++ b/widgetsTS/widget_search/view.js
@@ -174,7 +174,8 @@
haoutil.msg("鏃犳煡璇㈢粨鏋滐紝璇锋洿鎹㈡煡璇㈡潯浠讹紒")
return;
}
- var newsTotalNum = data.data.counter.counter; //璁板綍鐨勬�绘潯鏁�
+ var newsTotalNum = data.data.result.length; //璁板綍鐨勬�绘潯鏁�
+ console.log(data.data,"鎵�鏈夋暟鎹�")
var pageNum = Math.ceil(newsTotalNum/avgnam); //鍒嗛〉鐨勬�婚〉鏁�
for(var i=0;i<tableData.length;i++){
--
Gitblit v1.9.1