From a19ce43fb54c9d5e3aeb237ca3b2ca2f2abe0ba8 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 10:38:08 +0800
Subject: [PATCH] 废水图标完善
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue | 59 +++++++++--------------------------------------------------
1 files changed, 9 insertions(+), 50 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue
index b67cfa6..fbd04d6 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsRealWasteWater.vue
@@ -3,10 +3,10 @@
<div id="Tab">
<div class="animation">
<div class="infomation">
- <span class="grid-content">COD : <i>11.24385</i> 鏍囧噯 : 100</span>
- <span class="grid-content">姘哀 :<i>0.1889014</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鎬荤７ : <i>0.03812287</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸按娴侀噺 : <i>32.16287</i></span>
+ <span class="grid-content">COD : <i style="color: #e8ee0b">11.24385</i> 鏍囧噯 : 50</span>
+ <span class="grid-content">姘哀 :<i style="color: #e8ee0b">0.1889014</i> 鏍囧噯 : 30</span>
+ <span class="grid-content">鎬荤７ : <i style="color: #e8ee0b">0.03812287</i> 鏍囧噯 : 5</span>
+ <span class="grid-content">搴熸按娴侀噺 : <i style="color: #e8ee0b">32.16287</i></span>
</div>
</div>
<div class="form-echrts">
@@ -29,7 +29,7 @@
</div>
<div>
閲囨牱鐐规暟:
- <el-select v-model="formInline.region" placeholder="25">
+ <el-select v-model="formInline.region" placeholder="50">
<el-option label="0" value="0"></el-option>
<el-option label="25" value="25"></el-option>
<el-option label="50" value="50"></el-option>
@@ -38,37 +38,21 @@
</el-select>
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
- <div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
- <div class="el-dialog-div" style="height: 260px">
- <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ <div class="boxChart" style="height: 260px">
+ <div style="width: 100%;height: 100%;" id="popChart" ref="main">
+ </div>
</div>
</div>
- <!-- 鏄庣粏寮规 -->
- <el-dialog :visible.sync="dialogVisible"
- :append-to-body="true"
- :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[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>
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
import 'dayjs/locale/es'
import dayjs from 'dayjs'
export default {
name: 'ECharts',
- components: {
- PublicDetailedList
- },
data () {
return {
value1: '',
@@ -266,9 +250,7 @@
}
},
mounted () {
- this.$nextTick(() => {
- this.onSubmit()
- })
+ this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
methods: {
onSubmit () {
@@ -616,29 +598,6 @@
</script>
<style scoped lang="less">
-//.animation{
-// padding: 0 1rem;
-// overflow: hidden;
-// //width: 1rem;
-// .infomation{
-// display: flex;
-// //margin: 0 1rem;
-// overflow: hidden;
-// animation: move 1s linear 0s infinite;
-// @keyframes move {
-// 0% {
-// }
-// 100% {
-// transform: translateX(-10%);
-// }
-// }
-// /* 榧犳爣缁忚繃marquee 灏卞仠姝㈠姩鐢� */
-// &:hover {
-// //z-index: 9999999;
-// animation-play-state: paused;
-// }
-// }
-//}
.grid-content{
font-size: 8px;
background-color: #2e4967;
--
Gitblit v1.8.0