1.数据完整性列表调整

2.区域电能质量评估列表调整 3.调整监测点台账列表顺序 4.删除灿能电力字样 5.调整loge和ico图标 6.调整概览首页在线率和完整率数据 7.调整设备树的查询方式
2024-04-11 15:20:41 +08:00
parent 438c21880f
commit 051d4fc85a
43 changed files with 1169 additions and 208 deletions
--- a/pqs9000/src/main/webapp/WEB-INF/views/business/area/assesTable.jsp
+++ b/pqs9000/src/main/webapp/WEB-INF/views/business/area/assesTable.jsp
@@ -0,0 +1,131 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <title>电能质量评估列表</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+    <link rel="stylesheet" href="${ctx}/css/plugin/bootstrap/bootstrap.min.css">
+    <link rel="stylesheet" href="${ctx}/css/plugin/datatables/buttons.dataTables.min.css">
+    <link rel="stylesheet" href="${ctx}/css/plugin/datatables/datatables.bootstrap.css">
+    <link rel="stylesheet" href="${ctx}/css/plugin/datatimepicker/bootstrap-datetimepicker.css">
+    <link rel="stylesheet" href="${ctx}/css/plugin/ztree/zTreeStyle.css">
+    <link rel="stylesheet" href="${ctx}/css/plugin/fontawesome/font-awesome.min.css">
+    <link rel="stylesheet" href="${ctx}/css/plugin/bootstrapSwitch/bootstrap-switch.min.css">
+    <link rel="stylesheet" href="${ctx}/css/basic.css">
+    <link rel="stylesheet" href="${ctx}/css/plugin/basicButton.css">
+    <link rel="stylesheet" href="${ctx}/css/tip.css">
+    <style>
+
+        body {
+            overflow: hidden;
+        }
+
+        #integritylist {
+            min-width: 2000px;
+        }
+
+        .tr {
+            text-align: center;
+        }
+
+        .td {
+            text-align: center;
+            height: 48px;
+            line-height: 48px
+        }
+
+        .table > tbody > tr > td {
+            padding: 5px;
+            line-height: 1.42857143;
+            vertical-align: top;
+            border-top: 1px solid #ddd;
+        }
+
+        .pagination > li > a, .pagination > li > span {
+            padding: 6px 12px;
+        }
+
+    </style>
+</head>
+<body>
+<div class="container-fluid">
+    <div class="form-inline header mt10">
+        <label class="form-group">区域：</label>
+        <div class="form-group has-feedback mr10">
+            <div class="disinlineb">
+                <input id="area" class="form-control" style="width: 140px" readonly>
+                <i class="fa fa-caret-down areaicon"></i>
+                <i class="fa fa-caret-up treeUpIcon disnone"
+                   style="color: #C9CBCE;position: absolute;left: 60px;font-size: 18px;z-index: 9999;top: 20px"></i>
+                <div class=" ztree treeUpDiv disnone " id="areaTree"
+                     style="position: absolute;width: 140px;height: 147px;border: 2px solid #C9CBCE;overflow: auto;top: 32px;background: #fff;z-index: 100;border-radius: 2px">
+                </div>
+            </div>
+        </div>
+        <%@include file="../../include/time.jsp" %>
+        <button id="query" type="button" class="btn btn-primary ml5">
+            <i class="glyphicon glyphicon-search"></i>
+        </button>
+
+        <div class="form-group fr mr10" id="fliteData">
+            <label>筛选数据：</label>
+            <input type="text" class="form-control" onkeyup="searchResult(this.value)"
+                   placeholder="空格分开多条件筛选数据">
+        </div>
+    </div>
+    <table id="integritylist" class="table table-striped table-bordered dataTable no-footer width100">
+        <thead>
+        <tr>
+            <th>序号</th>
+            <th>供电公司</th>
+            <th>变电站</th>
+            <th>监测点名称</th>
+            <th>综合评估</th>
+            <th>电压偏差(%)</th>
+            <th>频率偏差(Hz)</th>
+            <th>谐波含量(%)</th>
+            <th>电压闪变</th>
+            <th>三相电压不平衡度(%)</th>
+        </tr>
+        </thead>
+    </table>
+</div>
+<input id="_startTime" value="${startTime}" hidden>
+<input id="_endTime" value="${endTime}" hidden>
+<input id="_area" value="${area}" hidden>
+<input id="_interval" value="${interval}" hidden>
+<input id="gwType" value="${gwType}" hidden>
+</body>
+<script src="${ctx}/js/plugin/jquery/jquery.min.js"></script>
+<script src="${ctx}/js/plugin/bootstrap/bootstrap.min.js"></script>
+<script src="${ctx}/js/plugin/bootstrap/bootstrap-datetimepicker.js"></script>
+<script src="${ctx}/js/plugin/bootstrap/bootstrap-datetimepicker.zh-CN.js"></script>
+<script src="${ctx}/js/plugin/datatables/datatables.jquery.js"></script>
+<script src="${ctx}/js/plugin/datatables/dataTables.buttons.min.js"></script>
+<script src="${ctx}/js/plugin/datatables/datatables.bootstrap.js"></script>
+<script src="${ctx}/js/plugin/datatables/buttons.html5.min.js"></script>
+<script src="${ctx}/js/plugin/bootstrapSwitch/bootstrap-switch.min.js"></script>
+<script src="${ctx}/js/plugin/layui/layer.js"></script>
+<script src="${ctx}/jspJS/utils/loading.js"></script>
+<script src="${ctx}/jspJS/utils/timeControl.js"></script>
+<script src="${ctx}/js/plugin/ztree/jquery.ztree.core.js"></script>
+<script src="${ctx}/js/area.js"></script>
+<script src="${ctx}/js/plugin/xss/xss.js"></script>
+<script src="${ctx}/jspJS/utils/judgeAjaxStatus.js"></script>
+<script src="${ctx}/js/color.js"></script>
+<script src="${ctx}/jspJS/area/assesTable.js"></script>
+<script src="${ctx}/jspJS/utils/helper.js"></script>
+<script type="text/javascript">
+    $("#helper").click(function () {
+        toHelper("#jcdsjwzx");
+    });
+    var gwType = $("#gwType");
+</script>
+</html>
--- a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/integrityTable.jsp
+++ b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/integrityTable.jsp
@@ -82,9 +82,19 @@
        <div class="form-inline disinlineb wanzhengdiv">
            <div class="form-group has-feedback mr10">
                <label>统计类型：</label>
