src/assets/css/map/map-panel-style.less | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/PublicBounced/PublicBounced.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/conf/MapConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/assets/css/map/map-panel-style.less
@@ -250,4 +250,23 @@ .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 { color: #00fff6; } .el-table__row>td{ border: none; } .el-table::before {//去掉最下面的那一条线 height: 0; } .el-table td, .el-table th.is-leaf { border: none; } .el-table .warning-row { background: #28304d; } .el-table .success-row { background: #30455f; } src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -6,18 +6,20 @@ <div class="border_corner border_corner_left_bottom"></div> <div class="border_corner border_corner_right_bottom"></div> <div class="main"> <div class="main-video"> <div class="main-table"> <el-table border stripe='stripe' :height="300" tooltip-effect="dark" :data="displayContentTableData" :row-class-name="tableRowClassName" > <el-table-column prop="StoragePlaceId" label="序号"></el-table-column> <el-table-column prop="StoragePlaceTypeName" label="类别"></el-table-column> <el-table-column prop="StoragePlaceName" label="固废名称"></el-table-column> <el-table-column prop="StorageZDMJ" label="代码"></el-table-column> <el-table-column prop="StorageZCNL" label="产生量"></el-table-column> <el-table-column prop="StorageZCL" label="储存量"></el-table-column> <el-table-column prop="StorageZCNL" label="产生量(t)"></el-table-column> <el-table-column prop="StorageZCL" label="储存量(t)"></el-table-column> <el-table-column prop="StorageType" label="产生装置"></el-table-column> </el-table> </div> @@ -38,42 +40,49 @@ this.$nextTick(() => { this.displayContentTable.forEach(item => { this.displayContentTableData = item // console.log(item[0]) }) }) }, methods: { tableRowClassName ({ row, rowIndex }) { if (rowIndex % 2 === 0) { return 'warning-row' } else if (rowIndex % 2 === 1) { return 'success-row' } return '' } } } </script> <style lang="less" scoped> .win { position: relative; background-color: rgba(33, 41, 69, 0.9); min-height: 300px; } .main { width: 100%; height: 100%; .main-video { .main-table { width: 100%; min-height: 195px; //border: 1px @color solid; video { width: 100%; height: 100%; outline: none; } } } .border_corner { z-index: 999; position: absolute; width: 14px; height: 14px; background: rgba(0, 0, 0, 0); border: 1.5px solid #47d5ea; border: 1px solid #47d5ea; } .border_corner_left_top { src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -16,22 +16,20 @@ </el-row> <el-row type="flex" class="row-bg" justify="space-around"> <el-col :span="8">排放去向:{{ setWasteGasdata.EmissDirecti }}</el-col> <el-col :span="8">控制级别名称:{{ setWasteGasdata.ContrLevelShowName }}</el-col> <el-col :span="8">内/外排口:{{ setWasteGasdata.OrOutPortName }}</el-col> <el-col :span="18">控制级别名称:{{ setWasteGasdata.ContrLevelShowName }}</el-col> <el-col :span="18">内/外排口:{{ setWasteGasdata.OrOutPortName }}</el-col> </el-row> </div> <div v-else-if="value === 'gufei'"> <el-row type="flex" class="row-bg row-item-one" justify="space-around"> <el-col :span="8">监测点名称:{{ displayContentTab2.StoragePlaceName }}</el-col> <el-col :span="8">生产单位:{{ displayContentTab2.StoragePlaceName }}</el-col> <el-col :span="8">排放类型加载:{{ displayContentTab2.DesignFloorArea }}</el-col> </el-row> <el-row type="flex" class="row-bg" justify="space-around"> <el-col :span="8">排放去向:{{ displayContentTab2.StorageQty }}</el-col> <el-col :span="8">控制级别名称:{{ displayContentTab2.SurplusFloorArea }}</el-col> <el-col :span="8">内/外排口:{{ displayContentTab2.StorageDate }}</el-col> </el-row> </div> <div v-else-if="value === 'gufei'"> <ul> <li>场所名称:{{ tabData.StoragePlaceName }}</li> <li>贮存能力:{{ tabData.StorageQty }}(吨)</li> <li>剩余贮存能力:{{ tabData.SurplusFloorArea }}(吨)</li> <li>占地面积(㎡):{{ tabData.DesignFloorArea }}(㎡)</li> <li>最近贮存日期:{{ tabData.StorageDate }}</li> <li></li> </ul> </div> <div v-else-if="value === 'feishui'"> <el-row type="flex" class="row-bg row-item-one" justify="space-around"> <el-col :span="8">监测点名称:{{ setWasteGasdata.Name }}</el-col> @@ -55,16 +53,19 @@ props: ['displayContentTab', 'value', 'setWasteGasdata'], data () { return { displayContentTab2: [] tabData: [] } }, mounted () { this.$nextTick(() => { this.displayContentTab.forEach(item => { this.displayContentTab2 = item // console.log(item) }) }) this.processingData() }, methods: { processingData () { for (var i = 0; i < this.displayContentTab.length; i++) { console.log(this.displayContentTab[i]) this.tabData = this.displayContentTab[i] } } } } </script> @@ -73,67 +74,103 @@ .win { position: relative; margin-bottom: 13px; background-color: rgba(33, 41, 69,0.9); margin-bottom: 10px; background-color: rgba(33, 41, 69, 0.9); } .main { width: 100%; height: 100%; .main-matter{ .main-matter { font-size: 13px; font-weight: normal; padding: 10px 6px; //padding: 10px 6px; min-height: 70px; border: 1px solid #396d83; .row-item-one{ .row-item-one { margin-bottom: 7px; } .el-row { width: 100%; color: #00d0f9; display: flex; font-size: 12px !important; .el-col{ .el-col { flex: 1; width: 100%; background-color: #243a55;; background-color: #243a55; text-align: center; line-height: 28px; margin-left: 6px; border-radius: 4px; &:nth-child(1){ margin-left:0; &:nth-child(1) { margin-left: 0; } } } ul { width: 100%; height: 100%; display: flex; align-items: center; justify-content: space-around; flex-wrap: wrap; line-height: 35px; li { text-align: center; width: 32%; height: 30px; margin: 5px auto; background-color: #243a55; color: #00d0f9; border-radius: 4px; } li:last-child { visibility: hidden } } } } .border_corner{ .border_corner { z-index: 999; position: absolute; width: 10px; height: 10px; background: rgba(0,0,0,0); border: 1.5px solid #47d5ea; //height: 10px; background: rgba(0, 0, 0, 0); border: 1px solid #47d5ea; } .border_corner_left_top{ .border_corner_left_top { top: 0; left: 0; border-right: none; border-bottom: none; } .border_corner_right_top{ .border_corner_right_top { top: 0; right: 0; border-left: none; border-bottom: none; } .border_corner_left_bottom{ .border_corner_left_bottom { bottom: 0; left: 0; border-right: none; border-top: none; } .border_corner_right_bottom{ .border_corner_right_bottom { bottom: 0; right: 0; border-left: none; src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
@@ -6,12 +6,12 @@ <div class="border_corner border_corner_left_bottom"></div> <div class="border_corner border_corner_right_bottom"></div> <div class="main"> <div class="main-video"> <!-- <div class="main-video">--> <video controls> <source src="movie.mp4" type="video/mp4"> <source src="movie.ogg" type="video/ogg"> </video> </div> <!-- </div>--> </div> </div> </template> @@ -30,15 +30,14 @@ .main { border: 1px solid #396d83; padding: 6px; .main-video { width: 100%; height: 100%; //.main-video { height: 378px; video { width: 100%; height: 100%; height: 378px; outline: none; } } //} } .border_corner{ z-index: 999; @@ -46,7 +45,7 @@ width: 14px; height: 14px; background: rgba(0,0,0,0); border: 1.5px solid #47d5ea; border: 1px solid #47d5ea; } .border_corner_left_top{ top: 0; src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,15 +6,16 @@ </div> <div class="public-bounced-content"> <div class="public-bounced-content-left"> <PublicTabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></PublicTabs> <public-tabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></public-tabs> <div class="public-bounced-content-left-bottom"> <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable> <PublicChart v-else></PublicChart> <public-table v-if="value === 'gufei'" :displayContentTable="displayContentTable"></public-table> <public-chart v-else></public-chart> </div> </div> <div class="public-bounced-content-right"> <PublicVideo></PublicVideo> <public-video></public-video> </div> </div> </div> @@ -48,13 +49,13 @@ }, methods: { setData (dataBasic, dataDetailed, value) { this.flag = true this.value = value dataBasic.forEach(item => { this.displayContentTitle = item.StoragePlaceName }) this.displayContentTab = dataBasic this.displayContentTable = dataDetailed this.flag = true this.value = value }, setGasData (data, value) { this.setWasteGasdata = data @@ -102,20 +103,22 @@ .public-bounced-content { margin: 15px auto; display: flex; //align-items: center; align-items: center; justify-content: space-around; padding: 10px; .public-bounced-content-left { flex: 3; height: 100%; margin-right: 10px; //width: 64%; //height: 100%; //margin-right: 10px; } .public-bounced-content-right { flex: 2; //width: 48%; height: 100%; margin-left: 10px; //width: 34%; //height: 100%; } } } src/conf/MapConfig.js
@@ -32,7 +32,7 @@ // center: [26, 104], center: [38.828558921813965, 117.41676807403564], // center: [29.454345703125, 113.40362548828125], zoom: 14, zoom: 5, worldCopyJump: true, inertia: true, zoomControl: false,