From 5eafdec8ecb2226f2077e8ae1138ee0d7d1aae7d Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期二, 09 十月 2018 14:29:58 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/equipWarn1.jsp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 95012b7..6e84fff 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -171,7 +171,7 @@
<script type="text/javascript">
var Page={
pageCurr:1,
- pageSize:14,
+ pageSize:16,
pageAll:0,
};
var arrTh = new Array(); // 琛ㄦ牸鐨勫ご閮�
@@ -574,6 +574,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
+ console.log(temp);
return temp;
}
@@ -721,6 +722,7 @@
case 618502:return "閫氳鍛婅";
case 618503:return "璁惧杩囨俯鍛婅";
case 618504:return "浜屾瀬绠1鍛婅";
+ case 119023:return "缁埅涓嶈冻鍛婅";
}
}
return "閫氫俊鏁呴殰";
@@ -966,7 +968,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
--
Gitblit v1.9.1