-                <input type="checkbox" checked class="wanzheng"/>
+                <input type="checkbox"  class="wanzheng" id="checkbox"/>
            </div>
        </div>
+        <label class="form-group">监测点性质:</label>
+        <select class="form-control"  id="powerId">
+            <option value="">全部</option>
+            <option value="0">电网侧</option>
+            <option value="1">非电网侧</option>
+            <option value="2">电网侧(新能源)</option>
+            <option value="3">非电网侧(新能源)</option>
+            <option value="4">上送国网</option>
+            <option value="5">PCC</option>
+        </select><label class="form-group">
        <button id="query" type="button" class="btn btn-primary ml5">
            <i class="glyphicon glyphicon-search"></i>
        </button>
@@ -121,6 +131,7 @@
 <input id="_endTime" value="${endTime}" hidden>
 <input id="_area" value="${area}" hidden>
 <input id="_interval" value="${interval}" hidden>
+<input id="gwType" value="${gwType}" hidden>
 </body>
 <script src="${ctx}/js/plugin/jquery/jquery.min.js"></script>
 <script src="${ctx}/js/plugin/bootstrap/bootstrap.min.js"></script>
@@ -145,5 +156,6 @@
    $("#helper").click(function () {
        toHelper("#jcdsjwzx");
    });
+    var gwType = $("#gwType");
 </script>
 </html>
--- a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/lineLedger.jsp
+++ b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/lineLedger.jsp
@@ -73,6 +73,16 @@
                <option value="-1">全部</option>
            </select>
        </div>
