From 682bfa52d2697aaf79a3815e99558cf07623bc7c Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 07 四月 2021 11:38:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 70 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 6 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index cdad7bf..5ab9de8 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -1,10 +1,44 @@
<template>
- <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
+ <div id="Tab">
+ <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>
+ </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"
+ :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName"
+ width="68%"
+ center
+ v-dialogDrag
+ >
+ <div class="el-dialog-div" style="height: 500px">
+ <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)
@@ -174,10 +208,34 @@
</script>
<style scoped lang="less">
- #echarts{
- margin: 0;
- padding: 0;
- border: 1px solid #396d83;
- margin: 10px 10px 10px 10px;
+ .Infomation{
+ margin-left: 10px;
+ }
+ .el-tag{
+ height: 25px;
+ 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%;
+ 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