From 610977c95dec18b78e3e50be5d172d2cb94de86a Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期一, 12 四月 2021 09:55:36 +0800 Subject: [PATCH] 修改废气图表 --- src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue | 138 ++++++++++++++++++++++++++++------------------ 1 files changed, 84 insertions(+), 54 deletions(-) diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue index 00a1f84..0d40bc9 100644 --- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue +++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue @@ -1,34 +1,27 @@ <!-- 鏃ユ暟鎹� --> <template> - <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>--> - <el-row> - <el-col :span="6"><div class="grid-content bg-purple">姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</div></el-col> - <el-col :span="6"><div class="grid-content bg-purple">浜屾哀鍖栫~ : 17.34 鏍囧噯 : 50</div></el-col> - <el-col :span="6"><div class="grid-content bg-purple">鐑熷皹 : 6.93 鏍囧噯 : 30</div></el-col> - <el-col :span="6"><div class="grid-content bg-purple">搴熸皵娴侀噺 : 120343.18</div></el-col> - <!-- <el-col :span="6"><div class="grid-content bg-purple"></div></el-col>--> - </el-row> - </div> - <div class="form-echrts"> - <div class="from-search"> - <el-row type="flex"> - <el-col :span="14"> - <div class="pickerMon"> - <div class="pickerData"> - <span> 寮�濮嬫椂闂�:</span> - <span class="pickerTable"><el-date-picker - type="datetime" - v-model="value1"> - </el-date-picker></span> - </div> - <div class="pickerData"> - <span >缁撴潫鏃堕棿:</span> - <span class="pickerTable"> + <div id="Tab"> + <div class="animation"> + <div class="infomation"> + <span class="grid-content">姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</span> + <span class="grid-content">浜屾哀鍖栫~ : 17.34 鏍囧噯 : 50</span> + <span class="grid-content">鐑熷皹 : 6.93 鏍囧噯 : 30</span> + <span class="grid-content">搴熸皵娴侀噺 : 120343.18</span> + </div> + </div> + <div class="form-echrts"> + <div class="from-search"> + <div class="pickerMon"> + <div class="pickerData"> + <span> 寮�濮嬫椂闂�:</span> + <span class="pickerTable"> + <el-date-picker type="datetime" v-model="value1"> + </el-date-picker> + </span> + </div> + <div class="pickerData"> + <span >缁撴潫鏃堕棿:</span> + <span class="pickerTable"> <el-date-picker type="datetime" v-model="value2" @@ -39,7 +32,7 @@ </div> <div> 閲囨牱鐐规暟: - <input list="source" id="ipt" class="echatsInput" v-model="value" @change="datalistBtn"> + <input list="source" id="ipt" class="echatsInput" @change="datalistBtn"> <datalist id="source" @click="datalistBtn"> <option value="0" /> <option value="25" /> @@ -84,7 +77,7 @@ watchData: [], dialogVisible: false, myChar: null, - value: '50', + value: '', formInline: { user: '', region: '' @@ -315,34 +308,71 @@ this.myChart = this.$echarts.init(this.$refs.main) this.myChart.setOption(opitons) }) + }, + // 鍦板浘鍒囨崲 + updateBasemapList () { + this.basemapList = this.basemapHelper.getBasemapList() + console.log(this.basemapList) + }, + changeBasemap (itm) { + const code = itm.code + this.basemapList.forEach((item) => { + if (item.code === code) { + console.log(this.currentBaseMapCode) + if (this.currentBaseMapCode == null || this.currentBaseMapCode !== code) { + this.currentBaseMapCode = code + this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, true) + } else { + this.basemapHelper.showBasemap(item.code, item.conf.annotationCheck, false) + } + + this.basemapHelper.getBasemapList().forEach((item) => { + item.layer.bringToBack() + }) + } + }) } } </script> <style scoped lang="less"> - .grid-content{ - font-size: 8px!important; - background-color:#2e4967; - text-align: center; - margin: 0 2px 4px 2px; - border-radius: 2px; - } - .Infomation { - margin-left: 10px; - } - - .el-tag { - height: 25px; - width: 140px; - line-height: 25px; - margin-right: 10px; - font-size: 10px; - background-color: rgba(0, 255, 246, 0.14); - color: #00d0f9; - border: none; - padding: 0 15px; - } - +//.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 !important; + background-color: #2e4967; + text-align: center; + margin: 0 2px 4px 2px; + border-radius: 2px; + } +.animation { + //width: 600px; + //height: 0.06rem; + .Infomation { + margin-left: 10px; + } +} .form-echrts { width: 100%; border-top: 1px solid #396d83; -- Gitblit v1.8.0