From 20bac7bbc63788b14a40757da47a7f200d4155c1 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 22 四月 2021 09:00:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteGas/HourData.vue | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/HourData.vue b/src/components/BaseNav/WasteGas/HourData.vue
index 0fb69f2..a50c62b 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) {
@@ -310,7 +314,7 @@
if (nameList[j] === '浜屾哀鍖栫～') {
zdcbcolor = 'red'
zxcolor = '#fff21c'
- } else if (nameList[j] === '姘哀鍖栫墿') {
+ } else if (nameList[j] === '姘ㄦ爱') {
zdcbcolor = 'red'
zxcolor = '#00B0F0'
} else if (nameList[j] === '鐑熷皹') {
--
Gitblit v1.8.0