From 02f95e88f98a24eeb53ae10b14c5ddf9935d05e4 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 25 九月 2018 11:36:49 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/control.jsp | 1 +
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 2 +-
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 19 +++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 74b0ab4..a06f324 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -840,6 +840,7 @@
<script type="text/javascript" src="js/dischargetest/bts.js"></script>
<script type="text/javascript" src="js/dischargetest/4016.js"></script>
<script type="text/javascript" src="pages/js/pages/control-common.js"></script>
+ <script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
new file mode 100644
index 0000000..9ca0203
--- /dev/null
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -0,0 +1,19 @@
+// 瀹氫箟椤甸潰涓殑siderbar缁勪欢
+;(function($, window, document, gl, undefined) {
+ gl.namespace('pages.siderbar');
+
+ first();
+ // 鐢熸垚涓�绾у鑸�
+ function first() {
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchAllStation",
+ async:true,
+ dataType:'text',
+ data:null,
+ success: function(data){
+ console.info(data);
+ }
+ });
+ }
+})(jQuery, window, document, GLOBAL);
\ No newline at end of file
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 81d2fca..23719b7 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -3247,7 +3247,7 @@
//鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤,num涓瓨鏀緐id)
public List serchAllStation(Object obj){
BattInf binf=(BattInf) obj;;
- String sql="select DISTINCT StationName " +
+ String sql="select DISTINCT StationName1 " +
" FROM db_battinf.tb_battinf " +
" where StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
--
Gitblit v1.9.1