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

1.数据完整性列表调整

Browse Source 
2.区域电能质量评估列表调整
3.调整监测点台账列表顺序
4.删除灿能电力字样
5.调整loge和ico图标
6.调整概览首页在线率和完整率数据
7.调整设备树的查询方式
This commit is contained in:
wr
2024-04-11 15:20:41 +08:00
parent 438c21880f
commit 051d4fc85a
43 changed files with 1169 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,8 +394,9 @@
district.setOption(option);
district.on('click', function (params) {
var city=params.data.areaIndex;
var gwtype= tiggleValue=="冀北省"?"0":"1";
if (getRole("/pqs9000/business/runtime") === 1) {
window.top.addTab('runtime?area='+city, '终端运行情况')
window.top.addTab('runtime?area='+city+"&type="+gwtype, '终端运行情况')
}
});
}
@@ -710,11 +711,11 @@
};
var factory = echarts.init(document.getElementById('company'));
factory.setOption(option);
factory.on('click', function () {
// var city=params.data.areaIndex;
alert(1)
factory.on('click', function (params) {
var gwtype= tiggleValue=="冀北省"?"0":"1";
var manufacturer= params.name;
if (getRole("/pqs9000/business/runtime") == 1) {
window.top.addTab('runtime', '终端运行情况')
window.top.addTab('runtime?type='+gwtype+"&manufacturer="+manufacturer, '终端运行情况')
}
});
}

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

@@ -134,7 +134,23 @@
var companyLength;//厂家个数
var color;
var companyname;
var onlines = [];
var gwonlines = [];
var integralitys = [];
var gwintegralitys = [];
function rate(num) {
if(num.length===0){
return 0;
}
var dataNum = 0;
for (var i = 0; i < num.length; i++) {
if (!(num[i] === 3.1415)&&!(num[i] === 3.14159)) {
dataNum=dataNum+num[i];
}
}
return (dataNum/num.length).toFixed(2);
}
function initInfo() {
var endTime = getEndTime();
var startTime = getMonthStartTime(endTime);
@@ -153,13 +169,13 @@
var str1 = "<b style='font-size: 13px;color:" + color + ";'>" + data.body.name +
":</b>\n<b style='font-size: 12px;color:" + color + ";'>&nbsp;&nbsp;监测点数:" +data.body.pointCount +
"</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;终端数：" + data.body.count +
"</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;在线率：" + data.body.online +
"%</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;数据完整性：" + data.body.dataIntegrality + "%</b>\n";
"</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;在线率：" + rate(onlines) +
"%</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;数据完整性：" + rate(integralitys) + "%</b>\n";
var str2 = "<b style='font-size: 13px;color: " + color + ";'>" + companyname +
"</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;监测点数：" + data.body.gwPointCount +
"</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;终端数：" + data.body.gwCount +
"</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;在线率：" + data.body.gwOnline +
"%</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;数据完整性：" + data.body.gwDataIntegrality + "%</b>\n";
"</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;在线率：" + rate(gwonlines) +
"%</b>\n<b style='font-size: 12px;color: " + color + ";'>&nbsp;&nbsp;数据完整性：" + rate(gwintegralitys) + "%</b>\n";
var str = str0;
str += data.body.count == 0 ? "" : str1;
str += data.body.gwCount == 0 ? "" : str2;
@@ -181,7 +197,6 @@
}
})
initInfo();
var t1 = getRole("/pqs9000/business/frequency");
var t2 = getRole("/pqs9000/business/powerquality");
var t3 = 0;
@@ -513,6 +528,8 @@
onContent(id, title + info);
}
});
initInfo();
});
//画终端状态缩略图
@@ -557,6 +574,8 @@
}
itemStyle.normal=normalData;
singleData.itemStyle=itemStyle;
onlines[i]=Number(area[i].online);
gwonlines[i]=Number(area[i].gwonline);
rate[i]=singleData;
}
}
@@ -723,6 +742,8 @@
}
singleData.itemStyle = item;
inte[i] = singleData;
integralitys[i]=Number(area[i].dataIntegrity);
gwintegralitys[i]=Number(area[i].gwdataIntegrity);
}
}
var option = {