From 17a9663a92425787bf2c0f1e8f5360d4e8dbf3f9 Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期三, 07 四月 2021 15:28:32 +0800 Subject: [PATCH] 弹框修改 --- src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 25 ++++++------ src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 2 src/components/BaseNav/PublicBounced/PublicBounced.vue | 50 +++++++++++++++++++------ 3 files changed, 52 insertions(+), 25 deletions(-) diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue index 2b0e353..51d41e4 100644 --- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue +++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue @@ -37,15 +37,10 @@ data () { return { watchData: [], - dialogVisible: false - } - }, - methods: { - drawChart: function () { - const myChart = this.$echarts.init(this.$refs.main) - const option = { + dialogVisible: false, + options: { title: { - // text: '鎶樼嚎鍥惧爢鍙�' + // text: '鎶樼嚎鍥惧爢鍙�' }, color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'], tooltip: { @@ -84,9 +79,9 @@ color: '#00d0f9' } }] - // pageTextStyle: { - // color: '#fff' - // } + // pageTextStyle: { + // color: '#fff' + // } }, grid: { left: '3%', @@ -199,7 +194,13 @@ } ] } - myChart.setOption(option) + } + }, + methods: { + drawChart: function () { + const myChart = this.$echarts.init(this.$refs.main) + // const option = {} + myChart.setOption(this.options) } }, mounted () { diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue index c9c584c..3b33e08 100644 --- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue +++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue @@ -174,7 +174,7 @@ z-index: 999; position: absolute; width: 10px; - //height: 10px; + height: 10px; background: rgba(0, 0, 0, 0); border: 1px solid #47d5ea; } diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue index 1aaf67c..c97375d 100644 --- a/src/components/BaseNav/PublicBounced/PublicBounced.vue +++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue @@ -11,7 +11,8 @@ <div class="public-bounced-content-left-bottom"> <public-table v-if="value === 'gufei'" :displayContentTable="displayContentTable"></public-table> - <public-chart v-else :getWasteGasDetails="getWasteGasDetails" :getWasteWaterMonitoring="getWasteWaterMonitoring" ></public-chart> + <public-chart v-else :getWasteGasDetails="getWasteGasDetails" + :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart> </div> </div> <div class="public-bounced-content-right"> @@ -19,6 +20,31 @@ </div> </div> </div> +<!-- <el-dialog--> +<!-- :visible.sync="flag"--> +<!-- width="70%"--> +<!-- class="public-bounced"--> +<!-- :modal="false">--> +<!-- <div class="public-bounced-title">--> +<!-- <span>{{ displayContentTitle }}</span>--> +<!-- <i class="el-icon-circle-close" @click="closePopup"></i>--> +<!-- </div>--> +<!-- <div class="public-bounced-content">--> +<!-- <div class="public-bounced-content-left">--> +<!-- <public-tabs :displayContentTab="displayContentTab" :value="value"--> +<!-- :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>--> +<!-- <div class="public-bounced-content-left-bottom">--> +<!-- <public-table v-if="value === 'gufei'"--> +<!-- :displayContentTable="displayContentTable"></public-table>--> +<!-- <public-chart v-else :getWasteGasDetails="getWasteGasDetails"--> +<!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>--> +<!-- </div>--> +<!-- </div>--> +<!-- <div class="public-bounced-content-right">--> +<!-- <public-video></public-video>--> +<!-- </div>--> +<!-- </div>--> +<!-- </el-dialog>--> </template> <script> @@ -52,6 +78,9 @@ } }, methods: { + closePopup () { + this.flag = false + }, setData (dataBasic, dataDetailed, value) { this.flag = true this.value = value @@ -80,9 +109,6 @@ this.displayContentTitle = dataWater.Name this.flag = true this.value = value - }, - closePopup () { - this.flag = false } } } @@ -90,13 +116,13 @@ <style lang="less" scoped> .public-bounced { - width: 75%; - z-index: 999; - position: absolute; - bottom: 5%; - left: 15%; - background-color: #002432; - border: 1px #9fc5c8 solid; + //width: 75%; + //z-index: 999; + //position: absolute; + //bottom: 5%; + //left: 15%; + //background-color: #002432; + //border: 1px #9fc5c8 solid; .public-bounced-title { border: 1px #a4c0d8 solid; @@ -119,7 +145,7 @@ } .public-bounced-content { - margin: 15px auto; + margin: 15px 0; display: flex; //align-items: center; justify-content: space-around; -- Gitblit v1.8.0