From ef1fe697f9eb530a7fba34665920e85044eed147 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 15 十一月 2018 10:59:47 +0800
Subject: [PATCH] 提交等待框关闭
---
gx_tieta/WebRoot/control.jsp | 123 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index d59fe55..433c845 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -28,7 +28,6 @@
<!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css"> -->
<script type="text/javascript" src="js/echarts.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/right-menu.js"></script>
<style>
body {
@@ -1151,6 +1150,7 @@
<script type="text/javascript" src="js/dischargetest/sysData.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/rightmenu.js"></script>
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
@@ -1216,7 +1216,7 @@
// 璁剧疆椤甸潰鏉冮檺妯″潡
$(function() {
var testOp = checkUserPermit(permits, 'batt_test_op_permit');
- console.log(testOp);
+ //console.log(testOp);
if(!testOp) {
$(".ele-circle .tools-btn").remove();
}
@@ -1760,6 +1760,8 @@
searchDevStatusByDev_id();
findrtstate();
findrtdata();
+ //鏌ヨ璁惧鐨刣cdc鐘舵��
+ searchDevDcDcState();
}
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -3039,8 +3041,8 @@
var city = batt.StationName2;
var county = batt.StationName5;
var home = batt.StationName;
- var homeid = batt.BattGroupId;
- $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
+ var battid = batt.BattGroupId;
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
});
});
@@ -3479,10 +3481,20 @@
// 鎷撴墤鍥惧浘鏍�
changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1}); // 鏀剧數鍗曞厓
changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1}); // 鍏呯數鍗曞厓
- console.log(data);
+ //console.log(data);
// 娌℃湁褰㈠弬灏变笉鍋氫换浣曟搷浣�
if(data == undefined) {
- status.hide();
+ var opts = [{
+ name: 'none',
+ type: 'text',
+ status: 0,
+ notShow: false,
+ content: {
+ text:'璁惧鐘舵�侊細<span class="red">鏈繛鎺�</span>'
+ }
+ }];
+ status.setOpts(opts);
+ //status.hide();
return false; // 缁撴潫鍑芥暟
}
@@ -3518,6 +3530,7 @@
status.setStatus('msg', isLink);
// 璁剧疆娓╁害淇℃伅
status.setStatus('tmp', alarms[2] == 'true'?0:1);
+
// 璁剧疆鏍稿鍋滄鍘熷洜
if(data.dev_workstate == 2) {
status.setStatus('stop', 99);
@@ -3539,11 +3552,7 @@
status.setStatus('workstatus', data.dev_workstate);
// 璁剧疆鏍稿鍋滄鍘熷洜
- if(data.dev_workstate == 2) {
- status.setStatus('stop', 99);
- }else {
- status.setStatus('stop', data.dev_last_captest_stop_type);
- }
+ status.setStatus('stop', data.dev_last_captest_stop_type);
// 璁剧疆閫氫俊璁℃暟
status.setText('count', "閫氫俊璁℃暟锛�"+data.dev_commcount);
@@ -4343,6 +4352,8 @@
// 鐢垫睜缁�
treeView.ele.on('click', '.eleGroup', function() {
var eleGroup = $(this).data('attr');
+ var status = GLOBAL.circleStatus.status;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
// 鏍规嵁BattGroupId鏌ヨ鏁版嵁
if(BattGroupId != eleGroup.BattGroupId) {
BattGroupId = eleGroup.BattGroupId;
@@ -4368,7 +4379,7 @@
// 璐熻浇鐢垫祦
var loadCurr = batt.Load_curr+'A';
changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
- changeEleCircleOpt(eleCircle, 'signal', {isShow:false});
+
// 鏈�澶ф牳瀹圭數娴�
var disCurrMax = batt.DisCurrMax+'A';
changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'鏈�澶ф牳瀹圭數娴侊細'+disCurrMax});
@@ -4413,6 +4424,37 @@
//鍏ㄩ儴鏀剁缉
$('#all_hide').click(function(){
treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
+ // 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
+ var menuItems = [
+ {txt: '鏈烘埧瀹炴椂鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
+ {txt: '璁惧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
+ {txt: '鏈烘埧缁埅鑳藉姏鏌ヨ', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
+ {txt: '璁惧鍏呮斁鐢垫ā鍧楃姸鎬�', cla:'target', data: {target: 'equip-charge-param.jsp'}},
+ {txt: '鏈烘埧鍘嗗彶浜嬩欢鏌ヨ', cla:'target', data: {target: 'batt-state-statistical.jsp'}},
+ ];
+ // 缁欒〃鏍兼坊鍔犺嚜宸辩殑鍙抽敭鑿滃崟
+ $('#contai').on('mousedown','.ele-circle',function(e){
+ var batt = getBatt();
+ if (e.which == 3) {
+ var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
+ var disY = (e || event).clientY + 10; // 鑾峰彇榧犳爣鐐瑰嚮鐨勭旱鍧愭爣
+
+ rightMenu.showMenu(menuItems, disX, disY);
+ }
+ });
+
+ $('body').on('click', '#rightMenu .target', function() {
+ var batt = getBatt();
+ var pageName = $(this).data('data').target;
+ var province = batt.StationName1;
+ var city = batt.StationName2;
+ var county = batt.StationName5;
+ var home = batt.StationName;
+ var battid = batt.BattGroupId;
+ // 瀹炵幇璺宠浆
+ window.open(skipUrl(pageName, province, city, county, home, battid));
});
// 宸ュ叿鏉℃暣浣撴牱寮�
@@ -4771,6 +4813,9 @@
// 鐐瑰嚮鏌ョ湅褰撳墠淇″彿鐨勮川閲�
$('#signalBtn').click(function() {
var batt = getBatt();
+ var status = GLOBAL.circleStatus.status;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
+ //var btsOpts = GLOBAL.circleStatus.btsOpts;
signalSearch.dev_id = batt.FBSDeviceId;
var load = layer.load(1);
// 璇锋眰鍚庡彴鑾峰彇淇″彿鐨勮川閲�
@@ -4796,7 +4841,9 @@
// 鍥剧墖鎻忚堪
signalOpts.name = '淇″彿寮哄害锛�'+signalInfo.signal;
- changeEleCircleOpt(eleCircle, 'signal', signalOpts);
+
+ // 鏄剧ず淇″彿寮哄害
+ layer.msg(signalOpts.name, {time: 5000});
});
});
@@ -4813,11 +4860,17 @@
if(testCsq) {
rs.signal = RegExp.$1;
rs.bitError = RegExp.$2;
- if(rs.signal>20) {
+ if(rs.signal>25) {
rs.img = 1;
+ rs.signal += '锛堝己锛�';
+ }else if(rs.signal>19) {
+ rs.img = 1;
+ rs.signal += '锛堜腑锛�';
+ }else {
+ rs.signal += '锛堝急锛�';
}
}
-
+ //console.info(rs);
return rs;
}
});
@@ -4869,6 +4922,46 @@
console.log(RegExp.$2);
console.log(data.data.ack_inf);
}); */
+
+
+ //鑾峰彇璁惧鐨刣cdc鐘舵��
+ function searchDevDcDcState(temp){
+ var obj = getBatt();
+ var temp = {
+ dev_id: obj.FBSDeviceId
+ };
+
+ $.ajax({
+ type: "post",
+ url: "Fbs9100s_dcdc_stateAction_action_serchByInfo",
+ async: true,
+ dataType: 'json',
+ data: "json = " + JSON.stringify(temp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ //console.info(rs);
+ if(rs.code == 1){
+ var dcdcWarn = '';
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ if(i == (data.length-1)) {
+ dcdcWarn += '0x'+_data.dcdc_SMR_Alarm1_16;
+ }else {
+ dcdcWarn += '0x'+_data.dcdc_SMR_Alarm1_16+'/';
+ }
+ }
+
+ changeEleCircleOpt(eleCircle, 'dcdcWarn', {name: 'DCDC妯″潡鍛婅锛�'+dcdcWarn});
+ }else{
+ changeEleCircleOpt(eleCircle, 'dcdcWarn', {name: 'DCDC妯″潡鍛婅锛氭湭鐭�'}); //
+ }
+ },
+ error: function() {
+
+ }
+ });
+ }
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
--
Gitblit v1.9.1