增加结论

api/request.js

@@ -14,7 +14,7 @@
 // const BASEURL = "http://121.40.217.77:8080/Device_Manager/";
 
 //本地调试url
- const BASEURL = "http://127.0.0.1:8080/Device_Manager/";
+const BASEURL = "http://127.0.0.1:8080/Device_Manager/";
 
 // 用户名、 密码
 const LOGIN_NAME = "admin";
@@ -158,7 +158,7 @@ const LOG_EXPORT = 'iot/log/getLogListExecl' //日志导出
 
 const RECORD_LIST = 'iot/spotoperationrecord/getList' //维保记录列表查询
 const RECORD_STATIC_AND_SELECT = 'iot/spotoperationrecord/getList3' //维保记录数据统计  
-const RECORD_AND_POINT = 'iot/spotoperationrecord/getJlPointsList'  //维保点位弹框
+const RECORD_AND_POINT = 'iot/spotoperationrecord/getJlPointsList' //维保点位弹框
 
 
 const MONTH_REPORT = "iot/px/queryPf"; //月报考评导出     
@@ -182,7 +182,7 @@ function ajaxRequest(path, method, data, success, error, type = 1) {
     if (type == 1) {
         data.queryJson = JSON.stringify(loginUser);
 
-    } else if(type == 2) {
+    } else if (type == 2) {
 
         let paramJson = {};
         for (key in loginUser) {
@@ -194,7 +194,7 @@ function ajaxRequest(path, method, data, success, error, type = 1) {
         data = {}
         data.queryJson = JSON.stringify(paramJson);
 
-    }else{
+    } else {
         let paramJson = {};
         for (key in loginUser) {
             paramJson[key] = loginUser[key];
@@ -202,7 +202,7 @@ function ajaxRequest(path, method, data, success, error, type = 1) {
         for (key in data) {
             paramJson[key] = data[key];
         }
-       
+
         data = {}
         data.page = paramJson['page'];
         data.limit = paramJson['limit'];
@@ -212,7 +212,7 @@ function ajaxRequest(path, method, data, success, error, type = 1) {
         delete paramJson.limit;
         delete paramJson.start;
         data.queryJson = JSON.stringify(paramJson);
-        
+
     }
 
     $.ajax({
@@ -221,7 +221,7 @@ function ajaxRequest(path, method, data, success, error, type = 1) {
         url: url,
         type: method, //请求方式 post get delete put
         dataType: "json",
-        beforeSend: function (XMLHttpRequest) {
+        beforeSend: function(XMLHttpRequest) {
             // $("#loading").html("<img src='images/loading.gif' />")
             // handlePreloader();
             // $(".loadingdata").append('<div class="preloader"></div>');

css/per-manage.css

@@ -609,6 +609,15 @@ ul.depart-opera {
     background: #1f2833;
 }
 
+
+/* .exportBox .summary {
+    padding: 10px 15px;
+    text-indent: 20px;
+    margin: 10px 10px 30px;
+    line-height: 1.5;
+    background: rgb(170, 170, 170);
+} */
+
 .layui-layer-title {
     background: #081A32 !important;
     color: #fff !important;

js/monthReport.js

@@ -87,6 +87,8 @@ $('#nextStep').click(function() {
     var startTimes = $('#startTime').val();
     var endTimes = $('#endTime').val();
 
+
+
     //获取表单的值 并转换成对象
     let allParam = serializeArrayToObj($("#reportOutForm").serializeArray());
 
@@ -100,7 +102,6 @@ $('#nextStep').click(function() {
         alert(res.msg);
         return;
     }
-
     //验证通过 请求ajax  
     ajaxRequest(MONTH_REPORT, "POST", allParam, function(result) {
         // layer.close(layerCreateIndex);
@@ -124,7 +125,6 @@ $('#nextStep').click(function() {
                     var deviceStatistic = data.deviceStatistic; //告警处理
                     var deviceOnly = data.deviceOnly; //设备离线情况统计
 
-
                     //大标题和时间动态赋值
                     (function() {
                         $('#companyName').html(companyInfo.ownerName);
@@ -135,9 +135,9 @@ $('#nextStep').click(function() {
                     (function() {
                         let items = '';
                         items = ` <tr>
-                            <td>${companyInfo.ownerName}</td>
-                            <td>${companyInfo.ownerAddress} </td>
-                        </tr>`
+                        <td>${companyInfo.ownerName}</td>
+                        <td>${companyInfo.ownerAddress} </td>
+                    </tr>`
                         $('#companyData').html(items);
                         $('#staticTime').html()
                     })();
@@ -149,18 +149,18 @@ $('#nextStep').click(function() {
                         let items2 = ''
                         typeList.forEach(function(item, key) {
                             items += ` <tr>
-                            <td>${item.TypeName} </td>
-                            <td>${item.Num}</td>
-                            <td>${item.TransmissionModel}</td>
-                        	<td>${item.Business}</td>
-                        </tr>`
+                        <td>${item.TypeName} </td>
+                        <td>${item.Num}</td>
+                        <td>${item.TransmissionModel}</td>
+                        <td>${item.Business}</td>
+                    </tr>`
                         })
                         items2 = ` <tr>
-                        <td>统计总数</td>
-                        <td>${data.typeList.deviceNum} </td>
-                        <td ></td>
-                        <td ></td>
-                    </tr>`
+                    <td>统计总数</td>
+                    <td>${data.typeList.deviceNum} </td>
+                    <td ></td>
+                    <td ></td>
+                </tr>`
                         $('#typeList').html(items + items2);
                     })();
 
@@ -169,13 +169,20 @@ $('#nextStep').click(function() {
                         var waterAlarm = JSON.parse(deviceStatistic.waterAlarm);
                         waterAlarm = waterAlarm.RESULT[0];
 
+                        var waterAlarmRate = waterAlarm.count ? (waterAlarm.sum / waterAlarm.count) * 100 : 100;
+                        if (waterAlarmRate == 100) {
+                            $('.waterSummary').html(` 目前数据反应：统计时段内水系统告警报告数量：<span>${waterAlarm.count}</span>条。报告数量良好。<br> 提示：消防水设备状态良好，需要保持。`)
+                        } else {
+                            $('.waterSummary').html(` 目前数据反应：统计时段内水系统告警报告数量：<span>${waterAlarm.count}</span>条。报告数量良好。<br> 提示：有一定的火系统隐患或存在系统故障，需要排查。`)
+                        }
+
                         let items = '';
                         items = ` <tr>
-                            <td>${waterAlarm.count}</td>
-                            <td>${waterAlarm.sum} </td>
-                            <td>${waterAlarm.count- waterAlarm.sum} </td>
-                            <td>${waterAlarm.count?(waterAlarm.sum/waterAlarm.count)*100:0}% </td>
-                        </tr>`
+                        <td>${waterAlarm.count}</td>
+                        <td>${waterAlarm.sum} </td>
+                        <td>${waterAlarm.count- waterAlarm.sum} </td>
+                        <td>${waterAlarmRate}% </td>
+                    </tr>`
                         $('#water_statistics').html(items);
 
                         (function() {
@@ -303,14 +310,22 @@ $('#nextStep').click(function() {
                     (function() {
                         var fireAlarm = JSON.parse(deviceStatistic.fireAlarm);
                         fireAlarm = fireAlarm.RESULT[0];
+                        $('#fireCount').html(fireAlarm.count)
+
+                        var fireAlarmRate = fireAlarm.count ? (fireAlarm.sum / fireAlarm.count) * 100 : 100;
+                        if (fireAlarmRate == 100) {
+                            $('.fireSummary').html(` 目前数据反应：火系统告警报告数量：<span>${fireAlarm.count}</span>条。报告数量良好。<br> 提示：消防火设备状态良好，需要保持 。`)
+                        } else {
+                            $('.fireSummary').html(` 目前数据反应：火系统告警报告数量：<span>${fireAlarm.count}</span>条。报告数量良好。<br> 提示：提示：有一定的火系统隐患或存在系统故障，需要排查。`)
+                        }
 
                         let items = '';
                         items = ` <tr>
-                            <td>${ fireAlarm.count}</td>
-                            <td>${ fireAlarm.sum} </td>
-                            <td>${ fireAlarm.count-  fireAlarm.sum} </td>
-                            <td>${ fireAlarm.count? (fireAlarm.sum/ fireAlarm.count)*100:0}% </td>
-                        </tr>`
+                        <td>${ fireAlarm.count}</td>
+                        <td>${ fireAlarm.sum} </td>
+                        <td>${ fireAlarm.count-  fireAlarm.sum} </td>
+                        <td>${ fireAlarmRate}% </td>
+                    </tr>`
                         $('#fire_statistics').html(items);
                         (function() {
                             var myChart = echarts.init(document.querySelector("#fireChart1"));
@@ -439,13 +454,20 @@ $('#nextStep').click(function() {
                         var waterDeviceOnly = JSON.parse(deviceOnly.waterDeviceOnly);
                         waterDeviceOnly = waterDeviceOnly.RESULT[0];
 
+                        var waterOnlyRate = waterDeviceOnly.count ? (waterDeviceOnly.sum / waterDeviceOnly.count) * 100 : 100;
+                        if (waterOnlyRate == 100) {
+                            $('.waterOnlySummary').html(` 目前数据反应：统计时段内水系统告警报告数量：<span>${waterDeviceOnly.count}</span>条。报告数量良好。<br> 提示：数据接收情况稳定，需要保持。`)
+                        } else {
+                            $('.waterOnlySummary').html(` 目前数据反应：统计时段内水系统告警报告数量：<span>${waterDeviceOnly.count}</span>条。报告数量良好。<br> 提示：有一定的水系统隐患或存在系统故障，需要排查。`)
+                        }
+
                         let items = '';
                         items = ` <tr>
-                            <td>${ waterDeviceOnly.count}</td>
-                            <td>${ waterDeviceOnly.sum} </td>
-                            <td>${ waterDeviceOnly.count-  waterDeviceOnly.sum} </td>
-                            <td>${ waterDeviceOnly.count? (waterDeviceOnly.sum/ waterDeviceOnly.count)*100:0}% </td>
-                        </tr>`
+                        <td>${ waterDeviceOnly.count}</td>
+                        <td>${ waterDeviceOnly.sum} </td>
+                        <td>${ waterDeviceOnly.count-  waterDeviceOnly.sum} </td>
+                        <td>${ waterOnlyRate}% </td>
+                    </tr>`
                         $('#waterDeviceOnly').html(items);
                         (function() {
                             var myChart = echarts.init(document.querySelector("#waterOnlyChart"));
@@ -573,14 +595,22 @@ $('#nextStep').click(function() {
 
                         var fireOnly = JSON.parse(deviceOnly.fireOnly);
                         fireOnly = fireOnly.RESULT[0];
+                        $('#fireOnlyCount').html(fireOnly.count);
+
+                        var fireOnlyRate = fireOnly.count ? (fireOnly.sum / fireOnly.count) * 100 : 100;
+                        if (fireOnlyRate == 100) {
+                            $('.fireOnlySummary').html(` 目前数据反应：统计时段内火系统告警报告数量：<span>${fireOnlyRate}</span>条。报告数量良好。<br> 提示：数据接收情况稳定，需要保持。`)
+                        } else {
+                            $('.fireOnlySummary').html(` 目前数据反应：统计时段内火系统告警报告数量：<span>${fireOnlyRate}</span>条。报告数量良好。<br> 提示：有一定的火系统隐患或存在系统故障，需要排查。`)
+                        }
 
                         let items = '';
                         items = ` <tr>
-                            <td>${ fireOnly.count}</td>
-                            <td>${ fireOnly.sum} </td>
-                            <td>${ fireOnly.count-  fireOnly.sum} </td>
-                            <td>${ fireOnly.count? (fireOnly.sum/ fireOnly.count)*100:0}% </td>
-                        </tr>`
+                        <td>${ fireOnly.count}</td>
+                        <td>${ fireOnly.sum} </td>
+                        <td>${ fireOnly.count-  fireOnly.sum} </td>
+                        <td>${fireOnlyRate}% </td>
+                    </tr>`
                         $('#fireOnly').html(items);
                         (function() {
                             var myChart = echarts.init(document.querySelector("#fireOnlyChart"));
@@ -707,14 +737,23 @@ $('#nextStep').click(function() {
                     (function() {
                         var smokeOnly = JSON.parse(deviceOnly.smokeOnly);
                         smokeOnly = smokeOnly.RESULT[0];
+                        $('#somkeOnlyCount').html(smokeOnly.count);
+
+                        var smokeOnlyRate = smokeOnly.count ? (smokeOnly.sum / smokeOnly.count) * 100 : 100;
+                        if (smokeOnlyRate == 100) {
+                            $('.smokeOnlySummary').html(` 目前数据反应：统计时段内烟感告警报告数量：<span>${smokeOnly.count}</span>条。报告数量良好。<br> 提示：数据接收情况稳定，需要保持。`)
+                        } else {
+                            $('.smokeOnlySummary').html(` 目前数据反应：统计时段内烟感告警报告数量：<span>${smokeOnly.count}</span>条。报告数量良好。<br> 提示：有一定的烟感隐患或存在系统故障，需要排查。`)
+                        }
+
 
                         let items = '';
                         items = ` <tr>
-                            <td>${ smokeOnly.count}</td>
-                            <td>${ smokeOnly.sum} </td>
-                            <td>${ smokeOnly.count-  smokeOnly.sum} </td>
-                            <td>${ smokeOnly.count? (smokeOnly.sum/ smokeOnly.count)*100:0}% </td>
-                        </tr>`
+                        <td>${ smokeOnly.count}</td>
+                        <td>${ smokeOnly.sum} </td>
+                        <td>${ smokeOnly.count-  smokeOnly.sum} </td>
+                        <td>${ smokeOnlyRate}% </td>
+                    </tr>`
                         $('#smokeOnly').html(items);
                         (function() {
                             var myChart = echarts.init(document.querySelector("#smokeOnlyChart"));
@@ -847,6 +886,8 @@ $('#nextStep').click(function() {
     }, function(errorMsg) {
         alert("异常错误!");
     });
+
+
 });
 
 
@@ -854,6 +895,9 @@ $('#nextStep').click(function() {
 
 
 
+
+
+
 // 打印
 (function() {
     $("#btnPrint").click(function() {
@@ -863,7 +907,7 @@ $('#nextStep').click(function() {
 
         //打印前echarts图表转换成图片 start 
         $('#waterChart1_img,#fireChart1_img,#waterOnlyChart_img,#fireOnlyChart_img,#smokeOnlyChart_img').show()
-        $('waterChart1,#fireChart1,#waterOnlyChart,#fireOnlyChart,#smokeOnlyChart').hide()
+        $('#waterChart1,#fireChart1,#waterOnlyChart,#fireOnlyChart,#smokeOnlyChart').hide()
 
         //  end
 

monthReport.html

@@ -10,18 +10,15 @@
     <link rel="stylesheet" href="layui/css/layui.css" />
     <link rel="stylesheet" href="css/common.css" />
     <link rel="stylesheet" href="css/per-manage.css" />
-
 </head>
 
 <body style=" background-size: cover;background-color:#000;background-image:none">
 
-
     <div class="xcConfirm reportOut" style="display:none">
         <div class="popBox">
             <div class="ttBox">
                 <a class="clsBtn"></a>
                 <span class="tt">工作月报</span>
-
             </div>
             <form id="reportOutForm">
                 <div class="txtBox " style="padding-right:0!important">
@@ -95,7 +92,6 @@
 
                     <section class="section">
                         <h4 class="big-tit">2 设备类型统计信息</h4>
-
                         <div>
                             <table width="100%" border="1" style="text-align: center;border-collapse: collapse;border-spacing: 0;">
                                 <tr>
@@ -105,12 +101,9 @@
                                     <td>厂家名称</td>
                                 </tr>
                                 <tbody id="typeList"></tbody>
-
                             </table>
                             <p class="table-sub" style="text-align:center">表2：设备类型统计信息表</p>
                         </div>
-
-
                     </section>
 
 
@@ -119,6 +112,7 @@
                         <h4 class="big-tit">3 告警处理情况统计</h4>
                         <div>
                             <h4 class="big-tit">3.1 水系统告警处理统计</h4>
+
                             <table width="100%" border="1" style="text-align: center;border-collapse: collapse;border-spacing: 0;">
                                 <tr>
                                     <td>总数</td>
@@ -127,19 +121,17 @@
                                     <td>处理率</td>
                                 </tr>
                                 <tbody id="water_statistics">
-                                    <!-- <tr>
-                                        <td>100</td>
-                                        <td>30</td>
-                                        <td>70</td>
-                                        <td>30%</td>
-                                    </tr> -->
                                 </tbody>
                             </table>
                             <p class="table-sub" style="text-align:center">表3-1：水系统告警处理统计表</p>
                             <div id="waterChart1" class="innerChart"></div>
-                            <br>
                             <img id="waterChart1_img" style="width:100%;display:none;">
-
+                            <div class="waterSummary" style=" padding: 15px;
+                            line-height: 1.5;
+                            margin:20px 0 20px;
+                            background: rgb(170, 170, 170);border:1px solid rgb(170, 170, 170)">
+                                结论：水系统告警报告数量：<span id="waterCount"></span>条。报告数量良好。<br> 提示：<span id="waterTips"></span>
+                            </div>
 
                         </div>
                         <div>
@@ -156,8 +148,12 @@
                             <p class="table-sub" style="text-align:center">表3-2：水系统告警处理统计表</p>
 
                             <div id="fireChart1" class="innerChart"></div>
-                            <br>
                             <img id="fireChart1_img" style="width:100%;display:none;">
+                            <div class="fireSummary" style=" padding: 15px;
+                            line-height: 1.5;
+                            margin:20px 0 0px;
+                            background: rgb(170, 170, 170);border:1px solid rgb(170, 170, 170)">
+                            </div>
                         </div>
 
                     </section>
@@ -180,9 +176,12 @@
                             </table>
                             <p class="table-sub" style="text-align:center">表4-1：水系统设备离线情况统计表</p>
                             <div id="waterOnlyChart" class="innerChart"></div>
-                            <br>
                             <img id="waterOnlyChart_img" style="width:100%;display:none;">
-
+                            <div class="waterOnlySummary" style=" padding: 15px;
+                            line-height: 1.5;
+                            margin:20px 0 20px;
+                            background: rgb(170, 170, 170);border:1px solid rgb(170, 170, 170)">
+                            </div>
 
                         </div>
                         <div>
@@ -199,8 +198,13 @@
                             <p class="table-sub" style="text-align:center">表4-2：火系统设备离线情况统计表</p>
 
                             <div id="fireOnlyChart" class="innerChart"></div>
-                            <br>
+
                             <img id="fireOnlyChart_img" style="width:100%;display:none;">
+                            <div class="fireOnlySummary" style=" padding: 15px;
+                            line-height: 1.5;
+                            margin:20px 0 20px;
+                            background: rgb(170, 170, 170);border:1px solid rgb(170, 170, 170)">
+                            </div>
                         </div>
 
                         <div>
@@ -215,23 +219,40 @@
                                 <tbody id="smokeOnly"></tbody>
                             </table>
                             <p class="table-sub" style="text-align:center">表4-3：烟感设备离线情况统计表</p>
-
                             <div id="smokeOnlyChart" class="innerChart"></div>
-                            <br>
                             <img id="smokeOnlyChart_img" style="width:100%;display:none;">
+                            <div class="smokeOnlySummary" style=" padding: 15px;
+                            line-height: 1.5;
+                            margin:20px 0 0px;
+                            background: rgb(170, 170, 170);border:1px solid rgb(170, 170, 170)">
+                            </div>
                         </div>
-
                     </section>
                     <!-- 设备离线情况统计end -->
 
+                    <section class="section">
+                        <h4 class="big-tit">4 分析结论</h4>
+                        <div style=" padding: 15px;
+                        line-height: 1.5;
+                        margin:20px 0 20px;
+                        background: rgb(170, 170, 170);border:1px solid rgb(170, 170, 170)">
+                            <div class="waterSummary"></div>
+                            <div class="fireSummary"></div>
+                            <div class="waterOnlySummary"></div>
+                            <div class="fireOnlySummary"></div>
+                            <div class="smokeOnlySummary"></div>
+                        </div>
+
+                    </section>
+
 
                 </div>
             </div>
 
             <div class="btnArea">
                 <div class="btnGroup">
-                    <a id="btnPrint" class="sgBtn ok"><img src="../../images/accept.png" alt="">导出</a>
-                    <a class="sgBtn cancel"><img src="../../images/cancel.png" alt="">关闭</a>
+                    <a id="btnPrint" class="sgBtn ok"><img src="images/accept.png" alt="">导出</a>
+                    <a class="sgBtn cancel"><img src="images/cancel.png" alt="">关闭</a>
                 </div>
             </div>
         </div>