ming 4 éve
szülő
commit
4edf4d63c4
12 módosított fájl, 2611 hozzáadás és 2641 törlés
  1. 27 13
      api/request.js
  2. 19 4
      css/index.css
  3. 23 26
      css/index.less
  4. 3 32
      eleFireIndex.html
  5. 1474 33
      js/eleFire.js
  6. 0 1392
      js/eleFireInner.js
  7. 2 0
      js/util.js
  8. 1058 19
      js/water.js
  9. 0 991
      js/waterInner.js
  10. 0 48
      layui/test.html
  11. 0 51
      layui/test2.html
  12. 5 32
      waterIndex.html

+ 27 - 13
api/request.js

@@ -1,28 +1,49 @@
 //url
 const URL = "http://172.16.120.183:8080/";
 
+//本地测试
+// const URL = "";
+// const ELE_FIRE_DATA = "api/data1.json"; //电气火灾
+
+//这里登陆用户名、密码 
+const LOGIN_NAME = "sgec68";
+const LOGIN_PASSWORD = "sgec68123";
+
 
 const ELE_FIRE_DATA = "YtIoT/iot/analysis/view/getEfAnalysisList"; //电气火灾
 const WATER_DATA = "YtIoT/iot/analysis/view/getWaterAnalysisList"; //水系统
