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

2
comService/src/main/java/com/njcn/pojo/commons/device/Tree.java
View File

@@ -20,7 +20,7 @@ public class Tree implements Serializable {
private int nodeIndex;
private String nodeIndexStr;
private int ppId; // 真实的PID值，对照数据库
private int state; // 终端运行状态 0-正常 1-检修 2-停运
private int state; // 终端运行状态 0-正常 1-检修 2-退运
private int gd_index;
private int status; //终端通讯状态 0-正常 1-中断
private int qualityAss;//综合质量评估

2
comService/src/main/java/com/njcn/pojo/configuration/Line.java
View File

@@ -81,7 +81,7 @@ public class Line {
@Column(name="SUBV_NAME")
private String subvName;
//监测点状态(0：投运；1：停运)
//监测点状态(0：投运；1：退运)
@Column(name="STATUS")
private Integer status;

2
comService/src/main/java/com/njcn/pojo/data/LineMaps.java
View File

@@ -47,7 +47,7 @@ public class LineMaps {
@Column(name="SUBV_NAME")
private String subvname;
//终端状态（0：正常；1：中断；2：停运）
//终端状态（0：正常；1：中断；2：退运）
@Column(name="DEVFLAG")
private Integer devflag;

4
comService/src/main/java/com/njcn/pojo/excel/AreaRuntimeExcelBody.java
View File

@@ -20,10 +20,10 @@ public class AreaRuntimeExcelBody extends BaseRowModel implements Serializable {
@ExcelProperty(value = "投运" ,index = 2)
private String normal;
@ExcelProperty(value = "热备用" ,index = 3)
@ExcelProperty(value = "检修" ,index = 3)
private String breaks;
@ExcelProperty(value = "停运" ,index = 4)
@ExcelProperty(value = "退运" ,index = 4)
private String shutdown;
@ExcelProperty(value = "在线率" ,index = 5)

4
comService/src/main/java/com/njcn/pojo/excel/CompanyRuntimeExcelBody.java
View File

@@ -20,10 +20,10 @@ public class CompanyRuntimeExcelBody extends BaseRowModel implements Serializabl
@ExcelProperty(value = "投运" ,index = 2)
private String normal;
@ExcelProperty(value = "热备用" ,index = 3)
@ExcelProperty(value = "检修" ,index = 3)
private String breaks;
@ExcelProperty(value = "停运" ,index = 4)
@ExcelProperty(value = "退运" ,index = 4)
private String shutdown;
@ExcelProperty(value = "在线率" ,index = 5)

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);

4
pqs9200/src/main/java/com/pqs9200/controller/business/ReportController.java
View File

@@ -1294,12 +1294,12 @@ public class ReportController {
+ stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "linecount"))) + "个，其中";
tips = tips + devmap.get(0).getName() + "、" + devmap.get(1).getName() + "监测点数量较多 ，监测点在线率达到"
+ df.format(rate) + "%（通讯正常为：" + String.valueOf(oncount) + "个，通讯异常为：" + String.valueOf(offcount)
+ "个）[在线率=通讯正常点数/总监测点数（统计时候排除检修和热备用监测点）]，具体见下图";
+ "个）[在线率=通讯正常点数/总监测点数（统计时候排除检修和检修监测点）]，具体见下图";
} else {
tips = reportAreaPojo.getAreaname() + "电网总共有监测点"
+ stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "linecount"))) + "个。";
tips = tips + "监测点在线率达到" + df.format(rate) + "%（通讯正常为：" + String.valueOf(oncount) + "个，通讯异常为："
+ String.valueOf(offcount) + "个）[通讯正常/总监测点数（统计时候排除检修和热备用监测点）]，具体见下图：";
+ String.valueOf(offcount) + "个）[通讯正常/总监测点数（统计时候排除检修和检修监测点）]，具体见下图：";
}
WordUtils.addParagraph(jcwfbContentRun, "宋体", 11, "000000", tips, false);
String devmapImage = stringInstantiateUtil.deInstantiate(stringInstantiateUtil.stringDeInstantiate(jedisManager.hget(RedisDB.SHORT_TIME_QUERY, userIndex, "devmapImage")));

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

@@ -27,8 +27,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
@@ -38,7 +38,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'">
@@ -252,8 +252,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
@@ -263,7 +263,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'">
@@ -317,8 +317,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
@@ -328,11 +328,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,

