From 6f52267465d2ce8e08ae0fd61bbe7f69b366a2c4 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 08 四月 2021 14:51:11 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 112 ++++---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 34 +-
src/assets/css/map/map-panel-style.less | 34 ++
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 299 +++++++++++++++++++++
src/components/panel/ToolBoxPanel.vue | 10
src/components/LayerController/logic/Company.js | 9
public/assets/images/map/company_oil.png | 0
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 28 +
src/components/LayerController/LayerController.vue | 29 +
/dev/null | 257 ------------------
src/assets/css/map/_map-variable.less | 1
src/components/table/components/tabHandover.vue | 7
public/assets/images/map/company_refining.png | 0
public/assets/images/map/company_sales.png | 0
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 16
15 files changed, 473 insertions(+), 363 deletions(-)
diff --git a/public/assets/images/map/company.png b/public/assets/images/map/company.png
deleted file mode 100644
index a48d213..0000000
--- a/public/assets/images/map/company.png
+++ /dev/null
Binary files differ
diff --git a/public/assets/images/map/company_oil.png b/public/assets/images/map/company_oil.png
new file mode 100644
index 0000000..cec6627
--- /dev/null
+++ b/public/assets/images/map/company_oil.png
Binary files differ
diff --git a/public/assets/images/map/company_refining.png b/public/assets/images/map/company_refining.png
new file mode 100644
index 0000000..faa99c1
--- /dev/null
+++ b/public/assets/images/map/company_refining.png
Binary files differ
diff --git a/public/assets/images/map/company_sales.png b/public/assets/images/map/company_sales.png
new file mode 100644
index 0000000..28a279a
--- /dev/null
+++ b/public/assets/images/map/company_sales.png
Binary files differ
diff --git a/src/assets/css/map/_map-variable.less b/src/assets/css/map/_map-variable.less
index 8ef5f52..64c7e30 100644
--- a/src/assets/css/map/_map-variable.less
+++ b/src/assets/css/map/_map-variable.less
@@ -6,6 +6,7 @@
@color-tool: #C0C4CC;//宸ュ叿鑹�
@color-shadow: #00fff6;//鏄剧ず棰滆壊
@background-color: rgba(0, 16, 30, .7);//鑳屾櫙濉厖鑹�
+@background-color4: rgba(0, 16, 30, .4);//鑳屾櫙濉厖鑹�
@background-color-light: rgba(40, 50, 100, .4);//鍏夋檿
@background-color-split: rgba(0, 255, 246, .14);//鍒嗗壊绾�
@background-color-tools: #1A4951;//宸ュ叿绠�
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index d61932f..161c604 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -1,5 +1,9 @@
@import "_map-variable";
-
+.leaflet-container,
+html,body{
+ // font-family: 'Microsoft YaHei';
+ font: 12px/1.5 "Microsoft YaHei", Arial, Helvetica, sans-serif;
+}
/*鍏ㄥ眬璁剧疆***********/
h1, h2, h3, h4, h5, h6, ul, li, p {
padding: 0;
@@ -243,18 +247,35 @@
/***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/
.company-bindTooltip {
- background: @background-color-split;
+ //background: @background-color-split;
+ background: none;
border: none;
color: red;
font-size: 16px;
- font-weight: 900 !important;
- text-shadow: 0 0 5px #fff;
+ box-shadow: none;
+ //text-shadow: 0 0 5px #fff;
//filter:Dropshadow(offx=1,offy=0,color=white)
//Dropshadow(offx=0,offy=1,color=white)
//Dropshadow(offx=0,offy=-1,color=white)
//Dropshadow(offx=-1,offy=0,color=white);
- box-shadow: none;
- -webkit-text-stroke: .5px #fff;
+ //box-shadow: none;
+ //-webkit-text-stroke: .5px #fff;
+ ul{
+ position: relative;
+ li:not(:first-child){
+ position: absolute;
+ top:0;
+ left:0;
+ width: 100%;
+ font-weight: 900;
+ }
+ li{
+ text-shadow: 0 0 4px #fff;
+ }
+ }
+}
+.company-bindTooltip:before{
+ display: none;
}
.company-bindTooltip-hover h3 {
@@ -345,6 +366,7 @@
.icon{
width: 20px;
margin: 0 auto;
+ font-size: 20px;
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
deleted file mode 100644
index ce510b7..0000000
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-<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>
- </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.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>
- <div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" 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 {
- watchData: [],
- dialogVisible: false,
- dataDate: [],
- options: {
- title: {
- // text: '鎶樼嚎鍥惧爢鍙�'
- },
- color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'],
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'cross',
- label: {
- color: '#1a4245'
- }
- }
- },
- legend: {
- x: '200px',
- y: '30px',
- data: [{
- name: '姘哀鍖栫墿',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '浜屾哀鍖栫～',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '鐑熷皹',
- textStyle: {
- color: '#00d0f9'
- }
- },
- {
- name: '搴熸皵娴侀噺',
- textStyle: {
- color: '#00d0f9'
- }
- }]
- // pageTextStyle: {
- // color: '#fff'
- // }
- },
- grid: {
- left: '3%',
- right: '1%',
- bottom: '3%',
- // top: '1%',
- containLabel: true
- },
- toolbox: {
- feature: {
- saveAsImage: {}
- }
- },
- // 鍥炬爣缂╂斁璁剧疆
- dataZoom: [{
- type: 'inside',
- start: 0,
- end: 100
- }, {
- start: 0,
- end: 100,
- show: false,
- // handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
- handleSize: '80%',
- handleStyle: {
- color: '#fff',
- shadowBlur: 3,
- shadowColor: 'rgba(0, 0, 0, 0.6)',
- shadowOffsetX: 2,
- shadowOffsetY: 2
- }
- }],
- // x杞寸殑璁剧疆
- xAxis: {
- type: 'category',
- boundaryGap: false,
- data: ['鍛ㄤ竴', '鍛ㄤ簩', '鍛ㄤ笁', '鍛ㄥ洓', '鍛ㄤ簲', '鍛ㄥ叚', '鍛ㄥ叚'],
- axisLabel: { // x杞村叏閮ㄦ樉绀�
- rotate: 20,
- interval: 0,
- textStyle: {
- color: '#fff'
- }
- },
- splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
- show: true,
- lineStyle: {
- type: 'dashed'
- }
- },
- axisTick: { // x 杞村埢搴︽樉绀�
- show: false
- },
- axisLine: {
- lineStyle: {
- color: '#FFFFFF',
- width: 1 // 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
- }
- }
- },
- // Y 杞寸殑璁剧疆
- yAxis: [{
- type: 'value',
- // position: 'left', // 澶� Y 杞翠娇鐢�
- // name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
- name: '娴撳害(mg/m鲁)',
- axisLabel: {
- formatter: '{value}',
- textStyle: {
- color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
- }
- },
- axisPointer: {
- snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
- },
- splitLine: {
- show: false // y杞� 缃戞牸绾夸笉鏄剧ず
- },
- axisLine: {
- lineStyle: {
- color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
- width: 1
- }
- }
- }],
- series: [
- {
- name: '姘哀鍖栫墿',
- type: 'line',
- stack: '鎬婚噺',
- data: [120, 132, 101, 134, 90, 230, 210]
- },
- {
- name: '浜屾哀鍖栫～',
- type: 'line',
- stack: '鎬婚噺',
- data: [150, 232, 201, 154, 190, 330, 410]
- },
- {
- name: '鐑熷皹',
- type: 'line',
- stack: '鎬婚噺',
- data: [320, 332, 301, 334, 390, 330, 320]
- },
- {
- name: '搴熸皵娴侀噺',
- type: 'line',
- stack: '鎬婚噺',
- data: [820, 932, 901, 934, 1290, 1330, 1320]
- }
- ]
- }
- }
- },
- methods: {
- drawChart: function () {
- const myChart = this.$echarts.init(this.$refs.main)
- myChart.setOption(this.options)
- }
- },
- mounted () {
- this.$nextTick(() => {
- this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
- // console.log(dataWatch)
- for (var i = 0; i < dataWatch.length; i++) {
- this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
- }
- // console.log(this.dataDate)
- })
- }
-}
-</script>
-
-<style scoped lang="less">
-.Infomation {
- margin-left: 10px;
- height: 0.2rem;
-}
-
-.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: 1rem;
- border-top: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .el-dialog-div {
- //height: 50vh!important;
- overflow: auto;
- //overflow: hidden;
- }
-
- #echarts {
- margin: 0;
- padding: 0;
- //height: 3rem;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- }
-}
-</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
new file mode 100644
index 0000000..3c40d37
--- /dev/null
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -0,0 +1,299 @@
+<!-- 灏忔椂鏁版嵁 -->
+<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>
+ </div>
+ <div class="form-echrts">
+ <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
+<!-- <div class="from-search">-->
+<!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">-->
+<!--<!– <el-form-item label="瀹℃壒浜�">–>-->
+<!--<!– <el-input v-model="formInline.user" placeholder="瀹℃壒浜�"></el-input>–>-->
+<!--<!– </el-form-item>–>-->
+<!-- <div class="block">-->
+<!-- <el-date-picker-->
+<!-- class="date"-->
+<!-- v-model="value"-->
+<!-- type="datetimerange"-->
+<!-- range-separator="鑷�"-->
+<!-- start-placeholder="寮�濮嬫棩鏈�"-->
+<!-- end-placeholder="缁撴潫鏃ユ湡">-->
+<!-- </el-date-picker>-->
+<!-- </div>-->
+<!-- <el-form-item label="閲囨牱鐐规暟" class="text-size">-->
+<!-- <el-select v-model="formInline.region" placeholder="0">-->
+<!-- <el-option label="0" value="shanghai"></el-option>-->
+<!-- <el-option label="25" value="beijing"></el-option>-->
+<!-- <el-option label="50" value="beijing"></el-option>-->
+<!-- <el-option label="75" value="beijing"></el-option>-->
+<!-- <el-option label="100" value="beijing"></el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item>-->
+<!-- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>-->
+<!-- <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>-->
+ <div style="width:100%;height:1rem;margin-top:-0.1rem;position:absolute;" 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 {
+ watchData: [],
+ dialogVisible: false,
+ dataDate: [],
+ value: '',
+ options: {
+ title: {
+ // text: '鎶樼嚎鍥惧爢鍙�'
+ },
+ color: ['#5470c6', '#91CC75', '#EE6666', '#FF0087'],
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'cross',
+ label: {
+ color: '#1a4245'
+ }
+ }
+ },
+ legend: {
+ x: '200px',
+ y: '30px',
+ data: [{
+ name: '姘哀鍖栫墿',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '浜屾哀鍖栫～',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '鐑熷皹',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '搴熸皵娴侀噺',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ }]
+ },
+ grid: {
+ left: '3%',
+ right: '1%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ },
+ // 鍥炬爣缂╂斁璁剧疆
+ dataZoom: [{
+ type: 'inside',
+ start: 0,
+ end: 100
+ }, {
+ start: 0,
+ end: 100,
+ show: false,
+ // handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+ handleSize: '80%',
+ handleStyle: {
+ color: '#fff',
+ shadowBlur: 3,
+ shadowColor: 'rgba(0, 0, 0, 0.6)',
+ shadowOffsetX: 2,
+ shadowOffsetY: 2
+ }
+ }],
+ // x杞寸殑璁剧疆
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: ['12:00:00', '13:00:00', '14:00:00', '15:00:00', '16:00:00', '17:00:00', '18:00:00'],
+ axisLabel: { // x杞村叏閮ㄦ樉绀�
+ rotate: 20,
+ interval: 0,
+ textStyle: {
+ color: '#fff'
+ }
+ },
+ splitLine: { // 缃戞牸鍨傜洿绾夸负铏氱嚎
+ show: true,
+ lineStyle: {
+ type: 'dashed'
+ }
+ },
+ axisTick: { // x 杞村埢搴︽樉绀�
+ show: false
+ },
+ axisLine: {
+ lineStyle: {
+ color: '#FFFFFF',
+ width: 1 // 杩欓噷鏄负浜嗙獊鍑烘樉绀哄姞涓婄殑
+ }
+ }
+ },
+ // Y 杞寸殑璁剧疆
+ yAxis: [{
+ type: 'value',
+ // position: 'left', // 澶� Y 杞翠娇鐢�
+ // name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
+ name: '娴撳害(mg/m鲁)',
+ axisLabel: {
+ formatter: '{value}',
+ textStyle: {
+ color: '#fff' // 鍧愭爣鐨勫瓧浣撻鑹�
+ }
+ },
+ axisPointer: {
+ snap: true // 鑷姩鍚搁檮鏈�杩戠殑鐐�
+ },
+ splitLine: {
+ show: false // y杞� 缃戞牸绾夸笉鏄剧ず
+ },
+ axisLine: {
+ lineStyle: {
+ color: '#ffffff', // 鍧愭爣杞寸殑棰滆壊
+ width: 1
+ }
+ }
+ }],
+ series: [
+ {
+ name: '姘哀鍖栫墿',
+ type: 'line',
+ stack: '鎬婚噺',
+ data: [120, 132, 101, 134, 90, 230, 210]
+ },
+ {
+ name: '浜屾哀鍖栫～',
+ type: 'line',
+ stack: '鎬婚噺',
+ data: [150, 232, 201, 154, 190, 330, 410]
+ },
+ {
+ name: '鐑熷皹',
+ type: 'line',
+ stack: '鎬婚噺',
+ data: [320, 332, 301, 334, 390, 330, 320]
+ },
+ {
+ name: '搴熸皵娴侀噺',
+ type: 'line',
+ stack: '鎬婚噺',
+ data: [820, 932, 901, 934, 1290, 1330, 1320]
+ }
+ ]
+ },
+ formInline: {
+ user: '',
+ region: ''
+ }
+ }
+ },
+ methods: {
+ onSubmit () {
+ console.log('submit!')
+ },
+ drawChart: function () {
+ const myChart = this.$echarts.init(this.$refs.main)
+ myChart.setOption(this.options)
+ window.onresize = function () {
+ var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ if (h1 > 700) {
+ myChart.getDom().style.height = 3 + 'rem'
+ myChart.getDom().style.width = 6 + 'rem'
+ } else {
+ myChart.getDom().style.height = 3 + 'rem'
+ myChart.getDom().style.width = 6 + 'rem'
+ }
+ myChart.resize()
+ }
+ }
+ },
+ mounted () {
+ this.$nextTick(() => {
+ this.drawChart()
+ const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
+ // console.log(dataWatch)
+ for (var i = 0; i < dataWatch.length; i++) {
+ this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
+ }
+ // console.log(this.dataDate)
+ })
+ }
+}
+</script>
+
+<style scoped lang="less">
+.Infomation {
+ margin-left: 10px;
+ height: 0.2rem;
+}
+
+.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;
+}
+
+.form-echrts {
+ width: 100%;
+ height: 1rem;
+ border-top: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ .el-dialog-div {
+ //height: 50vh!important;
+ overflow: auto;
+ //overflow: hidden;
+ }
+
+ #echarts {
+ margin: 0;
+ padding: 0;
+ //height: 3rem;
+ //border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ }
+}
+</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index a17a64a..09a7134 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -1,36 +1,36 @@
<template>
- <div class="win">
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- <ul class="tab">
- <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
- </ul>
- <component :is="currentTab" v-bind="$attrs"></component>
- </div>
+ <div class="win">
+ <div class="border_corner border_corner_left_top"></div>
+ <div class="border_corner border_corner_right_top"></div>
+ <div class="border_corner border_corner_left_bottom"></div>
+ <div class="border_corner border_corner_right_bottom"></div>
+ <ul class="tab">
+ <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
+ <li @click='tabTaggle("EChartsHour")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+ </ul>
+ <component :is="currentTab" v-bind="$attrs"></component>
+ </div>
</template>
<script>
-import ECharts from './ECharts'
+import EChartsHour from './EChartsHour'
export default {
name: 'PublicChart',
components: {
- ECharts
+ EChartsHour
},
data () {
return {
- currentTab: 'ECharts'
+ currentTab: 'EChartsHour'
}
},
methods: {
tabTaggle (taggleMenu) {
this.currentTab = taggleMenu
- debugger
+ // debugger
}
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 5da2a6f..0ca567b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,29 +1,31 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="500px">
+ <el-table :data="tableData" max-height="500px" border>
+ <el-scrollbar style="height: 50vh">
<el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
<el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
<el-table-column label="姘哀鍖栫墿">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
+ <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)" width="60"></el-table-column>
</el-table-column>
<el-table-column label="浜屾哀鍖栫～">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
+ <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)" width="60"></el-table-column>
</el-table-column>
<el-table-column label="鐑熷皹">
- <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)"></el-table-column>
- <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)"></el-table-column>
- <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)"></el-table-column>
+ <el-table-column prop="MonQty" label="娴撳害(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="OrglQty" label="鎶樼畻鍊�(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="ConvertQty" label="鏍囧噯鍊�(mg/m鲁)" width="60"></el-table-column>
+ <el-table-column prop="EmissQty" label="鎺掓斁閲�(kg/h)" width="60"></el-table-column>
</el-table-column>
<el-table-column label="搴熸皵娴侀噺">
<el-table-column prop="StdValue" label="姘旈噺"></el-table-column>
</el-table-column>
+ </el-scrollbar>
</el-table>
</div>
</template>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 3aa7f07..267759a 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -14,7 +14,7 @@
<el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.porltName }}</el-col>
<el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteGasdata.MonTypeName }}</el-col>
</el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
+ <el-row type="flex" class="row-bg row-item-two" justify="space-around">
<el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</el-col>
<el-col :span="18">鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</el-col>
<el-col :span="18">鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</el-col>
@@ -36,7 +36,7 @@
<el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteWaterdata.porltName }}</el-col>
<el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteWaterdata.MonTypeName }}</el-col>
</el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
+ <el-row type="flex" class="row-bg row-item-two" justify="space-around">
<el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteWaterdata.EmissDirecti }}</el-col>
<el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ setWasteWaterdata.ContrLevelShowName }}</el-col>
<el-col :span="8">鍐�/澶栨帓鍙�:{{ setWasteWaterdata.OrOutPortName }}</el-col>
@@ -77,7 +77,7 @@
margin-bottom: 10px;
background-color: rgba(33, 41, 69, 0.9);
//width: 6rem;
- height: 0.5rem;
+ //height: 0.5rem;
}
.main {
@@ -87,13 +87,19 @@
.main-matter {
font-size: 13px;
font-weight: normal;
- //padding: 10px 6px;
+ padding: 0px 6px;
border: 1px solid #396d83;
.row-item-one {
+ //flex-wrap: nowrap;
+ overflow: hidden;
+ margin-top: 6px;
margin-bottom: 7px;
+ //margin-left: 10px;
}
-
+ .row-item-two{
+ margin-bottom: 6px;
+ }
.el-row {
width: 100%;
color: #00d0f9;
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index ce4d496..e494157 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -7,7 +7,7 @@
<!-- <span class="icon-name">鍥惧眰</span>-->
</div>
</el-tooltip>
- <transition name="animationChange">
+ <transition name="layerChange">
<div :class="'legend-content map-background'" v-show="layerControllerVisible">
<lc-service-layer></lc-service-layer>
<button @click="showPanel" type="button" class="el-button special-button el-button--default el-icon-d-arrow-left"></button>
@@ -74,14 +74,27 @@
</script>
<style lang="less">
- .animationChange-enter-active, .animationChange-leave-active {
+
+ .layerChange-enter-active {
+ transform-origin: top left;
+ animation: bounce-in .2s;
+ }
+ .layerChange-leave-active {
+ transform-origin: top left;
+ animation: bounce-in .2s reverse;
+ }
+ /*
+
+ .layerChange-enter-active,
+ .layerChange-leave-active {
transition: all 0.5s;
}
- .animationChange-enter, .animationChange-leave-to {
+ .layerChange-enter,
+ .layerChange-leave-to {
opacity: 0;
transform: translateX(-100px);
- }
+ }*/
.float-panel.active{
overflow: visible;
}
@@ -235,16 +248,20 @@
}
.el-button--default{
padding: 15px 3px;
- background:@background-color;
+ background:@background-color4;
color:@color-tool;
position: absolute;
top:0;
left: 100%;
margin-left: .02rem;
- border-radius: 0.03rem 50% 50% 0.03rem;
+ border:1px solid @color-tool;
+ // border-radius: 0.03rem 50% 50% 0.03rem;
}
.el-button--default:hover{
background:@background-color;
+ border:1px solid @color;
+ box-shadow: 0 0 2px @color;
+ color:@color;
}
.legend-content{
width: 1.79167rem;
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index cfed515..4df12f7 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -2,7 +2,7 @@
* 鍥哄簾
*/
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
-const companyImg = '/assets/images/map/company.png'
+const companyImg = '/assets/images/map/company_refining.png'
const mapApi = require('../../../api/mapApi').default
const AnimalService = require('../service/AnimalService').default
@@ -32,13 +32,14 @@
icon: L.icon({
iconUrl: iconUrl,
iconSize: [30, 30],
- iconAnchor: [13, 5]
+ iconAnchor: [15, 15]
}),
test: data[i]
})
- marker.bindTooltip(data[i].name, {
+ const htmls = '<ul><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li><li>' + data[i].name + '</li></ul>'
+ marker.bindTooltip(htmls, {
permanent: true,
- offset: [0, 14],
+ offset: [0, 5],
direction: 'bottom',
className: 'company-bindTooltip'
}).bindPopup('<div class="company-bindTooltip-hover"><h3>姹℃煋鐗╀骇鐢熺粺璁�</h3><ul>' +
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 30af0e3..41d70da 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -1,49 +1,43 @@
<template>
<div class="panel-right" v-show="isShow">
- <div class="panel-tab">
-<!-- <div v-for="item in topicMenu" :key="item.id" :title="item.name" class="tab-item" @click="handleGd"-->
-<!-- :class="{'B-TMT-tab-waybill-isActive': isWaybillHover}">-->
-<!-- <img :src="item.icon" style="width: 24px;height: 24px;"></div>-->
- <div class="container">
- <ul>
- <li style="text-align: right">
- <button type="button" class="el-button special-button el-button--default el-icon-d-arrow-right"></button>
- </li>
- </ul>
-
- <ul v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" >
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
- <li>
- <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
- </li>
- </el-tooltip>
- </ul>
- </div>
- </div>
-<!-- <div class="panel-fold-btn" >-->
-<!-- <div class="btn-stretch" @click="toggleMonitorPanel"></div>-->
-<!-- </div>-->
-
-<!-- <div class="panel-fold-btn" @click="toggleMonitorPanel" >-->
-<!-- <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>-->
-<!--<!– <div class="btn-stretch" v-if="isCollapse" </div>–>-->
-<!--<!– <div class="btn-shrink" v-else-if="!isCollapse" ></div>–>-->
-<!--<!– :style = "{width:isCollapse ? '290px' : '0px'}"–>-->
-<!-- </div>-->
-<!-- <div class="right-control" v-if="!isCollapse" >-->
- <div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] " >
- <div class="panel-fold-btn" @click="toggleMonitorPanel">
-<!-- <div class="btn-stretch" v-if="isCollapse"></div>-->
-<!-- <div class="btn-shrink" v-else-if="!isCollapse"></div>-->
- <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>
- </div>
-
- <div :class="'search-container map-background'">
- <div class="el-message-box__content" style="padding:0 6px 6px 6px;font-size: 13px;">
- <component :title="title" :is="gcComp"></component>
- </div>
- </div>
- </div>
+ <transition name="searchPanelChange">
+ <div style=" display: inline-flex;">
+ <div class="panel-tab">
+ <div class="container">
+ <ul>
+ <li style="text-align: right">
+ <div @click="setSearchPanelChange" type="button" class="el-button special-button el-button--default">
+ <i class=" el-icon-d-arrow-right" v-if="selectGroup"></i>
+ <i class=" el-icon-d-arrow-left" v-else ></i>
+ </div>
+ </li>
+ </ul>
+ <ul v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" >
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
+ <li>
+ <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
+ </li>
+ </el-tooltip>
+ </ul>
+ </div>
+ </div>
+ <div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] " >
+ <div class="panel-fold-btn" @click="toggleMonitorPanel">
+ <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>
+ </div>
+ <div :class="'search-container map-background'" v-show="selectGroup" >
+ <div class="el-message-box__content" style="padding:0 6px 6px 6px;font-size: 13px;">
+ <component :title="title" :is="gcComp"></component>
+ </div>
+ </div>
+ </div>
+ </div>
+ </transition>
+ <!-- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎼滅储" placement="left" v-show="!selectGroup">
+ <div :class="selectGroup === true ?'active-button':''" class="iconBtn" @click="setSearchPanelChange" style="position: absolute;top:0;right: 0" >
+ <i class="el-icon-search icon"></i>
+ </div>
+ </el-tooltip> -->
</div>
</template>
@@ -75,7 +69,8 @@
toggleMonitorStyle: 'right:0px',
title: '姹￠洦姘寸缃�',
- isCollapse: true
+ isCollapse: true,
+ selectGroup: true
}
},
computed: {},
@@ -98,9 +93,18 @@
handleClose (done) {
console.log(done)
},
+ setSearchPanelChange () {
+ this.selectGroup = !this.selectGroup
+ if (!this.selectGroup) {
+ this.topicList.forEach((itm) => {
+ itm.checked = false
+ })
+ }
+ },
selected (val) {
// console.log(val)
this.title = val.name
+ this.selectGroup = true
this.topicList.forEach((itm) => {
itm.checked = val.name === itm.name
})
@@ -180,7 +184,14 @@
</script>
<style lang="less">
-
+ .searchPanelChange-enter-active {
+ transform-origin: top right;
+ animation: bounce-in .2s;
+ }
+ .searchPanelChange-leave-active {
+ transform-origin: top right;
+ animation: bounce-in .2s reverse;
+ }
.search-container {
position: relative;
width: 1.79167rem;
@@ -249,12 +260,15 @@
//}
.el-button--default {
padding: 15px 3px;
- background: rgba(0, 16, 30, 0.7);
- color: #C0C4CC;
- border-radius:50% 0.03rem 0.03rem 50% ;
+ background:@background-color4;
+ color:@color-tool;
+ border:1px solid @color-tool;
}
.el-button--default:hover{
background:@background-color;
+ border:1px solid @color;
+ box-shadow: 0 0 2px @color;
+ color:@color;
}
.el-form-item__label {
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index 850d54c..e019544 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -489,11 +489,15 @@
.special-button {
width: 0.1362rem;
height: 0.2725rem;
- color: #C0C4CC;
- border-radius: 0.03rem 50% 50% 0.03rem;
+ background:@background-color4;
+ color:@color-tool;
+ border:1px solid @color-tool;
}
.special-button:hover{
- color: #00fff6;
+ background:@background-color;
+ border:1px solid @color;
+ box-shadow: 0 0 2px @color;
+ color:@color;
}
}
}
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index ed43d60..35a1739 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -4,7 +4,8 @@
<waste-water></waste-water>
</el-tab-pane>
<el-tab-pane label="搴熸皵" name="second">
- <waste-gas></waste-gas>
+ <waste-water></waste-water>
+<!-- <waste-gas></waste-gas>-->
</el-tab-pane>
<el-tab-pane label="鍥哄簾" name="third">
<solid-waste></solid-waste>
@@ -17,14 +18,14 @@
<script>
import WasteWater from '@components/table/components/WasteWater'
-import WasteGas from '@components/table/components/WasteGas'
+// import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/SolidWaste'
import AirQuality from '@components/table/components/AirQuality'
export default {
name: 'tabHandover',
components: {
WasteWater,
- WasteGas,
+ // WasteGas,
SolidWaste,
AirQuality
},
--
Gitblit v1.8.0