From 1ff56f3bfcff5cf7f2df3963240c309135e6cc67 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 11:00:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/assets/css/map/_map-variable.less | 5 ++
src/components/plugin/PathDashFlow.js | 1
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 53 ++++++++++++++++++--------
public/assets/images/map/solidwaste/gf_green.png | 0
src/components/LayerController/logic/SolidWaste.js | 7 ++-
5 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/public/assets/images/map/solidwaste/gf_green.png b/public/assets/images/map/solidwaste/gf_green.png
index 144c0ce..3238061 100644
--- a/public/assets/images/map/solidwaste/gf_green.png
+++ b/public/assets/images/map/solidwaste/gf_green.png
Binary files differ
diff --git a/src/assets/css/map/_map-variable.less b/src/assets/css/map/_map-variable.less
index 2dd695f..8ef5f52 100644
--- a/src/assets/css/map/_map-variable.less
+++ b/src/assets/css/map/_map-variable.less
@@ -10,3 +10,8 @@
@background-color-split: rgba(0, 255, 246, .14);//鍒嗗壊绾�
@background-color-tools: #1A4951;//宸ュ叿绠�
@border-radius: .03rem;//鍊掕
+
+@size-0:.08333rem;
+@size-1: .125rem;
+@size-2: .125rem;
+@size-3: .24479rem;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 5a074dd..a1e01bd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -7,20 +7,11 @@
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
<div class="main-table">
- <el-table
- stripe='stripe'
- :height="300"
- tooltip-effect="dark"
- :data="displayContentTableData"
- :row-class-name="tableRowClassName"
- >
- <el-table-column prop="StoragePlaceId" label="搴忓彿"></el-table-column>
- <el-table-column prop="StoragePlaceTypeName" label="绫诲埆"></el-table-column>
- <el-table-column prop="StoragePlaceName" label="鍥哄簾鍚嶇О"></el-table-column>
- <el-table-column prop="StorageZDMJ" label="浠ｇ爜"></el-table-column>
- <el-table-column prop="StorageZCNL" label="浜х敓閲�(t)"></el-table-column>
- <el-table-column prop="StorageZCL" label="鍌ㄥ瓨閲�(t)"></el-table-column>
- <el-table-column prop="StorageType" label="浜х敓瑁呯疆"></el-table-column>
+ <el-table :data="listData" style="width: 100%" stripe='stripe'
+ :height="300"
+ tooltip-effect="dark" :row-class-name="tableRowClassName">
+ <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
+ :label="item.label"></el-table-column>
</el-table>
</div>
</div>
@@ -33,13 +24,43 @@
props: ['displayContentTable'],
data () {
return {
- displayContentTableData: []
+ listData: [],
+ listLabel: [
+ {
+ label: '搴忓彿',
+ prop: 'StoragePlaceId'
+ },
+ {
+ label: '绫诲埆',
+ prop: 'StoragePlaceTypeName'
+ },
+ {
+ label: '鍥哄簾鍚嶇О',
+ prop: 'StoragePlaceName'
+ },
+ {
+ label: '浠ｇ爜',
+ prop: 'StorageZDMJ'
+ },
+ {
+ label: '浜х敓閲�(t)',
+ prop: 'StorageZCL'
+ },
+ {
+ label: '璐瓨閲�(t)',
+ prop: 'StorageZCNL'
+ },
+ {
+ label: '浜х敓瑁呯疆',
+ prop: 'StorageType'
+ }
+ ]
}
},
mounted () {
this.$nextTick(() => {
this.displayContentTable.forEach(item => {
- this.displayContentTableData = item
+ this.listData = item
})
})
},
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index 9344ecf..ffbedfa 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -71,18 +71,21 @@
// 鏍规嵁鐐瑰嚮涓嶅悓鏁版嵁 杩涜鎺ュ彛鐨勬暟鎹姹�
this.requestSolidWasteData = async (e) => {
- // 鍩烘湰淇℃伅灞曠ず
+ // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
const dataValue = {
StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
}
+ // 鍩烘湰淇℃伅 tabs
const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
- // 璇︾粏淇℃伅灞曠ず
+ // 璇︾粏淇℃伅灞曠ず table
const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
+ // 缁戝畾寮规瀹炰緥
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
instance.$mount()
document.body.appendChild(instance.$el)
+ // 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
this.setPanTo(e.latlng, 200)
diff --git a/src/components/plugin/PathDashFlow.js b/src/components/plugin/PathDashFlow.js
index a868066..13b295f 100644
--- a/src/components/plugin/PathDashFlow.js
+++ b/src/components/plugin/PathDashFlow.js
@@ -71,6 +71,7 @@
}
},
_fillStroke: function (ctx, layer) {
+ debugger
var options = layer.options
if (options.fill) {
--
Gitblit v1.8.0