Microservice/system-jibei
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

监测点、终端的状态修改

Browse Source
This commit is contained in:
xy
2024-04-23 11:40:04 +08:00
parent 7fb4df66ef
commit ac39b8c0ce
60 changed files with 263 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pqs9000/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml
View File

@@ -26,8 +26,8 @@
<if test="_databaseId == 'MariaDB'">
case
when a.devflag = 0 then '投运'
when a.devflag = 1 then '热备用'
when a.devflag = 2 then '停运'
when a.devflag = 1 then '检修'
when a.devflag = 2 then '退运'
end
as devflag,
case
@@ -37,7 +37,7 @@
as status,
</if>
<if test="_databaseId == 'Oracle'">
decode(a.devflag, 0, '投运', 1, '热备用', '停运') as devflag,
decode(a.devflag, 0, '投运', 1, '检修', '退运') as devflag,
decode(a.status, 0, '中断', 1, '正常') as status,
</if>
<if test="_databaseId == 'Oracle'">
@@ -227,8 +227,8 @@
<if test="_databaseId == 'MariaDB'">
case
when a.devflag = 0 then '投运'
when a.devflag = 1 then '热备用'
when a.devflag = 2 then '停运'
when a.devflag = 1 then '检修'
when a.devflag = 2 then '退运'
end
as devflag,
case
@@ -238,7 +238,7 @@
as status,
</if>
<if test="_databaseId == 'Oracle'">
decode(a.DEVFLAG, 0, '正常', 1, '热备用', '停运') as devflag,
decode(a.DEVFLAG, 0, '正常', 1, '检修', '退运') as devflag,
decode(a.status, 0, '中断', 1, '正常') as status,
</if>
<if test="_databaseId == 'Oracle'">
@@ -308,8 +308,8 @@
<if test="_databaseId == 'MariaDB'">
case
when a.devflag = 0 then '投运'
when a.devflag = 1 then '热备用'
when a.devflag = 2 then '停运'
when a.devflag = 1 then '检修'
when a.devflag = 2 then '退运'
end
as devflag,
case
@@ -319,11 +319,11 @@
as status,
</if>
<if test="_databaseId == 'Oracle'">
decode(a.devflag, 0, '投运', 1, '热备用', '停运') as devflag,
decode(a.devflag, 0, '投运', 1, '检修', '退运') as devflag,
decode(a.status, 0, '中断', 1, '正常') as status,
</if>
<if test="_databaseId == 'Oracle'">
decode(d.status, 0, '投运', 1, '热备用', '停运') as lineStatus,
decode(d.status, 0, '投运', 1, '检修', '退运') as lineStatus,
</if>
<if test="_databaseId == 'Oracle'">
to_char(a.updatetime, 'yyyy-MM-dd hh24:mi:ss') as updatetime,

50
pqs9000/src/main/webapp/WEB-INF/views/business/area/deviceStatus.jsp
View File

