派生自 wuyushui/SewerAndRainNetwork
| src/assets/css/map/map-panel-style.less | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/BaseNav/PublicBounced/PublicBounced.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/LayerController/logic/WasteWater.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/assets/css/map/map-panel-style.less
@@ -333,12 +333,32 @@ } /*************** PublicTable 表格样式。*********************************/ .cell { padding: 0; .el-table{ .el-table__body-wrapper::-webkit-scrollbar { width: 0; height: 0; background: none; } .cell{ padding: 0 3px !important; i{ display: block; font-style: normal; font-size: 10px; line-height: 12px; } } } .el-table--border th{ border-right: none; border-left: 1px solid #ddd; } .el-table--border th.gutter{border-left: none} .el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell { /* padding-left: 10px; */ text-align: center; } .el-table th>.cell { @@ -351,9 +371,9 @@ height: 0; } .el-table td, .el-table th.is-leaf { border: none; font-size: 0.08rem; } .el-table .warning-row { background: #28304d; } @@ -367,10 +387,9 @@ //修改表格高度 .el-table td { padding: 0!important; height: 30px; line-height: 30px; font-size: 0.01rem !important; } /***********************************************动画效果************/ .transition{ transition: all .5s; @@ -420,3 +439,4 @@ .el-tabs__header .is-top { }
@@ -2,22 +2,29 @@ <template> <div id="Tab"> <div class="infomation"> <div> <span class="grid-content">氮氧化物 : 29.93 标准 : 100</span> <span class="grid-content">二氧化硫 : 17.34 标准 : 50</span> <span class="grid-content">烟尘 : 6.93 标准 : 30</span> <span class="grid-content">废气流量 : 120343.18</span> </div> <!-- <el-tag>氮氧化物 : 29.93 标准 : 100</el-tag>--> <!-- <el-tag>二氧化硫 : 17.34 标准 : 50</el-tag>--> <!-- <el-tag>烟尘 : 6.93 标准 : 30</el-tag>--> <!-- <el-tag>废气流量 : 120343.18</el-tag>--> <el-row> <el-col :span="6"><div class="grid-content bg-purple">氮氧化物 : 29.93 标准 : 100</div></el-col> <el-col :span="6"><div class="grid-content bg-purple">二氧化硫 : 17.34 标准 : 50</div></el-col> <el-col :span="6"><div class="grid-content bg-purple">烟尘 : 6.93 标准 : 30</div></el-col> <el-col :span="6"><div class="grid-content bg-purple">废气流量 : 120343.18</div></el-col> <!-- <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>--> </el-row> </div> <div class="form-echrts"> <div class="from-search"> <el-row type="flex"> <el-col :span="14"> <div class="pickerMon"> <div class="pickerData"> <span> 开始时间:</span> <span class="pickerTable"> <el-date-picker type="datetime" v-model="value1"> </el-date-picker> </span> <span class="pickerTable"><el-date-picker type="datetime" v-model="value1"> </el-date-picker></span> </div> <div class="pickerData"> <span >结束时间:</span> @@ -323,6 +330,19 @@ .Infomation { margin-left: 10px; } .el-tag { height: 25px; width: 140px; line-height: 25px; margin-right: 10px; font-size: 10px; background-color: rgba(0, 255, 246, 0.14); color: #00d0f9; border: none; padding: 0 15px; } .form-echrts { width: 100%; border-top: 1px solid #396d83; src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,31 +1,53 @@ <template> <div class="PublicDetailedList"> <el-table :data="tableData" max-height="500px" border> <el-scrollbar style="height: 50vh"> <el-table-column prop="OnLineMonEmissPointName" label="排放点"></el-table-column> <el-table :data="tableData" max-height="600px" border> <el-table-column prop="MonTimeStr" label="监测时间"></el-table-column> <el-table-column label="氮氧化物"> <el-table-column prop="MonQty" label="浓度(mg/m³)" width="60"></el-table-column> <el-table-column prop="OrglQty" label="折算值(mg/m³)" width="60"></el-table-column> <el-table-column prop="ConvertQty" label="标准值(mg/m³)" width="60"></el-table-column> <el-table-column prop="EmissQty" label="排放量(kg/h)" width="60"></el-table-column> <el-table-column prop="MonQty" width="70"> <template slot="header">浓度 <i>(mg/m³)</i></template> </el-table-column> <el-table-column prop="OrglQty" width="70"> <template slot="header">折算值 <i>(mg/m³)</i></template> </el-table-column> <el-table-column prop="ConvertQty" width="70"> <template slot="header">标准值 <i>(mg/m³)</i></template> </el-table-column> <el-table-column prop="EmissQty" width="70"> <template slot="header">排放量 <i>(kg/h)</i></template> </el-table-column> </el-table-column> <el-table-column label="二氧化硫"> <el-table-column prop="MonQty" label="浓度(mg/m³)" width="60"></el-table-column> <el-table-column prop="OrglQty" label="折算值(mg/m³)" width="60"></el-table-column> <el-table-column prop="ConvertQty" label="标准值(mg/m³)" width="60"></el-table-column> <el-table-column prop="EmissQty" label="排放量(kg/h)" width="60"></el-table-column> <el-table-column prop="MonQty" width="60"> <template slot="header">浓度 <i>(mg/m³)</i></template> </el-table-column> <el-table-column prop="OrglQty" width="60"> <template slot="header">折算值 <i>(mg/m³)</i></template> </el-table-column> <el-table-column prop="ConvertQty" width="60"> <template slot="header">标准值 <i>(mg/m³)</i></template> </el-table-column> <el-table-column prop="EmissQty" width="60"> <template slot="header">排放量 <i>(kg/h)</i></template> </el-table-column> </el-table-column> <el-table-column label="烟尘"> <el-table-column prop="MonQty" label="浓度(mg/m³)" width="60"></el-table-column> <el-table-column prop="OrglQty" label="折算值(mg/m³)" width="60"></el-table-column> <el-table-column prop="ConvertQty" label="标准值(mg/m³)" width="60"></el-table-column> <el-table-column prop="EmissQty" label="排放量(kg/h)" width="60"></el-table-column> <el-table-column prop="MonQty" width="60"> <template slot="header">浓度 <i>(mg/m³)</i></template> </el-table-column> <el-table-column label="废气流量"> <el-table-column prop="OrglQty" width="60"> <template slot="header">折算值 <i>(mg/m³)</i></template> </el-table-column> <el-table-column prop="ConvertQty" width="60"> <template slot="header">标准值 <i>(mg/m³)</i></template> </el-table-column> <el-table-column prop="EmissQty" label="排放量" width="60"> <template slot="header">排放量 <i>(kg/h)</i></template> </el-table-column> </el-table-column> <el-table-column label="废气流量" width="100"> <el-table-column prop="StdValue" label="气量"></el-table-column> </el-table-column> </el-scrollbar> <el-table-column prop="OnLineMonEmissPointName" label="排放点"></el-table-column> </el-table> </div> </template> src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,6 +14,7 @@ :displayContentTable="displayContentTable"></public-table> <public-chart v-else :getWasteGasDetails="getWasteGasDetails" :value="value" :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails" :getQueryOnlineMonData="getQueryOnlineMonData" :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails' > @@ -57,8 +58,8 @@ value: '', getWasteGasDetails: [], getWasteWaterMonitoringDetails: [], getQueryOnlineMonData: [] // getGasQueryOnlineMonData: [] getQueryOnlineMonHourData: [], getQueryOnlineMonDateData: [] } }, methods: { @@ -85,12 +86,15 @@ this.flag = true this.value = value }, setWaterData (dataWater, dataDetail, hourData, value) { setWaterData (dataWater, dataDetail, hourData, dateData, value) { this.setWasteWaterdata = dataWater // console.log(data) this.getQueryOnlineMonData = hourData this.getWasteWaterMonitoringDetails = dataDetail // 明细表数据 // console.log(dataDetail) this.getQueryOnlineMonHourData = hourData // 小时数据 // console.log(drawData) this.getWasteWaterMonitoringDetails = dataDetail this.getQueryOnlineMonDateData = dateData // 日数据 // console.log(dateData) this.displayContentTitle = dataWater.Name this.flag = true this.value = value src/components/LayerController/logic/WasteWater.js
@@ -62,21 +62,22 @@ endTime: '2020-04-07 15:13:20', dataType: '2' } // const dateValue = { // onLineMonEmissPointId: '23', // monItemId: '28,31', // beginTime: '2020-04-06 15:13:20', // endTime: '2020-04-07', // dataType: '1' // } const dateValue = { onLineMonEmissPointId: '23', monItemId: '28,31', beginTime: '2020-04-06', endTime: '2020-04-07', dataType: '1' } const hourData = await mapApi.getQueryOnlineMonData(hourValue) // const dateData = await mapApi.getQueryOnlineMonData(dateValue) const dateData = await mapApi.getQueryOnlineMonData(dateValue) console.log(dateData) // const drawback = await mapApi.getWasteWaterMonitoring() // console.log(drawback) const result = await mapApi.getWasteWaterMonitoringDetails(dataValue) const PublicBounced = window.Vue.extend(publicBounced) const instance = new PublicBounced() instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, 'feishui') instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui') // console.log(e.layer.options.test) instance.$mount() document.body.appendChild(instance.$el)
