1.概览-区域暂降评估-区域暂降评估->添加等级范围值

2.区域-终端状态统计->增加国网统计
3.台账管理-台账模板->导入信息增加（导入台账的模板：）加终端字段：监测装置安装位置、监测厂家设备编号、SIM卡号；监测点字段：行业类型、监测点性质，电网侧变电站、是否并网点、监测点运行状态。
4.运行管理-监测点台账信息->增加变电站名称+母线+监测点名称

pqs9000/src/main/java/com/pqs9000/controller/business/BusinessController.java

@@ -348,10 +348,11 @@ public class BusinessController {
 
     // 跳转终端运行管理页面
     @GetMapping(value = "runtime")
-    public ModelAndView runtime(String area) {
+    public ModelAndView runtime(String area,String type) {
         ModelAndView modelAndView = new ModelAndView();
         modelAndView.setViewName("business/manage/runtime");
         modelAndView.addObject("area", area);
+        modelAndView.addObject("type", type);
         return modelAndView;
     }
 

pqs9000/src/main/java/com/pqs9000/controller/business/DeviceController.java

@@ -1995,7 +1995,7 @@ public class DeviceController {
     @RequestMapping(value = "getDeviceDetail", method = RequestMethod.POST)
     @ResponseBody
     public String getDeviceDetail(HttpServletRequest request, HttpSession session, String status, String devflag, String gdName, String
-            manufacturer, String lineIndex, String area)
+            manufacturer, String lineIndex, String area,String type)
             throws
             JsonProcessingException, AccountException {
         if (session.getAttribute("line_index") != null || session.getAttribute("line_index") != "") {
@@ -2023,7 +2023,7 @@ public class DeviceController {
             }
             manufacturer = "%" + manufacturer + "%";
             if (lineIndex == null || lineIndex.length() == 0) {
-                result = deviceService.getDeviceDetails(status, devflag, gdName, manufacturer, area);
+                result = deviceService.getDeviceDetails(status, devflag, gdName, manufacturer, area,type);
             } else {
                 result = deviceService.queryDeviceDetailById(lineIndex);
             }

pqs9000/src/main/resources/mybatis/mappers/point/PointInfoMapper.xml

@@ -107,7 +107,8 @@
 		j.dic_name province,
 		a.line_index lineIndex,
 		mod(a.line_index,10) as lineNum,
-		a.name lineName,
+		a.name as lineName,
+		nvl(b.POWER_SUBSTATION_NAME,e.name)||'_'||sv.NAME||'_'||a.name as electricityQualityName,
 		a.dev_index devIndex,
 		a.status lineStatus,
 		b.pttype ptType,
@@ -167,6 +168,7 @@
 		LEFT JOIN overlimit c ON a.line_index = myindex
 		LEFT JOIN pq_device d ON a.dev_index = d.dev_index
 		LEFT JOIN pq_substation e ON a.sub_index = e.sub_index
+		LEFT JOIN pq_subvoltage sv ON a.SUBV_INDEX = sv.SUBV_INDEX
 		LEFT JOIN pq_gdinformation f ON a.gd_index = f.gd_index
 		LEFT JOIN pqs_dicdata g ON a.scale = g.dic_index
 		LEFT JOIN pqs_dicdata h ON b.loadtype = h.dic_index

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

@@ -623,7 +623,8 @@
         district.on('click', function (params) {
             if (getRole("/pqs9000/business/runtime") === 1) {
                 var city=params.data.areaIndex;
-                window.top.addTab('runtime?area='+city, '终端运行情况')
+                var type= tiggleValue=="冀北省"?"0":"1";
+                window.top.addTab('runtime?area='+city+'&&type='+ type, '终端运行情况')
             }
         });
     }

pqs9000/src/main/webapp/WEB-INF/views/business/manage/lineLedger.jsp

@@ -90,6 +90,7 @@
                 <th>市公司</th>
                 <th>监测点电压等级</th>
                 <th>监测点名称</th>
+                <th>电能质量名称</th>
                 <th>所属电站</th>
                 <th>干扰源类型</th>
                 <th>监测对象名称</th>

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

@@ -16,6 +16,7 @@
     <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/basicButton.css">
+    <link rel="stylesheet" href="${ctx}/css/plugin/bootstrapSwitch/bootstrap-switch.min.css">
     <link rel="stylesheet" href="${ctx}/css/basic.css">
     <style>
         .tr {
@@ -57,6 +58,10 @@
                          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 class="form-group has-feedback mr10">
+                    <label>统计类型：</label>
+                    <input type="checkbox"   id="checkbox"/>
+                </div>
                 <label class="form-group">终端状态：</label> <select
                     class="form-control" id="devflag">
                 <option value="">全部</option>
@@ -131,9 +136,12 @@
 <input type="hidden" id="username" value="${username}">
 <input type="hidden" id="token" value="${token}">
 <input id="_area" value="${area}" hidden>
+<input id="gwType" value="${type}" hidden>
 <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/jquery/jquery.dataTables.js"></script>
+<script src="${ctx}/js/plugin/bootstrap/bootstrap.min.js"></script>
+<script src="${ctx}/js/plugin/datatables/datatables.jquery.js"></script>
+<script src="${ctx}/js/plugin/bootstrapSwitch/bootstrap-switch.min.js"></script>
 <script src="${ctx}/js/plugin/datatables/datatables.bootstrap.js"></script>
 <script src="${ctx}/js/plugin/layui/layui.all.js"></script>
 <script src="${ctx}/js/plugin/bootstrap/bootstrap-datetimepicker.js"></script>
@@ -157,6 +165,7 @@
         toHelper("#jcdyxzt");
     });
     var $area = $("#area");
+    var gwType = $("#gwType");
 </script>
 </body>
 </html>

pqs9000/src/main/webapp/jspJS/manage/lineLedger.js

@@ -139,6 +139,7 @@ function initTable(data) {
 
             {width: "3%", data: "scale"},
             {width: "4%", data: "lineName"},
+            {width: "4%", data: "electricityQualityName"},
             {width: "4%", data: "subName"},
             {width: "5%", data: "loadType"},
             {

pqs9000/src/main/webapp/jspJS/manage/runtime.js

@@ -1,3 +1,35 @@
+var type;
+
+$(function () {
+    //初始化页面内容
+    if (gwType.val() == '1') {
+        type = '1';
+        $("#checkbox").prop('checked', false);
+    } else {
+        type = '0';
+        $("#checkbox").prop('checked', true);
+    }
+    //获取当前日期
+    $("#checkbox").bootstrapSwitch({
+        onText: "冀北省",      // 设置ON文本
+        offText: "国网",    // 设置OFF文本
+        onColor: "primary",// 设置ON文本颜色     (info/success/warning/danger/primary)
+        offColor: "primary",  // 设置OFF文本颜色        (info/success/warning/danger/primary)
+        size: "small",    // 设置控件大小,从小到大  (mini/small/normal/large)
+        handleWidth: "40",//设置控件宽度
+        // 当开关状态改变时触发
+        onSwitchChange: function (event, state) {
+            if (state == true) {
+                type = '0';
+            } else {
+                type = '1';
+            }
+            load();
+        }
+    });
+
+});
+
 /**
  * 终端运行管理
  */
@@ -85,7 +117,8 @@ function load() {
             status: status,
             devflag: devflag,
             gdName: gdIndex,
-            manufacturer: manufacturer
+            manufacturer: manufacturer,
+            type: type
         },
         beforeSend: function () {
             i = ityzl_SHOW_LOAD_LAYER();