+        <label class="form-group">监测点性质:</label>
+        <select class="form-control"  id="powerId">
+            <option value="">全部</option>
+            <option value="0">电网侧</option>
+            <option value="1">非电网侧</option>
+            <option value="2">电网侧(新能源)</option>
+            <option value="3">非电网侧(新能源)</option>
+            <option value="4">上送国网</option>
+            <option value="5">PCC</option>
+        </select><label class="form-group">
        <button id="query" type="button" class="btn btn-primary ml5">
            <i class="glyphicon glyphicon-search"></i>
        </button>
@@ -88,38 +98,35 @@
                <th>序号</th>
                <th>省公司</th>
                <th>市公司</th>
-                <th>监测点电压等级</th>
-                <th>监测点名称</th>
-                <th>电能质量名称</th>
+                <th id="devNo" title="监测终端编号(电能质量监测系统终端编号)">监测终端编号</th>
                <th>所属电站</th>
+                <th>母线名称</th>
+                <th>电能质量终端装置名称</th>
+                <th>监测点名称</th>
+                <th>监测点电压等级</th>
+                <th>监测点序号</th>
                <th>干扰源类型</th>
                <th>监测对象名称</th>
                <th>电网侧变电站</th>
-
+                <th>监测装置网络参数</th>
                <th>监测终端状态</th>
                <th>监测装置通讯状态</th>
-                <th>最新数据时间</th>
-                <th>监测装置网络参数</th>
+                <th>监测装置安装位置</th>
                <th>监测装置投运时间</th>
                <th>监测装置型号</th>
-                <th>所属前置机</th>
                <th>监测装置厂家</th>
-                <th>监测装置安装位置</th>
-
-
+                <th>监测厂家设备编号</th>
+                <th>监测点状态</th>
+                <th>监测点运行状态</th>
+                <th>最新数据时间</th>
                <th>最小短路容量（MVA）</th>
                <th>供电设备容量（MVA）</th>
                <th>用户协议容量（MVA）</th>
-                <th>监测点状态</th>
-                <th>监测点运行状态</th>
-                <th>监测点序号</th>
-
-                <th>监测终端编号(电能质量监测系统终端编号)</th>
-                <th>监测厂家设备编号</th>
                <th>监测点编号</th>
+                <th>监测点性质</th>


-
+                <th>所属前置机</th>
                <th>监测终端接线方式</th>
                <th>电压偏差上限</th>
                <th>电压偏差下限</th>
--- a/pqs9000/src/main/webapp/WEB-INF/views/business/manage/runtime.jsp
+++ b/pqs9000/src/main/webapp/WEB-INF/views/business/manage/runtime.jsp
@@ -137,6 +137,7 @@
 <input type="hidden" id="token" value="${token}">
 <input id="_area" value="${area}" hidden>
 <input id="gwType" value="${type}" hidden>
+<input id="facturer" value="${manufacturer}" hidden>
 <script src="${ctx}/js/plugin/jquery/jquery.min.js"></script>
 <script src="${ctx}/js/plugin/jquery/jquery.dataTables.js"></script>
 <script src="${ctx}/js/plugin/bootstrap/bootstrap.min.js"></script>
@@ -166,6 +167,8 @@
    });
    var $area = $("#area");
    var gwType = $("#gwType");
+    var facturer = $("#facturer").val();
+
 </script>
 </body>
 </html>
--- a/pqs9000/src/main/webapp/WEB-INF/views/include/deviceTree.jsp
+++ b/pqs9000/src/main/webapp/WEB-INF/views/include/deviceTree.jsp
@@ -21,21 +21,21 @@
 		</form>
 	</div>
 	<div id="search">
-			<input style="width: 200px; height: 25px;" id="search_value"
+			<input style="width: 94%;  height: 25px;" id="search_value"
 				type="text" value="" placeholder="请输入关键词" autocomplete="off"
 				oninput="valueChange(this.value)" />
