From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteGas/HourData.vue | 131 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 63 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/HourData.vue b/src/components/BaseNav/WasteGas/HourData.vue
index 0fb69f2..170357c 100644
--- a/src/components/BaseNav/WasteGas/HourData.vue
+++ b/src/components/BaseNav/WasteGas/HourData.vue
@@ -19,26 +19,25 @@
</div>
</div>
<div class="detailbtn">鏌ヨ</div>
- <div class="detailbtn">鏄庣粏琛�</div>
+ <div class="detailbtn" @click="ScheduleShow">鏄庣粏琛�</div>
</div>
<div style="width:5rem;height:1.5rem;" id="echarts" ref="wastegashour"></div>
</div>
- <!-- 鏄庣粏寮规 -->
- <!-- <el-dialog :visible.sync="dialogVisible"-->
- <!-- :append-to-body="true"-->
- <!-- 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>-->
+ <!-- 鏄庣粏寮规-->
+ <el-dialog :visible.sync="showSchedule"
+ :modal="false"
+ v-dialogDrag
+ >
+ <div class="el-dialog-div" style="height: 200px">
+ <Scheduleof></Scheduleof>
+ </div>
+ </el-dialog>
</div>
</template>
<script>
// import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
+import Scheduleof from '@components/BaseNav/WasteGas/Scheduleof'
import PublicDataStandard from '../PublicDataStandard'
import dayjs from 'dayjs'
@@ -48,7 +47,8 @@
name: 'HourData',
components: {
// PublicDetailedList
- PublicDataStandard
+ PublicDataStandard,
+ Scheduleof
},
data () {
return {
@@ -98,6 +98,7 @@
timeStart: null,
timeEnd: null
},
+ showSchedule: false,
dataType: 2,
myChart: null,
exhbzz: null,
@@ -111,6 +112,9 @@
})
},
methods: {
+ ScheduleShow () {
+ this.showSchedule = !this.showSchedule
+ },
async initnData () {
// 鐢ㄤ簬鎺ュ彛鏁版嵁璇锋眰鐨勫弬鏁� 寮�濮�/缁撴潫鏃堕棿 || 鍙�夋嫨鏌ヨ鐨勫紑濮�/缁撴潫鏃堕棿
this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
@@ -123,7 +127,7 @@
dataType: this.dataType
}
const result = (await mapApi.getWasteGasMonData(data)).Result.DataInfo
- console.log(result)
+ // console.log(result)
this.get24HourDate(result)
},
get24HourDate (res) {
@@ -272,7 +276,7 @@
iconurl = 'image://../assets/imgs/legend/grn.png'
} else if (nameList[l] === '娓╁害') {
iconurl = 'image://../assets/imgs/legend/WenDu.png'
- } else {
+ } else if (nameList[l] === '搴熸皵娴侀噺') {
iconurl = 'image://../assets/imgs/legend/VOCs.png'
}
@@ -316,12 +320,9 @@
} else if (nameList[j] === '鐑熷皹') {
zdcbcolor = 'red'
zxcolor = '#f48183'
- } else if (nameList[j] === '娓╁害') {
+ } else if (nameList[j] === '搴熸皵娴侀噺') {
zdcbcolor = 'red'
- zxcolor = '#F206FF'
- } else {
- zdcbcolor = 'red'
- zxcolor = '#9ACD32'
+ zxcolor = '#8fdc6e'
}
const ydata = {
name: nameList[j],
@@ -354,6 +355,8 @@
dataUnit = '姘旈噺(m鲁/h)'
}
+ const bzzList = this.exhbzzList
+
const serLists = []
for (let j = 0; j < ydatas.length; j++) {
const len = ydatas[j].data.length
@@ -365,7 +368,7 @@
}
for (let i = 0; i < ydatas.length; i++) {
- // const zdcbcolor = ydatas[i].zdcbcolor
+ const zdcbcolor = ydatas[i].zdcbcolor
const bzz = ydatas[i].bzz
let obj
if (bzz == null) {
@@ -375,31 +378,33 @@
symbolSize: 10, // 澶у皬
smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
yAxisIndex: 1,
- // itemStyle: {
- // normal: {
- // color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
- // let biaozhuiz
- // for (let i = 0; i < exhbzzList.length; i++) {
- // if (exhbzzList[i].name === c.seriesName) {
- // biaozhuiz = exhbzzList[i].bzhui
- // }
- // }
- // if (c.value > 999999999999) {
- // return zdcbcolor
- // } else {
- // return '#33c95f'
- // }
- // },
- // lineStyle: { // 鎶樼嚎鐨勯鑹�
- // color: ydatas[i].zxcolor,
- // width: 5
- // },
- // borderColor: ydatas[i].zxcolor, // 鎶樼偣杈规鐨勯鑹�
- // label: { // 鏄剧ず鍊�
- // show: false
- // }
- // }
- // },
+ itemStyle: {
+ normal: {
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ let biaozhuiz
+ for (let i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name === c.seriesName) {
+ biaozhuiz = bzzList[i].bzhui
+ }
+ }
+ if (c.value[1] > biaozhuiz) {
+ return zdcbcolor
+ } else if (c.value[1] > biaozhuiz * 0.9) {
+ return '#FFA500'
+ } else {
+ return '#33c95f'
+ }
+ },
+ lineStyle: { // 鎶樼嚎鐨勯鑹�
+ color: ydatas[i].zxcolor,
+ width: 5
+ },
+ borderColor: ydatas[i].zxcolor, // 鎶樼偣杈规鐨勯鑹�
+ label: { // 鏄剧ず鍊�
+ show: false
+ }
+ }
+ },
type: 'line',
data: ydatas[i].data
}
@@ -411,21 +416,21 @@
smooth: false, // 鐩寸嚎 锛宼rue 涓烘洸绾�
itemStyle: {
normal: {
- // color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
- // let biaozhuiz
- // for (let i = 0; i < exhbzzList.length; i++) {
- // if (exhbzzList[i].name == c.seriesName) {
- // biaozhuiz = exhbzzList[i].bzhui
- // }
- // }
- // if (c.value > biaozhuiz) {
- // return zdcbcolor
- // } else if (c.value > biaozhuiz * 0.9) {
- // return '#FFA500'
- // } else {
- // return '#33c95f'
- // }
- // },
+ color: function (c) { // 鏍规嵁value 鏄剧ず涓嶅悓鐨勬姌鐐归鑹�
+ let biaozhuiz
+ for (let i = 0; i < bzzList.length; i++) {
+ if (bzzList[i].name === c.seriesName) {
+ biaozhuiz = bzzList[i].bzhui
+ }
+ }
+ if (c.value[1] > biaozhuiz) {
+ return zdcbcolor
+ } else if (c.value[1] > biaozhuiz * 0.9) {
+ return '#FFA500'
+ } else {
+ return '#33c95f'
+ }
+ },
lineStyle: { // 鎶樼嚎鐨勯鑹�
color: ydatas[i].zxcolor,
width: 5
@@ -509,7 +514,7 @@
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#f48183;"></span>'
} else if (seriesName === '娓╁害') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#F206FF;"></span>'
- } else {
+ } else if (seriesName === '搴熸皵娴侀噺') {
maker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#4ec99c;"></span>'
}
s += maker + seriesName + ':' + valueFliter + '<br />'
@@ -619,7 +624,7 @@
type: 'value',
name: dataUnit,
max: function (value) {
- const ma = value.max > 120 ? value.max : 120
+ const ma = value.max > 12 ? value.max : 12
return parseInt(ma)
},
axisLabel: {
--
Gitblit v1.8.0