From 8e2f05701ae08a22630b3ff1bd490945e5a936ba Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期二, 30 三月 2021 17:27:18 +0800 Subject: [PATCH] 弹窗样式修改 --- src/assets/images/map-pages/basenav/flugas/exhaust/fq_blue.png | 0 src/assets/images/map-pages/basenav/flugas/exhaust/fq_bright_green.png | 0 src/assets/images/map-pages/basenav/flugas/exhaust/fq_gray.png | 0 src/assets/images/map-pages/basenav/flugas/exhaust/fq_green.png | 0 src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue | 12 ++++- src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 36 +++++++++--------- src/assets/images/map-pages/basenav/flugas/exhaust/fq_yellow.png | 0 src/assets/images/map-pages/basenav/flugas/exhaust/fq_orange.png | 0 src/components/BaseNav/PublicBounced/PublicBounced.vue | 32 +++++++++++----- src/assets/images/map-pages/basenav/flugas/exhaust/fq_green_xc.png | 0 src/assets/images/map-pages/basenav/flugas/exhaust/fq_red.png | 0 11 files changed, 49 insertions(+), 31 deletions(-) diff --git a/src/assets/images/map-pages/basenav/flugas/exhaust/fq_blue.png b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_blue.png new file mode 100644 index 0000000..93edcb3 --- /dev/null +++ b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_blue.png Binary files differ diff --git a/src/assets/images/map-pages/basenav/flugas/exhaust/fq_bright_green.png b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_bright_green.png new file mode 100644 index 0000000..19b0397 --- /dev/null +++ b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_bright_green.png Binary files differ diff --git a/src/assets/images/map-pages/basenav/flugas/exhaust/fq_gray.png b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_gray.png new file mode 100644 index 0000000..590b183 --- /dev/null +++ b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_gray.png Binary files differ diff --git a/src/assets/images/map-pages/basenav/flugas/exhaust/fq_green.png b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_green.png new file mode 100644 index 0000000..08e8a59 --- /dev/null +++ b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_green.png Binary files differ diff --git a/src/assets/images/map-pages/basenav/flugas/exhaust/fq_green_xc.png b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_green_xc.png new file mode 100644 index 0000000..acc7c10 --- /dev/null +++ b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_green_xc.png Binary files differ diff --git a/src/assets/images/map-pages/basenav/flugas/exhaust/fq_orange.png b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_orange.png new file mode 100644 index 0000000..718f237 --- /dev/null +++ b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_orange.png Binary files differ diff --git a/src/assets/images/map-pages/basenav/flugas/exhaust/fq_red.png b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_red.png new file mode 100644 index 0000000..5f93934 --- /dev/null +++ b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_red.png Binary files differ diff --git a/src/assets/images/map-pages/basenav/flugas/exhaust/fq_yellow.png b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_yellow.png new file mode 100644 index 0000000..169ce4d --- /dev/null +++ b/src/assets/images/map-pages/basenav/flugas/exhaust/fq_yellow.png Binary files differ diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue index 9084a18..68a04dc 100644 --- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue +++ b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue @@ -8,7 +8,7 @@ <div class="border_corner border_corner_right_bottom"></div> <div class="main"> <div class="main-echarts"> - <div id="echarts" style="width:100%;height:100%" ref="main"></div> + <div id="echarts" ref="main"></div> </div> </div> </div> @@ -116,8 +116,8 @@ <style scoped lang="less"> .win { - width: 100%; - height: 100%; + //width: 100%; + //height: 100%; position: relative; //display: inline-block; background-color: rgba(33, 41, 69,0.9); @@ -158,7 +158,13 @@ width: 100%; height: 100%; .main-echarts{ + width: 100%; + height: 100%; border: 1px solid #396d83; } + #echarts{ + width: 425px; + height: 300px; + } } </style> diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue index 12f1a91..2c878b8 100644 --- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue +++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue @@ -1,23 +1,23 @@ <template> <div class="public-table"> - <el-table - :data="tableData" - style="width: 100%"> - <el-table-column - prop="date" - label="鏃ユ湡" - width="180"> - </el-table-column> - <el-table-column - prop="name" - label="濮撳悕" - width="180"> - </el-table-column> - <el-table-column - prop="address" - label="鍦板潃"> - </el-table-column> - </el-table> + <table border="1"> + <tr> + <th>111</th> + <th>111</th> + <th>111</th> + <th>111</th> + <th>111</th> + <th>111</th> + </tr> + <tr> + <td>4444444444</td> + <td>4444444444</td> + <td>4444444444</td> + <td>4444444444</td> + <td>4444444444</td> + <td>4444444444</td> + </tr> + </table> </div> </template> diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue index d0f1347..aa27868 100644 --- a/src/components/BaseNav/PublicBounced/PublicBounced.vue +++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue @@ -6,8 +6,9 @@ </div> <div class="public-bounced-content"> <div class="public-bounced-content-left"> - <GasTable :displayContent="displayContent"></GasTable> - <GasECharts></GasECharts> + <GasTab :displayContent="displayContent"></GasTab> + <PublicTable v-if="value === 'gufei'"></PublicTable> + <GasECharts v-else></GasECharts> </div> <div class="public-bounced-content-right"> <GasVideo></GasVideo> @@ -19,14 +20,16 @@ <script> import '@/components/BaseNav/SolidWaste/directive' -import GasTable from '@components/BaseNav/PublicBounced/GasComponents/GasTab' +import GasTab from '@components/BaseNav/PublicBounced/GasComponents/GasTab' +import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable' import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts' import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/GasVideo' export default { name: 'PublicBounced', components: { - GasTable, + GasTab, + PublicTable, GasECharts, GasVideo }, @@ -37,9 +40,10 @@ } }, methods: { - setData (data) { + setData (data, value) { this.displayContent = data this.flag = true + this.value = value }, closePopup () { this.flag = false @@ -51,11 +55,11 @@ <style lang="less" scoped> .public-bounced { z-index: 999; - position: fixed; + position: absolute; top: 50%; left: 50%; - //transform: translate(-50%, -50%); - background-color: #0f1432; + width: 60%; + background-color: #002432; border: 1px #9fc5c8 solid; .public-bounced-title { @@ -84,15 +88,23 @@ align-items: center; justify-content: space-around; padding: 12px; + //width: 100%; + //height: 100%; .public-bounced-content-left { - //flex: 1; + //float: left; + //display: flex; + flex: 1; + width: 100%; flex-direction: column; margin-right: 13px; } .public-bounced-content-right { - //flex: 1; + width: 100%; + height: 100%; + //float: left; + flex: 1; } } -- Gitblit v1.8.0