@@ -42,7 +42,7 @@
<div class="container-fluid">
<div class="form-inline mt5 wanzhengdiv">
<div class="form-group has-feedback mr10">
<span class=' font12 fontBold'>终端状态(左柱) <span class='run'><span class='inB bg-run smallBlock'></span> 投运 </span><span class='breaks'><span class='inB bg-breaks smallBlock'></span> 热备用 </span><span class='grey'><span class='inB bg-grey smallBlock'></span> 停运 &nbsp;</span></span>
<span class=' font12 fontBold'>终端状态(左柱) <span class='run'><span class='inB bg-run smallBlock'></span> 投运 </span><span class='breaks'><span class='inB bg-breaks smallBlock'></span> 检修 </span><span class='grey'><span class='inB bg-grey smallBlock'></span> 退运 &nbsp;</span></span>
<span class=' font12 fontBold' > 终端在线率(右柱) <span class='info'><span class='inB bg-info smallBlock'></span> 在线率≥90%</span><span class='warn'> <span class='inB bg-warn smallBlock'></span> 60%≤在线率<90% </span><span class='error'> <span class='inB bg-error smallBlock'></span> 在线率<60%</span> </span>
</div>
</div>
@@ -105,8 +105,8 @@
<th>区域</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -121,8 +121,8 @@
<th>厂家</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -137,8 +137,8 @@
<th>电压等级</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -153,8 +153,8 @@
<th>干扰源类型</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -544,8 +544,8 @@
tips +='<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips+='<br/><font style="font-size: 10px">/</font>';
}else{
@@ -599,13 +599,13 @@
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -858,8 +858,8 @@
tips +='<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips+='<br/><font style="font-size: 10px">/</font>';
}else{
@@ -914,13 +914,13 @@
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -1171,8 +1171,8 @@
tips +='<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips+='<br/><font style="font-size: 10px">/</font>';
}else{
@@ -1227,13 +1227,13 @@
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -1484,8 +1484,8 @@
tips +='<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips+='<br/><font style="font-size: 10px">/</font>';
}else{
@@ -1540,13 +1540,13 @@
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

4
pqs9000/src/main/webapp/WEB-INF/views/business/area/monitorScope.jsp
View File

@@ -150,10 +150,10 @@
<div class="iconBox">
<div class="divs">
<img style="margin-right:9px;height: 15px" src="../images/img/pyellow.png" alt=""/> <label>热备用</label>
<img style="margin-right:9px;height: 15px" src="../images/img/pyellow.png" alt=""/> <label>检修</label>
</div>
<div class="divs">
<img style="margin-right:5px;height: 15px" src="../images/img/pgray.png" alt=""/> <label>停运</label>
<img style="margin-right:5px;height: 15px" src="../images/img/pgray.png" alt=""/> <label>退运</label>
</div>
<label class="divs">投运</label>
<div class="divs" style="padding-left: 10px">

4
pqs9000/src/main/webapp/WEB-INF/views/business/manage/integrityTable.jsp
View File

@@ -75,8 +75,8 @@
<select class="form-control" id="devflag">
<option value="">全部</option>
<option value="0">投运</option>
<option value="1">热备用</option>
<option value="2">停运</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select> <label class="form-group">
<div class="form-inline disinlineb wanzhengdiv">

4
pqs9000/src/main/webapp/WEB-INF/views/business/manage/runtime.jsp
View File

@@ -66,8 +66,8 @@
class="form-control" id="devflag">
<option value="">全部</option>
<option value="0">投运</option>
<option value="1">热备用</option>
<option value="2">停运</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select> <label class="form-group">通讯状态：</label> <select id="status"
class="form-control">
<option value="">全部</option>

24
pqs9000/src/main/webapp/WEB-INF/views/overview/deviceStatus.jsp
View File

@@ -48,8 +48,8 @@
<th>区域</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -64,8 +64,8 @@
<th>厂家</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -316,8 +316,8 @@
tips += '<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips += '<br/><font style="font-size: 10px">/</font>';
} else {
@@ -371,13 +371,13 @@
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -635,8 +635,8 @@
tips += '<br/><font style="font-size: 12px">终端状态(%)</font>';
if (color === noMonitor) {
tips += '<br/><font style="font-size: 10px">投运 : /</font>';
tips += '<br/><font style="font-size: 10px">热备用 : /</font>';
tips += '<br/><font style="font-size: 10px">停运 : /</font>';
tips += '<br/><font style="font-size: 10px">检修 : /</font>';
tips += '<br/><font style="font-size: 10px">退运 : /</font>';
tips += '<br/><font style="font-size: 12px">终端在线率(%)</font>';
tips += '<br/><font style="font-size: 10px">/</font>';
} else {
@@ -690,13 +690,13 @@
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

8
pqs9000/src/main/webapp/WEB-INF/views/overview/overview.jsp
View File

@@ -68,7 +68,7 @@
<li id="item2">
<div style="position:absolute;z-index: 99">
<div>
<span class=' font12 fontBold ' style="display: block;margin-left: 10px">终端状态(左柱) <span class='run'><span class='inB bg-run smallBlock'></span> 投运 </span><span class='breaks'><span class='inB bg-breaks smallBlock'></span> 热备用 </span><span class='grey'><span class='inB bg-grey smallBlock'></span> 停运 &nbsp;</span></span>
<span class=' font12 fontBold ' style="display: block;margin-left: 10px">终端状态(左柱) <span class='run'><span class='inB bg-run smallBlock'></span> 投运 </span><span class='breaks'><span class='inB bg-breaks smallBlock'></span> 检修 </span><span class='grey'><span class='inB bg-grey smallBlock'></span> 退运 &nbsp;</span></span>
<span class=' font12 fontBold' style="display: block;margin-left: 10px;margin-top: 8px" > 终端在线率(右柱) <span class='info'><span class='inB smallBlock' style="background-color:#2E8B57 "></span> 在线率≥90%</span><span class='warn'> <span class='inB bg-warn smallBlock'></span> 60%≤在线率<90% </span><span class='error'> <span class='inB bg-error smallBlock'></span> 在线率<60%</span> </span>
</div>
</div>
@@ -624,13 +624,13 @@
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -894,7 +894,7 @@
return "<span class='fr font12 fontBold' > 终端在线率(右柱) <span class='info'><span class='inB bg-info smallBlock'></span> 在线率≥90%</span><span class='warn''> " +
"<span class='inB bg-warn smallBlock'></span>" +
" 60%≤在线率<90% </span><span class='error'> <span class='inB bg-error smallBlock'></span> 在线率" +
"<60%</span> </span><span class='fr font12 fontBold'>终端状态(左柱) <span class='run'><span class='inB bg-run smallBlock'></span> 投运 </span><span class='breaks'><span class='inB bg-breaks smallBlock'></span> 热备用 </span><span class='grey'><span class='inB bg-grey smallBlock'></span> 停运 &nbsp;</span></span><span class='fr font12 '><span class='fontBold'>统计时间：</span><span class='' >" + startTime + "-" + endTime + "&nbsp;</span></span>";
"<60%</span> </span><span class='fr font12 fontBold'>终端状态(左柱) <span class='run'><span class='inB bg-run smallBlock'></span> 投运 </span><span class='breaks'><span class='inB bg-breaks smallBlock'></span> 检修 </span><span class='grey'><span class='inB bg-grey smallBlock'></span> 退运 &nbsp;</span></span><span class='fr font12 '><span class='fontBold'>统计时间：</span><span class='' >" + startTime + "-" + endTime + "&nbsp;</span></span>";
} else {
return "<span class='fr font12' ><span class='info'><span class='inB bg-info smallBlock'></span> "
+ name + "≥90%</span><span class='warn''> <span class='inB bg-warn smallBlock'></span> 60%≤"

6
pqs9000/src/main/webapp/js/color.js
View File

@@ -5,9 +5,9 @@ var red="#A52a2a";/*C相*/
var black="#000";/*总功*/
// var runColor="#32C5E9";/*投运*/
var runColor="#20B2AA";/*投运*/
// var breaksColor="#9FE6B8";/*热备用*/
var breaksColor="#F4A460";/*热备用*/
var grey="#696969";/*灰色 暂降触发点、停运状态*/
// var breaksColor="#9FE6B8";/*检修*/
var breaksColor="#F4A460";/*检修*/
var grey="#696969";/*灰色 暂降触发点、退运状态*/
var blue="#87CEEB";/*在线率*/
var orange="#FF7E50";/*单柱状图*/
var canvasBG="#F9F9F9";//画布背景色

20
pqs9000/src/main/webapp/jspJS/area/deviceStatus.js
View File

@@ -165,7 +165,7 @@ function drawAreaPic(area, intervals) {
color: [green, yellow, grey],
legend: {
x: 'left',
data: ['投运', '热备用', '停运'],
data: ['投运', '检修', '退运'],
},
tooltip: {
trigger: 'axis',
@@ -178,8 +178,8 @@ function drawAreaPic(area, intervals) {
var color = params[0].color;
if (color === noMonitor) {
tips += '<br/>投运 : /';
tips += '<br/>热备用 : /';
tips += '<br/>停运 : /';
tips += '<br/>检修 : /';
tips += '<br/>退运 : /';
tips+='<br/>在线率 : /';
} else {
for (var i = 0; i < params.length; i++) {
@@ -232,13 +232,13 @@ function drawAreaPic(area, intervals) {
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -442,7 +442,7 @@ function drawCompanyPic(companys, intervals) {
color: [green, yellow, grey],
legend: {
x: 'left',
data: ['投运', '热备用', '停运'],
data: ['投运', '检修', '退运'],
},
tooltip: {
trigger: 'axis',
@@ -455,8 +455,8 @@ function drawCompanyPic(companys, intervals) {
var value=params[0].value;
if(value===3.1415){
tips+='<br/>投运 : /';
tips+='<br/>热备用 : /';
tips+='<br/>停运 : /';
tips+='<br/>检修 : /';
tips+='<br/>退运 : /';
tips+='<br/>在线率 : /';
}else{
for (var i = 0; i < params.length; i++) {
@@ -510,13 +510,13 @@ function drawCompanyPic(companys, intervals) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

10
pqs9000/src/main/webapp/jspJS/area/moinitorMap.js
View File

@@ -349,12 +349,12 @@ function getPoint(lineMap, map) {
}
//监测点点位信息;终端状态;终端状态颜色
var marker, strState = '停运', fontState = '#808080';
var marker, strState = '退运', fontState = '#808080';
//通讯状态,通讯状态颜色
var strStatus = '中断', fontStatus = '#FF0000';
/********************************
终端状态： 2停运 灰色 128,128,128 #808080
1热备用 金色 255,215,0 #FFD700
终端状态： 2退运 灰色 128,128,128 #808080
1检修 金色 255,215,0 #FFD700
0投运（正常的则判断通讯状态）
通讯状态： 0正常 绿色 0,128,0 #08CF5A
1中断 红色 255,0,0 #FF0000
@@ -384,7 +384,7 @@ function getPoint(lineMap, map) {
}
break;
case 1:
strState = '热备用';
strState = '检修';
fontState = '#FFD700';
if (lineMap.eventCount > 0)
marker = new BMap.Marker(point, yellowMarkerOptions);//假如终端出现了暂降事件
@@ -392,7 +392,7 @@ function getPoint(lineMap, map) {
marker = new BMap.Marker(point, yellowMarkerOptions);
break;
case 2:
strState = '停运';
strState = '退运';
fontState = '#808080';
if (lineMap.eventCount > 0)
marker = new BMap.Marker(point, grayMarkerOptions);

4
pqs9000/src/main/webapp/jspJS/manage/integrityTable.js
View File

@@ -226,9 +226,9 @@ function initTable(data) {
case 0:
return "投运";
case 1:
return "热备用";
return "检修";
case 2:
return "停运";
return "退运";
}
}
},

16
pqs9000/src/main/webapp/jspJS/manage/runtime.js
View File

@@ -194,8 +194,8 @@ function updateDevflag(nameTest) {
var str =
"<div>" +
"<input type='radio' name='time' id='time' value='0'>投运" +
"<input type='radio' name='time' id='time' style='margin-left:25%' value='1'>热备用" +
"<input type='radio' name='time' id='time' style='margin-left:25%' value='2'>停运" +
"<input type='radio' name='time' id='time' style='margin-left:25%' value='1'>检修" +
"<input type='radio' name='time' id='time' style='margin-left:25%' value='2'>退运" +
"<br/>" +
"更改原因:<input type='text' class='form-control' style='width: 80%;display: inline' name='terminalDescribe' id='terminalDescribe'>" +
"</div>"
@@ -211,10 +211,10 @@ function updateDevflag(nameTest) {
devTypeBefore = "投运";
} else if (data.devFlag == 1) {
$("input[name='time'][value='1']").attr("checked", true);
devTypeBefore = "热备用";
devTypeBefore = "检修";
} else {
$("input[name='time'][value='2']").attr("checked", true);
devTypeBefore = "停运";
devTypeBefore = "退运";
}
}
});
@@ -232,9 +232,9 @@ function updateDevflag(nameTest) {
if (devflag == 0) {
devTypeNow = "投运";
} else if (devflag == 1) {
devTypeNow = "热备用";
devTypeNow = "检修";
} else {
devTypeNow = "停运";
devTypeNow = "退运";
}
var terminalDescribe = $("#terminalDescribe").val();
var str = terminalDescribe.replace(/(^\s*)|(\s*$)/g, '');//去除空格;
@@ -347,10 +347,10 @@ function initTable(data) {
url: '/pqs9000/json/chine.json'
},
"createdRow": function (row, data, index) {
if (data[9] == "停运") {
if (data[9] == "退运") {
$('td', row).eq(9).css('color', '#696969')
} else if (data[9] == "热备用") {
} else if (data[9] == "检修") {
$('td', row).eq(9).css('color', '#FFD700')
} else if (data[9] == "投运") {
$('td', row).eq(9).css('color', '#2E8B57')

20
pqs9000/src/main/webapp/jspJS/overview/deviceStatus.js
View File

@@ -132,7 +132,7 @@ function drawAreaPic(area, intervals) {
color: [green, yellow, grey],
legend: {
x: 'right',
data: ['投运', '热备用', '停运'],
data: ['投运', '检修', '退运'],
},
tooltip: {
trigger: 'axis',
@@ -145,8 +145,8 @@ function drawAreaPic(area, intervals) {
var color = params[0].color;
if (color === noMonitor) {
tips += '<br/>投运 : /';
tips += '<br/>热备用 : /';
tips += '<br/>停运 : /';
tips += '<br/>检修 : /';
tips += '<br/>退运 : /';
tips+='<br/>在线率 : /';
} else {
for (var i = 0; i < params.length; i++) {
@@ -199,13 +199,13 @@ function drawAreaPic(area, intervals) {
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -409,7 +409,7 @@ function drawCompanyPic(companys, intervals) {
color: [green, yellow, grey],
legend: {
x: 'right',
data: ['投运', '热备用', '停运'],
data: ['投运', '检修', '退运'],
},
tooltip: {
trigger: 'axis',
@@ -422,8 +422,8 @@ function drawCompanyPic(companys, intervals) {
var value=params[0].value;
if(value===3.1415){
tips+='<br/>投运 : /';
tips+='<br/>热备用 : /';
tips+='<br/>停运 : /';
tips+='<br/>检修 : /';
tips+='<br/>退运 : /';
tips+='<br/>在线率 : /';
}else{
for (var i = 0; i < params.length; i++) {
@@ -476,13 +476,13 @@ function drawCompanyPic(companys, intervals) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

10
pqs9000/src/main/webapp/jspJS/utils/positionOffset.js
View File

@@ -157,12 +157,12 @@ var dataPoint = 'monitor';
function getPoint(lineMap,map,iFlag) {
var point = new BMap.Point(lineMap.longitude, lineMap.latitude);
//监测点点位信息;终端状态;终端状态颜色
var marker,strState = '停运',fontState ='#808080';
var marker,strState = '退运',fontState ='#808080';
//通讯状态,通讯状态颜色
var strStatus = '中断',fontStatus='#FF0000';
/********************************
终端状态： 2停运 灰色 128,128,128 #808080
1热备用 金色 255,215,0 #FFD700
终端状态： 2退运 灰色 128,128,128 #808080
1检修 金色 255,215,0 #FFD700
0投运（正常的则判断通讯状态）
通讯状态： 0正常 绿色 0,128,0 #08CF5A
1中断 红色 255,0,0 #FF0000
@@ -192,7 +192,7 @@ function getPoint(lineMap,map,iFlag) {
}
break;
case 1:
strState = '热备用';
strState = '检修';
fontState='#FFD700';
if(lineMap.totalcount > 0)
marker = new BMap.Marker(point, winyellowMarkerOptions);//假如终端出现了暂降事件
@@ -200,7 +200,7 @@ function getPoint(lineMap,map,iFlag) {
marker = new BMap.Marker(point, yellowMarkerOptions);
break;
case 2:
strState = '停运';
strState = '退运';
fontState='#808080';
if(lineMap.totalcount > 0)
marker = new BMap.Marker(point, wingrayMarkerOptions);