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/assets/css/map/map-panel-style.less
@@ -335,6 +335,7 @@ /*************** PublicTable 表格样式。*********************************/ .el-table{ border-bottom: 1px solid #fff; .el-table__body-wrapper::-webkit-scrollbar { width: 0; height: 0; @@ -353,7 +354,6 @@ .el-table--border th{ border-right: none; border-left: 1px solid #ddd; } .el-table--border th.gutter{border-left: none} src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -1,30 +1,23 @@ <!-- 日数据 --> <template> <div id="Tab"> <div class="animation"> <div class="infomation"> <!-- <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> <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> </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> @@ -39,7 +32,7 @@ </div> <div> 采样点数: <input list="source" id="ipt" class="echatsInput" v-model="value" @change="datalistBtn"> <input list="source" id="ipt" class="echatsInput" @change="datalistBtn"> <datalist id="source" @click="datalistBtn"> <option value="0" /> <option value="25" /> @@ -84,7 +77,7 @@ watchData: [], dialogVisible: false, myChar: null, value: '50', value: '', formInline: { user: '', region: '' @@ -315,11 +308,57 @@ this.myChart = this.$echarts.init(this.$refs.main) this.myChart.setOption(opitons) }) }, // 地图切换 updateBasemapList () { this.basemapList = this.basemapHelper.getBasemapList() console.log(this.basemapList) }, changeBasemap (itm) { const code = itm.code this.basemapList.forEach((item) => { if (item.code === code) { console.log(this.currentBaseMapCode) if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) { this.currentBaseMapCode = code this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true) } else { this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false) } this.basemapHelper.getBasemapList().forEach((item) => { item.layer.bringToBack() }) } }) } } </script> <style scoped lang="less"> //.animation{ // padding: 0 1rem; // overflow: hidden; // //width: 1rem; // .infomation{ // display: flex; // //margin: 0 1rem; // overflow: hidden; // animation: move 1s linear 0s infinite; // @keyframes move { // 0% { // } // 100% { // transform: translateX(-10%); // } // } // /* 鼠标经过marquee 就停止动画 */ // &:hover { // //z-index: 9999999; // animation-play-state: paused; // } // } //} .grid-content{ font-size: 8px!important; background-color:#2e4967; @@ -327,22 +366,13 @@ margin: 0 2px 4px 2px; border-radius: 2px; } .animation { //width: 600px; //height: 0.06rem; .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,53 +1,31 @@ <template> <div class="PublicDetailedList"> <el-table :data="tableData" max-height="600px" border> <el-table :data="tableData" max-height="500px" border> <el-scrollbar style="height: 50vh"> <el-table-column prop="OnLineMonEmissPointName" label="排放点"></el-table-column> <el-table-column prop="MonTimeStr" label="监测时间"></el-table-column> <el-table-column label="氮氧化物"> <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 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> <el-table-column label="二氧化硫"> <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 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> <el-table-column label="烟尘"> <el-table-column prop="MonQty" width="60"> <template slot="header">浓度 <i>(mg/m³)</i></template> <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> <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 label="废气流量"> <el-table-column prop="StdValue" label="气量"></el-table-column> </el-table-column> <el-table-column prop="OnLineMonEmissPointName" label="排放点"></el-table-column> </el-scrollbar> </el-table> </div> </template> src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,7 +14,6 @@ :displayContentTable="displayContentTable"></public-table> <public-chart v-else :getWasteGasDetails="getWasteGasDetails" :value="value" :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails" :getQueryOnlineMonData="getQueryOnlineMonData" :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails' > @@ -58,8 +57,8 @@ value: '', getWasteGasDetails: [], getWasteWaterMonitoringDetails: [], getQueryOnlineMonHourData: [], getQueryOnlineMonDateData: [] getQueryOnlineMonData: [] // getGasQueryOnlineMonData: [] } }, methods: { @@ -81,7 +80,7 @@ this.setWasteGasdata = data this.getWasteGasDetails = dataDetails this.getQueryOnlineMonData = GasHourData // console.log(dataDetails) console.log(this.getQueryOnlineMonData) this.displayContentTitle = data.Name this.flag = true this.value = value @@ -89,12 +88,9 @@ setWaterData (dataWater, dataDetail, hourData, dateData, value) { this.setWasteWaterdata = dataWater // console.log(data) this.getWasteWaterMonitoringDetails = dataDetail // 明细表数据 // console.log(dataDetail) this.getQueryOnlineMonHourData = hourData // 小时数据 this.getQueryOnlineMonData = hourData // console.log(drawData) this.getQueryOnlineMonDateData = dateData // 日数据 // console.log(dateData) this.getWasteWaterMonitoringDetails = dataDetail this.displayContentTitle = dataWater.Name this.flag = true this.value = value