From 69fa4c84656dca30f92d605221c0098917cb613d Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期一, 15 三月 2021 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/panel/RightSearchPanel.vue | 21 +
src/assets/images/map-pages/icon/toolbox/biaohui.png | 0
src/assets/images/map-pages/icon/toolbox/ditu.png | 0
src/components/plugin/Editable.js | 7
src/assets/images/map-pages/icon/toolbox/tool.png | 0
src/components/panel/BaseNavMenuItem.vue | 27 +
src/assets/images/map-pages/icon/toolbox/line.png | 0
src/assets/css/map/map-panel-style.less | 53 ++
src/components/panel/ToolBoxPanel.vue | 374 +++++++++++-------------
src/components/table/components/IndexStatistics.vue | 189 ++++--------
src/assets/images/map-pages/icon/toolbox/polygon.png | 0
src/components/helpers/ServiceLayerHelper.js | 10
src/assets/images/map-pages/icon/toolbox/circle.png | 0
src/assets/images/map-pages/icon/toolbox/ju.png | 0
src/assets/css/map/_map-variable.less | 18
/dev/null | 0
src/assets/images/map-pages/icon/toolbox/xiazai.png | 0
src/assets/images/map-pages/icon/toolbox/map.png | 0
src/components/panel/topicSearch/SewersSearch.vue | 27 -
src/assets/images/map-pages/icon/toolbox/celiang1.png | 0
src/components/table/components/Warn.vue | 152 +++------
21 files changed, 400 insertions(+), 478 deletions(-)
diff --git a/src/assets/css/map/_map-variable.less b/src/assets/css/map/_map-variable.less
index caba7bb..9938ddd 100644
--- a/src/assets/css/map/_map-variable.less
+++ b/src/assets/css/map/_map-variable.less
@@ -1,9 +1,11 @@
-@color:#00fff6;
-@color-highlight:#fff700;
-@color-gray:#C0C4CC;
-@color-title:white;
-@color-over:white;
-@background-color:rgba(0,16,30,.8);
-@background-color-light:rgba(40,50,100,.4);
-@background-color-split:rgba(0,255,246,.14);
+@color: #00fff6;
+@color-highlight: #fff700;
+@color-gray: #C0C4CC;
+@color-title: white;
+@color-over: white;
+@color-tool:#C0C4CC;
+@background-color: rgba(0, 16, 30, .8);
+@background-color-light: rgba(40, 50, 100, .4);
+@background-color-split: rgba(0, 255, 246, .14);
+@background-color-tools: #1A4951;
@border-radius: .03rem;
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 5faaab9..e038a0a 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -12,7 +12,7 @@
height: 20px;
line-height: 20px;
- color: #00fff6;
+ color: @color;
cursor: pointer;
-ms-flex-negative: 0;
flex-shrink: 0;
@@ -21,7 +21,7 @@
.el-tabs__header{
font-size: .08333rem;
line-height: .10938rem;
- background: rgba(0,255,246,.14);
+ // background: rgba(0,255,246,.14);
}
.el-dialog{
border: 0.00521rem solid @color;
@@ -67,21 +67,29 @@
}
}
-.el-table{
- color: #00fff6;
+.el-tabs{
+ .el-tabs__item {
+ height: 40px;
+ line-height: 40px;
+ }
}
.el-table th, .el-table tr{
+ background-color: transparent;
+}
+.el-table{
+ color: @color;
background: transparent;
-}
-.el-table thead {
- color: #ffffff;
- font-weight: 500;
-}
-.el-table, .el-table__expanded-cell {
- background-color: transparent;
-}
-.el-table thead.is-group th{
- background-color: transparent;
+
+ thead {
+ color: #ffffff;
+ font-weight: 500;
+ }
+ thead.is-group th{
+ background: transparent;
+ }
+ .el-table__expanded-cell {
+ background: transparent;
+ }
}
.map-input{
input{
@@ -128,3 +136,20 @@
margin-block-start: 0;
margin-block-end: 0;
}
+.tools-panel-content {
+ border: 1px solid @background-color-tools;
+ background: @background-color-tools;
+ padding: 0;
+ .el-button {
+ padding: 0;
+ margin: 10px;
+ width: 45px;
+ height: 45px;
+ background: @background-color-tools;
+ vertical-align: middle !important;
+ img {
+ width: 16px;
+ height: 16px;
+ }
+ }
+}
diff --git a/src/assets/images/map-pages/icon/toolbox/biaohui.png b/src/assets/images/map-pages/icon/toolbox/biaohui.png
new file mode 100644
index 0000000..9f7fa30
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/biaohui.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/celiang1.png b/src/assets/images/map-pages/icon/toolbox/celiang1.png
new file mode 100644
index 0000000..069e2e4
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/celiang1.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/circle.png b/src/assets/images/map-pages/icon/toolbox/circle.png
index f03cf36..c1c3f3c 100644
--- a/src/assets/images/map-pages/icon/toolbox/circle.png
+++ b/src/assets/images/map-pages/icon/toolbox/circle.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/ditu.png b/src/assets/images/map-pages/icon/toolbox/ditu.png
new file mode 100644
index 0000000..8713eff
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/ditu.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/fullscreen.png b/src/assets/images/map-pages/icon/toolbox/fullscreen.png
deleted file mode 100644
index f24bec5..0000000
--- a/src/assets/images/map-pages/icon/toolbox/fullscreen.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/ju.png b/src/assets/images/map-pages/icon/toolbox/ju.png
new file mode 100644
index 0000000..1a0341e
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/ju.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/legend.png b/src/assets/images/map-pages/icon/toolbox/legend.png
deleted file mode 100644
index 43f6416..0000000
--- a/src/assets/images/map-pages/icon/toolbox/legend.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/line.png b/src/assets/images/map-pages/icon/toolbox/line.png
new file mode 100644
index 0000000..6736258
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/line.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/location.png b/src/assets/images/map-pages/icon/toolbox/location.png
deleted file mode 100644
index 4f0f9be..0000000
--- a/src/assets/images/map-pages/icon/toolbox/location.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/map.png b/src/assets/images/map-pages/icon/toolbox/map.png
new file mode 100644
index 0000000..93cd827
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/map.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/polygon.png b/src/assets/images/map-pages/icon/toolbox/polygon.png
index e2c5ff0..4111565 100644
--- a/src/assets/images/map-pages/icon/toolbox/polygon.png
+++ b/src/assets/images/map-pages/icon/toolbox/polygon.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/square.png b/src/assets/images/map-pages/icon/toolbox/square.png
deleted file mode 100644
index 91373ad..0000000
--- a/src/assets/images/map-pages/icon/toolbox/square.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/tool.png b/src/assets/images/map-pages/icon/toolbox/tool.png
new file mode 100644
index 0000000..94528d2
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/tool.png
Binary files differ
diff --git a/src/assets/images/map-pages/icon/toolbox/xiazai.png b/src/assets/images/map-pages/icon/toolbox/xiazai.png
new file mode 100644
index 0000000..83e8d59
--- /dev/null
+++ b/src/assets/images/map-pages/icon/toolbox/xiazai.png
Binary files differ
diff --git a/src/components/helpers/ServiceLayerHelper.js b/src/components/helpers/ServiceLayerHelper.js
index 6a2ff71..4e0d2fc 100644
--- a/src/components/helpers/ServiceLayerHelper.js
+++ b/src/components/helpers/ServiceLayerHelper.js
@@ -26,11 +26,11 @@
getByLayerId (layerId) {
for (var k in this.layerArray) {
- var layer = this.layerArray[k]
- var geojson = layer.toGeoJSON()
- var features = geojson.features
- for (var j = 0; j < features.length; j++) {
- var feature = features[j]
+ var layerGroup = this.layerArray[k]
+ var layers = layerGroup.getLayers()
+ for (var m = 0; m < layers.length; m++) {
+ var layer = layers[m]
+ var feature = layer.feature
if (feature.id === layerId) {
return layer
}
diff --git a/src/components/panel/BaseNavMenuItem.vue b/src/components/panel/BaseNavMenuItem.vue
index 69330e9..9b497ae 100644
--- a/src/components/panel/BaseNavMenuItem.vue
+++ b/src/components/panel/BaseNavMenuItem.vue
@@ -6,12 +6,13 @@
<template slot="title" v-if="item.icon">
<img :src="item.icon" :title="item.label"/>
</template>
- <template slot="title" v-else>{{item.label}}</template>
+ <template slot="title" v-else>{{ item.label }}</template>
<base-nav-menu-item v-for="child in item.items" :key="child.title" :menuList='[child]'></base-nav-menu-item>
</el-submenu>
</template>
<template v-else>
<el-menu-item :index="item.index" :key="index">
+ <!-- <el-radio></el-radio>-->
{{ item.label }}
</el-menu-item>
</template>
@@ -33,24 +34,26 @@
</script>
<style lang="less" scoped>
+.el-menu--popup {
+ min-width: 100px;
+}
.base-nav-menu {
height: 38px;
- line-height: 38px;
display: flex;
align-items: center;
- justify-content: space-around;
+ justify-content: center;
outline: none;
border: none;
+ //margin-left: 20px;
+ padding: 0;
+ .el-menu--popup {
+ min-width: 100px;
+ }
+}
- .el-submenu {
- .el-submenu__title {
- border-radius: 50%;
-
- .el-icon-arrow-down {
- display: none;
- }
-
- }
+.el-menu--horizontal {
+ .el-menu--popup {
+ min-width: 100px;
}
}
</style>
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index ea52369..d8e296b 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -35,7 +35,15 @@
<!-- <div class="btn-shrink" v-else-if="!isCollapse"></div>-->
<div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>
</div>
- <component :title="title" :is="gcComp"></component>
+
+ <div :class="'search-container map-background'">
+ <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
+ <div class="search-title">
+ 姹￠洦姘�
+ </div>
+ <component :title="title" :is="gcComp"></component>
+ </div>
+ </div>
</div>
</div>
</template>
@@ -145,6 +153,17 @@
</script>
<style lang="less">
+.search-title{
+ color: rgb(255, 255, 255);
+ font-size: 16px;
+ margin: 5px;
+}
+.search-container {
+ position: relative;
+ width: 1.79167rem;
+ height: 3.4375rem;
+ overflow: hidden;
+}
.module-wrap{
width: 0.15rem;
height: 0.15rem;
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index ac33f0f..88f2c4e 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,86 +1,109 @@
<template>
- <div class="lefttop-toolbox-panel">
- <div>
- <div class="init-choose" @click="changeSelect()">
- <img src="@/assets/images/map-pages/icon/toolbox/circle.png" alt=""/>
- </div>
- <el-menu class="el-menu"
- mode="horizontal"
- :collapse="isCollapse"
- unique-opened
- @open="handleOpen"
- @close="handleClose"
- @select="handleSelect"
- v-show='selectGroup'
- >
- <base-nav-menu-item :menuList='menuList'></base-nav-menu-item>
- </el-menu>
+ <div class="left-top-toolbox-panel">
+ <div class="specific-tools">
+ <el-button @click="changeSelect">
+ <!-- <i class="el-icon-s-tools"></i>-->
+ <img src="@assets/images/map-pages/icon/toolbox/tool.png" alt="">
+ <span>宸ュ叿</span>
+ </el-button>
+ <el-row v-show="selectGroup" class="specific-tools-group">
+ <el-popover
+ placement="bottom"
+ width="200"
+ trigger="click"
+ :popper-class="'tools-panel-content'"
+ v-for="(item,index) in menuList" :key="index"
+ >
+ <el-button slot="reference" class="tools-panel-choose">
+ <img :src="item.icon" alt=""/>
+ <span>{{ item.label }}</span>
+ </el-button>
+ <el-button v-for="(itemT,indexT) in item.items" :key="indexT">
+ <!-- <i class="el-icon-s-tools"></i>-->
+ <img :src="itemT.icon" alt=""/>
+ <!-- <span>{{ itemT.label }}</span>-->
+ </el-button>
+ </el-popover>
+ </el-row>
+ <el-button @click="changeSelect" class="special-button">
+ <i :class="selectGroup === false ? 'el-icon-d-arrow-right':'el-icon-d-arrow-left'"></i>
+ </el-button>
</div>
- <!--鏂囧瓧鏍囨敞寮规-->
- <!-- <TextBounced v-show="this.bouncedText" @changeBounced="gitBounced"></TextBounced>-->
</div>
</template>
<script>
-// import legend from '@/assets/images/map-pages/icon/toolbox/legend.png'
+import plot from '@assets/images/map-pages/icon/toolbox/biaohui.png'
+import polygon from '@assets/images/map-pages/icon/toolbox/celiang1.png'
+import location from '@assets/images/map-pages/icon/toolbox/ditu.png'
+import fullscreen from '@assets/images/map-pages/icon/toolbox/xiazai.png'
+
+// 鏍囩粯鐨勫彲閫夋嫨鏁版嵁
+import marker from '@assets/images/map-pages/icon/toolbox/map.png'
+import line from '@assets/images/map-pages/icon/toolbox/line.png'
+
// import square from '@/assets/images/map-pages/icon/toolbox/square.png'
-import circle from '@assets/images/map-pages/icon/toolbox/circle.png'
-import location from '@assets/images/map-pages/icon/toolbox/location.png'
-import polygon from '@assets/images/map-pages/icon/toolbox/polygon.png'
-import fullscreen from '@assets/images/map-pages/icon/toolbox/fullscreen.png'
-
// 娴嬮噺鐨勬柟娉�
-import '@/components/plugin/leaflet-measure-path/leaflet-measure-path.css'
-import Measure from '@/components/plugin/MeaSure'
-
+// import '@/components/plugin/leaflet-measure-path/leaflet-measure-path.css'
+// import Measure from '@/components/plugin/MeaSure'
// 鏍囨敞鐨勬柟娉�
-import MakeTation from '@components/plugin/MakeTation'
-
+// import MakeTation from '@components/plugin/MakeTation'
// 灏佽鐨勯�夋嫨寮规
-import BaseNavMenuItem from '@components/panel/BaseNavMenuItem'
+// import BaseNavMenuItem from '@components/panel/BaseNavMenuItem'
export default {
name: 'ToolBoxPanel',
- components: { BaseNavMenuItem },
+ // components: { BaseNavMenuItem },
data () {
return {
menuList: [
{
- icon: circle,
+ icon: plot,
label: '鏍囩粯',
index: '1',
items: [
{
index: '1-1',
- label: '鐐规爣缁�'
+ label: '鐐规爣缁�',
+ icon: marker
},
{
index: '1-2',
- label: '绾挎爣缁�'
+ label: '绾挎爣缁�',
+ icon: line
},
{
index: '1-3',
- label: '闈㈡爣缁�',
- items: [
- {
- index: '1-3-1',
- label: '鍦嗗舰'
- },
- {
- index: '1-3-2',
- label: '澶氳竟褰�'
- },
- {
- index: '1-3-3',
- label: '鐭╁舰'
- }
- ]
+ label: '鍦嗗舰'
+ },
+ {
+ index: '1-4',
+ label: '澶氳竟褰�'
+ },
+ {
+ index: '1-5',
+ label: '鐭╁舰'
+ }
+ ]
+ },
+ {
+ icon: polygon,
+ label: '娴嬮噺',
+ index: '3',
+ items: [
+ {
+ index: '3-1',
+ label: '璺濈'
+ },
+ {
+ index: '3-2',
+ label: '闈㈢Н'
}
]
},
{
icon: location,
- label: '鍒囨崲搴曞浘',
+ label: '鍦板浘',
index: '2',
items: [
{
@@ -116,29 +139,6 @@
]
},
{
- icon: polygon,
- label: '绠＄綉',
- index: '3',
- items: [
- {
- index: '3-1',
- label: '杩為�氭�у垎鏋�'
- },
- {
- index: '3-2',
- label: '鐖嗙鍒嗘瀽'
- },
- {
- index: '3-3',
- label: '娴佸悜鍒嗘瀽'
- },
- {
- index: '3-4',
- label: '妯柇闈㈠垎鏋�'
- }
- ]
- },
- {
icon: fullscreen,
label: '涓嬭浇',
index: '4',
@@ -162,151 +162,135 @@
selectGroup: false,
drawLayer: null,
map: null,
- L: window.L,
- // 鎺у埗宸ュ叿鏍� 鏂囧瓧鏍囨敞 鐨勫脊妗嗘槸鍚︽樉绀�
- bouncedText: false
+ L: window.L
}
},
methods: {
- handleOpen () {
- },
- handleClose () {
- },
- handleSelect (index, indexPath) {
-
- },
+ // handleSelect (index) {
+ // console.log(index)
+ // switch (index) {
+ // case '4-1':
+ // // this.map.toggleFullscreen()
+ // var printer = this.L.easyPrint({
+ // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ // filename: 'map_image',
+ // exportOnly: true,
+ // hideControlContainer: true
+ // }).addTo(this.map)
+ // printer.printMap('CurrentSize', 'MyManualPrint')
+ // break
+ // case '4-2':
+ // var printerX = this.L.easyPrint({
+ // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ // filename: 'map_image',
+ // exportOnly: true,
+ // hideControlContainer: true
+ // }).addTo(this.map)
+ // printerX.printMap('A4Landscape page', 'MyManualPrint')
+ // break
+ // case '4-3':
+ // var printerY = this.L.easyPrint({
+ // sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
+ // filename: 'map_image',
+ // exportOnly: true,
+ // hideControlContainer: true
+ // }).addTo(this.map)
+ // printerY.printMap('A4Portrait page', 'MyManualPrint')
+ // break
+ // case '1-2':
+ // this.drawLayer = this.map.editTools.startPolyline()
+ // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ // Measure.startMeasureLen(this.map, this.L)
+ // break
+ // case '1-3-1':
+ // // alert('鍦嗗舰')
+ // this.drawLayer = this.map.editTools.circleMarker()
+ // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ // break
+ // case '1-3-2':
+ // this.drawLayer = this.map.editTools.startPolygon()
+ // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ // break
+ // case '1-1':
+ // MakeTation.StartPointAnnotation(this.map, this.L)
+ // break
+ // case '鍥炬爣鏍囨敞':
+ // this.drawLayer = this.map.editTools.startIcon()
+ // this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
+ // break
+ // case '鏂囧瓧鏍囨敞':
+ // this.bouncedText = true
+ // MakeTation.startMakeText(this.map, this.L)
+ // break
+ // case '璺濈娴嬮噺':
+ // Measure.startMeasureLen(this.map, this.L)
+ // break
+ // case '闈㈢Н娴嬮噺':
+ // Measure.startMeasureArea(this.map, this.L)
+ // break
+ // }
+ // },
+ // 鏂囧瓧鏍囨敞鎺у埗
gitBounced (params) {
this.bouncedText = params
},
+ // 宸︿笂鍔熻兘鎺у埗
changeSelect () {
this.selectGroup = !this.selectGroup
- },
- handleSelects (command) {
- console.log(command)
- switch (command) {
- case '鍏ㄥ睆':
- // this.map.toggleFullscreen()
- var printer = this.L.easyPrint({
- sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
- filename: 'map_image',
- exportOnly: true,
- hideControlContainer: true
- }).addTo(this.map)
- printer.printMap('CurrentSize', 'MyManualPrint')
- break
- case 'A4妯悜':
- var printerX = this.L.easyPrint({
- sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
- filename: 'map_image',
- exportOnly: true,
- hideControlContainer: true
- }).addTo(this.map)
- printerX.printMap('A4Landscape page', 'MyManualPrint')
- break
- case 'A4绾靛悜':
- var printerY = this.L.easyPrint({
- sizeModes: ['Current', 'A4Landscape', 'A4Portrait'],
- filename: 'map_image',
- exportOnly: true,
- hideControlContainer: true
- }).addTo(this.map)
- printerY.printMap('A4Portrait page', 'MyManualPrint')
- break
- case '绾挎爣缁�':
- this.drawLayer = this.map.editTools.startPolyline()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- Measure.startMeasureLen(this.map, this.L)
- break
- case '闈㈡爣缁�':
- this.drawLayer = this.map.editTools.startPolygon()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- break
- case '澶氳竟褰�':
- alert('澶氳竟褰�')
- break
- case '鐐规爣缁�':
- MakeTation.StartPointAnnotation(this.map, this.L)
- break
- case '鍥炬爣鏍囨敞':
- this.drawLayer = this.map.editTools.startIcon()
- this.drawLayer.on('dblclick').on('dblclick', this.drawLayer.toggleEdit)
- break
- case '鏂囧瓧鏍囨敞':
- this.bouncedText = true
- MakeTation.startMakeText(this.map, this.L)
- break
- case '璺濈娴嬮噺':
- Measure.startMeasureLen(this.map, this.L)
- break
- case '闈㈢Н娴嬮噺':
- Measure.startMeasureArea(this.map, this.L)
- break
- }
}
}
}
</script>
-<style lang="less">
-
-.lefttop-toolbox-panel {
+<style lang="less" scoped>
+.left-top-toolbox-panel {
position: absolute;
- left: 15px;
+ left: 0;
top: 15px;
z-index: 999;
- div {
- width: 100%;
- height: 55px;
- line-height: 55px;
+ .specific-tools {
display: flex;
align-items: center;
- justify-content: space-around;
+ justify-content: space-evenly;
- .init-choose {
- background: @background-color;
- width: 35px;
- height: 35px;
- border-radius: 50%;
- border: 2px skyblue solid;
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 999;
+ .el-button {
+ padding: 0;
+ margin: 0 0.015rem;
+ width: 45px;
+ height: 45px;
+ background: @background-color-tools;
+ border: none;
+ box-shadow: 0 0 0.03rem #00fff6;
+
+ img {
+ width: 22px;
+ height: 22px;
+ }
+
+ span {
+ display: block;
+ font-size: 0.012rem;
+ color: @color-tool;
+ }
}
- .el-menu {
- width: 80%;
- background: none;
- z-index: 1;
- border: none;
- background: #305B62;
- border-radius: 50px;
+ .special-button {
+ width: 22.5px;
+ height: 45px;
+ color: @color-over;
+ }
+
+ .tools-panel-choose {
+ img {
+ width: 16px;
+ height: 16px;
+ }
+
+ span {
+ display: block;
+ }
}
}
-
- //.transition {
- // @keyframes bounce-in {
- // 0% {
- // transform: scale(0);
- // opacity: 0.3;
- // }
- // 100% {
- // transform: scale(1);
- // opacity: 1;
- // }
- // }
- //
- // .fade-enter-active {
- // transform-origin: left center;
- // animation: bounce-in .2s;
- // }
- //
- // .fade-leave-active {
- // transform-origin: left;
- // animation: bounce-in .2s reverse;
- // }
- //}
-
}
</style>
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index b9d023e..9012ad0 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,8 +1,5 @@
<template>
- <div :class="'sewers-search map-background'">
- <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
- <div class="box__content" v-if="gdVisible">
- <div>
+ <div class="sewers-search" v-if="gdVisible">
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
@@ -40,7 +37,6 @@
</el-form>
</div>
<el-scrollbar style="height:100%">
- <el-card class="search-result" >
<div class="B-TMD-table-list" v-for="(item,index) in list" :key="index">
<div class="B-TMD-table-list-title">
<div class="B-TMD-table-list-head">
@@ -82,7 +78,6 @@
<!-- 璐х墿鍚嶇О锛�<span :title="item.materialName">{{ item.materialName }}</span></div>-->
<!-- </div>-->
</div>
- </el-card>
</el-scrollbar>
<el-card class="footer-page" v-if="total > 10">
<el-pagination
@@ -97,16 +92,12 @@
</el-pagination>
</el-card>
</div>
- </div>
<!-- <div class="monitor2" v-if="hbVisible">-->
<!-- <env-protect-search></env-protect-search>-->
<!-- </div>-->
<!-- <div class="monitor2" v-if="pkVisible">-->
<!-- <discharge-search></discharge-search>-->
<!-- </div>-->
- </div>
- </div>
-
</template>
<script>
@@ -159,7 +150,7 @@
}
})
},
- handleSearch () {
+ async handleSearch () {
const param = {
pipelineType: this.form.pipelineType,
dataType: this.form.dataType
@@ -169,17 +160,15 @@
wfsHelper.addTypeName(this.form.query.layerName)
wfsHelper.addLike(this.form.query.key, this.form.keyword)
// const _this = this
- AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {}, (res) => {
- console.log(res)
- this.list = res.features
- })
+ const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
+ if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
+ this.list = res.data.features
+ }
},
handleLocation (val) {
console.log(val)
const bound = this.L.geoJSON([val], {}).getBounds()
- console.log(bound)
var layer = window.serviceLayerHelper.getByLayerId(val.id)
- console.log(layer)
layer && layer.openPopup()
this.$store.state.map.map.flyToBounds(bound)
}
@@ -188,10 +177,9 @@
</script>
<style lang="less" scoped>
+
.sewers-search{
position: relative;
- width: 1.79167rem;
- height: 3.4375rem;
overflow: hidden;
.search-panel{
background-color: transparent;
@@ -218,7 +206,6 @@
//location-btn{
//
//}
-
.location-btn:hover,.el-input__icon:hover{
color: @color;
cursor: pointer;
diff --git a/src/components/plugin/Editable.js b/src/components/plugin/Editable.js
index d39de14..15b4c3a 100644
--- a/src/components/plugin/Editable.js
+++ b/src/components/plugin/Editable.js
@@ -301,6 +301,7 @@
// 馃崅method startPolyline(latlng: L.LatLng, options: hash): L.Polyline
// Start drawing a Polyline. If `latlng` is given, a first point will be added. In any case, continuing on user click.
// If `options` is given, it will be passed to the Polyline class constructor.
+ // 鐢荤嚎
startPolyline: function (latlng, options) {
const line = this.createPolyline([], options)
line.enableEdit(this.map).newShape(latlng)
@@ -316,6 +317,12 @@
return polygon
},
+ // circleMarker :function (latlng,options) {
+ // const yuan = this.circleMarker(latlng,options)
+ // yuan.enableEdit(this.map).newShape(latlng)
+ // return yuan
+ // }
+
// 馃崅method startMarker(latlng: L.LatLng, options: hash): L.Marker
// Start adding a Marker. If `latlng` is given, the Marker will be shown first at this point.
// In any case, it will follow the user mouse, and will have a final `latlng` on next click (or touch).
diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue
index f38b288..c82e142 100644
--- a/src/components/table/components/IndexStatistics.vue
+++ b/src/components/table/components/IndexStatistics.vue
@@ -1,103 +1,85 @@
<template>
<el-tabs v-model="activeName">
<el-tab-pane label="鎸囨爣缁熻" name="first"><el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
- prop="date"
- label="搴忓彿"
- width="150">
+ type="index"
+ label="搴忓彿">
</el-table-column>
<el-table-column
prop="date"
- label="鍗曚綅鍚嶇О"
- width="150">
+ label="鍗曚綅鍚嶇О">
</el-table-column>
<el-table-column
- prop="date"
- label="宸ヤ笟鍙栨按閲�(m3)"
- width="150">
+ prop="province"
+ label="宸ヤ笟鍙栨按閲�(m3)">
</el-table-column>
<el-table-column
- prop="date"
- label="澶栨帓搴熸按閲�(m3)"
- width="150">
+ prop="province"
+ label="澶栨帓搴熸按閲�(m3)">
</el-table-column>
<el-table-column
- prop="date"
- label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)"
- width="150">
+ prop="province"
+ label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)">
</el-table-column>
<el-table-column label="COD(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="姘ㄦ爱(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="浜屾哀鍖栫～(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="姘哀鍖栫墿(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="VOCs(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
</el-table></el-tab-pane>
@@ -106,96 +88,83 @@
style="width: 100%"
max-height="250">
<el-table-column
- fixed
+ type="index"
+ label="搴忓彿">
+ </el-table-column>
+ <el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column
prop="name"
- label="搴熸按杈炬爣鐜�"
- width="120">
+ label="搴熸按杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="province"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="city"
- label="搴熸皵杈炬爣鐜�"
- width="120">
+ label="搴熸皵杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="address"
- label="鍚嶆"
- width="300">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="浼犺緭鐜�"
- width="120">
+ label="浼犺緭鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="璁惧瀹屽ソ鐜�"
- width="120">
+ label="璁惧瀹屽ソ鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鎺掑悕"
- width="120">
+ label="鎺掑悕">
</el-table-column>
</el-table></el-tab-pane>
<el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third"><el-table
- :data="tableData"
- style="width: 100%"
- max-height="250">
+ :data="tableData">
<el-table-column
- fixed
+ type="index"
+ label="搴忓彿">
+ </el-table-column>
+ <el-table-column
prop="date"
- label="鎺掓斁鐐瑰悕绉�"
- width="150">
+ label="鎺掓斁鐐瑰悕绉�">
</el-table-column>
<el-table-column
prop="name"
- label="鎺掓斁绫诲瀷"
- width="120">
+ label="鎺掓斁绫诲瀷">
</el-table-column>
<el-table-column
prop="province"
- label="杈炬爣鐜�"
- width="120">
+ label="杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="city"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="address"
- label="浼犺緭鐜�"
- width="300">
+ label="浼犺緭鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="璁惧瀹屽ソ鐜�"
- width="120">
+ label="璁惧瀹屽ソ鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
</el-table></el-tab-pane>
</el-tabs>
@@ -208,53 +177,25 @@
return {
activeName: 'first',
tableData: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ date: '闆嗗洟鍏徃',
+ name: '35',
+ province: '23',
+ city: '11',
+ address: 235,
+ zip: 23
+ }, {
+ date: '澶╂触鐭冲寲',
+ name: 32,
+ province: 33,
+ city: 44,
+ address: 53,
zip: 200333
}, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-08',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-06',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-07',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ date: '娴庡崡鐐煎寲',
+ name: 35,
+ province: 13,
+ city: 33,
+ address: 44,
zip: 200333
}]
}
diff --git a/src/components/table/components/Warn.vue b/src/components/table/components/Warn.vue
index efc2577..fee998e 100644
--- a/src/components/table/components/Warn.vue
+++ b/src/components/table/components/Warn.vue
@@ -1,169 +1,144 @@
<template>
<el-tabs v-model="activeName">
<el-tab-pane label="瀹炴椂缁熻" name="first">
+ <el-scrollbar style="width:100%">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
+ </el-scrollbar>
</el-tab-pane>
<el-tab-pane label="褰撴湀缁熻" name="second">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="涓婃湀缁熻" name="third">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
@@ -177,54 +152,33 @@
return {
activeName: 'first',
tableData: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: '闆嗗洟鍏徃',
+ name: 1,
+ province: 1,
+ city: 0,
+ address: 1,
+ zip: 0
}, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: '澶╂触鐭冲寲',
+ name: 1,
+ province: 0,
+ city: 1,
+ address: 1,
+ zip: 2
}, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: 'XXX鐐煎寲',
+ name: 1,
+ province: 2,
+ city: 0,
+ address: 0,
+ zip: 1
}, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-08',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-06',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-07',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: 'XXX鐐煎寲2',
+ name: 1,
+ province: 2,
+ city: 0,
+ address: 0,
+ zip: 1
}]
}
}
--
Gitblit v1.8.0