From 8b67d0abb22ebbab192fa51be7f271eb215999d9 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.9>
Date: 星期一, 26 十一月 2018 15:34:06 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/Top.jsp | 70 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 04816b8..458dcfe 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -132,6 +132,9 @@
</div>
<div class="cell-list control">
<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
+ </div>
+ <div class="cell-list server-time">
+ 2018-11-26 00:00:00
</div>
</div>
<div class="international">
@@ -194,6 +197,7 @@
<script src="js/createTab.js"></script>
<script type="text/javascript" src="js/scrollBar.js"></script>
<script type="text/javascript" src="js/VoiceUtil.js"></script>
+ <script type="text/javascript" src="js/rightmenu.js"></script>
<script type="text/javascript">
$(document).ready(function(){
setUserName(); //璁剧疆鐢ㄦ埛鍚嶇О
@@ -331,8 +335,6 @@
}
});
}
-
-
$(function(){
@@ -527,6 +529,31 @@
warnAlarmData = temp;
}
+ seachServerTime();
+ //鑾峰彇鏈嶅姟鍣ㄤ笂鐨勬椂闂�
+ function seachServerTime(){
+ $.ajax({
+ type:"post",
+ url: "User_infAction!searchServerTime",
+ async:true,
+ dataType:'text',
+ data:null,
+ success: function(data){
+ data = eval('('+data+')');
+ var model = eval('('+data.result+')');
+ if(model.code == 1){
+ $('.server-time').text(model.msg);
+ }else{
+
+ }
+ setTimeout(seachServerTime, 1000);
+ },
+ error:function() {
+ setTimeout(seachServerTime, 2000);
+ }
+ });
+ }
+
// 鐩戞祴褰撳墠鐨勫憡璀︿俊鎭槸鍚︿负鏈�鏂扮殑鍛婅
function checkWarnDataIsNew(warnData) {
var rs = 0;
@@ -691,6 +718,36 @@
alert('褰撳墠涓鸿鎯呴〉锛屼笉鐢ㄨ烦杞紒');
}
});
+
+ var menuItems = [{
+ txt: '瀹炴椂-鐩戞祴鏁版嵁',cla: 'menu-control'
+ }];
+
+ eleTd.on('mousedown', 'tr',function(e) {
+ // 鍒ゆ柇鏄惁涓哄彸閿�
+ if(e.which == 3) {
+ var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
+ var disY = (e || event).clientY + 10; // 鑾峰彇榧犳爣鐐瑰嚮鐨勭旱鍧愭爣
+ var trData = $(this).data('attr');
+ menuItems[0].data = trData;
+ //console.log(trData);
+ rightMenu.showMenu(menuItems, disX, disY);
+ }
+ });
+
+ // 鐐瑰嚮瀹炴椂-鐩戞祴鏁版嵁璺宠浆
+ $('body').on('click', '.menu-control', function() {
+ var _data = $(this).data('data');
+ //console.log(_data);
+ var province = _data.stationName1;
+ var city = _data.stationName2;
+ var county = _data.stationName5;
+ var home = _data.stationName;
+
+ var url = skipUrl('control.jsp',province,city,county,home);
+ window.open(url);
+ });
+
//鏌ヨ褰撳墠鐢ㄦ埛绠＄悊鐨凚TS姝ｅ湪澶勪簬鏍稿娴嬭瘯鐨勮澶囪褰�
function searchNuclear_cap(){
$.ajax({
@@ -724,7 +781,7 @@
// 鏍规嵁鏁版嵁鐢熸垚琛ㄦ牸
function createTblByModel(model) {
- console.log(model);
+ //console.log(model);
arrTd = [];
for(var i=0; i<model.data.length; i++) {
var data = model.data[i];
@@ -742,6 +799,13 @@
}
createFullTbl(eleTh, eleTd, arrTh, arrTd);
+ // 缁欐瘡涓�琛屾坊鍔犳暟鎹�
+ var trList = eleTd.find('tbody tr');
+ // 閬嶅巻鍐呭缁檛r娣诲姞attr
+ for(var i=0; i<model.data.length; i++) {
+ trList.eq(i).data('attr', model.data[i]);
+ }
+
// 鏍规嵁鍛婅鍊艰缃俯搴︼紝k1鐢甸樆锛屽閫氬帇闄嶇殑瀛椾綋棰滆壊
/* var trList = eleTd.find('tbody tr');
for(var i=0; i<model.data.length; i++) {
--
Gitblit v1.9.1