From 0a2b0a6d67aa52137f1a32fcb39b7ceed4d3f0ca Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 15:26:53 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 11 +-
src/components/table/components/tabHandover.vue | 70 +++++++++++++----
src/components/table/components/WasteWater.vue | 84 ++++----------------
src/components/table/components/componented/ChemicalWastewater.vue | 67 +++-------------
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 2
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue | 2
6 files changed, 93 insertions(+), 143 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index 4c46d8f..05af4e3 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -41,7 +41,7 @@
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
<div class="boxChart">
- <div style="width: 5rem;height: 1.5rem;" id="popChart" ref="main">
+ <div style="width:5rem;height:1.5rem" id="popChart" ref="main">
</div>
</div>
</div>
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index 4c132d5..c224353 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -41,7 +41,7 @@
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
<div class="boxChart">
- <div style="width: 5rem;height: 1.5rem" id="popChart" ref="main">
+ <div style="width: 5rem;height:1.5rem;" id="popChart" ref="main">
</div>
</div>
</div>
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
index 05f8f76..b59c45b 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -39,9 +39,8 @@
</div>
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
</div>
- <div class="boxChart" style="height: 260px">
- <div style="width: 100%;height: 100%;" id="popChart" ref="main">
- </div>
+ <div class="boxChart">
+ <div style="width: 5rem;height: 1.5rem;" id="popChart" ref="main"></div>
</div>
</div>
</div>
@@ -367,8 +366,8 @@
label: {
color: '#1a4245'
}
- },
- formatter: function (params) {
+ }
+ /* formatter: function (params) {
var s = params[0].name + '<br />'
for (var i = 0; i < params.length; i++) {
// var name = params[i].name
@@ -402,7 +401,7 @@
s += maker + seriesName + ':' + valueFliter + '<br />'
}
return s
- }
+ } */
},
toolbox: { // 鎵撳嵃绛夊伐鍏�
show: false,
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index c8ad3dd..5b59a82 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -1,14 +1,7 @@
<template>
<div class="waste-water">
- <el-table
- class="tableBox"
- :data="tableData"
- @cell-click="handle"
- >
- <el-table-column
- width="30px"
- label=""
- >
+ <el-table class="tableBox" :data="tableData" @cell-click="handle">
+ <el-table-column width="30px" label="">
<template slot-scope="{row,$index}">
<!-- <i class="el-icon-caret-right" v-if="$index ===1"></i>-->
<el-popover
@@ -23,60 +16,33 @@
</el-popover>
</template>
</el-table-column>
- <el-table-column
- label="搴忓彿"
- width="45px"
- type="index">
- </el-table-column>
- <el-table-column
- prop="UserName"
- label="浼佷笟鍚嶇О"
- width="120px">
+ <el-table-column label="搴忓彿" width="45px" type="index"></el-table-column>
+ <el-table-column prop="UserName" label="浼佷笟鍚嶇О" width="120px">
<template slot-scope="scope">
<div v-if="scope.row.UserName==='闆嗗洟鍚嶇О'" style="color: #00ffff">{{scope.row.UserName}}</div>
<div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{scope.row.UserName}}</div>
<div v-else >{{scope.row.UserName}}</div>
</template>
</el-table-column>
- <el-table-column prop="WasteWaters" label="澶栨帓搴熸按閲忥紙m鲁锛�"></el-table-column>
+ <el-table-column prop="WasteWaters">
+ <div slot="header">
+ <span>澶栨帓搴熸按閲�</span>
+ <div>锛坢鲁锛�</div>
+ </div>
+ </el-table-column>
<el-table-column label="COD (t)">
- <el-table-column
- prop="AddOutPut"
- label="绱浜х敓閲�"
- width="70px">
- </el-table-column>
- <el-table-column
- prop="MonthOutPut"
- label="褰撴湀鐢熶骇閲�"
- width="70px">
- </el-table-column>
+ <el-table-column prop="AddOutPut" label="绱浜х敓閲�" width="70px"></el-table-column>
+ <el-table-column prop="MonthOutPut" label="褰撴湀鐢熶骇閲�" width="70px"></el-table-column>
</el-table-column>
<el-table-column label="姘ㄦ爱 (t)">
- <el-table-column
- prop="NH4NPut"
- label="绱浜х敓閲�"
- width="70px">
- </el-table-column>
- <el-table-column
- prop="NH4NMonth"
- label="褰撴湀鐢熶骇閲�"
- width="70px">
- </el-table-column>
+ <el-table-column prop="NH4NPut" label="绱浜х敓閲�" width="70px"></el-table-column>
+ <el-table-column prop="NH4NMonth" label="褰撴湀鐢熶骇閲�" width="70px"></el-table-column>
</el-table-column>
<el-table-column label="鎺掓斁鍙ｆ娴嬬粺璁＄姸鎬�">
- <el-table-column
- prop="normal"
- label="姝ｅ父"
- width="60px">
+ <el-table-column prop="normal" label="姝ｅ父" width="60px">
<template slot-scope="{row,$index}">
<u v-if="$index!=2" >{{row.normal}}</u>
- <el-popover v-else
- placement="bottom-end"
- width="200"
- trigger="click"
- popper-class="popovers"
- title="鐩戞祴鐐规槑缁嗚〃"
- >
+ <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="鐩戞祴鐐规槑缁嗚〃">
<refinery></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
<!-- <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
@@ -85,21 +51,9 @@
</el-popover>
</template>
</el-table-column>
- <el-table-column
- prop="overProof"
- label="瓒呮爣"
- width="60px">
- </el-table-column>
- <el-table-column
- prop="Abnormal"
- label="寮傚父"
- width="60px">
- </el-table-column>
- <el-table-column
- prop="StopProduction"
- label="鍋滀骇"
- width="60px">
- </el-table-column>
+ <el-table-column prop="overProof" label="瓒呮爣" width="60px"></el-table-column>
+ <el-table-column prop="Abnormal" label="寮傚父" width="60px"></el-table-column>
+ <el-table-column prop="StopProduction" label="鍋滀骇" width="60px"></el-table-column>
<el-table-column
prop="deficiency"
label="缂哄け"
diff --git a/src/components/table/components/componented/ChemicalWastewater.vue b/src/components/table/components/componented/ChemicalWastewater.vue
index 75c7d30..ecb78a1 100644
--- a/src/components/table/components/componented/ChemicalWastewater.vue
+++ b/src/components/table/components/componented/ChemicalWastewater.vue
@@ -1,67 +1,26 @@
<template>
<div class="Chemical-Waste-water" id="Chemical-Waste-water">
- <el-row type="flex" class="head-area" align="middle">
+ <!-- <el-row type="flex" class="head-area" align="middle">
<el-col>
<span>鐩戞祴鐐规帓鏀炬槑缁�</span>
</el-col>
-<!-- <el-col class="head-area-button">-->
-<!-- <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info" @click="closeBtns"></el-button>-->
-<!-- </el-col>-->
- </el-row>
- <el-table
- class="tableBox"
- :data="tableData"
- >
- <el-table-column
- label="搴忓彿"
- width="60px"
- type="index">
- </el-table-column>
- <el-table-column
- prop="UserName"
- label="浼佷笟鍚嶇О"
- width="120px">
- </el-table-column>
- <el-table-column
- prop="WasteWaters"
- label="宸ヤ笟澶栨帓搴熸按閲忥紙m鲁锛�"
- width="200px">
- </el-table-column>
+ </el-row> -->
+ <div class="panel-title">鐩戞祴鐐规帓鏀炬槑缁�</div>
+ <el-table class="tableBox" :data="tableData">
+ <el-table-column label="搴忓彿" width="60px" type="index"></el-table-column>
+ <el-table-column prop="UserName" label="浼佷笟鍚嶇О" width="120px"></el-table-column>
+ <el-table-column prop="WasteWaters" label="宸ヤ笟澶栨帓搴熸按閲忥紙m鲁锛�" width="200px"></el-table-column>
<el-table-column label="浜х敓閲� 锛堝惃锛�">
- <el-table-column
- prop="AddOutPut"
- label="涓�鑸浐搴�"
- width="100px">
- </el-table-column>
- <el-table-column
- prop="MonthOutPut"
- label="鍗遍櫓搴熺墿"
- width="100px">
- </el-table-column>
+ <el-table-column prop="AddOutPut" label="涓�鑸浐搴�" width="100px"></el-table-column>
+ <el-table-column prop="MonthOutPut" label="鍗遍櫓搴熺墿" width="100px"></el-table-column>
</el-table-column>
<el-table-column label="璐瓨鐘舵�侊紙涓級">
- <el-table-column
- prop="normal"
- label="姝ｅ父"
- width="100px">
- </el-table-column>
- <el-table-column
- prop="warning"
- label="棰勮"
- width="100px">
- </el-table-column>
+ <el-table-column prop="normal" label="姝ｅ父" width="100px"></el-table-column>
+ <el-table-column prop="warning" label="棰勮" width="100px"></el-table-column>
</el-table-column>
<el-table-column label="璐瓨鐘舵�侊紙涓級">
- <el-table-column
- prop="normal"
- label="姝ｅ父"
- width="100px">
- </el-table-column>
- <el-table-column
- prop="warning"
- label="棰勮"
- width="100px">
- </el-table-column>
+ <el-table-column prop="normal" label="姝ｅ父" width="100px"></el-table-column>
+ <el-table-column prop="warning" label="棰勮" width="100px"></el-table-column>
</el-table-column>
</el-table>
</div>
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index a346334..311d7b6 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -1,19 +1,24 @@
<template>
- <el-tabs v-model="activeName">
- <el-tab-pane label="搴熸按" name="first">
- <waste-water></waste-water>
- </el-tab-pane>
- <el-tab-pane label="搴熸皵" name="second">
- <waste-water></waste-water>
-<!-- <waste-gas></waste-gas>-->
- </el-tab-pane>
- <el-tab-pane label="鍥哄簾" name="third">
- <solid-waste></solid-waste>
- </el-tab-pane>
- <el-tab-pane label="绌烘皵璐ㄩ噺" name="fourth">
- <AirQuality></AirQuality>
- </el-tab-pane>
- </el-tabs>
+ <div>
+ <el-tabs v-model="activeName" @tab-click="handleClick">
+ <!-- <el-tab-pane label="搴熸按" name="first">
+ <waste-water></waste-water>
+ </el-tab-pane>
+ <el-tab-pane label="搴熸皵" name="second">
+ <waste-water></waste-water>
+ </el-tab-pane>
+ <el-tab-pane label="鍥哄簾" name="third">
+ <solid-waste></solid-waste>
+ </el-tab-pane>
+ <el-tab-pane label="绌烘皵璐ㄩ噺" name="fourth">
+ <AirQuality></AirQuality>
+ </el-tab-pane> -->
+ <el-tab-pane v-for="(item,index) in topicList" :key="index" :label="item.name" :name="item.name"></el-tab-pane>
+ </el-tabs>
+ <div>
+ <component :is="gcComp"></component>
+ </div>
+ </div>
</template>
<script>
@@ -21,6 +26,9 @@
// import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/SolidWaste'
import AirQuality from '@components/table/components/AirQuality'
+
+import { TopicList } from '../../../conf/Topic'
+
export default {
name: 'tabHandover',
components: {
@@ -31,7 +39,37 @@
},
data () {
return {
- activeName: 'first'
+ activeName: 'first',
+ topicList: TopicList,
+ gcComp: AirQuality
+ }
+ },
+ methods: {
+ handleClick (tab, event) {
+ console.log(tab.label)
+ switch (tab.label) {
+ case '姹℃煋婧�':
+ this.gcComp = AirQuality
+ break
+ case '搴熸按':
+ this.gcComp = WasteWater
+ break
+ case '搴熸皵':
+ this.gcComp = WasteWater
+ break
+ case '鍥哄簾':
+ this.gcComp = SolidWaste
+ break
+ case '鐜椋庨櫓':
+ this.gcComp = AirQuality
+ break
+ case '鍦熷￥鍙婂湴涓嬫按':
+ this.gcComp = AirQuality
+ break
+ case '绠＄嚎':
+ this.gcComp = AirQuality
+ break
+ }
}
}
}
--
Gitblit v1.8.0