增加单位和水系统增加具体时间

eleFireIndex.html

@@ -200,7 +200,6 @@
         </div>
     </div>
 
-
     <div class="page-container">
         <header>
             <h1>分析报告及数据可视化</h1>

js/eleFire.js

@@ -601,9 +601,9 @@ function getListData(queryParam = {}) {
 
                         formatter: function(params) {
                             if ($('#active').hasClass('active')) {
-                                var res = params[0].seriesName + '：' + params[0].value + '<br />' + params[1].seriesName + '：' + params[1].value + '<br />时间：' + data_time[params[0].dataIndex];
+                                var res = params[0].seriesName + '：' + params[0].value + 'mA<br />' + params[1].seriesName + '：' + params[1].value + 'V<br />时间：' + data_time[params[0].dataIndex];
                             } else {
-                                var res = params[0].seriesName + '：' + params[0].value + '<br />' + params[1].seriesName + '：' + params[1].value + '<br />时间：' + data_time2[params[0].dataIndex];
+                                var res = params[0].seriesName + '：' + params[0].value + 'mA<br />' + params[1].seriesName + '：' + params[1].value + 'V<br />时间：' + data_time2[params[0].dataIndex];
                             }
                             return res;
                         },
@@ -1115,7 +1115,7 @@ function getListData(queryParam = {}) {
                         top: "0%",
                         left: "1%",
                         right: "1%",
-                        bottom: "15%",
+                        bottom: "20%",
                         show: true, // 显示边框
                         borderWidth: '0', //去除边框
                         containLabel: true // 包含刻度文字在内
@@ -1126,6 +1126,7 @@ function getListData(queryParam = {}) {
                         boundaryGap: false,
                         data: d,
                         axisTick: {
+                            lineStyle: { color: 'rgb(150,150,150)' }
                             // show: true // 去除刻度线
                         },
                         axisLabel: {
@@ -1301,7 +1302,7 @@ function getListData(queryParam = {}) {
                         top: "0%",
                         left: "1%",
                         right: "1%",
-                        bottom: "15%",
+                        bottom: "20%",
                         show: true, // 显示边框
                         borderWidth: '0', //去除边框
                         containLabel: true // 包含刻度文字在内
@@ -1312,6 +1313,7 @@ function getListData(queryParam = {}) {
                         boundaryGap: false,
                         data: d2,
                         axisTick: {
+                            lineStyle: { color: 'rgb(150,150,150)' },
                             show: true
                         },
                         axisLabel: {
@@ -1482,7 +1484,7 @@ function getListData(queryParam = {}) {
                         top: "0%",
                         left: "1%",
                         right: "1%",
-                        bottom: "15%",
+                        bottom: "20%",
                         show: true, // 显示边框
                         borderWidth: '0', //去除边框
                         containLabel: true // 包含刻度文字在内
@@ -1493,6 +1495,7 @@ function getListData(queryParam = {}) {
                         boundaryGap: false,
                         data: d3,
                         axisTick: {
+                            lineStyle: { color: 'rgb(150,150,150)' },
                             show: true
                         },
                         axisLabel: {
@@ -1520,6 +1523,7 @@ function getListData(queryParam = {}) {
                     yAxis: {
                         type: "value",
                         axisTick: {
+
                             show: false // 去除刻度线
                         },
                         axisLabel: {
@@ -1659,7 +1663,7 @@ function getListData(queryParam = {}) {
                         top: "0%",
                         left: "1%",
                         right: "1%",
-                        bottom: "15%",
+                        bottom: "20%",
                         show: true, // 显示边框
                         borderWidth: '0', //去除边框
                         containLabel: true // 包含刻度文字在内
@@ -1670,6 +1674,7 @@ function getListData(queryParam = {}) {
                         boundaryGap: false,
                         data: d4,
                         axisTick: {
+                            lineStyle: { color: 'rgb(150,150,150)' },
                             show: true
                         },
                         axisLabel: {
@@ -1797,7 +1802,7 @@ function getListData(queryParam = {}) {
 
                         // formatter: '{a0}: {c0}<br />{a1}: {c1}<br />时间：' + chooseTime + ''
                         formatter: function(params) {
-                            var res = params[0].seriesName + '：' + params[0].value + '<br />' + params[1].seriesName + '：' + params[1].value + '<br />时间：' + data_time[params[0].dataIndex];
+                            var res = params[0].seriesName + '：' + params[0].value + 'mA<br />' + params[1].seriesName + '：' + params[1].value + 'V<br />时间：' + data_time[params[0].dataIndex];
                             return res;
                         },
 
@@ -1967,7 +1972,7 @@ function getListData(queryParam = {}) {
                         backgroundColor: '#12DFE0',
                         // formatter: '{a0}: {c0}<br />{a1}: {c1}<br />时间：' + chooseTime + ''
                         formatter: function(params) {
-                            var res = params[0].seriesName + '：' + params[0].value + '<br />' + params[1].seriesName + '：' + params[1].value + '<br />时间：' + data_time2[params[0].dataIndex];
+                            var res = params[0].seriesName + '：' + params[0].value + 'mA<br />' + params[1].seriesName + '：' + params[1].value + 'V<br />时间：' + data_time2[params[0].dataIndex];
                             return res;
                         },
 

js/water.js

@@ -260,11 +260,13 @@ function getListData(queryParam = {}) {
                 let a = [];
                 let b = [];
                 let c = [];
+                let data_time = [];
                 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)
+                    data_time.push(item.data_time)
                 });
 
                 var sortData = [{
@@ -320,7 +322,11 @@ function getListData(queryParam = {}) {
                             align: 'left' //图例左对齐
                         },
                         backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间：' + chooseTime + ''
+                        formatter: function(params) {
+                            var res = params[0].seriesName + '：' + params[0].value + '<br />' + params[1].seriesName + '：' + params[1].value + '<br />' + params[2].seriesName + '：' + params[2].value + '<br />时间：' + data_time[params[2].dataIndex];
+                            return res;
+                        },
+                        // formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间：' + chooseTime + ''
                     },
                     legend: {
                         // 如果series 对象有name 值，则 legend可以不用写data
@@ -434,20 +440,19 @@ function getListData(queryParam = {}) {
                 let location_description = [];
                 let start_pressure = [];
                 let end_pressure = [];
+                let data_time = [];
                 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)
+                        //时间
+                    data_time.push(item.data_time)
                 });
 
                 var xData = location_description;
@@ -464,8 +469,7 @@ function getListData(queryParam = {}) {
                         //提示框组件
                         trigger: 'axis',
                         formatter: function(params) {
-                            // console.log(params)
-                            var res = '位置：' + params[0].axisValue + '<br />异常水压值 ：' + abnormal_pressure[params[0].dataIndex] + 'Mpa';
+                            var res = '位置：' + params[0].axisValue + '<br />异常水压值 ：' + abnormal_pressure[params[0].dataIndex] + 'Mpa<br />时间：' + data_time[params[0].dataIndex];
                             return res;
                         },
                         axisPointer: {
@@ -610,25 +614,29 @@ function getListData(queryParam = {}) {
                 // 喷淋末端、消火栓与水泵启停关联
                 let spray_end = [];
                 let fire_hydrant = [];
-                let pump_status = []
+                let pump_status = [];
+                let data_time = [];
 
                 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)
+                    data_time.push(item.data_time)
                 });
 
                 // 喷淋末端、消火栓屋顶水箱液位关联
                 let spray_end2 = [];
                 let fire_hydrant2 = [];
-                let water_tank_level = []
+                let water_tank_level = [];
+                let data_time2 = [];
 
                 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)
+                    data_time2.push(item.data_time)
                 });
 
                 var sortData = [{
@@ -668,9 +676,9 @@ function getListData(queryParam = {}) {
                         backgroundColor: '#12DFE0',
                         formatter: function(params) {
                             if ($('#active').hasClass('active')) {
-                                var res = params[0].seriesName + '：' + params[0].value + '<br />' + params[1].seriesName + '：' + params[1].value + '<br />水泵启动状态 ：' + pump_status[params[0].dataIndex] + '<br />时间：' + chooseTime + '';
+                                var res = params[0].seriesName + '：' + params[0].value + 'Mpa<br />' + params[1].seriesName + '：' + params[1].value + 'Mpa<br />水泵启动状态 ：' + pump_status[params[0].dataIndex] + '<br />时间：' + data_time[params[0].dataIndex] + '';
                             } else {
-                                var res = params[0].seriesName + '：' + params[0].value + '<br />' + params[1].seriesName + '：' + params[1].value + '<br /> 水箱液位 ：' + water_tank_level[params[0].dataIndex] + '<br />时间：' + chooseTime + '';
+                                var res = params[0].seriesName + '：' + params[0].value + 'Mpa<br />' + params[1].seriesName + '：' + params[1].value + 'Mpa<br /> 水箱液位 ：' + water_tank_level[params[0].dataIndex] + 'm<br />时间：' + data_time2[params[0].dataIndex] + '';
                             }
                             return res;
                         },
@@ -826,6 +834,7 @@ function getListData(queryParam = {}) {
                 let position = [];
                 let before_fluctuation = [];
                 let after_fluctuation = [];
+                let data_time = [];
                 let volatility_data = data_fluctuation.volatility_data;
                 volatility_data.forEach(function(item, index) {
 
@@ -837,6 +846,10 @@ function getListData(queryParam = {}) {
 
                     //结束值
                     after_fluctuation.push(item.after_fluctuation)
+
+                    //时间
+                    data_time.push(item.data_time)
+
                 });
                 // 1. 实例化对象
                 var myChart = echarts.init(document.querySelector(".data_fluctuation .chart"));
@@ -850,7 +863,11 @@ function getListData(queryParam = {}) {
                         backgroundColor: '#12DFE0',
                         //提示框组件
                         trigger: 'axis',
-                        formatter: '{a0}: {c0}<span>Mpa</span><br />{a1}: {c1}<span>Mpa</span><br />时间：' + chooseTime + '',
+                        formatter: function(params) {
+                            var res = params[0].seriesName + '：' + params[0].value + 'Mpa<br />' + params[1].seriesName + '：' + params[1].value + 'Mpa<br />' + data_time[params[1].dataIndex];
+                            return res;
+                        },
+                        // formatter: '{a0}: {c0}<span>Mpa</span><br />{a1}: {c1}<span>Mpa</span><br />时间：' + chooseTime + '',
                         axisPointer: {
                             type: 'shadow',
                         },
@@ -982,6 +999,11 @@ function getListData(queryParam = {}) {
                  主页面数据对接 end
             */
 
+
+            /* 
+                 导出数据对接 start
+            */
+
             //项目情况
             var project_situation = result.RESULT[0].project_situation;
             var items = '';
@@ -1051,11 +1073,13 @@ function getListData(queryParam = {}) {
                 let a = [];
                 let b = [];
                 let c = [];
+                let data_time = [];
                 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)
+                    data_time.push(item.data_time)
                 });
 
                 var sortData = [{
@@ -1110,7 +1134,11 @@ function getListData(queryParam = {}) {
                             align: 'left' //图例左对齐
                         },
                         backgroundColor: '#12DFE0',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间：2021年3月{b}日'
+                        formatter: function(params) {
+                            var res = params[0].seriesName + '：' + params[0].value + '<br />' + params[1].seriesName + '：' + params[1].value + '<br />' + params[2].seriesName + '：' + params[2].value + '<br />时间：' + data_time[params[2].dataIndex];
+                            return res;
+                        },
+                        // formatter: '{a0}: {c0}<br />{a1}: {c1}<br />{a2}: {c2}<br />时间：2021年3月{b}日'
 
                     },
                     legend: {
@@ -1228,6 +1256,7 @@ function getListData(queryParam = {}) {
                 let location_description = [];
                 let start_pressure = [];
                 let end_pressure = [];
+                let data_time = [];
                 let leakage_data = leakage_investigation.leakage_data;
                 leakage_data.forEach(function(item, index) {
 
@@ -1242,6 +1271,9 @@ function getListData(queryParam = {}) {
 
                     //结束值
                     end_pressure.push(item.end_pressure)
+
+                    //时间
+                    data_time.push(item.data_time)
                 });
 
                 var xData = location_description;
@@ -1253,13 +1285,14 @@ function getListData(queryParam = {}) {
                     backgroundColor: 'transparent',
                     color: ['rgba(0,150,255,.5)', 'rgba(255,156,0,.5)'],
                     tooltip: {
+                        backgroundColor: '#12DFE0',
                         //提示框组件
                         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<br />时间：' + data_time[params[0].dataIndex];
                             return res;
                         },
+
                         axisPointer: {
                             type: 'shadow',
                         },
@@ -1267,7 +1300,7 @@ function getListData(queryParam = {}) {
 
                             fontStyle: 'normal',
                             fontFamily: '微软雅黑',
-                            fontSize: 12,
+
                         },
                     },
                     grid: {
@@ -1387,13 +1420,15 @@ function getListData(queryParam = {}) {
             // 喷淋末端、消火栓与水泵启停关联
             let spray_end = [];
             let fire_hydrant = [];
-            let pump_status = []
+            let pump_status = [];
+            let data_time = [];
 
             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)
+                data_time.push(item.data_time)
             });
 
             (function() {
@@ -1425,7 +1460,7 @@ function getListData(queryParam = {}) {
                         },
                         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 + '';
+                            var res = params[0].seriesName + '：' + params[0].value + 'Mpa<br />' + params[1].seriesName + '：' + params[1].value + '<br />水泵启动状态 ：' + pump_status[params[0].dataIndex] + 'Mpa<br />时间：' + data_time[params[0].dataIndex] + '';
                             return res;
                         },
                     },
@@ -1557,12 +1592,14 @@ function getListData(queryParam = {}) {
             // 喷淋末端、消火栓屋顶水箱液位关联
             let spray_end2 = [];
             let fire_hydrant2 = [];
+            let data_time2 = [];
             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)
+                data_time2.push(item.data_time)
                 water_tank_level.push(item.water_tank_level)
             });
             (function() {
@@ -1595,7 +1632,7 @@ function getListData(queryParam = {}) {
                         },
                         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 + '';
+                            var res = params[0].seriesName + '：' + params[0].value + 'Mpa<br />' + params[1].seriesName + '：' + params[1].value + 'Mpa<br /> 水箱液位 ：' + water_tank_level[params[0].dataIndex] + 'm<br />时间：' + data_time[params[0].dataIndex] + '';
 
                             return res;
                         },
@@ -1740,6 +1777,7 @@ function getListData(queryParam = {}) {
                 let position = [];
                 let before_fluctuation = [];
                 let after_fluctuation = [];
+                let data_time = [];
                 let volatility_data = data_fluctuation.volatility_data;
                 volatility_data.forEach(function(item, index) {
 
@@ -1751,6 +1789,8 @@ function getListData(queryParam = {}) {
 
                     //结束值
                     after_fluctuation.push(item.after_fluctuation)
+
+                    data_time.push(item.data_time)
                 });
                 // 1. 实例化对象
                 var myChart = echarts.init(document.querySelector("#dataChangeChart1"));
@@ -1763,7 +1803,11 @@ function getListData(queryParam = {}) {
                         backgroundColor: '#12DFE0',
                         //提示框组件
                         trigger: 'axis',
-                        formatter: '{a0}: {c0}<br />{a1}: {c1}<br />时间：' + chooseTime + '',
+                        // formatter: '{a0}: {c0}<br />{a1}: {c1}<br />时间：' + chooseTime + '',
+                        formatter: function(params) {
+                            var res = params[0].seriesName + '：' + params[0].value + 'Mpa<br />' + params[1].seriesName + '：' + params[1].value + 'Mpa<br />' + data_time[params[1].dataIndex];
+                            return res;
+                        },
                         axisPointer: {
                             type: 'shadow',
                         },
@@ -1901,7 +1945,7 @@ function getListData(queryParam = {}) {
             })();
 
             /* 
-                 导出数据对接 start
+                 导出数据对接 end
             */
 
 

waterIndex.html

@@ -106,7 +106,7 @@
                         <td>处理数</td>
                         <td>未处理数</td>
                         <td>处置率</td>
-                        <td>备注</td>
+                        <td>未处置率</td>
                     </tr>
                     <tbody id="data_statistics"></tbody>
                     <!-- <tr>