From ded371830aaa4a149eb33b4363bdf828a9dc7c06 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 03 十一月 2018 13:45:46 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/Test.jsp | 40 +---------------------------------------
1 files changed, 1 insertions(+), 39 deletions(-)
diff --git a/gx_tieta/WebRoot/Test.jsp b/gx_tieta/WebRoot/Test.jsp
index 639e23c..ffe00c7 100644
--- a/gx_tieta/WebRoot/Test.jsp
+++ b/gx_tieta/WebRoot/Test.jsp
@@ -20,10 +20,8 @@
<link rel="stylesheet" type="text/css" href="styles.css">
-->
<link rel="stylesheet" type="text/css" href="css/basic.css" />
- <script type="text/javascript" src="js/frame.js"></script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/base.js"></script>
- <script type="text/javascript" src="js/buildNav.js"></script>
</head>
<body>
<!-- <form action="MyFileAction!UploadTestFile" method="post" enctype="multipart/form-data" id="up-form1">
@@ -38,7 +36,7 @@
<img alt="" id="im" src="">
</form>
</body>
-
+ <script type="text/javascript" src="js/VoiceUtil.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -47,42 +45,6 @@
permits=<%=permits%>;
//console.info(json);
<% } %>
-
-
-
-
- var param = {
- dev_id:910000001,
- record_datetime:'2018-01-01 00:00:00',
- record_datetime_end:'2018-03-30 23:59:59',
- station_event_type:0, //1:鍩虹珯鍋滅數 2:鍩虹珯缁埅 3:鍩虹珯鍙戠數 4:鍩虹珯寮�闂� 5:鍩虹珯鎺夌珯 6:鍩虹珯娓╁害涓婇檺 7:鍩虹珯娓╁害涓嬮檺 8:鍩虹珯婀垮害涓婇檺 9:鍩虹珯婀垮害涓嬮檺
- page:{
- pageSize:10, //姣忛〉鐨勮鏁�
- pageCurr:1 //褰撳墠椤电爜鏁�
- }
- };
- searchStationHistRecord(param);
-
- //鏌ヨ鍩虹珯璇︽儏
- function searchStationHistRecord(param){
- // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
- $.ajax({
- type: "post",
- url: "Bts_station_eventAction!serchByInfo",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(param),
- success: function(data){
- var rs = JSON.parse(data.result);
- console.info(rs);
- if(rs.code == 1) {
-
- }else {
-
- }
- }
- });
- }
--
Gitblit v1.9.1