2
pqs9200/src/main/webapp/WEB-INF/views/business/manage/machineAccount.jsp
View File

@@ -159,7 +159,7 @@
},
data : info,
"createdRow": function ( row, data, index ) {
if(data[9]=="停运"){
if(data[9]=="退运"){
$('td', row).eq(9).css('color','#FF2D2D')
}else if(data[9]=="中断"){
$('td', row).eq(9).css('color','#FFFF37')

4
pqs9200/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>

26
pqs9200/src/main/webapp/WEB-INF/views/business/manage/runtimeStatus.jsp
View File

@@ -40,7 +40,7 @@
<div class="container-fluid">
<div class="form-inline mt10 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 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>
@@ -82,8 +82,8 @@
<th>区域</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -98,8 +98,8 @@
<th>厂家</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -294,8 +294,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{
@@ -349,13 +349,13 @@
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth:barMax,
data: breaks
},{
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -571,8 +571,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{
@@ -626,13 +626,13 @@
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
},{
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

4
pqs9200/src/main/webapp/WEB-INF/views/business/manage/userHelp.jsp
View File

@@ -36,8 +36,8 @@
<h2 id="jcdyxzt">一、监测点运行状态</h2>
<p class="pcontent">本系统中，对监测点运行状态有如下若干定义：</p>
<p class="pcontent">1：运行状态：监测点相关监测终端与系统有通信链路，处于投运工作状态，需考核终端在线率和数据完整性。运行状态又可分为两个子状态：投运状态、异常状态（包括终端故障、链路中断）。</p>
<p class="pcontent">2：停运状态：监测终端虽已安装到现场或在系统中已建立台账，但还没有投运，不纳入终端考核。</p>
<p class="pcontent">3：热备用状态：处于运行状态的终端由授权人员人工切换的一个状态，处于热备用状态的终端不参与日常的终端考核和事件统计。</p>
<p class="pcontent">2：退运状态：监测终端虽已安装到现场或在系统中已建立台账，但还没有投运，不纳入终端考核。</p>
<p class="pcontent">3：检修状态：处于运行状态的终端由授权人员人工切换的一个状态，处于检修状态的终端不参与日常的终端考核和事件统计。</p>
<div class="row">
<img src="${ctx}/images/jcdzt.png" class="col-md-4 col-md-offset-2" style="width: 600px;height: 400px;" >
</div>

2
pqs9200/src/main/webapp/WEB-INF/views/business/overview/glindex.jsp
View File

@@ -64,7 +64,7 @@
<li id="item0">
<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>

24
pqs9200/src/main/webapp/WEB-INF/views/business/overview/sbyxzt.jsp
View File

@@ -42,8 +42,8 @@
<th>区域</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -58,8 +58,8 @@
<th>厂家</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -234,8 +234,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{
@@ -289,13 +289,13 @@
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth:barMax,
data: breaks
},{
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -515,8 +515,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{
@@ -570,13 +570,13 @@
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
},{
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

8
pqs9200/src/main/webapp/images/svg/ydhxgy.svg
View File

@@ -3738,7 +3738,7 @@
</symbol>
<symbol
id="173107110677053459"
name="nj_热备用">
name="nj_检修">
<rect
x="2"
y="2"
@@ -4425,7 +4425,7 @@
</symbol>
<symbol
id="173107110677053480"
name="开关热备用">
name="开关检修">
<rect
x="0"
y="0"
@@ -9162,7 +9162,7 @@
</symbol>
<symbol
id="173107110677053459-9"
name="nj_热备用">
name="nj_检修">
<rect
x="2"
y="2"
@@ -9849,7 +9849,7 @@
</symbol>
<symbol
id="173107110677053480-7"
name="开关热备用">
name="开关检修">
<rect
x="0"
y="0"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

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

@@ -4,9 +4,9 @@ var green="#2E8B57";/*B相*/
var red="#A52a2a";/*C相*/
// 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";//画布背景色

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

@@ -144,8 +144,8 @@ $('#importExl').click(function () {
// 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>"
@@ -161,10 +161,10 @@ $('#importExl').click(function () {
// 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 = "退运";
// }
// }
// });
@@ -182,9 +182,9 @@ $('#importExl').click(function () {
// if (devflag == 0) {
// devTypeNow = "投运";
// } else if (devflag == 1) {
// devTypeNow = "热备用";
// devTypeNow = "检修";
// } else {
// devTypeNow = "停运";
// devTypeNow = "退运";
// }
// var terminalDescribe = $("#terminalDescribe").val();
// var str = terminalDescribe.replace(/(^\s*)|(\s*$)/g, '');//去除空格;
@@ -267,10 +267,10 @@ function initTable(data) {
url: '/pqs9200/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')

16
pqs9200/src/main/webapp/jspJS/manage/runtimeStatus.js
View File

@@ -135,8 +135,8 @@ function drawAreaPic (area,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++) {
@@ -179,13 +179,13 @@ function drawAreaPic (area,intervals) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth:barMax,
data: breaks
},{
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -342,8 +342,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++) {
@@ -384,13 +384,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,

2
pqs9200/src/main/webapp/jspJS/monitor/showdevicedetail.js
View File

@@ -59,7 +59,7 @@ var greenIcon = new BMap.Icon("../images/img/pgreen.png", new BMap.Size(25, 25))
var yellowIcon = new BMap.Icon("../images/img/pyellow.png", new BMap.Size(25, 25));
var grayIcon = new BMap.Icon("../images/img/pgray.png", new BMap.Size(25, 25));
var winIcon = new BMap.Icon("../images/img/warning.gif", new BMap.Size(40, 40));
//终端状态（0：投运；1：中断；2：停运）
//终端状态（0：投运；1：中断；2：退运）
var redMarkerOptions = {
icon: redIcon,
enableDragging: false

4
pqs9200/src/main/webapp/jspJS/overview/glindex.js
View File

@@ -216,7 +216,7 @@ function getTitleInfoDeviceStatus(startTime, endTime) {
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>";
}
@@ -539,7 +539,7 @@ function initRun(area) {
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

20
pqs9200/src/main/webapp/jspJS/overview/sbyxzt.js
View File

@@ -101,7 +101,7 @@ function drawAreaPic (area,intervals) {
color:[green,yellow,grey],
legend: {
x: 'left',
data: ['投运','热备用','停运'],
data: ['投运','检修','退运'],
},
tooltip: {
trigger: 'axis',
@@ -114,8 +114,8 @@ function drawAreaPic (area,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++) {
@@ -156,13 +156,13 @@ function drawAreaPic (area,intervals) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth:barMax,
data: breaks
},{
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -310,7 +310,7 @@ function drawCompanyPic(companys,intervals) {
color:[green,yellow,grey],
legend: {
x: 'left',
data: ['投运','热备用','停运'],
data: ['投运','检修','退运'],
},
tooltip: {
trigger: 'axis',
@@ -323,8 +323,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++) {
@@ -365,13 +365,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
pqs9200/src/main/webapp/jspJS/utils/positionOffset.js
View File

@@ -156,12 +156,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
@@ -191,7 +191,7 @@ function getPoint(lineMap,map,iFlag) {
}
break;
case 1:
strState = '热备用';
strState = '检修';
fontState='#FFD700';
if(lineMap.totalcount > 0)
marker = new BMap.Marker(point, winyellowMarkerOptions);//假如终端出现了暂降事件
@@ -199,7 +199,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);

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

@@ -4,9 +4,9 @@ var green="#2E8B57";/*B相*/
var red="#A52a2a";/*C相*/
// 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";//画布背景色

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

@@ -158,12 +158,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
@@ -193,7 +193,7 @@ function getPoint(lineMap,map,iFlag) {
}
break;
case 1:
strState = '热备用';
strState = '检修';
fontState='#FFD700';
if(lineMap.totalcount > 0)
marker = new BMap.Marker(point, winyellowMarkerOptions);//假如终端出现了暂降事件
@@ -201,7 +201,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);

2
pqs9900/src/main/java/com/pqs9900/controller/business/DeviceController.java
View File

@@ -2051,7 +2051,7 @@ public class DeviceController {
case "投运":
line.setStatus(0);
break;
case "热备用":
case "检修":
line.setStatus(1);
break;
default:

4
pqs9900/src/main/java/com/pqs9900/controller/linedata/LineMarkController.java
View File

@@ -339,7 +339,7 @@ public class LineMarkController {
/**
* 批量修改停运监测点评级为空
* 批量修改退运监测点评级为空
* @author cdf
* @date 2023/7/6
*/
@@ -349,7 +349,7 @@ public class LineMarkController {
if(flag){
return PubUtils.assignmentResult(null, 200, "操作成功");
}
return PubUtils.assignmentResult(null, 500, "不存在停运评级的监测点");
return PubUtils.assignmentResult(null, 500, "不存在退运评级的监测点");
}
}

2
pqs9900/src/main/java/com/pqs9900/pojo/terminal/TerminalRVO.java
View File

@@ -16,7 +16,7 @@ public class TerminalRVO {
private String bdName;//变电站名称
private String edName;//版本号
private String ip;
private Integer devFlag;//装置状态（0：投运；1：热备用；2：停运）
private Integer devFlag;//装置状态（0：投运；1：检修；2：退运）
private BigDecimal flowSum;//套餐流量总数
private BigDecimal useFlow;//已使用流量百分比
private BigDecimal actualflow;

2
pqs9900/src/main/java/com/pqs9900/serviceImpl/configuration/ManaDeviceServiceImpl.java
View File

@@ -2285,7 +2285,7 @@ public class ManaDeviceServiceImpl implements ManaDeviceService {
sheet.addValidationData(setDataValidation(sheet, xzs, 2, 1002, 34, 34));
String[] isLine = {"否", "是"};
sheet.addValidationData(setDataValidation(sheet, isLine, 2, 1002, 36, 36));
String[] isRunLine = {"投运", "热备用","停运"};
String[] isRunLine = {"投运", "检修","退运"};
sheet.addValidationData(setDataValidation(sheet, isRunLine, 2, 1002, 37, 37));
for (int x = 0; x < 41; x++) {

4
pqs9900/src/main/java/com/pqs9900/serviceImpl/terminal/TerminalStateServiceImpl.java
View File

@@ -133,8 +133,8 @@ public class TerminalStateServiceImpl implements TerminalStateService {
String devFlag(Integer devFlag){
switch (devFlag){
case 0 : return "投运";
case 1 : return "热备用";
case 2 : return "停运";
case 1 : return "检修";
case 2 : return "退运";
default:return "";
}
}

4
pqs9900/src/main/resources/mybatis/mappers/configuration/DeviceDetailMapper.xml
View File

@@ -17,7 +17,7 @@
DevType,
a.ip,
a.PORTID,
decode(a.DEVFLAG, 0, '投运', 1, '热备用', '停运') as devflag,
decode(a.DEVFLAG, 0, '投运', 1, '检修', '退运') as devflag,
decode(a.status, 0, '中断', 1, '正常') as status,
to_char(a.UpdateTime, 'yyyy-MM-dd hh24:mi:ss') as updatetime,
t2.OnlineRateTj as evaluate
@@ -152,7 +152,7 @@
DevType,
a.ip,
a.PORTID,
decode(a.DEVFLAG, 0, '正常', 1, '热备用', '停运') as devflag,
decode(a.DEVFLAG, 0, '正常', 1, '检修', '退运') as devflag,
decode(a.status, 0, '中断', 1, '正常') as status,
to_char(a.UpdateTime, 'yyyy-MM-dd hh24:mm:ss') as updatetime,
t2.OnlineRateTj as evaluate

4
pqs9900/src/main/resources/mybatis/mappers/configuration/ExportDevMapper.xml
View File

@@ -45,7 +45,7 @@
and state = 1) as devtype,
k.node_name as nodename,
e.portid as portid,
decode(e.devflag,0,'投运',1,'热备用','停运') as devFlag,
decode(e.devflag,0,'投运',1,'检修','退运') as devFlag,
decode(i.POWERID,0,'电网侧',1,'非电网侧',2,'电网侧(新能源)',3,'非电网侧(新能源)',4,'上送国网',5,'PCC','') as powerid,
decode(i.IS_GRID_POINT,0,'否',1,'是','') as isGridPoint,
nvl(e.dev_series, '') as series,
@@ -122,7 +122,7 @@
h.dlcMp as dlrl,
h.devcMp as sbrl,
h.xycMp as xyrl,
decode(e.devflag,0,'投运',1,'热备用','停运') as devFlag,
decode(e.devflag,0,'投运',1,'检修','退运') as devFlag,
(case e.devmodel
when 0 then
'虚拟终端'

4
pqs9900/src/main/webapp/WEB-INF/views/business/device/deviceUnit.jsp
View File

@@ -42,8 +42,8 @@
<label class="form-group">装置状态：</label>
<select id="devFlag" class="form-control">
<option value="0">投运</option>
<option value="1">热备用</option>
<option value="2">停运</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select>

2
pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp
View File

@@ -374,7 +374,7 @@
<td align="left" class="width2">
<select class="width3" id="lineStatus">
<option value="0" selected>投运</option>
<option value="1">热备用</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select>
</td>

8
pqs9900/src/main/webapp/WEB-INF/views/business/device/termainState.jsp
View File

@@ -60,10 +60,10 @@
<input type="radio" name="optionsRadiosinline" id="yes" value="0" checked>投运
</label>
<label class="radio-inline">
<input type="radio" name="optionsRadiosinline" id="stop" value="2">停运
<input type="radio" name="optionsRadiosinline" id="stop" value="2">退运
</label>
<label class="radio-inline">
<input type="radio" name="optionsRadiosinline" id="wait" value="1">热备用
<input type="radio" name="optionsRadiosinline" id="wait" value="1">检修
</label>
</div>
</div>
@@ -239,9 +239,9 @@ function initTransactionTable(tableData) {
if (da == 0) {
info = '<font style="color:#20B2AA">投运</font>'
}else if(da == 1){
info = '<font style="color:#F4A460">热备用</font>'
info = '<font style="color:#F4A460">检修</font>'
}else {
info = '<font style="color:#A52a2a">停运</font>'
info = '<font style="color:#A52a2a">退运</font>'
}
return info;
}

16
pqs9900/src/main/webapp/WEB-INF/views/business/linedata/areaOnlineRate.jsp
View File

@@ -120,8 +120,8 @@
<th>区域</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -136,8 +136,8 @@
<th>厂家</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -152,8 +152,8 @@
<th>电压等级</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>
@@ -168,8 +168,8 @@
<th>干扰源类型</th>
<th>终端个数</th>
<th>投运</th>
<th>热备用</th>
<th>停运</th>
<th>检修</th>
<th>退运</th>
<th>在线率(%)</th>
</tr>
</thead>

4
pqs9900/src/main/webapp/WEB-INF/views/business/linedata/halfReport.jsp
View File

@@ -44,8 +44,8 @@
<select id="devFlag" class="form-control">
<option value="">全部</option>
<option value="0">投运</option>
<option value="1">热备用</option>
<option value="2">停运</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select>

2
pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMark.jsp
View File

@@ -55,7 +55,7 @@
</button>
<div class="form-group fr mr10" id="fliteData">
<button type="button" style="margin-right: 50px" class="btn-primary btn" id="stopLineMark" >停运点评级清空</button>
<button type="button" style="margin-right: 50px" class="btn-primary btn" id="stopLineMark" >退运点评级清空</button>
<button type="button" class="btn-primary btn mr15" id="templateExport" >模板导出</button>
<button type="button" class="btn-primary btn mr15" id="batchImport" >批量导入监测点评级</button>

4
pqs9900/src/main/webapp/WEB-INF/views/business/linedata/lineMarkWeight.jsp
View File

@@ -48,8 +48,8 @@
<select style="width: 100px" id="devFlag" class="form-control mr10">
<option value="">全部</option>
<option value="0" selected>投运</option>
<option value="1">热备用</option>
<option value="2">停运</option>
<option value="1">检修</option>
<option value="2">退运</option>
</select>

6
pqs9900/src/main/webapp/WEB-INF/views/business/overview/overview.jsp
View File

@@ -186,7 +186,7 @@
color: [green, yellow, grey],
legend: {
x: 'left',
data: ['投运', '热备用', '停运'],
data: ['投运', '检修', '退运'],
},
tooltip: {
trigger: 'axis',
@@ -234,13 +234,13 @@
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

4
pqs9900/src/main/webapp/js/basic.js
View File

@@ -250,5 +250,5 @@ var middNames = /^[\w\u4E00-\u9FA5()（）/、_ \\\-]+\.?[\w\u4E00-\u9FA5()（
var barspaclength = 20;
var runColor="#20B2AA";/*投运*/
var breaksColor="#F4A460";/*热备用*/
var grey="#696969";/*灰色 暂降触发点、停运状态*/
var breaksColor="#F4A460";/*检修*/
var grey="#696969";/*灰色 暂降触发点、退运状态*/

4
pqs9900/src/main/webapp/js/color.js
View File

@@ -2,7 +2,7 @@
var yellow="#DAA520";/*A相*/
var green="#2E8B57";/*B相*/
var red="#A52a2a";/*C相*/
var grey="#696969";/*灰色 暂降触发点、停运状态*/
var grey="#696969";/*灰色 暂降触发点、退运状态*/
var blue="#87CEEB";/*在线率*/
var orange="#FF7E50";/*单柱状图*/
var canvasBG="#F9F9F9";//画布背景色
@@ -16,6 +16,6 @@ var ITICBottom='#00E3E3';/*ITIC曲线的下限*/
var noMonitor="#CCC";
var noData="#808080";
var runColor="#20B2AA";/*投运*/
var breaksColor="#F4A460";/*热备用*/
var breaksColor="#F4A460";/*检修*/
var barMax="30";/*柱状图最大宽度*/

4
pqs9900/src/main/webapp/jspJS/device/deviceUnit.js
View File

@@ -106,9 +106,9 @@ function initTable(data) {
if (data == 0) {
return "投运"
} else if (data == 1) {
return "热备用"
return "检修"
} else {
return "停运"
return "退运"
}
}
},

34
pqs9900/src/main/webapp/jspJS/linedata/areaOnlineRate.js
View File

@@ -93,7 +93,7 @@ function addTab(url, label) {
//获取告警策略
function queryListForRun(lineGrade){
let title = ' <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>\n' +
let title = ' <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>\n' +
' <span class=\' font12 fontBold\' > 终端在线率(右柱) <span class=\'info\'><span class=\'inB bg-info smallBlock\'></span> 在线率≥{{1}}</span><span class=\'warn\'> <span class=\'inB bg-warn smallBlock\'></span> 60%≤在线率<{{2}}</span><span class=\'error\'> <span class=\'inB bg-error smallBlock\'></span> 在线率<60%</span> </span>'
let html = title.replace("{{1}}",'90%').replace("{{2}}",'90')
$.ajax({
@@ -329,8 +329,8 @@ function drawAreaPic(area, lineFeed,route) {
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{
@@ -384,13 +384,13 @@ function drawAreaPic(area, lineFeed,route) {
barMaxWidth: barMax,
data: normal
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -584,8 +584,8 @@ function drawCompanyPic(companys, lineFeed,route) {
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{
@@ -640,13 +640,13 @@ function drawCompanyPic(companys, lineFeed,route) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -836,8 +836,8 @@ function drawVolPic(companys, lineFeed,route) {
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{
@@ -892,13 +892,13 @@ function drawVolPic(companys, lineFeed,route) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
@@ -1088,8 +1088,8 @@ function drawloadtypePic(companys, lineFeed,route) {
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{
@@ -1144,13 +1144,13 @@ function drawloadtypePic(companys, lineFeed,route) {
barMaxWidth: barMax,
data: run
}, {
name: '热备用',
name: '检修',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,
data: breaks
}, {
name: '停运',
name: '退运',
type: 'bar',
stack: 'sum',
barMaxWidth: barMax,

4
pqs9900/src/main/webapp/jspJS/linedata/halfReport.js
View File

@@ -121,9 +121,9 @@ function initTable(data) {
if (data == 0) {
return "投运"
} else if(data == 1) {
return "热备用"
return "检修"
} else {
return "停运"
return "退运"
}
}
},

4
pqs9900/src/main/webapp/jspJS/linedata/lineMark.js
View File

@@ -118,9 +118,9 @@ function initTable(data) {
if (data == 0) {
return "投运"
} else if (data == 1) {
return "热备用"
return "检修"
} else {
return "停运"
return "退运"
}
}
},

4
pqs9900/src/main/webapp/jspJS/linedata/lineMarkWeight.js
View File

@@ -109,9 +109,9 @@ function initTable(data) {
if (data == 0) {
return "投运"
} else if (data == 1) {
return "热备用"
return "检修"
} else {
return "停运"
return "退运"
}
}
},

2
sso/src/main/webapp/js/color.js
View File

@@ -2,7 +2,7 @@
var yellow="#DAA520";/*A相*/
var green="#2E8B57";/*B相*/
var red="#A52a2a";/*C相*/
var grey="#696969";/*灰色 暂降触发点、停运状态*/
var grey="#696969";/*灰色 暂降触发点、退运状态*/
var blue="#87CEEB";/*在线率*/
var orange="#FF7E50";/*单柱状图*/
var canvasBG="#F9F9F9";//画布背景色