+const GET_NAME_LIST_DATA = "YtIoT/iot/company/view/getNameList"; //建筑下拉
 
 
-//本地测试
-// const URL = "";
-// const ELE_FIRE_DATA = "api/data1.json"; //电气火灾
-
 function ajaxRequest(path, method, data, success, error, type = 1) {
 
     let url = URL + path;
 
+    let loginUser = {
 
+        "V_LOGINNAME": LOGIN_NAME,
+        "V_PASSWORD": LOGIN_PASSWORD,
+    }
 
-    if (type == 1) {
+    if (type == 1) { //不传用户名密码
 
+        let paramJson = {};
+
+        for (key in data) {
+            paramJson[key] = data[key];
+        }
+
+        data = {}
+        data.queryJson = JSON.stringify(paramJson);
 
-    } else {
+
+    } else { //传用户名密码
 
         let paramJson = {};
 
+        for (key in loginUser) {
+            paramJson[key] = loginUser[key];
+        }
 
         for (key in data) {
             paramJson[key] = data[key];
@@ -32,7 +53,6 @@ function ajaxRequest(path, method, data, success, error, type = 1) {
         data.queryJson = JSON.stringify(paramJson);
     }
 
-
     $.ajax({
         async: false, //同步
         data: data,
@@ -41,12 +61,6 @@ function ajaxRequest(path, method, data, success, error, type = 1) {
         dataType: "json",
         beforeSend: function(XMLHttpRequest) {
 
-            // layui.use('layer', function() {
-            //     var layer = layui.layer;
-            //     var index = layer.load(2);
-            // });
-
-
         },
         success: success,
         error: error

+ 19 - 4
css/index.css

@@ -114,7 +114,7 @@ header .filterSec {
 }
 .panel {
   position: relative;
-  height: 6rem;
+  height: 5.9rem;
   border: 1px solid rgba(25, 140, 186, 0.5);
   background: rgba(8, 26, 50, 0.6);
   padding: 0 0.5375rem;
@@ -263,7 +263,7 @@ header .filterSec {
 .filterSec select,
 .filterSec input {
   border: 1px solid #64A7D4;
-  width: 1.8125rem;
+  width: 2.1rem;
   height: 0.35rem;
   color: #fff;
   line-height: 0.35rem;
@@ -338,7 +338,7 @@ a.button text {
 .summary div:last-child {
   width: calc(100% - 0.85rem);
   padding-right: 0.2rem;
-  height: 0.55rem;
+  height: 0.57rem;
   overflow: auto;
 }
 .summary p {
@@ -386,7 +386,7 @@ a.button text {
   font-size: 14px;
   width: 100%;
   height: 90%;
-  z-index: 1;
+  z-index: -1;
 }
 .exportBox table,
 .exportBox table tr th,
@@ -445,3 +445,18 @@ a.button text {
 .exportBox .section1 {
   background: #1f2833;
 }
+.layui-layer-title {
+  background: #081A32 !important;
+  color: #fff !important;
+  border-bottom: 1px solid #1E9FFF !important;
+}
+.layui-layer {
+  background: #072442 !important;
+  color: #fff;
+}
+.layui-layer-ico {
+  border-radius: 50%;
+}
+.layui-layer-btn .layui-layer-btn0 {
+  font-size: 0.3rem;
+}

+ 23 - 26
css/index.less

@@ -22,7 +22,6 @@ select,input{
   width: 7px !important;
 }
 
-
 /*定义了滚动条滑块的样式*/
 
 .summary ::-webkit-scrollbar-thumb {
@@ -34,9 +33,7 @@ select,input{
   background-clip: padding-box;
 }
 
-
 /*定义了轨道的样式*/
-
 .summary ::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
   -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
@@ -45,8 +42,6 @@ select,input{
 }
 
 
-
-
 @font-face {
   font-family: electronicFont;
   src: url(../font/DS-DIGIT.TTF);
@@ -140,7 +135,7 @@ header {
 
 .panel {
   position: relative;
-  height: 6rem;  
+  height: 5.9rem;  
   border: 1px solid rgba(25, 140, 186, 0.5);
   background: rgba(8,26,50,0.60);
   padding: 0 .5375rem ;
@@ -296,15 +291,11 @@ header {
 // 电老化分析
 
 
-
 .line.panel {
   text-align:center;
   .chart{
     height:50%;
   }
-  
-  
-  
 
 }
 .hotAnalysis.panel .chart,.data_fluctuation.panel .chart{
@@ -312,9 +303,6 @@ header {
   margin-top:.5rem
 }
 
-
-
-
 /* 搜索区域样式 */
 
 .filterSec {
@@ -327,7 +315,7 @@ header {
 .filterSec select,
 .filterSec input {
   border: 1px solid #64A7D4;
-  width: 1.8125rem;
+  width: 2.1rem;
   height:.35rem;
   color: #fff;
   line-height: .35rem;
@@ -336,6 +324,7 @@ header {
   font-size: .175rem
 }
 
+
 .filterSec span {
   display: inline-block;
   margin-right: .125rem;
@@ -389,7 +378,6 @@ a.button {
 
 
  .summary{
- 
    color:#fff;
    font-size: .175rem;
    text-align:left;
@@ -411,7 +399,7 @@ a.button {
    div:last-child{
     width: calc(100% - .85rem);
     padding-right:.2rem;
-    height: .55rem;
+    height: .57rem;
     overflow: auto;
    }
    p{
@@ -420,9 +408,7 @@ a.button {
    div{
      display:inline-block;
     // vertical-align: middle;
-
    }
-
  }
  .bar-3d{
   .chart{
@@ -457,12 +443,8 @@ a.button {
       }
     }
   }
-
  } 
 
-
- 
-
 //  导出排版
 .exportBox{
   position: absolute;
@@ -474,7 +456,7 @@ a.button {
   width: 100%;
   height: 90%;
   // background:#aaa;
-  z-index: 1;
+  z-index: -1;
 
   table,
   table tr th,
@@ -531,13 +513,28 @@ a.button {
     .big-tit {
       padding: 10px 0;
       background: #1f2833;
-     
   }
- 
 }
   .section1 {
       background: #1f2833
   }
-  
 }
 
+//弹框按钮样式调整
+.layui-layer-title{
+  background:#081A32!important;
+  color:#fff!important;
+  border-bottom:1px solid #1E9FFF!important
+}
+
+.layui-layer{
+  background:rgba(7,36,66, 1)!important;
+  color:#fff
+}
+.layui-layer-ico{
+  border-radius:50%
+  // display:none!important
+}
+.layui-layer-btn .layui-layer-btn0 {
+  font-size: .3rem;
+}

+ 3 - 32
eleFireIndex.html

@@ -5,6 +5,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>杨浦二期(电气火灾)</title>
+    <script src="js/flexible.js"></script>
     <link rel="shortcut icon" href="images/favicon.ico">
     <link rel="stylesheet" href="layui/css/layui.css">
     <link rel="stylesheet" href="css/index.css" />
@@ -206,7 +207,7 @@
             <div class="filterSec">
                 <span>建筑</span>
                 <select name="" id="building">
-                    <option value="10012">建筑一</option>
+                    <option value="10246">建筑一</option>
                     <option value="10062">建筑二</option>
                 </select>
                 <span>时间</span>
@@ -246,7 +247,6 @@
                             </li>
                         </ul>
                         <div class="chart">
-                            <!-- <div>123</div> -->
                         </div>
                         <div class="panel-footer"></div>
                     </div>
@@ -295,7 +295,7 @@
                             <div class="line"></div>
                         </h2>
                         <div class="tab-line">
-                            <a href="javascript:;" class="active">异常设备监控电缆数据</a>
+                            <a href="javascript:;" class="active" id="active">异常设备监控电缆数据</a>
                             <a href="javascript:;">漏电告警数据</a>
                         </div>
 
@@ -342,7 +342,6 @@
     </div>
 
 
-    <script src="js/flexible.js"></script>
 
     <script src="js/jquery.js"></script>
     <script src="layui/layui.js"></script>
@@ -354,37 +353,9 @@
     <script src="js/util.js"></script>
 
     <script src="js/eleFire.js"></script>
-    <script src="js/eleFireInner.js"></script>
 
 
     <script>
-        layui.use('laydate', function() {
-            var laydate = layui.laydate;
-            ///年月选择器
-            laydate.render({
-                elem: '#chooseTime',
-                type: 'month',
-                max: -30, //7天后
-                trigger: 'click', //呼出事件改成click
-
-                done: function(value, date, endDate) {
-                    setTimeout(function() {
-                        getListData(getSearchParamObj());
-                        getListData2(getSearchParamObj());
-                    }, 100)
-                }
-
-            });
-
-        });
-
-        $("#building").change(function() {
-            setTimeout(function() {
-                getListData(getSearchParamObj());
-                getListData2(getSearchParamObj());
-            }, 100)
-
-        })
     </script>
 </body>
 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1474 - 33
js/eleFire.js


+ 0 - 1392
js/eleFireInner.js

@@ -1,1392 +0,0 @@
-/* 
-     电气火灾打印页面  echarts配置 及打印
-*/
-
-// 数据请求传参
-getListData(getSearchParamObj());
-// getListData();
-
-
-function getListData(queryParam = {}) {
-
-
-    ajaxRequest(ELE_FIRE_DATA, "POST", queryParam, function(result) {
-
-
-        if (result.totalCount != 0) {
-            console.log(1)
-                //项目情况
-            var project_situation = result.RESULT[0].project_situation;
-            var items = '';
-            items = `<tr>
-                    <td>单位名称</td>
-                    <td colspan="5">${project_situation.company_name}</td>
-                </tr>
-                <tr>
-                    <td>进场日期</td>
-                    <td>${project_situation.entry_date} </td>
-                    <td>完工日期</td>
-                    <td>${project_situation.completion_date}</td>
-                    <td>验收日期</td>
-                    <td>${project_situation.acceptance_date}</td>
-                </tr>`
-            $('#project_situation').html(items);
-
-            //设备清单
-            var equipment_list = result.RESULT[0].equipment_list;
-            var items2 = '';
-            if (equipment_list) {
-                equipment_list.forEach(function(item, key) {
-                    items2 += `<tr>
-                                <td>${item.device_name}</td>  
-                                <td>${item.device_info}</td>
-                                <td>${item.device_code}</td>
-                                <td>${item.remarks}</td>
-                            </tr>`;
-                })
-                $('#equipment_list').html(items2)
-            }
-
-            //统计时段
-            var statistical_period = result.RESULT[0].statistical_period;
-            var items3 = '';
-            items3 = `<div>统计起始日期:${statistical_period.start_date}</div>
-                <div>统计截止日期:${statistical_period.closing_date}</div>
-                <div>统计时段时长:${statistical_period.duration}</div>`;
-            $('#statistical_period').html(items3)
-
-            //数据统计计算
-            var data_statistics = result.RESULT[0].data_statistics;
-            var items4 = '';
-            items4 = `<tr>
-                    <td>${data_statistics.alarm_number}</td>
-                    <td>${data_statistics.processing_number}</td>
-                    <td>${data_statistics.unprocessed_number}</td>
-                    <td>${data_statistics.treatment_rate}</td>
-                    <td>${data_statistics.untreated_rate}</td>
-                </tr>`;
-            $('#data_statistics').html(items4);
-
-
-            // 数据离散率挖掘
-            let dispersion_rate = result.RESULT[0].dispersion_rate;
-            console.log(result.RESULT[0].dispersion_rate)
-
-            // 结论数据渲染
-            var items = '';
-            var conclusion = dispersion_rate.conclusion
-            for (x in conclusion) {
-                xIndex = x.substr(x.length - 1, 1);
-                items += `<div>${xIndex}、${conclusion[x]}</div>`
-            }
-            $('.exportBox .divergence .summaryDetail').html(items);
-
-            // 数据离散率挖掘1
-            (function() {
-                // 三相电压
-                let a = [];
-                let b = [];
-                let c = [];
-                let lectric_current = dispersion_rate.electric_current;
-                lectric_current.forEach(function(item, index) {
-                    a.push(item.variance)
-                    b.push(item.standard_deviation)
-                    c.push(item.average_value)
-                });
-                var sortData = [{
-                    sortName: "三相电压",
-                    data: [
-                        a, b, c
-                    ]
-                }, ];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < lectric_current.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#divergenceChart1"));
-                // 2.指定配置
-                var option = {
-
-                    color: [{
-                            colorStops: [{
-                                offset: 0,
-                                color: '#F9860C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#fff' // 100% 处的颜色
-                            }],
-                        },
-
-                        {
-                            colorStops: [{
-                                offset: 0,
-                                color: '#07E1F1' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#0456CB' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-                            colorStops: [{
-                                offset: 0,
-                                color: '#11F90C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#3FC713' // 100% 处的颜色
-                            }],
-
-                        }
-
-                    ],
-
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间:' + chooseTime + ''
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#aaa"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            lineStyle: {
-                                color: 'rgba(255,255,255,.3)'
-                            }
-                        },
-                        splitLine: {
-                            show: false
-                        },
-                        splitArea: {
-                            show: true,
-                            areaStyle: {
-                                color: ["rgba(250,250,250,0.05)", "rgba(250,250,250,0.0)"]
-                            }
-                        }
-                    },
-
-                    yAxis: {
-                        splitNumber: 8,
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#012f4a", // 分割线颜色
-                                opacity: .2
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "方差",
-                            type: "line",
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "标准差",
-                            type: "line",
-                            data: sortData[0].data[1]
-                        }, {
-                            symbol: "none",
-                            name: "平均值",
-                            type: "line",
-                            data: sortData[0].data[2]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-
-                //echarts赋值到src
-                var img1 = document.getElementById('divergenceChart1_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-
-            })();
-
-            // 数据离散率挖掘2
-            (function() {
-
-                // 三相电流
-                let a2 = [];
-                let b2 = [];
-                let c2 = [];
-                let leakage_current = dispersion_rate.leakage_current;
-                leakage_current.forEach(function(item, index) {
-                    a2.push(item.variance)
-                    b2.push(item.standard_deviation)
-                    c2.push(item.average_value)
-                });
-
-
-
-
-                var sortData = [{
-                        sortName: "三相电流",
-                        data: [
-                            a2, b2, c2
-                        ]
-                    },
-
-                ];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < leakage_current.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#divergenceChart2"));
-                // 2.指定配置
-                var option = {
-
-                    color: [{
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#F9860C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#fff' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#07E1F1' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#0456CB' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#11F90C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#3FC713' // 100% 处的颜色
-                            }],
-
-                        }
-
-                    ],
-
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间:' + chooseTime + ''
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#aaa"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            lineStyle: {
-                                color: 'rgba(255,255,255,.3)'
-                            }
-                        },
-                        splitNumber: 8,
-                        splitLine: {
-                            show: false
-                        },
-                        splitArea: {
-                            show: true,
-                            areaStyle: {
-                                color: ["rgba(250,250,250,0.05)", "rgba(250,250,250,0.0)"]
-                            }
-                        }
-                    },
-
-                    yAxis: {
-                        type: "value",
-                        splitNumber: 8,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#012f4a", // 分割线颜色
-                                opacity: .2
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "方差",
-                            type: "line",
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "标准差",
-                            type: "line",
-                            data: sortData[0].data[1]
-                        }, {
-                            symbol: "none",
-                            name: "平均值",
-                            type: "line",
-                            data: sortData[0].data[2]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-
-                //echarts赋值到src
-                var img1 = document.getElementById('divergenceChart2_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-            })();
-
-            // 数据离散率挖掘3
-            (function() {
-                // 三相温度
-                let a3 = [];
-                let b3 = [];
-                let c3 = [];
-                let temperature = dispersion_rate.temperature;
-                temperature.forEach(function(item, index) {
-                    a3.push(item.variance)
-                    b3.push(item.standard_deviation)
-                    c3.push(item.average_value)
-                });
-
-
-                var sortData = [{
-                    sortName: "三相温度",
-                    data: [
-                        a3, b3, c3
-                    ]
-                }, ];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < temperature.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#divergenceChart3"));
-                // 2.指定配置
-                var option = {
-
-                    color: [{
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#F9860C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#fff' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#07E1F1' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#0456CB' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#11F90C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#3FC713' // 100% 处的颜色
-                            }],
-
-                        }
-
-                    ],
-
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间:' + chooseTime + ''
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#aaa"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            lineStyle: {
-                                color: 'rgba(255,255,255,.3)'
-                            }
-                        },
-                        splitNumber: 8,
-                        splitLine: {
-                            show: false
-                        },
-                        splitArea: {
-                            show: true,
-                            areaStyle: {
-                                color: ["rgba(250,250,250,0.05)", "rgba(250,250,250,0.0)"]
-                            }
-                        }
-                    },
-
-                    yAxis: {
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#012f4a", // 分割线颜色
-                                opacity: .2
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "方差",
-                            type: "line",
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "标准差",
-                            type: "line",
-                            data: sortData[0].data[1]
-                        }, {
-                            symbol: "none",
-                            name: "平均值",
-                            type: "line",
-                            data: sortData[0].data[2]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-                //echarts赋值到src
-                var img1 = document.getElementById('divergenceChart3_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-            })();
-
-            // 数据离散率挖掘4
-            (function() {
-                //  漏电电流
-                let a4 = [];
-                let b4 = [];
-                let c4 = [];
-                let voltage = dispersion_rate.voltage;
-                voltage.forEach(function(item, index) {
-                    a4.push(item.variance)
-                    b4.push(item.standard_deviation)
-                    c4.push(item.average_value)
-                });
-                var sortData = [{
-                    sortName: "三相电流",
-                    data: [
-                        a4, b4, c4
-                    ]
-                }, ];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < voltage.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#divergenceChart4"));
-                // 2.指定配置
-                var option = {
-
-                    color: [{
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#F9860C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#fff' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#07E1F1' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#0456CB' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#11F90C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#3FC713' // 100% 处的颜色
-                            }],
-
-                        }
-
-                    ],
-
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间:' + chooseTime + ''
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#aaa"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            lineStyle: {
-                                color: 'rgba(255,255,255,.3)'
-                            }
-                        },
-                        splitNumber: 8,
-                        splitLine: {
-                            show: false
-                        },
-                        splitArea: {
-                            show: true,
-                            areaStyle: {
-                                color: ["rgba(250,250,250,0.05)", "rgba(250,250,250,0.0)"]
-                            }
-                        }
-                    },
-
-                    yAxis: {
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#012f4a", // 分割线颜色
-                                opacity: .2
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "方差",
-                            type: "line",
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "标准差",
-                            type: "line",
-                            data: sortData[0].data[1]
-                        }, {
-                            symbol: "none",
-                            name: "平均值",
-                            type: "line",
-                            data: sortData[0].data[2]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-                //echarts赋值到src
-                var img1 = document.getElementById('divergenceChart4_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-            })();
-
-
-            // 电老化分析
-            let electrical_aging = result.RESULT[0].electrical_aging;
-
-            // 结论数据渲染
-            var items = '';
-            var conclusion = electrical_aging.conclusion
-            for (x in conclusion) {
-                xIndex = x.substr(x.length - 1, 1);
-                items += `<div>${xIndex}、${conclusion[x]}</div>`
-            }
-            $('.exportBox .oldAnalysis .summaryDetail').html(items);
-
-            // 电老化分析1
-            (function() {
-                // 异常设备监控电缆数据
-                let a = [];
-                let b = [];
-
-                let abnormal_equipment = electrical_aging.abnormal_equipment;
-                abnormal_equipment.forEach(function(item, index) {
-                    a.push(item.electric_current)
-                    b.push(item.voltage)
-                });
-
-                var sortData = [{
-                        sortName: "异常设备",
-                        data: [a, b]
-                    },
-
-                ];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < abnormal_equipment.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#oldAnalysisChart1"));
-                // 2.指定配置
-                var option = {
-
-                    color: ["#FF9C00", "#0096FF"], // 通过这个color修改两条线的颜色
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />时间:' + chooseTime + ''
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#aaa"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        }
-                    },
-
-                    yAxis: {
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#012f4a", // 分割线颜色
-                                opacity: .2
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "电流",
-                            type: "line",
-                            smooth: true, // true 可以让我们的折线显示带有弧度
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(255,156,0, 0.4)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(255,156,0, 0.3)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                    shadowColor: "rgba(0, 0, 0, 0.1)"
-                                }
-                            },
-
-
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "电压",
-                            type: "line",
-                            smooth: true,
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(0,150,255,0.5)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(0,150,255, 0.1)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                    shadowColor: "rgba(0, 0, 0, 0.1)"
-                                }
-                            },
-
-                            data: sortData[0].data[1]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-                var img1 = document.getElementById('oldAnalysisChart1_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-
-            })();
-
-            // 电老化分析2
-            (function() {
-
-                // 漏电告警数据
-                let a2 = [];
-                let b2 = [];
-
-                let leakage_alarm = electrical_aging.leakage_alarm;
-                leakage_alarm.forEach(function(item, index) {
-                    a2.push(item.electric_current)
-                    b2.push(item.voltage)
-                });
-
-
-                var sortData = [{
-                    sortName: "漏电告警",
-                    data: [a2, b2]
-                }];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < leakage_alarm.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#oldAnalysisChart2"));
-                // 2.指定配置
-                var option = {
-
-                    color: ["#FF9C00", "#0096FF"], // 通过这个color修改两条线的颜色
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />时间:' + chooseTime + ''
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#aaa"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        }
-                    },
-
-                    yAxis: {
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#012f4a", // 分割线颜色
-                                opacity: .2
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "电流",
-                            type: "line",
-                            smooth: true, // true 可以让我们的折线显示带有弧度
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(255,156,0, 0.4)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(255,156,0, 0.3)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                    shadowColor: "rgba(0, 0, 0, 0.1)"
-                                }
-                            },
-
-
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "电压",
-                            type: "line",
-                            smooth: true,
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(0,150,255,0.5)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(0,150,255, 0.1)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                    shadowColor: "rgba(0, 0, 0, 0.1)"
-                                }
-                            },
-
-                            data: sortData[0].data[1]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-                var img1 = document.getElementById('oldAnalysisChart2_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-            })();
-
-            // 热老化分析
-
-            let thermal_aging = result.RESULT[0].thermal_aging;
-
-            // 结论数据渲染
-            var items = '';
-            var conclusion = thermal_aging.conclusion
-            for (x in conclusion) {
-                xIndex = x.substr(x.length - 1, 1);
-                items += `<div>${xIndex}、${conclusion[x]}</div>`
-            }
-            $('.exportBox .hotAnalysis .summaryDetail').html(items);
-
-            // 热老化
-            (function() {
-
-                let a = [];
-                let b = [];
-                let c = [];
-                let visualization = thermal_aging.visualization;
-                visualization.forEach(function(item, index) {
-                    a.push(item.generation_temperature)
-                    b.push(item.ambient_temperature)
-                    c.push(item.Cable_temperature)
-                });
-
-                var sortData = [{
-                    data: [a, b, c]
-                }];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < visualization.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#hotAnalysisChart1"));
-                // 2.指定配置
-                var option = {
-
-                    color: ["#05EEE7", "#9999FF", "#FE92B3"], // 通过这个color修改三条线的颜色
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}°C<br />{a1}: {c1}°C<br />{a2}: {c2}°C<br />时间:' + chooseTime + ''
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#aaa"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        }
-                    },
-
-                    yAxis: {
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#012f4a", // 分割线颜色
-                                opacity: .2
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "线缆产生的温度",
-                            type: "line",
-                            smooth: true, // true 可以让我们的折线显示带有弧度
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(5,238,231,.6)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(5,238,231, 0.4)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                }
-                            },
-
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "环境温度",
-                            type: "line",
-                            smooth: true,
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(153,153,255,.6)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(153,153,255, 0.4)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                }
-                            },
-
-                            data: sortData[0].data[1]
-                        },
-                        {
-                            symbol: "none",
-                            name: "线缆温度",
-                            type: "line",
-                            smooth: true,
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(255,147,180,.6)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(255,147,180, 0.4)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                }
-                            },
-
-                            data: sortData[0].data[2]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-                var img1 = document.getElementById('hotAnalysisChart1_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-
-
-            })();
-
-        } else {
-            alert('暂无数据')
-                // layer.alert('暂无数据', { icon: 5 });
-        }
-
-
-    }, function(errorMsg) {
-        alert("请求数据失败!");
-    }, 2)
-};
-
-function getSearchParamObj() {
-    let queryParam = {};
-    let buildingVal = $('#building').val();
-    let chooseTime = $('#chooseTime').val();
-    queryParam.company_code = buildingVal;
-    queryParam.generation_time = chooseTime;
-    return queryParam;
-
-}
-
-
-// 打印
-(function() {
-
-    $("#btnPrint").click(function() {
-
-        print_detail()
-
-    });
-
-    var print_detail = function() {
-
-        //打印前echarts图表转换成图片 start 
-        $('#divergenceChart1_img,#divergenceChart2_img,#divergenceChart3_img,#divergenceChart4_img').show()
-        $('#divergenceChart1,#divergenceChart2,#divergenceChart3,#divergenceChart4').hide()
-        $('#oldAnalysisChart1_img,#oldAnalysisChart2_img').show()
-        $('#oldAnalysisChart1,#oldAnalysisChart2').hide()
-        $('#hotAnalysisChart1_img').show()
-        $('#hotAnalysisChart1').hide()
-            //  end
-
-        var div1_label1 = document.getElementById('printArea').innerHTML;
-        var hkey_key;
-        var hkey_root = 'HKEY_CURRENT_USER';
-        var hkey_path = '\\Software\\Micorsoft\\Internet Explorer\\PageSetup\\';
-        var print_win = window.open('打印窗口', '_blank');
-        var div = document.createElement('div');
-        div.setAttribute('width', '100%');
-        div.setAttribute('height', '100%');
-        var div_print = document.createElement('div');
-        div_print.setAttribute('style', 'width:595px;height:842px;padding:50px 20px;margin:0px auto 0px auto');
-        div_print.innerHTML = div1_label1;
-        div.appendChild(div_print);
-
-        print_win.document.write(div.innerHTML);
-        print_win.document.close();
-        try {
-            var RegWsh = new ActiveXObject('WScript.Shell');
-            hkey_key = 'header';
-            RegWsh.RegWrite(hkey_root + hkey_path + hkey_key, '');
-            hkey_key = 'footer';
-            RegWsh.RegWrite(hkey_root + hkey_path + hkey_key, '');
-        } catch (e) {}
-        print_win.print();
-        print_win.close();
-    }
-})()

+ 2 - 0
js/util.js

@@ -6,6 +6,8 @@ var getTime = y + '-' + add0(m);
 $('#chooseTime').attr('value', getTime)
 
 
+
+
 // 公共变量
 var chooseTime = $('#chooseTime').val()
 

+ 1058 - 19
js/water.js

@@ -1,3 +1,24 @@
+//建筑下拉
+getNameList();
+
+function getNameList(queryParam = {}) {
+
+    ajaxRequest(GET_NAME_LIST_DATA, "POST", queryParam, function(result) {
+        let data = result.RESULT;
+        let items = '';
+
+        data.forEach(function(item, key) {
+
+            items += `<option value="${item.owner_id}">${item.owner_name}</option>`
+
+        })
+        $('#building').html(items);
+
+    }, function(errorMsg) {
+        // alert("请求数据失败!");
+    }, 2)
+};
+
 // 数据请求传参
 getListData(getSearchParamObj());
 
@@ -5,7 +26,11 @@ function getListData(queryParam = {}) {
 
     ajaxRequest(WATER_DATA, "POST", queryParam, function(result) {
 
-        if (result.RESULT) {
+        if (result.totalCount != 0) {
+
+            /* 
+                 主页面数据对接 start
+            */
 
             //数据统计
             var data_statistics = result.RESULT[0].data_statistics;
@@ -391,7 +416,7 @@ function getListData(queryParam = {}) {
 
             })();
 
-            // 渗漏隐排查
+            // 渗漏隐排查
             (function() {
 
                 let leakage_investigation = result.RESULT[0].leakage_investigation;
@@ -440,7 +465,7 @@ function getListData(queryParam = {}) {
                         trigger: 'axis',
                         formatter: function(params) {
                             // console.log(params)
-                            var res = '位置:' + params[0].axisValue + '<br />异常水压值 :' + abnormal_pressure[params[0].dataIndex];
+                            var res = '位置:' + params[0].axisValue + '<br />异常水压值 :' + abnormal_pressure[params[0].dataIndex] + 'Mpa';
                             return res;
                         },
                         axisPointer: {
@@ -786,6 +811,8 @@ function getListData(queryParam = {}) {
             (function() {
 
                 let data_fluctuation = result.RESULT[0].data_fluctuation;
+                console.log('data_fluctuation')
+                console.log(data_fluctuation)
 
                 // 结论数据渲染
                 var items = '';
@@ -823,10 +850,11 @@ function getListData(queryParam = {}) {
                         backgroundColor: '#12DFE0',
                         //提示框组件
                         trigger: 'axis',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />时间:' + chooseTime + '',
+                        formatter: '{a0}: {c0}<span>Mpa</span><br />{a1}: {c1}<span>Mpa</span><br />时间:' + chooseTime + '',
                         axisPointer: {
                             type: 'shadow',
                         },
+
                         textStyle: {
                             fontStyle: 'normal',
                             fontFamily: '微软雅黑',
@@ -950,21 +978,1032 @@ function getListData(queryParam = {}) {
 
             })();
 
-        } else {
-            alert('暂无数据')
-        }
+            /* 
+                 主页面数据对接 end
+            */
+
+            //项目情况
+            var project_situation = result.RESULT[0].project_situation;
+            var items = '';
+            items = `<tr>
+                    <td>单位名称</td>
+                    <td colspan="5">${project_situation.company_name}</td>
+                </tr>
+                <tr>
+                    <td>进场日期</td>
+                    <td>${project_situation.entry_date} </td>
+                    <td>完工日期</td>
+                    <td>${project_situation.completion_date}</td>
+                    <td>验收日期</td>
+                    <td>${project_situation.acceptance_date}</td>
+                </tr>`
+            $('#project_situation').html(items);
+
+            //设备清单
+            var equipment_list = result.RESULT[0].equipment_list;
+            var items2 = '';
+            if (equipment_list) {
+                equipment_list.forEach(function(item, key) {
+                    items2 += `<tr>
+                                <td>${item.device_name}</td>  
+                                <td>${item.device_info}</td>
+                                <td>${item.device_code}</td>
+                                <td>${item.remarks}</td>
+                            </tr>`;
+                })
+                $('#equipment_list').html(items2)
+            }
+
+            //统计时段
+            var statistical_period = result.RESULT[0].statistical_period;
+            var items3 = '';
+            items3 = `<div>统计起始日期:${statistical_period.start_date}</div>
+                <div>统计截止日期:${statistical_period.closing_date}</div>
+                <div>统计时段时长:${statistical_period.duration}</div>`;
+            $('#statistical_period').html(items3)
+
+            //数据统计计算
+            var data_statistics = result.RESULT[0].data_statistics;
+            var items4 = '';
+            items4 = `<tr>
+                    <td>${data_statistics.alarm_number}</td>
+                    <td>${data_statistics.processing_number}</td>
+                    <td>${data_statistics.unprocessed_number}</td>
+                    <td>${data_statistics.treatment_rate}</td>
+                    <td>${data_statistics.untreated_rate}</td>
+                </tr>`;
+            $('#data_statistics').html(items4);
+
+            // 数据离散率挖掘
+            let dispersion_rate = result.RESULT[0].dispersion_rate;
+            console.log(result.RESULT[0].dispersion_rate)
+                // 结论数据渲染
+            var items = '';
+            var conclusion = dispersion_rate.conclusion
+            for (x in conclusion) {
+                xIndex = x.substr(x.length - 1, 1);
+                items += `<div>${xIndex}、${conclusion[x]}</div>`
+            }
+            $('.exportBox .divergence .summaryDetail').html(items);
+
+            // 数据离散率挖掘1
+            (function() {
+                let a = [];
+                let b = [];
+                let c = [];
+                let hydraulic_pressure = dispersion_rate.hydraulic_pressure;
+                hydraulic_pressure.forEach(function(item, index) {
+                    a.push(item.variance)
+                    b.push(item.standard_deviation)
+                    c.push(item.average_value)
+                });
 
-    }, function(errorMsg) {
-        alert("请求数据失败!");
-    }, 2)
-};
+                var sortData = [{
+                    data: [a, b, c]
+                }];
 
-function getSearchParamObj() {
-    let queryParam = {};
-    let buildingVal = $('#building').val();
-    let chooseTime = $('#chooseTime').val();
-    queryParam.company_code = buildingVal;
-    // queryParam.generation_time = chooseTime;
-    return queryParam;
+                var xData = function() {
+                    var data = [];
+                    for (var i = 1; i < hydraulic_pressure.length + 1; i++) {
+                        data.push(i);
+                    }
+                    return data;
+                }();
+
+                // 1. 实例化对象
+                var myChart = echarts.init(document.querySelector("#divergenceChart1"));
+                // 2.指定配置
+                var option = {
+
+                    color: [{
+                            colorStops: [{
+                                offset: 0,
+                                color: '#F9860C' // 0% 处的颜色
+                            }, {
+                                offset: 1,
+                                color: '#fff' // 100% 处的颜色
+                            }],
+
+                        },
+                        {
+                            colorStops: [{
+                                offset: 0,
+                                color: '#07E1F1' // 0% 处的颜色
+                            }, {
+                                offset: 1,
+                                color: '#0456CB' // 100% 处的颜色
+                            }],
+                        },
+                        {
+                            colorStops: [{
+                                offset: 0,
+                                color: '#11F90C' // 0% 处的颜色
+                            }, {
+                                offset: 1,
+                                color: '#3FC713' // 100% 处的颜色
+                            }],
+                        }
+                    ],
+                    tooltip: {
+                        trigger: "axis",
+                        textStyle: {
+                            align: 'left' //图例左对齐
+                        },
+                        backgroundColor: '#12DFE0',
+                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间:2021年3月{b}日'
+
+                    },
+                    legend: {
+                        // 如果series 对象有name 值,则 legend可以不用写data
+                        itemGap: 20,
+                        itemHeight: 2,
+                        itemWidth: 15,
+                        icon: 'rect',
+                        textStyle: {
+                            color: "#aaa"
+                        },
+                        top: "bottom",
+                    },
+                    grid: {
+                        top: "0%",
+                        left: "1%",
+                        right: "1%",
+                        bottom: "15%",
+                        show: true, // 显示边框
+                        borderWidth: '0', //去除边框
+                        containLabel: true // 包含刻度文字在内
+                    },
+                    xAxis: {
+                        type: "category",
+                        boundaryGap: false,
+                        data: xData,
+                        axisTick: {
+                            show: false // 去除刻度线
+                        },
+                        axisLabel: {
+                            color: "#AADDFF" // 文本颜色
+                        },
+                        axisLine: {
+                            lineStyle: {
+                                color: 'rgba(255,255,255,.3)'
+                            }
+                        },
+                        splitNumber: 8,
+                        splitLine: {
+                            show: false
+                        },
+                        splitArea: {
+                            show: true,
+                            areaStyle: {
+                                color: ["rgba(250,250,250,0.05)", "rgba(250,250,250,0.0)"]
+                            }
+                        }
+                    },
+
+                    yAxis: {
+                        splitNumber: 8,
+                        type: "value",
+                        axisTick: {
+                            show: false // 去除刻度线
+                        },
+                        axisLabel: {
+                            show: false // 去除文本
+                        },
+                        axisLine: {
+                            show: false // 去除轴线
+                        },
+                        splitLine: {
+                            lineStyle: {
+                                color: "#aaa", // 分割线颜色
+                                opacity: '0.1'
+                            }
+                        }
+                    },
+                    series: [{
+                            symbol: "none",
+                            name: "方差",
+                            type: "line",
+                            data: sortData[0].data[0]
+                        },
+                        {
+                            symbol: "none",
+                            name: "标准差",
+                            type: "line",
+                            data: sortData[0].data[1]
+                        }, {
+                            symbol: "none",
+                            name: "平均值",
+                            type: "line",
+                            data: sortData[0].data[2]
+                        }
+                    ]
+                };
+
+                myChart.setOption(option);
+
+                //echarts赋值到src
+                var img1 = document.getElementById('divergenceChart1_img');
+                setTimeout(function() {
+                    img1.src = myChart.getDataURL();
+                }, 1000)
+
+            })();
+
+            // 渗漏隐患排查
+            let leakage_investigation = result.RESULT[0].leakage_investigation;
+
+            // 结论数据渲染
+            var items = '';
+            var conclusion = leakage_investigation.conclusion
+            for (x in conclusion) {
+                xIndex = x.substr(x.length - 1, 1);
+                items += `<div>${xIndex}、${conclusion[x]}</div>`
+            }
+            $('.exportBox .hiddenCheck .summaryDetail').html(items);
+
+            // 渗漏隐患排查
+            (function() {
+
+                let abnormal_pressure = [];
+                let location_description = [];
+                let start_pressure = [];
+                let end_pressure = [];
+                let leakage_data = leakage_investigation.leakage_data;
+                leakage_data.forEach(function(item, index) {
+
+                    //异常值
+                    abnormal_pressure.push(item.abnormal_pressure)
+
+                    //楼层
+                    location_description.push(item.location_description)
+
+                    //开始值
+                    start_pressure.push(item.start_pressure)
+
+                    //结束值
+                    end_pressure.push(item.end_pressure)
+                });
+
+                var xData = location_description;
+
+                // 基于准备好的dom,初始化echarts实例
+                var myChart = echarts.init(document.querySelector("#hiddenCheckChart1"));
+
+                var option = {
+                    backgroundColor: 'transparent',
+                    color: ['rgba(0,150,255,.5)', 'rgba(255,156,0,.5)'],
+                    tooltip: {
+                        //提示框组件
+                        trigger: 'axis',
+                        formatter: function(params) {
+                            // console.log(params)
+                            var res = '位置:' + params[0].axisValue + '<br />异常水压值 :' + abnormal_pressure[params[0].dataIndex];
+                            return res;
+                        },
+                        axisPointer: {
+                            type: 'shadow',
+                        },
+                        textStyle: {
+
+                            fontStyle: 'normal',
+                            fontFamily: '微软雅黑',
+                            fontSize: 12,
+                        },
+                    },
+                    grid: {
+                        left: '0',
+                        right: '0',
+                        bottom: '40',
+                        top: '0',
+                        containLabel: true,
+                    },
+                    legend: {
+                        // 如果series 对象有name 值,则 legend可以不用写data
+                        itemGap: 20,
+                        itemHeight: 2,
+                        itemWidth: 15,
+                        icon: 'rect',
+                        textStyle: {
+                            color: "#AAA"
+                        },
+                        top: "bottom",
+                    },
+
+                    xAxis: [{
+                        type: 'category',
+                        //	boundaryGap: true,//坐标轴两边留白
+                        data: xData,
+                        axisLabel: {
+                            interval: 0,
+                            // rotate: 340,
+                            // formatter: function(val) {
+                            //     return val.split("").join("\n");
+                            // }, //横轴信息文字竖直显示
+                            textStyle: {
+                                color: '#AAA',
+                                fontStyle: 'normal',
+                                fontFamily: '微软雅黑',
+                                fontSize: 12,
+                            },
+                        },
+
+                        axisTick: {
+                            //坐标轴刻度相关设置。
+                            show: false,
+                        },
+                        axisLine: {
+                            //坐标轴轴线相关设置
+
+                        },
+                        splitLine: {
+                            //坐标轴在 grid 区域中的分隔线。
+                            show: false,
+                        },
+                    }, ],
+                    yAxis: [{
+                        type: 'value',
+
+                        axisLabel: false,
+                        axisLine: {
+                            show: false,
+                        },
+                        axisTick: {
+                            show: false,
+                        },
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: "#aaa", // 分割线颜色
+                                opacity: '0.2'
+                            }
+                        },
+                        boundaryGap: ['0', '10%'],
+                    }],
+                    series: [{
+                            name: '起层',
+                            type: 'bar',
+                            data: start_pressure,
+                            barMaxWidth: '11',
+                            itemStyle: {
+                                borderColor: "#0096FF",
+                            },
+                            barGap: '50%',
+                        },
+                        {
+                            name: '始层',
+                            type: 'bar',
+                            data: end_pressure,
+                            barMaxWidth: '11',
+                            itemStyle: {
+                                borderColor: "#FF9C00",
+                            },
+                        },
+                    ],
+                };
+
+                myChart.setOption(option);
+
+                //echarts赋值到src
+                var img1 = document.getElementById('hiddenCheckChart1_img');
+                setTimeout(function() {
+                    img1.src = myChart.getDataURL();
+                }, 1000)
+
+            })();
+
+            // 跨设备数据关联
+            let device_association = result.RESULT[0].device_association;
+
+            // 结论数据渲染
+            var items = '';
+            var conclusion = device_association.conclusion
+            for (x in conclusion) {
+                xIndex = x.substr(x.length - 1, 1);
+                items += `<div>${xIndex}、${conclusion[x]}</div>`
+            }
+            $('.exportBox .device_association .summaryDetail').html(items);
+            // 跨设备数据关联1
+
+            // 喷淋末端、消火栓与水泵启停关联
+            let spray_end = [];
+            let fire_hydrant = [];
+            let pump_status = []
+
+            let pump_associated_data = device_association.pump_associated_data;
+            pump_associated_data.forEach(function(item, index) {
+                spray_end.push(item.spray_end)
+                fire_hydrant.push(item.fire_hydrant)
+                pump_status.push(item.pump_status)
+            });
+
+            (function() {
+                var sortData = [{
+                    sortName: "喷淋末端、消火栓与水泵启停关联",
+                    data: [
+                        spray_end, fire_hydrant
+                    ]
+                }, ];
+
+                var xData = function() {
+                    var data = [];
+                    for (var i = 1; i < spray_end.length + 1; i++) {
+                        data.push(i);
+                    }
+                    return data;
+                }();
+
+                // 1. 实例化对象
+                var myChart = echarts.init(document.querySelector("#deviceLinkChart1"));
+                // 2.指定配置
+                var option = {
+
+                    color: ["#FF9C00", "#0096FF"], // 通过这个color修改两条线的颜色
+                    tooltip: {
+                        trigger: "axis",
+                        textStyle: {
+                            align: 'left' //图例左对齐
+                        },
+                        backgroundColor: '#12DFE0',
+                        formatter: function(params) {
+                            var res = params[0].seriesName + ':' + params[0].value + '<br />' + params[1].seriesName + ':' + params[1].value + '<br />水泵启动状态 :' + pump_status[params[0].dataIndex] + '<br />时间:' + chooseTime + '';
+                            return res;
+                        },
+                    },
+                    legend: {
+                        // 如果series 对象有name 值,则 legend可以不用写data
+                        itemGap: 20,
+                        itemHeight: 2,
+                        itemWidth: 15,
+                        icon: 'rect',
+                        textStyle: {
+                            color: "#aaa"
+                        },
+                        top: "bottom",
+                    },
+                    grid: {
+                        top: "0%",
+                        left: "1%",
+                        right: "1%",
+                        bottom: "15%",
+                        show: true, // 显示边框
+                        borderWidth: '0', //去除边框
+                        containLabel: true // 包含刻度文字在内
+                    },
+
+                    xAxis: {
+                        type: "category",
+                        boundaryGap: false,
+                        data: xData,
+                        axisTick: {
+                            show: false // 去除刻度线
+                        },
+                        axisLabel: {
+                            color: "#AADDFF" // 文本颜色
+                        },
+                        axisLine: {
+                            show: false // 去除轴线
+                        }
+                    },
+
+                    yAxis: {
+                        type: "value",
+                        axisTick: {
+                            show: false // 去除刻度线
+                        },
+                        axisLabel: {
+                            show: false // 去除文本
+                        },
+                        axisLine: {
+                            show: false // 去除轴线
+                        },
+                        splitLine: {
+                            lineStyle: {
+                                color: "#aaa", // 分割线颜色
+                                opacity: '0.2'
+                            }
+                        }
+                    },
+                    series: [{
+                            symbol: "none",
+                            name: "喷淋末端",
+                            type: "line",
+                            smooth: true, // true 可以让我们的折线显示带有弧度
+                            areaStyle: {
+                                normal: {
+                                    color: new echarts.graphic.LinearGradient(
+                                        0,
+                                        0,
+                                        0,
+                                        1, [{
+                                                offset: 0,
+                                                color: "rgba(255,156,0, 0.4)"
+                                            },
+                                            {
+                                                offset: 0.8,
+                                                color: "rgba(255,156,0, 0.3)"
+                                            }
+                                        ],
+                                        false
+                                    ),
+                                    shadowColor: "rgba(0, 0, 0, 0.1)"
+                                }
+                            },
+
+
+                            data: sortData[0].data[0]
+                        },
+                        {
+                            symbol: "none",
+                            name: "消防栓",
+                            type: "line",
+                            smooth: true,
+                            areaStyle: {
+                                normal: {
+                                    color: new echarts.graphic.LinearGradient(
+                                        0,
+                                        0,
+                                        0,
+                                        1, [{
+                                                offset: 0,
+                                                color: "rgba(0,150,255,0.5)"
+                                            },
+                                            {
+                                                offset: 0.8,
+                                                color: "rgba(0,150,255, 0.1)"
+                                            }
+                                        ],
+                                        false
+                                    ),
+                                    shadowColor: "rgba(0, 0, 0, 0.1)"
+                                }
+                            },
+
+                            data: sortData[0].data[1]
+                        }
+                    ]
+                };
+
+                myChart.setOption(option);
+                var img1 = document.getElementById('deviceLinkChart1_img');
+                setTimeout(function() {
+                    img1.src = myChart.getDataURL();
+                }, 1000)
+
+            })();
+
+
+            // 跨设备数据关联2
+
+            // 喷淋末端、消火栓屋顶水箱液位关联
+            let spray_end2 = [];
+            let fire_hydrant2 = [];
+            let water_tank_level = []
+
+            let water_associated_data = device_association.water_associated_data;
+            water_associated_data.forEach(function(item, index) {
+                spray_end2.push(item.spray_end)
+                fire_hydrant2.push(item.fire_hydrant)
+                water_tank_level.push(item.water_tank_level)
+            });
+            (function() {
+
+                var sortData = [{
+                    sortName: "喷淋末端、消火栓屋顶水箱液位关联",
+                    data: [
+                        spray_end2, fire_hydrant2
+                    ]
+                }];
+
+                var xData = function() {
+                    var data = [];
+                    for (var i = 1; i < water_associated_data.length + 1; i++) {
+                        data.push(i);
+                    }
+                    return data;
+                }();
+
+                // 1. 实例化对象
+                var myChart = echarts.init(document.querySelector("#deviceLinkChart2"));
+                // 2.指定配置
+                var option = {
+
+                    color: ["#FF9C00", "#0096FF"], // 通过这个color修改两条线的颜色
+                    tooltip: {
+                        trigger: "axis",
+                        textStyle: {
+                            align: 'left' //图例左对齐
+                        },
+                        backgroundColor: '#12DFE0',
+                        formatter: function(params) {
+                            var res = params[0].seriesName + ':' + params[0].value + '<br />' + params[1].seriesName + ':' + params[1].value + '<br /> 水箱液位 :' + water_tank_level[params[0].dataIndex] + '<br />时间:' + chooseTime + '';
+
+                            return res;
+                        },
+                    },
+                    legend: {
+                        // 如果series 对象有name 值,则 legend可以不用写data
+                        itemGap: 20,
+                        itemHeight: 2,
+                        itemWidth: 15,
+                        icon: 'rect',
+                        textStyle: {
+                            color: "#aaa"
+                        },
+                        top: "bottom",
+                    },
+                    grid: {
+                        top: "0%",
+                        left: "1%",
+                        right: "1%",
+                        bottom: "15%",
+                        show: true, // 显示边框
+                        borderWidth: '0', //去除边框
+                        containLabel: true // 包含刻度文字在内
+                    },
+
+                    xAxis: {
+                        type: "category",
+                        boundaryGap: false,
+                        data: xData,
+                        axisTick: {
+                            show: false // 去除刻度线
+                        },
+                        axisLabel: {
+                            color: "#AADDFF" // 文本颜色
+                        },
+                        axisLine: {
+                            show: false // 去除轴线
+                        }
+                    },
+
+                    yAxis: {
+                        type: "value",
+                        axisTick: {
+                            show: false // 去除刻度线
+                        },
+                        axisLabel: {
+                            show: false // 去除文本
+                        },
+                        axisLine: {
+                            show: false // 去除轴线
+                        },
+                        splitLine: {
+                            lineStyle: {
+                                color: "#aaa", // 分割线颜色
+                                opacity: '0.2'
+                            }
+                        }
+                    },
+                    series: [{
+                            symbol: "none",
+                            name: "喷淋末端",
+                            type: "line",
+                            smooth: true, // true 可以让我们的折线显示带有弧度
+                            areaStyle: {
+                                normal: {
+                                    color: new echarts.graphic.LinearGradient(
+                                        0,
+                                        0,
+                                        0,
+                                        1, [{
+                                                offset: 0,
+                                                color: "rgba(255,156,0, 0.4)"
+                                            },
+                                            {
+                                                offset: 0.8,
+                                                color: "rgba(255,156,0, 0.3)"
+                                            }
+                                        ],
+                                        false
+                                    ),
+                                    shadowColor: "rgba(0, 0, 0, 0.1)"
+                                }
+                            },
+                            data: sortData[0].data[0]
+                        },
+                        {
+                            symbol: "none",
+                            name: "消防栓",
+                            type: "line",
+                            smooth: true,
+                            areaStyle: {
+                                normal: {
+                                    color: new echarts.graphic.LinearGradient(
+                                        0,
+                                        0,
+                                        0,
+                                        1, [{
+                                                offset: 0,
+                                                color: "rgba(0,150,255,0.5)"
+                                            },
+                                            {
+                                                offset: 0.8,
+                                                color: "rgba(0,150,255, 0.1)"
+                                            }
+                                        ],
+                                        false
+                                    ),
+                                    shadowColor: "rgba(0, 0, 0, 0.1)"
+                                }
+                            },
+
+                            data: sortData[0].data[1]
+                        }
+                    ]
+                };
+
+                myChart.setOption(option);
+                var img1 = document.getElementById('deviceLinkChart2_img');
+                setTimeout(function() {
+                    img1.src = myChart.getDataURL();
+                }, 1000)
+
+            })();
+
+
+            //数据波动关联
+
+            let data_fluctuation = result.RESULT[0].data_fluctuation;
+
+            // 结论数据渲染
+            var items = '';
+            var conclusion = data_fluctuation.conclusion
+            for (x in conclusion) {
+                xIndex = x.substr(x.length - 1, 1);
+                items += `<div>${xIndex}、${conclusion[x]}</div>`
+            }
+            $('.exportBox .data_fluctuation .summaryDetail').html(items);
+
+            // 数据波动关联
+            (function() {
+
+                let position = [];
+                let before_fluctuation = [];
+                let after_fluctuation = [];
+                let volatility_data = data_fluctuation.volatility_data;
+                volatility_data.forEach(function(item, index) {
+
+                    //楼层
+                    position.push(item.position)
+
+                    //开始值
+                    before_fluctuation.push(item.before_fluctuation)
+
+                    //结束值
+                    after_fluctuation.push(item.after_fluctuation)
+                });
+                // 1. 实例化对象
+                var myChart = echarts.init(document.querySelector("#dataChangeChart1"));
+                var xData = position;
+                // 2.指定配置
+                var option = {
+                    backgroundColor: 'transparent',
+                    color: ['rgba(0,150,255,.5)', 'rgba(255,156,0,.5)'],
+                    tooltip: {
+                        backgroundColor: '#12DFE0',
+                        //提示框组件
+                        trigger: 'axis',
+                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />时间:' + chooseTime + '',
+                        axisPointer: {
+                            type: 'shadow',
+                        },
+                        textStyle: {
+                            fontStyle: 'normal',
+                            fontFamily: '微软雅黑',
+                            align: 'left' //图例左对齐
+                        },
+                    },
+                    legend: {
+                        // 如果series 对象有name 值,则 legend可以不用写data
+                        itemGap: 20,
+                        itemHeight: 2,
+                        itemWidth: 15,
+                        icon: 'rect',
+                        textStyle: {
+                            color: "#AAA"
+                        },
+                        top: "bottom",
+                    },
+                    grid: {
+                        left: '0',
+                        right: '0',
+                        bottom: '40',
+                        top: '0',
+                        containLabel: true,
+                    },
+
+                    //添加横线滚动条
+                    dataZoom: {
+                        start: 0, //默认为0
+                        end: 100 - 1500 / 1, //默认为100
+                        type: 'slider',
+                        show: xData.length > 10 ? true : false,
+                        xAxisIndex: [0],
+                        handleSize: 0, //滑动条的 左右2个滑动条的大小
+                        height: 4, //组件高度
+                        left: 20, //左边的距离
+                        right: 20, //右边的距离
+                        bottom: 20, //右边的距离
+                        handleColor: '#CBBCDB', //h滑动图标的颜色
+                        handleStyle: {
+                            borderColor: "#CBBCDB",
+                            borderWidth: "1",
+                            shadowBlur: 2,
+                            background: "#CBBCDB",
+                            shadowColor: "#CBBCDB",
+                        },
+                        textStyle: {
+                            color: "#fff"
+                        },
+
+                        backgroundColor: 'rgba(37, 46, 100, 0.45)', //两边未选中的滑动条区域的颜色
+                        showDataShadow: false, //是否显示数据阴影 默认auto
+                        // showDetail: false, //即拖拽时候是否显示详细数值信息 默认true
+                        filterMode: 'filter',
+                    },
+
+                    xAxis: [{
+                        type: 'category',
+                        //	boundaryGap: true,//坐标轴两边留白
+                        data: xData,
+                        axisLabel: {
+                            interval: 0,
+                            // rotate: 340,
+                            // formatter: function(val) {
+                            //     return val.split("").join("\n");
+                            // }, //横轴信息文字竖直显示
+                            textStyle: {
+                                color: '#AADDFF',
+                                fontStyle: 'normal',
+                                fontFamily: '微软雅黑',
+                                fontSize: 12,
+                            },
+                        },
+
+                        axisTick: {
+                            //坐标轴刻度相关设置。
+                            show: false,
+                        },
+                        axisLine: {
+                            //坐标轴轴线相关设置
+                        },
+                        splitLine: {
+                            //坐标轴在 grid 区域中的分隔线。
+                            show: false,
+                        },
+                    }, ],
+                    yAxis: [{
+                        type: 'value',
+
+                        axisLabel: false,
+                        axisLine: {
+                            show: false,
+                        },
+                        axisTick: {
+                            show: false,
+                        },
+                        splitLine: {
+                            show: true,
+                            lineStyle: {
+                                color: "#aaa", // 分割线颜色
+                                opacity: '0.2'
+                            },
+                        },
+                        boundaryGap: ['0', '10%'],
+                    }],
+                    series: [{
+                            name: '波动前水压值',
+                            type: 'bar',
+                            data: before_fluctuation,
+                            barMaxWidth: '11',
+                            itemStyle: {
+                                borderColor: "#0096FF",
+                            },
+                            barGap: '50%',
+                        },
+                        {
+                            name: '波动后水压值',
+                            type: 'bar',
+                            data: after_fluctuation,
+                            barMaxWidth: '11',
+                            itemStyle: {
+                                borderColor: "#FF9C00",
+                            },
+                        },
+                    ],
+                };
+
+                myChart.setOption(option);
+                var img1 = document.getElementById('dataChangeChart1_img');
+                setTimeout(function() {
+                    img1.src = myChart.getDataURL();
+                }, 1000)
+            })();
+
+            /* 
+                 导出数据对接 start
+            */
+
+
+        } else {
+            layui.use('layer', function() {
+                var layer = layui.layer;
+                layer.alert('暂无数据', { icon: 5 }, function() {
+                    location.reload();
+                });
+            });
+        }
+    }, function(errorMsg) {
+        layui.use('layer', function() {
+            var layer = layui.layer;
+            layer.alert('数据请求失败', { icon: 5 });
+        });
+    }, 1)
+};
+
+function getSearchParamObj() {
+    let queryParam = {};
+    let buildingVal = $('#building').val();
+    let chooseTime = $('#chooseTime').val();
+    queryParam.company_code = buildingVal;
+    queryParam.generation_time = chooseTime;
+    return queryParam;
+};
+
+//日期筛选
+layui.use('laydate', function() {
+    var laydate = layui.laydate;
+    ///年月选择器
+    laydate.render({
+        elem: '#chooseTime',
+        type: 'month',
+        max: -30, //7天后
+        trigger: 'click', //呼出事件改成click
+
+        done: function(value, date, endDate) {
+            setTimeout(function() {
+                getListData(getSearchParamObj());
+            }, 100)
+        }
 
-}
+    });
+
+});
+
+//建筑筛选
+$("#building").change(function() {
+    setTimeout(function() {
+        getListData(getSearchParamObj());
+    }, 100)
+
+});
+
+// 打印
+(function() {
+
+    $("#btnPrint").click(function() {
+        print_detail()
+    });
+
+    var print_detail = function() {
+
+        //打印前echarts图表转换成图片 start   
+        $('#divergenceChart1_img').show()
+        $('#divergenceChart1').hide()
+
+        $('#hiddenCheckChart1_img').show()
+        $('#hiddenCheckChart1').hide()
+
+        $('#deviceLinkChart1_img,#deviceLinkChart2_img').show()
+        $('#deviceLinkChart1,#deviceLinkChart2').hide()
+
+        $('#dataChangeChart1_img').show()
+        $('#dataChangeChart1').hide()
+            //  end
+
+        var div1_label1 = document.getElementById('printArea').innerHTML;
+        var hkey_key;
+        var hkey_root = 'HKEY_CURRENT_USER';
+        var hkey_path = '\\Software\\Micorsoft\\Internet Explorer\\PageSetup\\';
+        var print_win = window.open('打印窗口', '_blank');
+        var div = document.createElement('div');
+        div.setAttribute('width', '100%');
+        div.setAttribute('height', '100%');
+        var div_print = document.createElement('div');
+        div_print.setAttribute('style', 'width:595px;height:842px;padding:50px 20px;margin:0px auto 0px auto');
+        div_print.innerHTML = div1_label1;
+        div.appendChild(div_print);
+
+        print_win.document.write(div.innerHTML);
+        print_win.document.close();
+        try {
+            var RegWsh = new ActiveXObject('WScript.Shell');
+            hkey_key = 'header';
+            RegWsh.RegWrite(hkey_root + hkey_path + hkey_key, '');
+            hkey_key = 'footer';
+            RegWsh.RegWrite(hkey_root + hkey_path + hkey_key, '');
+        } catch (e) {}
+        print_win.print();
+        print_win.close();
+    }
+})()

+ 0 - 991
js/waterInner.js

@@ -1,991 +0,0 @@
-/* 
-     水系统打印页面echarts配置 及打印
-*/
-
-
-// 数据请求传参
-getListData(getSearchParamObj());
-// getListData();
-
-
-function getListData(queryParam = {}) {
-
-
-    ajaxRequest(WATER_DATA, "POST", queryParam, function(result) {
-
-
-        if (result.totalCount != 0) {
-
-
-            /**
-             * 水系统导出数据对接 start 
-             * **/
-            //项目情况
-            var project_situation = result.RESULT[0].project_situation;
-            var items = '';
-            items = `<tr>
-                    <td>单位名称</td>
-                    <td colspan="5">${project_situation.company_name}</td>
-                </tr>
-                <tr>
-                    <td>进场日期</td>
-                    <td>${project_situation.entry_date} </td>
-                    <td>完工日期</td>
-                    <td>${project_situation.completion_date}</td>
-                    <td>验收日期</td>
-                    <td>${project_situation.acceptance_date}</td>
-                </tr>`
-            $('#project_situation').html(items);
-
-            // //设备清单
-            var equipment_list = result.RESULT[0].equipment_list;
-            var items2 = '';
-            if (equipment_list) {
-                equipment_list.forEach(function(item, key) {
-                    items2 += `<tr>
-                                <td>${item.device_name}</td>  
-                                <td>${item.device_info}</td>
-                                <td>${item.device_code}</td>
-                                <td>${item.remarks}</td>
-                            </tr>`;
-                })
-                $('#equipment_list').html(items2)
-            }
-
-            //统计时段
-            var statistical_period = result.RESULT[0].statistical_period;
-            var items3 = '';
-            items3 = `<div>统计起始日期:${statistical_period.start_date}</div>
-                <div>统计截止日期:${statistical_period.closing_date}</div>
-                <div>统计时段时长:${statistical_period.duration}</div>`;
-            $('#statistical_period').html(items3)
-
-            //数据统计计算
-            var data_statistics = result.RESULT[0].data_statistics;
-            var items4 = '';
-            items4 = `<tr>
-                    <td>${data_statistics.alarm_number}</td>
-                    <td>${data_statistics.processing_number}</td>
-                    <td>${data_statistics.unprocessed_number}</td>
-                    <td>${data_statistics.treatment_rate}</td>
-                    <td>${data_statistics.untreated_rate}</td>
-                </tr>`;
-            $('#data_statistics').html(items4);
-
-
-
-            // 数据离散率挖掘
-            let dispersion_rate = result.RESULT[0].dispersion_rate;
-            console.log(result.RESULT[0].dispersion_rate)
-                // 结论数据渲染
-            var items = '';
-            var conclusion = dispersion_rate.conclusion
-            for (x in conclusion) {
-                xIndex = x.substr(x.length - 1, 1);
-                items += `<div>${xIndex}、${conclusion[x]}</div>`
-            }
-            $('.exportBox .divergence .summaryDetail').html(items);
-
-            // 数据离散率挖掘1
-            (function() {
-                let dispersion_rate = result.RESULT[0].dispersion_rate;
-
-                // 结论数据渲染
-                var items = '';
-                var conclusion = dispersion_rate.conclusion
-                for (x in conclusion) {
-                    xIndex = x.substr(x.length - 1, 1);
-                    items += `<p>${xIndex}、${conclusion[x]}</p>`
-                }
-                $('.divergence .summaryDetail').html(items);
-
-                let a = [];
-                let b = [];
-                let c = [];
-                let hydraulic_pressure = dispersion_rate.hydraulic_pressure;
-                hydraulic_pressure.forEach(function(item, index) {
-                    a.push(item.variance)
-                    b.push(item.standard_deviation)
-                    c.push(item.average_value)
-                });
-
-                var sortData = [{
-                    data: [a, b, c]
-                }];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < hydraulic_pressure.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#divergenceChart1"));
-                // 2.指定配置
-                var option = {
-
-                    color: [{
-
-                            colorStops: [{
-                                offset: 0,
-                                color: '#F9860C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#fff' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-                            colorStops: [{
-                                offset: 0,
-                                color: '#07E1F1' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#0456CB' // 100% 处的颜色
-                            }],
-
-                        },
-
-                        {
-                            colorStops: [{
-                                offset: 0,
-                                color: '#11F90C' // 0% 处的颜色
-                            }, {
-                                offset: 1,
-                                color: '#3FC713' // 100% 处的颜色
-                            }],
-
-                        }
-
-                    ],
-
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间:2021年3月{b}日'
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#aaa"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            lineStyle: {
-                                color: 'rgba(255,255,255,.3)'
-                            }
-                        },
-                        splitNumber: 8,
-                        splitLine: {
-                            show: false
-                        },
-                        splitArea: {
-                            show: true,
-                            areaStyle: {
-                                color: ["rgba(250,250,250,0.05)", "rgba(250,250,250,0.0)"]
-                            }
-                        }
-                    },
-
-                    yAxis: {
-                        splitNumber: 8,
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#aaa", // 分割线颜色
-                                opacity: '0.1'
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "方差",
-                            type: "line",
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "标准差",
-                            type: "line",
-                            data: sortData[0].data[1]
-                        }, {
-                            symbol: "none",
-                            name: "平均值",
-                            type: "line",
-                            data: sortData[0].data[2]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-
-                //echarts赋值到src
-                var img1 = document.getElementById('divergenceChart1_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-
-            })();
-
-
-            // 渗漏隐患排查
-            let leakage_investigation = result.RESULT[0].leakage_investigation;
-
-            // 结论数据渲染
-            var items = '';
-            var conclusion = leakage_investigation.conclusion
-            for (x in conclusion) {
-                xIndex = x.substr(x.length - 1, 1);
-                items += `<p>${xIndex}、${conclusion[x]}</p>`
-            }
-            $('.exportBox .hiddenCheck .summaryDetail').html(items);
-
-
-            // 渗漏隐患排查1
-            (function() {
-
-                let abnormal_pressure = [];
-                let location_description = [];
-                let start_pressure = [];
-                let end_pressure = [];
-                let leakage_data = leakage_investigation.leakage_data;
-                leakage_data.forEach(function(item, index) {
-
-                    //异常值
-                    abnormal_pressure.push(item.abnormal_pressure)
-
-                    //楼层
-                    location_description.push(item.location_description)
-
-                    //开始值
-                    start_pressure.push(item.start_pressure)
-
-                    //结束值
-                    end_pressure.push(item.end_pressure)
-                });
-
-                var xData = location_description;
-
-                // 基于准备好的dom,初始化echarts实例
-                var myChart = echarts.init(document.querySelector("#hiddenCheckChart1"));
-
-                var option = {
-                    backgroundColor: 'transparent',
-                    color: ['rgba(0,150,255,.5)', 'rgba(255,156,0,.5)'],
-                    tooltip: {
-                        //提示框组件
-                        trigger: 'axis',
-                        formatter: function(params) {
-                            // console.log(params)
-                            var res = '位置:' + params[0].axisValue + '<br />异常水压值 :' + abnormal_pressure[params[0].dataIndex];
-                            return res;
-                        },
-                        axisPointer: {
-                            type: 'shadow',
-                        },
-                        textStyle: {
-
-                            fontStyle: 'normal',
-                            fontFamily: '微软雅黑',
-                            fontSize: 12,
-                        },
-                    },
-                    grid: {
-                        left: '0',
-                        right: '0',
-                        bottom: '40',
-                        top: '0',
-                        containLabel: true,
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#AAA"
-                        },
-                        top: "bottom",
-                    },
-
-                    xAxis: [{
-                        type: 'category',
-                        //	boundaryGap: true,//坐标轴两边留白
-                        data: xData,
-                        axisLabel: {
-                            interval: 0,
-                            rotate: 340,
-                            // formatter: function(val) {
-                            //     return val.split("").join("\n");
-                            // }, //横轴信息文字竖直显示
-                            textStyle: {
-                                color: '#AAA',
-                                fontStyle: 'normal',
-                                fontFamily: '微软雅黑',
-                                fontSize: 12,
-                            },
-                        },
-
-                        axisTick: {
-                            //坐标轴刻度相关设置。
-                            show: false,
-                        },
-                        axisLine: {
-                            //坐标轴轴线相关设置
-
-                        },
-                        splitLine: {
-                            //坐标轴在 grid 区域中的分隔线。
-                            show: false,
-                        },
-                    }, ],
-                    yAxis: [{
-                        type: 'value',
-
-                        axisLabel: false,
-                        axisLine: {
-                            show: false,
-                        },
-                        axisTick: {
-                            show: false,
-                        },
-                        splitLine: {
-                            show: true,
-                            lineStyle: {
-                                color: "#aaa", // 分割线颜色
-                                opacity: '0.2'
-                            }
-                        },
-                        boundaryGap: ['0', '10%'],
-                    }],
-                    series: [{
-                            name: '起层',
-                            type: 'bar',
-                            data: start_pressure,
-                            barMaxWidth: '11',
-                            itemStyle: {
-                                borderColor: "#0096FF",
-                            },
-                            barGap: '50%',
-                        },
-                        {
-                            name: '始层',
-                            type: 'bar',
-                            data: end_pressure,
-                            barMaxWidth: '11',
-                            itemStyle: {
-                                borderColor: "#FF9C00",
-                            },
-
-                        },
-
-                    ],
-                };
-
-                myChart.setOption(option);
-
-                //echarts赋值到src
-                var img1 = document.getElementById('hiddenCheckChart1_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-
-            })();
-
-            // 跨设备数据关联
-            let device_association = result.RESULT[0].device_association;
-
-            // 结论数据渲染
-            var items = '';
-            var conclusion = device_association.conclusion
-            for (x in conclusion) {
-                xIndex = x.substr(x.length - 1, 1);
-                items += `<p>${xIndex}、${conclusion[x]}</p>`
-            }
-            $('.exportBox .device_association .summaryDetail').html(items);
-            // 跨设备数据关联1
-
-            // 喷淋末端、消火栓与水泵启停关联
-            let spray_end = [];
-            let fire_hydrant = [];
-            let pump_status = []
-
-            let pump_associated_data = device_association.pump_associated_data;
-            pump_associated_data.forEach(function(item, index) {
-                spray_end.push(item.spray_end)
-                fire_hydrant.push(item.fire_hydrant)
-                pump_status.push(item.pump_status)
-            });
-
-            (function() {
-                var sortData = [{
-                    sortName: "喷淋末端、消火栓与水泵启停关联",
-                    data: [
-                        spray_end, fire_hydrant
-                    ]
-                }, ];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < spray_end.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#deviceLinkChart1"));
-                // 2.指定配置
-                var option = {
-
-                    color: ["#FF9C00", "#0096FF"], // 通过这个color修改两条线的颜色
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: function(params) {
-                            var res = params[0].seriesName + ':' + params[0].value + '<br />' + params[1].seriesName + ':' + params[1].value + '<br />水泵启动状态 :' + pump_status[params[0].dataIndex] + '<br />时间:' + chooseTime + '';
-                            return res;
-                        },
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#fff"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        }
-                    },
-
-                    yAxis: {
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#aaa", // 分割线颜色
-                                opacity: '0.2'
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "喷淋末端",
-                            type: "line",
-                            smooth: true, // true 可以让我们的折线显示带有弧度
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(255,156,0, 0.4)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(255,156,0, 0.3)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                    shadowColor: "rgba(0, 0, 0, 0.1)"
-                                }
-                            },
-
-
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "消防栓",
-                            type: "line",
-                            smooth: true,
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(0,150,255,0.5)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(0,150,255, 0.1)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                    shadowColor: "rgba(0, 0, 0, 0.1)"
-                                }
-                            },
-
-                            data: sortData[0].data[1]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-                var img1 = document.getElementById('deviceLinkChart1_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-
-            })();
-
-
-
-
-            // 跨设备数据关联2
-
-            // 喷淋末端、消火栓屋顶水箱液位关联
-            let spray_end2 = [];
-            let fire_hydrant2 = [];
-            let water_tank_level = []
-
-            let water_associated_data = device_association.water_associated_data;
-            water_associated_data.forEach(function(item, index) {
-                spray_end2.push(item.spray_end)
-                fire_hydrant2.push(item.fire_hydrant)
-                water_tank_level.push(item.water_tank_level)
-            });
-            (function() {
-
-                var sortData = [{
-                    sortName: "喷淋末端、消火栓屋顶水箱液位关联",
-                    data: [
-                        spray_end2, fire_hydrant2
-                    ]
-                }];
-
-                var xData = function() {
-                    var data = [];
-                    for (var i = 1; i < water_associated_data.length + 1; i++) {
-                        data.push(i);
-                    }
-                    return data;
-                }();
-
-                // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#deviceLinkChart2"));
-                // 2.指定配置
-                var option = {
-
-                    color: ["#FF9C00", "#0096FF"], // 通过这个color修改两条线的颜色
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        backgroundColor: '#12DFE0',
-                        formatter: function(params) {
-                            var res = params[0].seriesName + ':' + params[0].value + '<br />' + params[1].seriesName + ':' + params[1].value + '<br /> 水箱液位 :' + water_tank_level[params[0].dataIndex] + '<br />时间:' + chooseTime + '';
-
-                            return res;
-                        },
-
-                    },
-                    legend: {
-                        // 如果series 对象有name 值,则 legend可以不用写data
-                        itemGap: 20,
-                        itemHeight: 2,
-                        itemWidth: 15,
-                        icon: 'rect',
-                        textStyle: {
-                            color: "#fff"
-                        },
-                        top: "bottom",
-                    },
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "15%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true // 包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF" // 文本颜色
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        }
-                    },
-
-                    yAxis: {
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#aaa", // 分割线颜色
-                                opacity: '0.2'
-                            }
-                        }
-                    },
-                    series: [{
-                            symbol: "none",
-                            name: "喷淋末端",
-                            type: "line",
-                            smooth: true, // true 可以让我们的折线显示带有弧度
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(255,156,0, 0.4)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(255,156,0, 0.3)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                    shadowColor: "rgba(0, 0, 0, 0.1)"
-                                }
-                            },
-
-
-                            data: sortData[0].data[0]
-                        },
-                        {
-                            symbol: "none",
-                            name: "消防栓",
-                            type: "line",
-                            smooth: true,
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0,
-                                        0,
-                                        0,
-                                        1, [{
-                                                offset: 0,
-                                                color: "rgba(0,150,255,0.5)"
-                                            },
-                                            {
-                                                offset: 0.8,
-                                                color: "rgba(0,150,255, 0.1)"
-                                            }
-                                        ],
-                                        false
-                                    ),
-                                    shadowColor: "rgba(0, 0, 0, 0.1)"
-                                }
-                            },
-
-                            data: sortData[0].data[1]
-                        }
-                    ]
-                };
-
-                myChart.setOption(option);
-                var img1 = document.getElementById('deviceLinkChart2_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-
-            })();
-
-
-            // 数据波动关联
-            (function() {
-
-                var sortData = [{
-                    data: [
-                        [30, 70, 100, 120, 130, 190, 200, 230, 120, 100, 90, 80, 59, 30],
-                    ]
-                }];
-
-                var xData = ['一到二层', '二到三层', '三到四层', '四到五层', '五到六层', '六到七层', '七到八层', '八到九层', '九到十层', '十到十一层', '十一到十二层', '十二到十三层']
-                    // 1. 实例化对象
-                var myChart = echarts.init(document.querySelector("#dataChangeChart1"));
-                // 2.指定配置
-                var option = {
-
-                    color: ["#FE92B3"], // 通过这个color修改三条线的颜色
-                    tooltip: {
-                        trigger: "axis",
-                        textStyle: {
-                            align: 'left' //图例左对齐
-                        },
-                        // backgroundColor: '#12DFE0',
-                        // formatter: '{a0}: {c0}<br />{b}'
-
-                    },
-                    legend: false,
-                    grid: {
-                        top: "0%",
-                        left: "1%",
-                        right: "1%",
-                        bottom: "1%",
-                        show: true, // 显示边框
-                        borderWidth: '0', //去除边框
-                        containLabel: true, // 不包含刻度文字在内
-                    },
-
-                    xAxis: {
-                        type: "category",
-                        boundaryGap: false,
-                        data: xData,
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            color: "#AADDFF", // 文本颜色
-                            interval: 0,
-                            rotate: 340,
-                            // formatter: function(val) {
-                            //     return val.split("").join("\n");
-                            // }, //横轴信息文字竖直显示
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        }
-                    },
-
-                    yAxis: {
-                        splitNumber: 8,
-                        type: "value",
-                        axisTick: {
-                            show: false // 去除刻度线
-                        },
-                        axisLabel: {
-                            show: false // 去除文本
-                        },
-                        axisLine: {
-                            show: false // 去除轴线
-                        },
-                        splitLine: {
-                            lineStyle: {
-                                color: "#012f4a", // 分割线颜色
-                                opacity: .2
-                            }
-                        }
-                    },
-                    series: [{
-                        symbol: "none",
-                        name: "异常水压值",
-                        type: "line",
-                        smooth: true,
-                        areaStyle: {
-                            normal: {
-                                color: new echarts.graphic.LinearGradient(
-                                    0,
-                                    0,
-                                    0,
-                                    1, [{
-                                            offset: 0,
-                                            color: "rgba(255,147,180,.6)"
-                                        },
-                                        {
-                                            offset: 0.8,
-                                            color: "rgba(255,147,180, 0.4)"
-                                        }
-                                    ],
-                                    false
-                                ),
-                            }
-                        },
-
-                        data: sortData[0].data[0]
-                    }]
-                };
-
-                myChart.setOption(option);
-                var img1 = document.getElementById('dataChangeChart1_img');
-                setTimeout(function() {
-                    img1.src = myChart.getDataURL();
-                }, 1000)
-
-
-            })();
-
-
-
-
-            /**水系统导出数据对接 end **/
-
-
-
-
-
-        } else {
-            alert('暂无数据')
-
-        }
-
-
-    }, function(errorMsg) {
-        alert("请求数据失败!");
-    }, 2)
-};
-
-function getSearchParamObj() {
-    let queryParam = {};
-    let buildingVal = $('#building').val();
-    let chooseTime = $('#chooseTime').val();
-    queryParam.company_code = buildingVal;
-    queryParam.generation_time = chooseTime;
-    return queryParam;
-
-}
-
-
-
-
-
-
-
-
-// 打印
-(function() {
-
-    $("#btnPrint").click(function() {
-        print_detail()
-    });
-
-    var print_detail = function() {
-
-        //打印前echarts图表转换成图片 start   
-        $('#divergenceChart1_img').show()
-        $('#divergenceChart1').hide()
-
-        $('#hiddenCheckChart1_img').show()
-        $('#hiddenCheckChart1').hide()
-
-        $('#deviceLinkChart1_img,#deviceLinkChart2_img').show()
-        $('#deviceLinkChart1,#deviceLinkChart2').hide()
-
-        $('#dataChangeChart1_img').show()
-        $('#dataChangeChart1').hide()
-            //  end
-
-        var div1_label1 = document.getElementById('printArea').innerHTML;
-        var hkey_key;
-        var hkey_root = 'HKEY_CURRENT_USER';
-        var hkey_path = '\\Software\\Micorsoft\\Internet Explorer\\PageSetup\\';
-        var print_win = window.open('打印窗口', '_blank');
-        var div = document.createElement('div');
-        div.setAttribute('width', '100%');
-        div.setAttribute('height', '100%');
-        var div_print = document.createElement('div');
-        div_print.setAttribute('style', 'width:595px;height:842px;padding:50px 20px;margin:0px auto 0px auto');
-        div_print.innerHTML = div1_label1;
-        div.appendChild(div_print);
-
-        print_win.document.write(div.innerHTML);
-        print_win.document.close();
-        try {
-            var RegWsh = new ActiveXObject('WScript.Shell');
-            hkey_key = 'header';
-            RegWsh.RegWrite(hkey_root + hkey_path + hkey_key, '');
-            hkey_key = 'footer';
-            RegWsh.RegWrite(hkey_root + hkey_path + hkey_key, '');
-        } catch (e) {}
-        print_win.print();
-        print_win.close();
-    }
-})()

+ 0 - 48
layui/test.html

@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Layui</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-  <link rel="stylesheet" href="css/layui.css"  media="all">
-  <!-- 注意:如果你直接复制所有代码到本地,上述css路径需要改成你本地的 -->
-</head>
-<body>
-
- 
-<table class="layui-hide" id="test" lay-filter="test"></table>
-              
-          
-<script src="layui.js" charset="utf-8"></script>
- 
-<script>
-layui.use('table', function(){
-  var table = layui.table;
-  
-  table.render({
-    elem: '#test'
-    ,url:'/test/table/demo3.json'
-    ,toolbar: true
-    ,title: '用户数据表'
-    ,totalRow: true
-    ,cols: []
-    ,page: true
-    ,response: {
-      statusCode: 200 //重新规定成功的状态码为 200,table 组件默认为 0
-    }
-    ,parseData: function(res){ //将原始数据解析成 table 组件所规定的数据
-      return {
-        "code": res.status, //解析接口状态
-        "msg": res.message, //解析提示文本
-        "count": res.total, //解析数据长度
-        "data": res.rows.item //解析数据列表
-      };
-    }
-  });
-});
-</script>
-
-</body>
-</html>

+ 0 - 51
layui/test2.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>readystate</title>
-    <style>
-        .preloader {
-            position: fixed;
-            left: 0px;
-            top: 0px;
-            width: 100%;
-            height: 100%;
-            z-index: 999999;
-            background-color: #fff;
-            background-position: center center;
-            background-repeat: no-repeat;
-            background-image: url(../images/preloader.svg);
-        }
-    </style>
-</head>
-
-<body>
-    <!-- Preloader -->
-    <div class="preloader"></div>
-
-    
-    <script src="http://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
-
-    <script type="text/javascript">
-
-function handlePreloader() {
-  if($('.preloader').length){
-   $('.preloader').delay(200).fadeOut(500);
-  }
- }
-
- $(window).on('load', function() {
-  handlePreloader();
- });
-
-
-
-
-
-
-
-    </script>
-</body>
-
-</html>

+ 5 - 32
waterIndex.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>杨浦二期(水系统)</title>
     <link rel="shortcut icon" href="images/favicon.ico">
+    <script src="js/flexible.js"></script>
     <link rel="stylesheet" href="layui/css/layui.css">
     <link rel="stylesheet" href="css/index.css" />
 
@@ -154,8 +155,6 @@
 
             </section>
 
-
-
             <section class="deviceLink device_association">
                 <h4 class="big-tit">4 跨设备数据关联</h4>
 
@@ -178,7 +177,7 @@
 
             </section>
 
-            <section class="dataChange">
+            <section class="dataChange data_fluctuation">
                 <h4 class="big-tit">5 数据波动关联</h4>
 
                 <div id="dataChangeChart1" class="innerChart"></div>
@@ -188,7 +187,7 @@
                     <div>
                         <p>结论:</p>
                     </div>
-                    <div>
+                    <div class="summaryDetail">
                         <div>1、请检查绝缘皮出现硬化、裂纹;接触电阻变大,现硬化、裂纹;1、请检查绝缘皮出现硬化、裂纹;接触电阻变大,现硬化、裂纹;1、请检查绝缘皮出现硬化、裂纹;接触电阻变大,现硬化、裂纹;1、请检查绝缘皮出现硬化、裂纹;接触电阻变大,现硬化、裂纹;</div>
                     </div>
                 </div>
@@ -203,7 +202,7 @@
             <div class="filterSec">
                 <span>建筑</span>
                 <select name="" id="building">
-                    <option value="10012">建筑一</option>
+                    <option value="10246">建筑一</option>
                     <option value="10062">建筑二</option>
                 </select>
                 <span>时间</span>
@@ -349,7 +348,7 @@
 
 
 
-    <script src="js/flexible.js"></script>
+
 
     <script src="js/jquery.js"></script>
     <script src="layui/layui.js"></script>
@@ -362,33 +361,7 @@
 
 
     <script src="js/water.js"></script>
-    <script src="js/waterInner.js"></script>
     <script>
-        layui.use('laydate', function() {
-            var laydate = layui.laydate;
-            ///年月选择器
-            laydate.render({
-                elem: '#chooseTime',
-                type: 'month',
-                max: -30, //7天后
-                trigger: 'click', //呼出事件改成click
-
-                done: function(value, date, endDate) {
-                    setTimeout(function() {
-                        getListData(getSearchParamObj());
-                    }, 100)
-                }
-
-            });
-
-        });
-
-        $("#building").change(function() {
-            setTimeout(function() {
-                getListData(getSearchParamObj());
-            }, 100)
-
-        })
     </script>
 </body>
 

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott