From 12ac24e91636c9723b2e89fc354735aa27e10c69 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期二, 13 四月 2021 16:00:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/summarySheets.vue | 6
src/components/table/components/AirQuality.vue | 62 ++------
src/components/table/components/tabHandover.vue | 2
src/assets/css/map/map-panel-style.less | 1
src/components/table/components/IndexStatistics.vue | 207 ++++++----------------------
src/styles/theme-dark/el-ui/tabs.less | 7
src/components/table/components/WasteWater.vue | 26 ---
src/views/popup/Dialog.vue | 1
src/components/table/components/SolidWaste.vue | 75 ++--------
9 files changed, 92 insertions(+), 295 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 7ca8a80..e556ee1 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -115,6 +115,7 @@
thead.is-group th {
background: transparent;
+ padding:0
}
.el-table__expanded-cell {
diff --git a/src/components/table/components/AirQuality.vue b/src/components/table/components/AirQuality.vue
index 7e52808..ddf7dab 100644
--- a/src/components/table/components/AirQuality.vue
+++ b/src/components/table/components/AirQuality.vue
@@ -1,55 +1,23 @@
<template>
<div class="AirQuality">
- <el-table
- class="tableBox"
- :data="tableData"
- :header-cell-style="tableHeaderColor"
- :cell-style="rowClass"
- border
- >
- <el-table-column
- width="30px"
- label=""
- >
+ <el-table class="tableBox" :data="tableData" :header-cell-style="tableHeaderColor" :cell-style="rowClass" border>
+ <el-table-column width="30px" label="">
<template>
<i class="el-icon-caret-right"></i>
<span style="margin-left: 10px"></span>
</template>
</el-table-column>
- <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="AQI"
- label="AQI"
- width="200px">
- </el-table-column>
- <el-table-column
- prop="MajorPollutant"
- label="棣栬姹℃煋鐗� "
- width="200px">
- </el-table-column>
- <el-table-column
- prop="AirQualityCategory"
- label="绌烘皵璐ㄩ噺绫诲埆"
- width="200px">
- </el-table-column>
- <el-table-column
- prop="RegionalColor"
- label="鍖哄煙棰滆壊"
- width="200px">
- <template slot-scope="scope">
- <div v-if="scope.row.RegionalColor==='鍥涚骇绾㈣壊'" style="background-color: red">{{scope.row.RegionalColor}}</div>
- <div v-else-if="scope.row.RegionalColor==='涓夌骇姗欒壊'" style="background-color: orange">{{scope.row.RegionalColor}}</div>
- <div v-else style="background-color: green">{{scope.row.RegionalColor}}</div>
- </template>
+ <el-table-column label="搴忓彿" width="60px" type="index"></el-table-column>
+ <el-table-column prop="UserName" label="浼佷笟鍚嶇О"></el-table-column>
+ <el-table-column prop="AQI" label="AQI"></el-table-column>
+ <el-table-column prop="MajorPollutant" label="棣栬姹℃煋鐗� "></el-table-column>
+ <el-table-column prop="AirQualityCategory" label="绌烘皵璐ㄩ噺绫诲埆"></el-table-column>
+ <el-table-column prop="RegionalColor" label="鍖哄煙棰滆壊">
+ <template slot-scope="scope">
+ <div v-if="scope.row.RegionalColor==='鍥涚骇绾㈣壊'" style="background-color: red">{{scope.row.RegionalColor}}</div>
+ <div v-else-if="scope.row.RegionalColor==='涓夌骇姗欒壊'" style="background-color: orange">{{scope.row.RegionalColor}}</div>
+ <div v-else style="background-color: green">{{scope.row.RegionalColor}}</div>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -89,11 +57,11 @@
},
methods: {
tableHeaderColor ({ row, column, owIndex, columnIndex }) {
- return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
+ // return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
},
// 琛ㄥご鏍峰紡璁剧疆
rowClass () {
- return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
}
}
}
diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue
index c82e142..04b1a37 100644
--- a/src/components/table/components/IndexStatistics.vue
+++ b/src/components/table/components/IndexStatistics.vue
@@ -1,171 +1,60 @@
<template>
<el-tabs v-model="activeName">
- <el-tab-pane label="鎸囨爣缁熻" name="first"><el-table
- :data="tableData">
- <el-table-column
- type="index"
- label="搴忓彿">
- </el-table-column>
- <el-table-column
- prop="date"
- label="鍗曚綅鍚嶇О">
- </el-table-column>
- <el-table-column
- prop="province"
- label="宸ヤ笟鍙栨按閲�(m3)">
- </el-table-column>
- <el-table-column
- prop="province"
- label="澶栨帓搴熸按閲�(m3)">
- </el-table-column>
- <el-table-column
- prop="province"
- label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)">
- </el-table-column>
- <el-table-column label="COD(t)">
- <el-table-column
- prop="province"
- label="绱浜х敓閲�">
- </el-table-column>
- <el-table-column
- prop="city"
- label="褰撴湀浜х敓閲�">
- </el-table-column>
- </el-table-column>
- <el-table-column label="姘ㄦ爱(t)">
- <el-table-column
- prop="province"
- label="绱浜х敓閲�">
+ <el-tab-pane label="鎸囨爣缁熻" name="first">
+ <el-table :data="tableData" >
+ <el-table-column type="index" label="搴忓彿"></el-table-column>
+ <el-table-column prop="date" label="鍗曚綅鍚嶇О"></el-table-column>
+ <el-table-column prop="province" label="宸ヤ笟鍙栨按閲�(m3)"></el-table-column>
+ <el-table-column prop="province" label="澶栨帓搴熸按閲�(m3)"></el-table-column>
+ <el-table-column prop="province" label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)"></el-table-column>
+ <el-table-column label="COD(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
</el-table-column>
- <el-table-column
- prop="city"
- label="褰撴湀浜х敓閲�">
+ <el-table-column label="姘ㄦ爱(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
</el-table-column>
- </el-table-column>
- <el-table-column label="浜屾哀鍖栫～(t)">
- <el-table-column
- prop="province"
- label="绱浜х敓閲�">
+ <el-table-column label="浜屾哀鍖栫～(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
</el-table-column>
- <el-table-column
- prop="city"
- label="褰撴湀浜х敓閲�">
+ <el-table-column label="姘哀鍖栫墿(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
</el-table-column>
- </el-table-column>
- <el-table-column label="姘哀鍖栫墿(t)">
- <el-table-column
- prop="province"
- label="绱浜х敓閲�">
+ <el-table-column label="VOCs(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
</el-table-column>
- <el-table-column
- prop="city"
- label="褰撴湀浜х敓閲�">
+ <el-table-column label="鍥哄簾(t)">
+ <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column>
</el-table-column>
- </el-table-column>
- <el-table-column label="VOCs(t)">
- <el-table-column
- prop="province"
- label="绱浜х敓閲�">
- </el-table-column>
- <el-table-column
- prop="city"
- label="褰撴湀浜х敓閲�">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍥哄簾(t)">
- <el-table-column
- prop="province"
- label="绱浜х敓閲�">
- </el-table-column>
- <el-table-column
- prop="city"
- label="褰撴湀浜х敓閲�">
- </el-table-column>
- </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="浼佷笟鎺掑悕" name="second"><el-table :data="tableData">
+ <el-table-column type="index" label="搴忓彿"></el-table-column>
+ <el-table-column prop="date" label="浼佷笟鍚嶇О"></el-table-column>
+ <el-table-column prop="name" label="搴熸按杈炬爣鐜�"></el-table-column>
+ <el-table-column prop="province" label="鍚嶆"></el-table-column>
+ <el-table-column prop="city" label="搴熸皵杈炬爣鐜�"></el-table-column>
+ <el-table-column prop="address" label="鍚嶆"></el-table-column>
+ <el-table-column prop="zip" label="浼犺緭鐜�"></el-table-column>
+ <el-table-column prop="zip" label="鍚嶆"></el-table-column>
+ <el-table-column prop="zip" label="璁惧瀹屽ソ鐜�"></el-table-column>
+ <el-table-column prop="zip" label="鎺掑悕"></el-table-column>
</el-table></el-tab-pane>
- <el-tab-pane label="浼佷笟鎺掑悕" name="second"><el-table
- :data="tableData"
- style="width: 100%"
- max-height="250">
- <el-table-column
- type="index"
- label="搴忓彿">
- </el-table-column>
- <el-table-column
- prop="date"
- label="浼佷笟鍚嶇О">
- </el-table-column>
- <el-table-column
- prop="name"
- label="搴熸按杈炬爣鐜�">
- </el-table-column>
- <el-table-column
- prop="province"
- label="鍚嶆">
- </el-table-column>
- <el-table-column
- prop="city"
- label="搴熸皵杈炬爣鐜�">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍚嶆">
- </el-table-column>
- <el-table-column
- prop="zip"
- label="浼犺緭鐜�">
- </el-table-column>
- <el-table-column
- prop="zip"
- label="鍚嶆">
- </el-table-column>
- <el-table-column
- prop="zip"
- label="璁惧瀹屽ソ鐜�">
- </el-table-column>
- <el-table-column
- prop="zip"
- label="鎺掑悕">
- </el-table-column>
- </el-table></el-tab-pane>
- <el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third"><el-table
- :data="tableData">
- <el-table-column
- type="index"
- label="搴忓彿">
- </el-table-column>
- <el-table-column
- prop="date"
- label="鎺掓斁鐐瑰悕绉�">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎺掓斁绫诲瀷">
- </el-table-column>
- <el-table-column
- prop="province"
- label="杈炬爣鐜�">
- </el-table-column>
- <el-table-column
- prop="city"
- label="鍚嶆">
- </el-table-column>
- <el-table-column
- prop="address"
- label="浼犺緭鐜�">
- </el-table-column>
- <el-table-column
- prop="zip"
- label="鍚嶆">
- </el-table-column>
- <el-table-column
- prop="zip"
- label="璁惧瀹屽ソ鐜�">
- </el-table-column>
- <el-table-column
- prop="zip"
- label="鍚嶆">
- </el-table-column>
+ <el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third"><el-table :data="tableData">
+ <el-table-column type="index" label="搴忓彿"></el-table-column>
+ <el-table-column prop="date" label="鎺掓斁鐐瑰悕绉�"></el-table-column>
+ <el-table-column prop="name" label="鎺掓斁绫诲瀷"></el-table-column>
+ <el-table-column prop="province" label="杈炬爣鐜�"></el-table-column>
+ <el-table-column prop="city" label="鍚嶆"></el-table-column>
+ <el-table-column prop="address" label="浼犺緭鐜�"></el-table-column>
+ <el-table-column prop="zip" label="鍚嶆"></el-table-column>
+ <el-table-column prop="zip" label="璁惧瀹屽ソ鐜�"></el-table-column>
+ <el-table-column prop="zip" label="鍚嶆"></el-table-column>
</el-table></el-tab-pane>
</el-tabs>
diff --git a/src/components/table/components/SolidWaste.vue b/src/components/table/components/SolidWaste.vue
index 89be52e..ae00c44 100644
--- a/src/components/table/components/SolidWaste.vue
+++ b/src/components/table/components/SolidWaste.vue
@@ -18,63 +18,33 @@
placement="bottom"
trigger="click"
:disabled="!isShowIcon"
- popper-class="popovers"
- >
+ popper-class="popovers">
<ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
<i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
<!-- <i class="el-icon-caret-bottom" slot="reference" v-else @click="doIcon($index)"></i>-->
</el-popover>
</template>
</el-table-column>
- <el-table-column
- label="搴忓彿"
- width="45px"
- type="index">
+ <el-table-column label="搴忓彿" width="45px" type="index">
</el-table-column>
- <el-table-column
- prop="UserName"
- label="浼佷笟鍚嶇О"
- width="120px">
+ <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鲁锛�"
- width="100px">
- </el-table-column>
+ <el-table-column prop="WasteWaters" label="澶栨帓搴熸按閲忥紙m鲁锛�" width="100px"></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="绱浜х敓閲�"></el-table-column>
+ <el-table-column prop="NH4NMonth" label="褰撴湀鐢熶骇閲�"></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
@@ -92,25 +62,10 @@
</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="deficiency"
- label="缂哄け"
- width="60px">
+ <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="缂哄け" width="60px">
<template slot-scope="{row,$index}">
<u v-if="$index!=1" >{{row.deficiency}}</u>
<el-popover v-else
@@ -201,11 +156,11 @@
},
methods: {
tableHeaderColor ({ row, column, owIndex, columnIndex }) {
- return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
+ // return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
},
// 琛ㄥご鏍峰紡璁剧疆
rowClass () {
- return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
},
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
handle (row, column, event, cell) {
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index af191ce..c8ad3dd 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -3,9 +3,6 @@
<el-table
class="tableBox"
:data="tableData"
- style="width: 100%"
- :header-cell-style="tableHeaderColor"
- :cell-style="rowClass"
@cell-click="handle"
>
<el-table-column
@@ -41,11 +38,7 @@
<div v-else >{{scope.row.UserName}}</div>
</template>
</el-table-column>
- <el-table-column
- prop="WasteWaters"
- label="澶栨帓搴熸按閲忥紙m鲁锛�"
- width="100px">
- </el-table-column>
+ <el-table-column prop="WasteWaters" label="澶栨帓搴熸按閲忥紙m鲁锛�"></el-table-column>
<el-table-column label="COD (t)">
<el-table-column
prop="AddOutPut"
@@ -201,11 +194,11 @@
},
methods: {
tableHeaderColor ({ row, column, owIndex, columnIndex }) {
- return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
+ // return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
},
// 琛ㄥご鏍峰紡璁剧疆
rowClass () {
- return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
},
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
handle (row, column, event, cell) {
@@ -228,17 +221,6 @@
}
</script>
-<style scoped>
-.popovers{
- width: auto !important;
- background-color: gray !important;
-}
-.popovers.el-popover{
-padding:0;
-}
-.active {
- /*color: red;*/
- transform:rotate(90deg);
-}
+<style>
</style>
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index 35a1739..a346334 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -1,5 +1,5 @@
<template>
- <el-tabs v-model="activeName" type="border-card">
+ <el-tabs v-model="activeName">
<el-tab-pane label="搴熸按" name="first">
<waste-water></waste-water>
</el-tab-pane>
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 909a35f..fab563b 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -27,13 +27,13 @@
</el-tooltip>
</div>
</transition>
- <Dialog ref="summarySheets" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" >
+ <Dialog ref="summarySheets" title="鎶ヨ〃" >
<tab-handover></tab-handover>
</Dialog>
- <Dialog ref="warnDialog" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" >
+ <Dialog ref="warnDialog" title="棰勬姤璀�" >
<warn></warn>
</Dialog>
- <Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻">
+ <Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻" >
<index-statistics></index-statistics>
</Dialog>
</div>
diff --git a/src/styles/theme-dark/el-ui/tabs.less b/src/styles/theme-dark/el-ui/tabs.less
index 17808d8..746d5b0 100644
--- a/src/styles/theme-dark/el-ui/tabs.less
+++ b/src/styles/theme-dark/el-ui/tabs.less
@@ -1,12 +1,15 @@
-.el-tabs{}
+.el-tabs{
+}
+.el-table td, .el-table th{
+ padding: 0;
+}
.el-tabs__header{
border-bottom: 1px solid @background-color-split !important;
padding: 0;
position: relative;
margin: 0 0 15px;
}
-
.el-tabs__active-bar{
position: absolute;
bottom: 0;
diff --git a/src/views/popup/Dialog.vue b/src/views/popup/Dialog.vue
index f8c26a4..516e523 100644
--- a/src/views/popup/Dialog.vue
+++ b/src/views/popup/Dialog.vue
@@ -2,7 +2,6 @@
<el-dialog v-dialogDrag
:title="title"
:visible.sync="centerDialogVisible"
- width="30%"
:modal="false"
:close-on-click-modal="false"
@close='closeDialog'
--
Gitblit v1.8.0