From f3f693a10d00b75f1eafe7f029cbd99bd3c9825b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 10:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index 0fc0cfb..c3338d4 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -6,13 +6,37 @@
<el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>
<el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>
</div>
- <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
+ <div class="form-echrts">
+ <div>
+ <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
+ <el-dialog :visible.sync="dialogVisible"
+ :append-to-body="true"
+ width="66%"
+ center
+ >
+ <div class="el-dialog-div" style="height: 600px">
+ <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ </div>
+ </el-dialog>
+ </div>
+ <div style="width:750px;height:260px;" id="echarts" ref="main">
+ </div>
+ </div>
</div>
</template>
<script>
+import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
export default {
name: 'ECharts',
+ components: {
+ PublicDetailedList
+ },
+ data () {
+ return {
+ dialogVisible: false
+ }
+ },
methods: {
drawChart: function () {
const myChart = this.$echarts.init(this.$refs.main)
@@ -195,10 +219,21 @@
border: none;
padding: 0 15px;
}
- #echarts{
- margin: 0;
- padding: 0;
- border: 1px solid #396d83;
- margin: 10px 10px 10px 10px;
+ .form-echrts{
+ width: 100%;
+ height: 100%;
+ border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ .el-dialog-div{
+ //height: 50vh!important;
+ overflow: auto;
+ //overflow: hidden;
+ }
+ #echarts {
+ margin: 0;
+ padding: 0;
+ //border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ }
}
</style>
--
Gitblit v1.8.0