-			<button type="button" id="serchB"
-				class="btn-primary"
-				onclick="javascript: searchNode(search_value.value)"
-				style="height: 25px; width: 55px; border-radius: 4px; border: 1px solid;">
-				<i class="glyphicon glyphicon-search"></i>搜索
-			</button>
-			<button type="button" id="resetB"
-				class="btn-primary"
-				onclick="resetTree()"
-				style="padding: 0 5px; height: 25px; width: 55px; border-radius: 4px; border: 1px solid;display:none;">
-				<i class="glyphicon glyphicon-refresh"></i>重置
-			</button>
+<%--			<button type="button" id="serchB"--%>
+<%--				class="btn-primary"--%>
+<%--				onclick="javascript: searchNode(search_value.value)"--%>
+<%--				style="height: 25px; width: 55px; border-radius: 4px; border: 1px solid;">--%>
+<%--				<i class="glyphicon glyphicon-search"></i>搜索--%>
+<%--			</button>--%>
+<%--			<button type="button" id="resetB"--%>
+<%--				class="btn-primary"--%>
+<%--				onclick=""--%>
+<%--				style="padding: 0 5px; height: 25px; width: 55px; border-radius: 4px; border: 1px solid;display:none;">--%>
+<%--				<i class="glyphicon glyphicon-refresh"></i>重置--%>
+<%--			</button>--%>
 	</div>
 	<div id="tree" class="ztree" style="overflow: auto;margin-left: -8px;"></div>
 </div>
--- a/pqs9000/src/main/webapp/WEB-INF/views/main.jsp
+++ b/pqs9000/src/main/webapp/WEB-INF/views/main.jsp
@@ -185,9 +185,9 @@
                        <shiro:hasPermission name="/pqs9000/area/harmonicrate">
                            <a href="javascript:void(0)" onclick="addTab('/pqs9000/area/harmonicrate','谐波总畸变率统计')">谐波总畸变率统计</a>
                        </shiro:hasPermission>
-                            <%--                        <shiro:hasPermission name="/pqs9000/area/onlinerate">--%>
-                            <%--                            <a href="javascript:void(0)" onclick="addTab('/pqs9000/area/onlinerate','终端在线率')">终端在线率</a>--%>
-                            <%--                        </shiro:hasPermission>--%>
+                        <shiro:hasPermission name="/pqs9000/area/tomonitorscope">
+                            <a href="javascript:void(0)" onclick="addTab('/pqs9000/business/tomonitorscope','监测点信息图')">监测点信息图</a>
+                        </shiro:hasPermission>
                        <shiro:hasPermission name="/pqs9000/area/vdlist">
                            <a href="javascript:void(0)" onclick="addTab('/pqs9000/area/vdlist','暂态事件列表')">暂态事件列表</a>
                        </shiro:hasPermission>
@@ -303,7 +303,7 @@
    </div>
 </header>
 <div class="footer-copy clearfix">
-    <div class="fr f13">CopyRight@2017 南京灿能电力自动化股份有限公司 版权所有</div>
+    <div class="fr f13"></div>
 </div>
 <div id="rightContent" style="position: absolute; left: 270px; right: 20px; top: 80px;">
    <div id="tabs" style="width: 100%; height: 100%;">
--- a/pqs9000/src/main/webapp/WEB-INF/views/main.jsp.bak
+++ b/pqs9000/src/main/webapp/WEB-INF/views/main.jsp.bak
@@ -272,7 +272,7 @@
    </div>
 </header>
 <div class="footer-copy clearfix">
-    <div class="fr f13">CopyRight@2017 南京灿能电力自动化股份有限公司 版权所有</div>
+    <div class="fr f13"></div>
 </div>
 <div id="rightContent" style="position: absolute; left: 270px; right: 20px; top: 80px;">
    <div id="tabs" style="width: 100%; height: 100%;">
--- a/pqs9000/src/main/webapp/WEB-INF/views/overview/deviceStatus.jsp
+++ b/pqs9000/src/main/webapp/WEB-INF/views/overview/deviceStatus.jsp
@@ -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, '终端运行情况')
            }
        });
    }
--- a/pqs9000/src/main/webapp/WEB-INF/views/overview/overview.jsp
+++ b/pqs9000/src/main/webapp/WEB-INF/views/overview/overview.jsp
@@ -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 = {