From 38fea8139670d34cedea336fbd1ba34fc92bcf02 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 22 四月 2021 21:34:59 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/assets/css/map/map-panel-style.less | 55 +++
src/components/panel/ToolBoxPanel.vue | 30 ++
src/utils/dialogDrag.js | 2
src/components/table/components/componented/ChemicalWastewater.vue | 46 +--
src/views/MapTemplate.vue | 7
src/components/LayerController/service/LayerFactory.js | 29 +
src/views/popup/Popup.vue | 2
src/components/LayerController/modules/LcServiceLayer.vue | 2
src/components/table/components/WasteSolid.vue | 35 +-
public/assets/images/map/sewers/雨水排口.png | 0
src/components/table/summarySheets.vue | 30 +-
src/components/table/components/SoilGroundwater.vue | 42 ++
src/components/LayerController/service/WfsLayerService.js | 84 +++---
src/components/table/components/tabHandover.vue | 10
src/conf/layers/LayerHbss.js | 2
src/conf/Constants.js | 10
src/components/table/components/WasteWater.vue | 48 +--
src/components/table/components/WasteGas.vue | 151 +++--------
src/components/table/components/componented/MissingAlarm.vue | 115 +-------
src/components/table/components/componented/refinery.vue | 55 +--
src/views/Temp.vue | 7
21 files changed, 328 insertions(+), 434 deletions(-)
diff --git "a/public/assets/images/map/sewers/\351\233\250\346\260\264\346\216\222\345\217\243.png" "b/public/assets/images/map/sewers/\351\233\250\346\260\264\346\216\222\345\217\243.png"
index 3646905..04e5ae6 100644
--- "a/public/assets/images/map/sewers/\351\233\250\346\260\264\346\216\222\345\217\243.png"
+++ "b/public/assets/images/map/sewers/\351\233\250\346\260\264\346\216\222\345\217\243.png"
Binary files differ
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 0a4a136..51d8c87 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -131,6 +131,7 @@
.el-table th, .el-table tr {
background-color: transparent;
+ padding: 0.02rem;
}
.el-table {
@@ -221,13 +222,20 @@
margin: 5px;
width: 30px;
height: 30px;
- background: @background-color-tools;
+ color: #00fff6;
+ background: rgba(0, 16, 30, 0.7);
+ border: 0.00521rem solid #00fff6;
vertical-align: middle !important;
img {
width: 16px;
height: 16px;
}
+ }
+ .el-button.hover{
+ color: @color-highlight;
+ border: .00521rem solid @color-highlight;
+ box-shadow: 0 0 .03rem @color-highlight;
}
}
@@ -375,9 +383,7 @@
}
}
}
-.el-table--border{
- border-bottom: 1px solid #ddd;
-}
+
.el-dialog--center .el-dialog__body{
padding: 0.04rem;
@@ -411,6 +417,19 @@
.el-table td, .el-table th.is-leaf {
font-size: 0.08rem;
+}
+.el-table .has-gutter tr th{
+ border:1px solid @background-color-split;
+}
+.el-table .has-gutter tr th .cell{
+ color: #fff;
+}
+.el-table--border{
+ // border:1px solid @background-color-split;
+ border:none
+}
+.el-table--border::after, .el-table--group::after, .el-table::before{
+ background:none;
}
.el-table .warning-row {
@@ -647,10 +666,28 @@
.fixed-table {
background: rgba(0, 16, 30, 1) !important;
}
-/****************************绉佹湁***/
-.baoBiao{
- .el-dialog.el-dialog--center{
- top:100px;
- left: 100px;
+/****************************鎶ヨ〃浜岀骇瀛愬脊妗嗘牱寮�***/
+.el-tabs__nav-wrap::after{background: none;}
+.el-tabs__header{margin-bottom: 0.04rem;
+ .is-active{color: @color-highlight}
+}
+.el-tabs__active-bar{
+ background: @color-highlight;
+}
+
+.el-popover.popovers{
+ background: @background-color;
+ padding: 0;
+ border: 0.00521rem solid @color;
+ overflow: hidden;
+ box-shadow: 0 0 0.03rem @color;
+ .el-popover__title{color: #fff;margin: 0;padding:0.06rem; background: @background-color;border-bottom: 1px solid @background-color-split}
+ .refinery {
+ background-color: @background-color;
+
+ }
+ .waste-water{
+ background-color: @background-color;
}
}
+
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 323d75a..71df312 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -94,7 +94,7 @@
.wms-panel {
.wms-panel-scrollbar{
- height: 457px;
+ height: 600px;
width: 285px;
//width: 2.5rem;
font-size: 14px;
diff --git a/src/components/LayerController/service/LayerFactory.js b/src/components/LayerController/service/LayerFactory.js
index 9387933..909038e 100644
--- a/src/components/LayerController/service/LayerFactory.js
+++ b/src/components/LayerController/service/LayerFactory.js
@@ -32,7 +32,13 @@
initMinZoom (config) {
const minZoom = parseInt(config.minZoom)
if (minZoom) {
- this.minZoomLayers[minZoom] = config
+ var configs = this.minZoomLayers[minZoom]
+ if (configs) {
+ configs[configs.length] = config
+ } else {
+ configs = [config]
+ }
+ this.minZoomLayers[minZoom] = configs
}
}
@@ -101,20 +107,23 @@
* @param layerConfig
*/
initEvent (layerConfig) {
- // this.map.on('zoomend ', () => this.toggleByZoom())
+ this.map.on('zoomend ', () => this.toggleByZoom())
}
toggleByZoom () {
const zoom = this.map.getZoom()
for (var k in this.minZoomLayers) {
- const config = this.minZoomLayers[k]
- const checked = config.checked
- console.log(zoom)
- console.log(k)
- if (checked && zoom > k) {
- this.show(config)
- } else if (checked && zoom < k) {
- this.hide(config)
+ const configs = this.minZoomLayers[k]
+ for (var j in configs) {
+ const config = configs[j]
+ const checked = config.checked
+ console.log(zoom)
+ console.log(k)
+ if (checked && zoom > k) {
+ this.show(config)
+ } else if (checked && zoom < k) {
+ this.hide(config)
+ }
}
}
}
diff --git a/src/components/LayerController/service/WfsLayerService.js b/src/components/LayerController/service/WfsLayerService.js
index cb0a4bf..0c601a2 100644
--- a/src/components/LayerController/service/WfsLayerService.js
+++ b/src/components/LayerController/service/WfsLayerService.js
@@ -35,48 +35,50 @@
}
draw (features) {
- const icon = this.config.icon
- const styles = this.config.styles
- Object.assign(STYLES, styles)
- const geojsonLayer = this.L.geoJSON(features, {
- style: function (feature) {
- return {
- fill: STYLES.FILL,
- weight: STYLES.WEIGHT,
- fillColor: STYLES.FILL_COLOR,
- color: STYLES.COLOR,
- fillOpacity: STYLES.FILL_OPACITY,
- opacity: STYLES.OPACITY
- // dashArray: STYLES.DASH_ARRAY,
- // dashSpeed: STYLES.DASH_SPPED
- }
- },
- pointToLayer: (geoJsonPoint, latlng) => {
- return this.L.canvasMarker(latlng,
- {
- img: {
- // url: 'assets/images/map/marker-icon.png',
- url: '/assets/images/map/' + icon,
- size: STYLES.ICON_SIZE
- }
+ if (features && features.length > 0) {
+ const icon = this.config.icon
+ const styles = this.config.styles
+ Object.assign(STYLES, styles)
+ const geojsonLayer = this.L.geoJSON(features, {
+ style: function (feature) {
+ return {
+ fill: STYLES.FILL,
+ weight: STYLES.WEIGHT,
+ fillColor: STYLES.FILL_COLOR,
+ color: STYLES.COLOR,
+ fillOpacity: STYLES.FILL_OPACITY,
+ opacity: STYLES.OPACITY
+ // dashArray: STYLES.DASH_ARRAY,
+ // dashSpeed: STYLES.DASH_SPPED
+ }
+ },
+ pointToLayer: (geoJsonPoint, latlng) => {
+ return this.L.canvasMarker(latlng,
+ {
+ img: {
+ // url: 'assets/images/map/marker-icon.png',
+ url: '/assets/images/map/' + icon,
+ size: STYLES.ICON_SIZE
+ }
+ })
+ },
+ onEachFeature: (feature, layer) => {
+ layer.bindPopup((layer) => {
+ this.popupComp.setDatas(layer)
+ this.popupComp.setShow()
+ return this.popupComp.$el
+ }, {
+ className: 's-map-popup',
+ minWidth: 300,
+ closeButton: false,
+ autoClose: false
})
- },
- onEachFeature: (feature, layer) => {
- layer.bindPopup((layer) => {
- this.popupComp.setDatas(layer)
- this.popupComp.setShow()
- return this.popupComp.$el
- }, {
- className: 's-map-popup',
- minWidth: 300,
- closeButton: false,
- autoClose: false
- })
- .bindTooltip((layer) => this.tooltipListener(layer), { direction: 'bottom', offset: [0, 15], sticky: true })
- .on('mouseover', (e) => this.mouseOverListener(e, layer)).on('mouseout', (e) => this.mouseOutListener(e, layer))
- }
- }).addTo(this.layer)
- setZIndex(geojsonLayer)
+ .bindTooltip((layer) => this.tooltipListener(layer), { direction: 'bottom', offset: [0, 15], sticky: true })
+ .on('mouseover', (e) => this.mouseOverListener(e, layer)).on('mouseout', (e) => this.mouseOutListener(e, layer))
+ }
+ }).addTo(this.layer)
+ setZIndex(geojsonLayer)
+ }
}
mouseOverListener (e, layer) {
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index aa9d37c..cca3068 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -14,12 +14,11 @@
:popper-class="'tools-panel-content'"
v-for="(item,index) in menuList" :key="index"
:width="item.index === '2'?230 : 150"
- v-model="isShow[index]"
- >
+ v-model="isShow[index]">
<el-button slot="reference" class="el-button" :class="active === index? 'tools-panel-choose':''" @click.native="changeChoose(index)">
<i :class="'icon iconfont '+item.icon"></i>
</el-button>
- <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)" v-show="item.index!=='2'">
+ <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)" v-show="item.index!=='2'" :class="indexT==toolActive?'hover':''" >
<i :class="'icon iconfont '+itemT.icon"></i>
</el-button>
<lc-base-map v-show="item.index==='2'"></lc-base-map>
@@ -102,6 +101,7 @@
checkedItem: false,
Selecd: -1,
isSelecd: -1,
+ toolActive: -1,
menuList: [
{
icon: 'iconjuliceliang', // plot,
@@ -114,6 +114,7 @@
label: '鐐规爣缁�',
icon: 'iconlocation-full', // marker,
title: '鐐规爣缁�',
+ active: false,
iconChoose: markerChoose
},
{
@@ -121,6 +122,7 @@
label: '绾挎爣缁�',
icon: 'iconline', // line,
title: '绾挎爣缁�',
+ active: 0,
iconChoose: lineChoose
},
{
@@ -128,6 +130,7 @@
label: '澶氳竟褰�',
icon: 'iconliubianxing1', // polygonJ,
title: '澶氳竟褰�',
+ active: 0,
iconChoose: polygonJChoose
},
{
@@ -135,6 +138,7 @@
label: '鐭╁舰',
icon: 'iconcheckbox-full', // polygonS,
title: '鐭╁舰',
+ active: 0,
iconChoose: polygonSChoose
},
{
@@ -142,11 +146,13 @@
label: '鍦嗗舰',
icon: 'iconyuan', // polygonY,
title: '鍦嗗舰',
+ active: 0,
iconChoose: polygonYChoose
},
{
index: '1-4',
label: '鍒犻櫎',
+ active: -1,
icon: 'icondelete-fill', // del,
title: '鍒犻櫎鏍囩粯',
iconChoose: delChoose
@@ -164,6 +170,7 @@
label: '璺濈',
icon: 'iconjuliceliang', // distance,
title: '璺濈娴嬮噺',
+ active: 0,
iconChoose: distanceChoose
},
{
@@ -171,6 +178,7 @@
label: '闈㈢Н',
icon: 'iconmianjiceliang', // mm,
title: '闈㈢Н娴嬮噺',
+ active: 0,
iconChoose: mmChoose
},
{
@@ -178,6 +186,7 @@
label: '娓呴櫎',
icon: 'icondelete-fill', // del,
title: '娓呴櫎娴嬮噺',
+ active: -1,
iconChoose: delChoose
}
]
@@ -191,6 +200,7 @@
{
label: '褰卞儚鍥�',
index: '2-1',
+ active: 0,
items: [
{
index: '2-1-1',
@@ -201,6 +211,7 @@
{
label: '鐭㈤噺鍥�',
index: '2-2',
+ active: 0,
items: [
{
index: '2-2-1',
@@ -211,6 +222,7 @@
{
label: '鍦板舰鍥�',
index: '2-3',
+ active: 0,
items: [
{
index: '2-3-1',
@@ -230,18 +242,21 @@
index: '4-1',
label: '鍏ㄥ睆',
icon: 'icontianchongxing-', // FullScreen,
+ active: 0,
title: '鍏ㄥ睆'
},
{
index: '4-2',
label: 'A4妯悜',
icon: 'iconsaoma', // cross,
+ active: 0,
title: 'A4妯悜'
},
{
index: '4-3',
label: 'A4绾靛悜',
icon: 'iconsaoma zongs', // vertical,
+ active: 0,
title: 'A4绾靛悜'
}
]
@@ -270,6 +285,7 @@
this.drawLayer = this.L.layerGroup().addTo(this.map)
}
this.active = index
+ this.toolActive = -1
// console.log(this.basemapList)
for (let i = 0; i < this.isShow.length; i++) {
if (i !== index) {
@@ -282,6 +298,11 @@
},
choiceItem (itemT, indexT) {
this.Selecd = indexT
+ if (itemT.active !== -1) {
+ this.toolActive = indexT
+ } else {
+ this.toolActive = -1
+ }
if (this.isSelecd === indexT) {
this.checkedItem = !this.checkedItem
} else {
@@ -432,8 +453,9 @@
margin: 0 0.015rem;
width: 0.2725rem;
height: 0.2725rem;
- color:#fff;
+ color:#00fff6;
background: @background-color;
+ border: 0.00521rem solid #00fff6;
vertical-align: middle !important;
font-size: 20px;
.base-map-img {
diff --git a/src/components/BaseNav/SoilGroundwater/ReportTable.vue b/src/components/table/components/SoilGroundwater.vue
similarity index 72%
rename from src/components/BaseNav/SoilGroundwater/ReportTable.vue
rename to src/components/table/components/SoilGroundwater.vue
index a395b17..cad6f79 100644
--- a/src/components/BaseNav/SoilGroundwater/ReportTable.vue
+++ b/src/components/table/components/SoilGroundwater.vue
@@ -4,7 +4,7 @@
<el-table-column width="30px" label="">
<template slot-scope="{row,$index}">
<el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" popper-class="popovers">
- <!-- <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater> -->
+ <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
<i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
</el-popover>
</template>
@@ -23,8 +23,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="涓�绾ч闄╁湴鍧�">
+ <refinery :tableHeader="tableHeader1" :tableContent="tableContent1" ></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -35,8 +35,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="浜岀骇椋庨櫓鍦板潡">
+ <refinery :tableHeader="tableHeader1" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -47,8 +47,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="涓夌骇椋庨櫓鍦板潡">
+ <refinery :tableHeader="tableHeader1" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -59,8 +59,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="鍦熷￥閲囨牱鐐�">
+ <refinery :tableHeader="tableHeader2" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -71,8 +71,8 @@
</div>
<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="鐩戞祴鐐规槑缁嗚〃">
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="鍦颁笅姘撮噰鏍风偣">
+ <refinery :tableHeader="tableHeader2" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</el-popover>
</template>
@@ -144,7 +144,25 @@
StopProduction: '2',
deficiency: '2'
- }]
+ }],
+ tableHeader1: [
+ { name: '浼佷笟鍚嶇О', width: '140', propS: 'value1' },
+ { name: '鍦板潡鍚嶇О', width: '140', propS: 'value2' },
+ { name: '鍦板潡淇℃伅', width: '140', propS: 'value3' },
+ { name: '鍦颁笅姘达紙涓級', width: '140', propS: 'value4' },
+ { name: '鍦熷￥锛堜釜锛�', width: '140', propS: 'value5' }
+ ],
+ tableHeader2: [
+ { name: '鍦熷￥鍚嶇О', width: '140', propS: 'value1' },
+ { name: 'PH', width: '80', propS: 'value2' },
+ { name: '鍏环鏍�', width: '100', propS: 'value3' },
+ { name: '閾�', width: '100', propS: 'value4' },
+ { name: '姹�', width: '100', propS: 'value5' }
+ ],
+ tableContent1: [
+ { value1: '1', value2: '2', value3: '3', value4: '4', value5: '5' },
+ { value1: '1', value2: '2', value3: '3', value4: '4', value5: '5' }
+ ]
}
},
methods: {
diff --git a/src/components/table/components/WasteGas.vue b/src/components/table/components/WasteGas.vue
index 0c2c839..1bbe3b1 100644
--- a/src/components/table/components/WasteGas.vue
+++ b/src/components/table/components/WasteGas.vue
@@ -1,131 +1,54 @@
<template>
<div class="Waste-water">
- <el-table
- class="tableBox"
- :data="tableData"
- :header-cell-style="tableHeaderColor"
- :cell-style="rowClass"
- @cell-click="handle"
- >
- <el-table-column
- width="30px"
- label=""
- >
+ <el-table class="tableBox" :data="tableData" :header-cell-style="tableHeaderColor" :cell-style="rowClass" @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
- placement="bottom"
- trigger="click"
- :disabled="!isShowIcon"
- popper-class="popovers"
- >
+ <el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" 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="浼佷笟鍚嶇О">
+ <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="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 prop="WasteWaters" label="宸ヤ笟澶栨帓搴熸按閲忥紙m鲁锛�" width="100px"></el-table-column>
+ <el-table-column label="浜屾哀鍖栫～ (浜х敓閲�/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>
- <el-table-column
- prop="WasteWaters"
- label="宸ヤ笟澶栨帓搴熸按閲忥紙m鲁锛�"
- width="100px">
+ <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>
- <el-table-column label="浜屾哀鍖栫～ (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>
- <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>
- <el-table-column label="VOCs (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 label="VOCs (浜х敓閲�/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>
<el-table-column label="鎺掓斁鍙ｆ娴嬬姸鎬�">
- <el-table-column
- prop="normal"
- label="姝ｅ父"
- width="60px">
+ <el-table-column prop="normal" label="姝ｅ父" width="40px">
<template slot-scope="{row,$index}">
<u v-if="$index!==1" >{{row.normal}}</u>
- <el-popover v-else
- placement="bottom-end"
- width="200"
- trigger="click"
- title="鐩戞祴鐐规帓鏀炬槑缁�"
- >
- <refinery></refinery>
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="鐩戞祴鐐规帓鏀炬槑缁�">
+ <refinery :tableHeader="tableHeader1" :tableContent="tableContent1"></refinery>
<u slot="reference" style="color: #00ffff">{{row.normal}}</u>
</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="40px"></el-table-column>
+ <el-table-column prop="Abnormal" label="寮傚父" width="40px"></el-table-column>
+ <el-table-column prop="StopProduction" label="鍋滀骇" width="40px"></el-table-column>
+ <el-table-column prop="deficiency" label="缂哄け" width="40px">
<template slot-scope="{row,$index}">
<u v-if="$index!==1" >{{row.deficiency}}</u>
- <el-popover v-else
- placement="bottom-end"
- width="200"
- trigger="click"
- title="鐩戞祴鐐规帓鏀炬槑缁�"
- >
+ <el-popover v-else placement="bottom-end" trigger="click" popper-class="popovers" title="鐩戞祴鐐规帓鏀炬槑缁�">
<MissingAlarm></MissingAlarm>
<u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
</el-popover>
@@ -199,16 +122,28 @@
StopProduction: '2',
deficiency: '2'
- }]
+ }],
+ tableHeader1: [
+ { name: '鎺掓斁鐐�', width: '140', propS: 'value1' },
+ { name: '鍗曚綅閮ㄩ棬', width: '80', propS: 'value2' },
+ { name: '搴熸皵鎺掓斁閲忥紙m鲁锛�', width: '120', propS: 'value3' },
+ { name: '浜屾哀鍖栫～锛坱锛�', width: '100', propS: 'value4' },
+ { name: '姘哀鍖栫墿锛坱锛�', width: '100', propS: 'value5' },
+ { name: 'VOCs锛坱锛�', width: '100', propS: 'value5' }
+ ],
+ tableContent1: [
+ { value1: '1', value2: '2', value3: '3', value4: '4', value5: '5' },
+ { value1: '1', value2: '2', value3: '3', value4: '4', value5: '5' }
+ ]
}
},
methods: {
tableHeaderColor ({ 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/WasteSolid.vue b/src/components/table/components/WasteSolid.vue
index ee4dbb4..4b24e07 100644
--- a/src/components/table/components/WasteSolid.vue
+++ b/src/components/table/components/WasteSolid.vue
@@ -35,26 +35,25 @@
<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 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="WasteWaters" width="100px">
+ <div slot="header">
+ <span>澶栨帓搴熸按閲�</span>
+ <div>锛坢鲁锛�</div>
+ </div>
</el-table-column>
- <el-table-column label="姘ㄦ爱 (t)">
- <el-table-column prop="NH4NPut" label="绱浜х敓閲�"></el-table-column>
- <el-table-column prop="NH4NMonth" label="褰撴湀鐢熶骇閲�"></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>
+ <el-table-column label="姘ㄦ爱 (浜х敓閲�/t)">
+ <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">
<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" 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>-->
@@ -69,13 +68,7 @@
<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
- placement="bottom-end"
- width="200"
- trigger="click"
- title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�"
- popper-class="popovers"
- >
+ <el-popover v-else placement="bottom-end" trigger="click" title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�" popper-class="popovers">
<MissingAlarm></MissingAlarm>
<u slot="reference" style="color: #00ffff">{{ row.deficiency }}</u>
</el-popover>
diff --git a/src/components/table/components/WasteWater.vue b/src/components/table/components/WasteWater.vue
index c16d4dd..a4c51fd 100644
--- a/src/components/table/components/WasteWater.vue
+++ b/src/components/table/components/WasteWater.vue
@@ -4,12 +4,7 @@
<el-table-column width="30px" label="">
<template slot-scope="{row,$index}">
<!-- <i class="el-icon-caret-right" v-if="$index ===1"></i>-->
- <el-popover
- placement="bottom"
- trigger="click"
- :disabled="!isShowIcon"
- popper-class="popovers"
- >
+ <el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" 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>-->
@@ -17,32 +12,32 @@
</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 prop="UserName" label="浼佷笟鍚嶇О" >
<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">
+ <el-table-column prop="WasteWaters" width="80">
<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 label="COD (浜х敓閲�/t)">
+ <el-table-column prop="AddOutPut" label="绱" width="70"></el-table-column>
+ <el-table-column prop="MonthOutPut" label="褰撴湀" width="70"></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 label="姘ㄦ爱 (浜х敓閲�/t)">
+ <el-table-column prop="NH4NPut" label="绱" width="70"></el-table-column>
+ <el-table-column prop="NH4NMonth" label="褰撴湀" width="70"></el-table-column>
</el-table-column>
- <el-table-column label="鎺掓斁鍙ｆ娴嬬粺璁＄姸鎬�">
- <el-table-column prop="normal" label="姝ｅ父" width="60px">
+ <el-table-column label="鎺掓斁鍙ｆ娴嬬粺璁＄姸鎬� (涓�)">
+ <el-table-column prop="normal" label="姝ｅ父" width="60">
<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" 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>-->
@@ -51,22 +46,13 @@
</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="60"></el-table-column>
+ <el-table-column prop="Abnormal" label="寮傚父" width="60"></el-table-column>
+ <el-table-column prop="StopProduction" label="鍋滀骇" width="60"></el-table-column>
+ <el-table-column prop="deficiency" label="缂哄け" width="60">
<template slot-scope="{row,$index}">
<u v-if="$index!=1" >{{row.deficiency}}</u>
- <el-popover v-else
- placement="bottom-end"
- width="200"
- trigger="click"
- title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�"
- popper-class="popovers"
- >
+ <el-popover v-else placement="bottom-end" trigger="click" title="澶╂触鐭冲寲鐩戞祴鐐圭己澶辨姤璀︽槑缁�" popper-class="popovers">
<MissingAlarm></MissingAlarm>
<u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
</el-popover>
diff --git a/src/components/table/components/componented/ChemicalWastewater.vue b/src/components/table/components/componented/ChemicalWastewater.vue
index ecb78a1..214f59c 100644
--- a/src/components/table/components/componented/ChemicalWastewater.vue
+++ b/src/components/table/components/componented/ChemicalWastewater.vue
@@ -8,19 +8,24 @@
<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 prop="UserName" label="浼佷笟鍚嶇О" width="120"></el-table-column>
+ <el-table-column prop="WasteWaters" width="100">
+ <div slot="header">
+ <span>宸ヤ笟澶栨帓搴熸按閲�</span>
+ <div>锛坢鲁锛�</div>
+ </div>
+ </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="65"></el-table-column>
+ <el-table-column prop="MonthOutPut" label="鍗遍櫓搴熺墿" width="65"></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="60"></el-table-column>
+ <el-table-column prop="warning" label="棰勮" width="60"></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="60"></el-table-column>
+ <el-table-column prop="warning" label="棰勮" width="60"></el-table-column>
</el-table-column>
</el-table>
</div>
@@ -48,30 +53,9 @@
}
}
</script>
-<style scoped>
+<style lang="less">
.Chemical-Waste-water {
- /* position:fixed;*/
- /* top: 330px;*/
- /* left: 65px;*/
- /* !*width: 850px;*!*/
- /* !*height: 265px;*!*/
- /* border: #90c8e0 1px solid;*/
- /* z-index:3000;*/
- text-align: center;
- background-color: rgba(26, 73, 81, 0.901960784313726);
+ text-align: center;background:@background-color;
color: #fff;
}
- /*.head-area{*/
- /* color: #fff;*/
- /* width: 100%;*/
- /* height: 40px;*/
- /* background-color: #002433;*/
- /* font-size: 16px;*/
- /* border-bottom: #90c8e0 2px solid;*/
- /* padding-left: 16px;*/
- /* !*line-height: 40px;*!*/
- /*}*/
- /*.head-area-button{*/
- /* margin-right: 5px;*/
- /*}*/
</style>
diff --git a/src/components/table/components/componented/MissingAlarm.vue b/src/components/table/components/componented/MissingAlarm.vue
index f1def62..b83f886 100644
--- a/src/components/table/components/componented/MissingAlarm.vue
+++ b/src/components/table/components/componented/MissingAlarm.vue
@@ -1,99 +1,28 @@
<template>
-<div class="MissingAlarm">
+<div class="waste-water">
<el-tabs v-model="activeName">
<el-tab-pane label="灏忔椂鏁版嵁" name="first">
- <el-table
- :data="tableData"
- border
- style="width: 100%"
- >
- <el-table-column
- prop="date"
- label="鎺掓斁鐐�"
- width="150">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎺掓斁绫诲瀷"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ鏃堕棿"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎭㈠鏃堕棿"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="缂哄け灏忔椂鏁�"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="缂哄け鍘熷洜绫诲瀷"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍘熷洜鎻忚堪"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鏁存敼鎺柦"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="闄愬畾鏁存敼缁撴潫鏃堕棿"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="瀹為檯鏁存敼缁撴潫鏃堕棿"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鑱旂綉鏃堕棿"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍑瘉"
- width="120">
- </el-table-column>
+ <el-table :data="tableData" border style="width: 100%">
+ <el-table-column prop="date" label="鎺掓斁鐐�" width="150"></el-table-column>
+ <el-table-column prop="name" label="鎺掓斁绫诲瀷" width="120"></el-table-column>
+ <el-table-column prop="name" label="鎶ヨ鏃堕棿" width="120"></el-table-column>
+ <el-table-column prop="name" label="鎭㈠鏃堕棿" width="120"></el-table-column>
+ <el-table-column prop="name" label="缂哄け灏忔椂鏁�" width="120"></el-table-column>
+ <el-table-column prop="name" label="缂哄け鍘熷洜绫诲瀷" width="120"></el-table-column>
+ <el-table-column prop="name" label="鍘熷洜鎻忚堪" width="120"></el-table-column>
+ <el-table-column prop="name" label="鏁存敼鎺柦" width="120"></el-table-column>
+ <el-table-column prop="name" label="闄愬畾鏁存敼缁撴潫鏃堕棿" width="120"></el-table-column>
+ <el-table-column prop="name" label="瀹為檯鏁存敼缁撴潫鏃堕棿" width="120"></el-table-column>
+ <el-table-column prop="name" label="鑱旂綉鏃堕棿" width="120"></el-table-column>
+ <el-table-column prop="name" label="鍑瘉" width="120"></el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="鏃ユ暟鎹�" name="second">
- <el-table
- :data="tableData"
- border
- style="width: 100%">
- <el-table-column
- prop="date"
- label="鎺掓斁鐐�"
- width="150">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎺掓斁绫诲瀷"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="妫�娴嬫椂闂�"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鐘舵��"
- width="120">
- </el-table-column>
+ <el-table :data="tableData" border style="width: 100%">
+ <el-table-column prop="date" label="鎺掓斁鐐�" width="150"></el-table-column>
+ <el-table-column prop="name" label="鎺掓斁绫诲瀷" width="120"></el-table-column>
+ <el-table-column prop="name" label="妫�娴嬫椂闂�" width="120"></el-table-column>
+ <el-table-column prop="name" label="鐘舵��" width="120"></el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
@@ -134,9 +63,5 @@
</script>
<style scoped>
-.MissingAlarm {
- background-color: #0E3565;
- color: #fff;
- text-align: center;
-}
+
</style>
diff --git a/src/components/table/components/componented/refinery.vue b/src/components/table/components/componented/refinery.vue
index 15dda9e..af87df9 100644
--- a/src/components/table/components/componented/refinery.vue
+++ b/src/components/table/components/componented/refinery.vue
@@ -1,36 +1,13 @@
<template>
<div class="refinery">
- <el-table
- :data="tableData"
- border
- style="width: 100%">
+ <el-table :data="tableData" border style="width: 100%">
+ <el-table-column label="搴忓彿" width="45px" type="index"></el-table-column>
<el-table-column
- label="搴忓彿"
- width="45px"
- type="index">
- </el-table-column>
- <el-table-column
- prop="date"
- label="鎺掓斁鐐�"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍗曚綅閮ㄩ棬"
- width="180">
- </el-table-column>
- <el-table-column
- prop="address"
- label="搴熸按浜х敓閲忥紙m3锛�">
- </el-table-column>
- <el-table-column
- prop="address"
- label="COD (t)">
- </el-table-column>
- <el-table-column
- prop="address"
- label="姘ㄦ爱(t)">
- </el-table-column>
+ v-for="(item,index) in tableHeader"
+ :key="index"
+ :prop="item.propS"
+ :label="item.name"
+ :width="item.width"></el-table-column>
</el-table>
</div>
</template>
@@ -58,12 +35,24 @@
address: ' 1516 寮�'
}]
}
+ },
+ props: {
+ tableHeader: {
+ type: Array,
+ default: () => {
+ return []
+ },
+ tableContent: {
+ type: Array,
+ default: () => {
+ return []
+ }
+ }
+ }
}
}
</script>
<style scoped lang="less">
-.refinery {
- background-color: #0E3565;
-}
+
</style>
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index dd0727a..a9617c9 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -23,9 +23,10 @@
<script>
import WasteWater from '@components/table/components/WasteWater'
-import ReportTable from '../../../components/BaseNav/SoilGroundwater/ReportTable'
-// import WasteGas from '@components/table/components/WasteGas'
+import SoilGroundwater from '@components/table/components/SoilGroundwater'
+
+import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/WasteSolid'
import AirQuality from '@components/table/components/AirQuality'
@@ -36,6 +37,7 @@
components: {
WasteWater,
// WasteGas,
+ // SoilGroundwater,
SolidWaste,
AirQuality
},
@@ -57,7 +59,7 @@
this.gcComp = WasteWater
break
case '搴熸皵':
- this.gcComp = WasteWater
+ this.gcComp = WasteGas
break
case '鍥哄簾':
this.gcComp = SolidWaste
@@ -66,7 +68,7 @@
this.gcComp = AirQuality
break
case '鍦熷￥鍙婂湴涓嬫按':
- this.gcComp = ReportTable
+ this.gcComp = SoilGroundwater
break
case '绠＄嚎':
this.gcComp = AirQuality
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index a5d73eb..6bc279f 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,6 +1,6 @@
<template>
<div class="summary-sheets">
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="" placement="left">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left">
<div :class='["iconBtn",subtopic ? "active-button" : ""]' @click="subtopicBtn" >
<i class="el-icon-tickets icon"></i>
</div>
@@ -115,16 +115,7 @@
}
</script>
-<style scoped lang="less">
- .animationChange-enter-active, .animationChange-leave-active {
- transition: all 0.5s;
- }
-
- .animationChange-enter, .animationChange-leave-to {
- opacity: 0;
- transform: translateX(-100px);
- }
-
+<style lang="less">
.summary-sheets {
position: absolute;
display: inline-flex;
@@ -138,8 +129,8 @@
display: inline-flex;
.iconBtn{
margin-left: 0.03rem;
- border-color:#DCDFE6;
- color:#fff;
+ border-color:#00fff6;
+ color:#00fff6;
}
.iconBtn.active-button{
//border-color:#00fff6 !important;
@@ -154,7 +145,14 @@
top: 15%;
left: 3rem;
}
+ .animationChange-enter-active, .animationChange-leave-active {
+ transition: all 0.5s;
+ }
+ .animationChange-enter, .animationChange-leave-to {
+ opacity: 0;
+ transform: translateX(-100px);
+ }
/*color: #fff;*/
.el-icon-c-scale-to-original {
@@ -162,5 +160,11 @@
height: 30px;
font-size: 30px;
}
+
+ .el-dialog.el-dialog--center{
+ left: 0.5rem;
+ top: 0.73979rem;
+ }
+
}
</style>
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index debe021..8384fca 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -27,12 +27,16 @@
}
export const props = {
+ code: '缂栧彿',
+ name: '鍚嶇О',
+ pfktype: '鎺掓斁鍙ｇ被鍨�',
+ level: '绾у埆',
+ length: '闀垮害(m)',
+ unitname: '鍗曚綅鍚嶇О',
pipename: '绠＄嚎鍚嶇О',
- pipecode: '绠＄嚎缂栫爜',
subchaname: '鏀嚎鍚嶇О',
subchacode: '鏀嚎缂栫爜',
mediumtype: '杈撻�佷粙璐�',
- length: '闀垮害(m)',
startposname: '璧风偣浣嶇疆鍚嶇О',
endposname: '缁堢偣浣嶇疆鍚嶇О',
pressureating: '璁捐鍘嬪姏锛圡Pa锛�',
@@ -50,8 +54,6 @@
pipetrenchtype: '绠℃矡绫诲瀷',
datecollected: '鎺㈡祴鏃堕棿',
operationalstatus: '杩愯鐘舵��',
- acquisitionpeople: '閲囬泦浜�',
- acquisitiondate: '閲囬泦鏃ユ湡',
fourtype: '鍥涢�氱被鍨�',
fourm: '鍥涢�氭潗鏂�'
}
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 5fdeca9..e0bceeb 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -12,7 +12,7 @@
code: 'yj',
name: '绐ㄤ簳',
sname: '绐ㄤ簳',
- checked: true,
+ checked: false,
minZoom: 16,
wfs: WFS_URL + '?TYPENAME=绐ㄤ簳',
icon: 'sewers/绐ㄤ簳.png'
diff --git a/src/utils/dialogDrag.js b/src/utils/dialogDrag.js
index 3c7b596..466f856 100644
--- a/src/utils/dialogDrag.js
+++ b/src/utils/dialogDrag.js
@@ -11,7 +11,6 @@
//console.log(dragDom.style.cssText)
//dragDom.style.cssText += ';top:0px;'
// dragDom.style.cssText = 'bottom:15px;'
-
// 鑾峰彇鍘熸湁灞炴�� ie dom鍏冪礌.currentStyle 鐏嫄璋锋瓕 window.getComputedStyle(dom鍏冪礌, null);
const sty = (function () {
if (window.document.currentStyle) {
@@ -22,6 +21,7 @@
})()
dialogHeaderEl.onmousedown = (e) => {
+
// 榧犳爣鎸変笅锛岃绠楀綋鍓嶅厓绱犺窛绂诲彲瑙嗗尯鐨勮窛绂�
const disX = e.clientX - dialogHeaderEl.offsetLeft
const disY = e.clientY - dialogHeaderEl.offsetTop
diff --git a/src/views/MapTemplate.vue b/src/views/MapTemplate.vue
index 1bbf9e8..1d3e4d9 100644
--- a/src/views/MapTemplate.vue
+++ b/src/views/MapTemplate.vue
@@ -133,13 +133,6 @@
z-index: 999;
}
-.Waste-water {
- position: absolute;
- top: 88px;
- left: 280px;
- z-index: 999;
-}
-
.full-screen {
width: 100%;
height: 100%;
diff --git a/src/views/Temp.vue b/src/views/Temp.vue
index c60d3de..ad04bdb 100644
--- a/src/views/Temp.vue
+++ b/src/views/Temp.vue
@@ -200,13 +200,6 @@
z-index: 999;
}
-.Waste-water {
- position: absolute;
- top: 88px;
- left: 280px;
- z-index: 999;
-}
-
.full-screen {
width: 100%;
height: 100%;
diff --git a/src/views/popup/Popup.vue b/src/views/popup/Popup.vue
index b2fe8db..46a5d1c 100644
--- a/src/views/popup/Popup.vue
+++ b/src/views/popup/Popup.vue
@@ -75,7 +75,7 @@
setDatas (layer) {
console.log(layer)
this.tabs = [{
- title: layer.feature.properties.pipename || layer.feature.id,
+ title: layer.feature.properties.name || layer.feature.id,
name: '1'
}]
this.properties = layer.feature.properties
--
Gitblit v1.8.0