From 0cce8cd45143eb6aa19423554ec5bb1f59f3ebfc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 14:11:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 35 ++++++++++-------
gx_tieta/WebRoot/js/elecircle.content.js | 6 +-
gx_tieta/WebRoot/pages/js/pages/control-common.js | 4 +-
gx_tieta/WebRoot/js/elecircle.js | 23 +++++++++--
4 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index b84c4c2..c51e1bb 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -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();
}
@@ -3479,10 +3479,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 +3528,7 @@
status.setStatus('msg', isLink);
// 璁剧疆娓╁害淇℃伅
status.setStatus('tmp', alarms[2] == 'true'?0:1);
+
// 璁剧疆鏍稿鍋滄鍘熷洜
if(data.dev_workstate == 2) {
status.setStatus('stop', 99);
@@ -3539,11 +3550,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);
@@ -4539,7 +4546,7 @@
searchSysData(temp, true);
});
- // 鐐瑰嚮璁剧疆绯荤粺鍙傛暟
+ // 鐐瑰嚮绯荤粺鍙傛暟鎸夐挳
$('#sysSet').click(function() {
var batt = getBatt();
var temp = {
@@ -4571,7 +4578,7 @@
var batt = getBatt();
var temp = {
dev_id: batt.FBSDeviceId,
- cmd: sysCMD.restart
+ num: sysCMD.restart
};
/* console.log(temp);
@@ -4702,8 +4709,8 @@
$('#sysSet_endur').val(data.GroupVolRange); // 鎬荤画鑸椂闂�
$('#sysSet_firTime').val(data.GroupVolSorce); // 淇濅竴娆′笅鐢电画鑸椂闂�
$('#sysSet_range').val(data.CurrentRange); // 鐢垫祦閽抽噺绋�
- $('#sysSet_firVol').val(data.CurrentTyte); // 涓�娆′笅鐢电數鍘�
- $('#sysSet_secVol').val(data.MonomerOrder); // 浜屾涓嬬數鐢靛帇
+ $('#sysSet_firVol').val(data.CurrentTyte/10); // 涓�娆′笅鐢电數鍘�
+ $('#sysSet_secVol').val(data.MonomerOrder/10); // 浜屾涓嬬數鐢靛帇
$('#sysSet_dcdc').val(data.LoaderCount); // DCDC妯″潡鏁伴噺
$('#sysSet_sourceStyle').val(data.DtCardCount); // 鍗曚綋鏁版嵁鏉ユ簮绫诲瀷
$('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt); // 鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺
@@ -4745,8 +4752,8 @@
GroupVolRange: endur,
GroupVolSorce: firTime,
CurrentRange: range,
- CurrentTyte: firVol,
- MonomerOrder: secVol,
+ CurrentTyte: firVol*10,
+ MonomerOrder: secVol*10,
LoaderCount: dcdc,
DtCardCount: sourceStyle,
POF_BG_Boost_Cnt:bleedNum,
diff --git a/gx_tieta/WebRoot/js/elecircle.content.js b/gx_tieta/WebRoot/js/elecircle.content.js
index 265753a..0bb0133 100644
--- a/gx_tieta/WebRoot/js/elecircle.content.js
+++ b/gx_tieta/WebRoot/js/elecircle.content.js
@@ -476,12 +476,12 @@
});
// 鎷撴墤鍥惧悕绉�
- eleCircle.drawText({
+ /*eleCircle.drawText({
id: 'title',
startX: 400,
startY: 40,
name: '璁惧娴厖鐘舵�佺數娴佹柟鍚�',
- });
+ });*/
// 璁惧鍐呴儴娓╁害
eleCircle.drawText({
@@ -980,7 +980,7 @@
name: 'workstatus',
type: 'list',
notShow: false,
- imgCallback: gl.statusImg.getImg,
+ //imgCallback: gl.statusImg.getImg,
status: 0,
content: {
list:gl.BTS9100.workstates,
diff --git a/gx_tieta/WebRoot/js/elecircle.js b/gx_tieta/WebRoot/js/elecircle.js
index bf440a4..24a9ab2 100644
--- a/gx_tieta/WebRoot/js/elecircle.js
+++ b/gx_tieta/WebRoot/js/elecircle.js
@@ -312,7 +312,7 @@
var opts = $.extend({}, defaults, options || {});
// 鏍规嵁寮�鍏崇殑绫诲瀷鍜屽揩鍏崇殑鐘舵�佽缃畍alue鐨勫�艰幏鍙栫嚎鍖呯數鍘�
- var lineVol = '绾垮寘鐢靛帇:';
+ /*var lineVol = '绾垮寘鐢靛帇:';
if(opts.id == 'ko') {
if(opts.stats == 'on') {
lineVol =lineVol + '0V';
@@ -325,7 +325,7 @@
}else {
lineVol =lineVol + '0V';
}
- }
+ }*/
@@ -495,7 +495,7 @@
}
// 缁樺埗鑳屾櫙鑹�
- this.context.beginPath();
+ /*this.context.beginPath();
this.context.fillStyle = '#FFFFFF';
var strWidth = getStringWidth(lineVol);
this.context.rect(valueTxtX,valueTxtY-12,strWidth,14);
@@ -504,7 +504,7 @@
this.context.strokStyle = '#0000DD';
this.context.fillStyle = '#0000DD';
this.context.font = 'bold 12px Arial';
- this.context.fillText(lineVol, valueTxtX, valueTxtY);
+ this.context.fillText(lineVol, valueTxtX, valueTxtY);*/
var switchBtnInfor = {
options: opts,
@@ -812,17 +812,30 @@
this.context.setLineDash([]); // 鎭㈠瀹炵嚎
+ if(opts.name.length > 0) {
+ this.context.beginPath();
+ this.context.fillStyle = '#FFFFFF';
+ this.context.rect(opts.startX-20,opts.startY+16*2+156, 30,32);
+ this.context.fill();
+ }
+
+
var textList = opts.name.split('&');
+ this.context.fillStyle = opts.strokeStyle;
var lineHeight = 16;
for(var i=0; i<textList.length; i++) {
this.context.fillText(textList[i], opts.startX-20, opts.startY+lineHeight*i+200);
}
+
+
+
+
// 瀛樺偍鍐呭
var dotLineInfor = {
options: opts,
type:'drawDotLine',
- }
+ };
this.opts.push(dotLineInfor);
diff --git a/gx_tieta/WebRoot/pages/js/pages/control-common.js b/gx_tieta/WebRoot/pages/js/pages/control-common.js
index 067ab6a..531e101 100644
--- a/gx_tieta/WebRoot/pages/js/pages/control-common.js
+++ b/gx_tieta/WebRoot/pages/js/pages/control-common.js
@@ -393,8 +393,8 @@
min = min>0?0:min;
}
- console.info(max);
- console.info(min);
+ //console.info(max);
+ //console.info(min);
var option={
tooltip:{
--
Gitblit v1.9.1