From 022dea326d8ea2f68dee90a49e8103ad8f398cd1 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 17:18:55 +0800
Subject: [PATCH] 固废废水废气弹框问题修改
---
src/components/BaseNav/WasteSolid/PublicTabs.vue | 10 ---
src/components/layer/src/layer.vue | 3
src/components/BaseNav/PublicSector.vue | 19 +++---
src/components/LayerController/logic/WasteSolid.js | 11 ++-
src/components/BaseNav/WasteSolid/PublicTable.vue | 35 ++---------
src/components/BaseNav/WasteSolid/WasteSolidIndex.vue | 51 ++++++----------
6 files changed, 44 insertions(+), 85 deletions(-)
diff --git a/src/components/BaseNav/PublicSector.vue b/src/components/BaseNav/PublicSector.vue
index 8c848c6..927f67b 100644
--- a/src/components/BaseNav/PublicSector.vue
+++ b/src/components/BaseNav/PublicSector.vue
@@ -1,22 +1,21 @@
<template>
<div class="public-bounced-content">
- <WasteSolidIndex>
- <template v-slot:WasteSolidTabs></template>
- <template v-slot:WasteSolidTable></template>
- <template v-slot:WasteSolidVideo></template>
- </WasteSolidIndex>
+ <div class="public-bounced-content-left">
+ <slot name='tabs'></slot>
+ <div class="public-bounced-content-left-bottom">
+ <slot name='table'></slot>
+ </div>
+ </div>
+ <div class="public-bounced-content-right">
+ <slot name='video'></slot>
+ </div>
</div>
</template>
<script>
-import WasteSolidIndex from '@components/BaseNav/WasteSolid/WasteSolidIndex'
-
export default {
name: 'PublicSector',
- components: {
- WasteSolidIndex
- },
data () {
return {}
}
diff --git a/src/components/BaseNav/WasteSolid/PublicTable.vue b/src/components/BaseNav/WasteSolid/PublicTable.vue
index f1c70fb..ca2ccf9 100644
--- a/src/components/BaseNav/WasteSolid/PublicTable.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTable.vue
@@ -1,12 +1,4 @@
<template>
- <!-- <div class="react">-->
- <!-- <div class="main-table">-->
- <!-- <el-table :data="listData" style="width: 100%" height="255px" :row-class-name="tableRowClassName">-->
- <!-- <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"-->
- <!-- :label="item.label" :show-overflow-tooltip="true"></el-table-column>-->
- <!-- </el-table>-->
- <!-- </div>-->
- <!-- </div>-->
<div class="slotChildTable">
<span></span>
<span></span>
@@ -83,23 +75,10 @@
</script>
<style lang="less" scoped>
-//.react {
-// position: relative;
-// background: rgba(33, 41, 69, 0.9);
-// background: linear-gradient(to left, #02a6b5, #02a6b5) left top no-repeat,
-// linear-gradient(to bottom, #02a6b5, #02a6b5) left top no-repeat,
-// linear-gradient(to left, #02a6b5, #02a6b5) right top no-repeat,
-// linear-gradient(to bottom, #02a6b5, #02a6b5) right top no-repeat,
-// linear-gradient(to left, #02a6b5, #02a6b5) left bottom no-repeat,
-// linear-gradient(to bottom, #02a6b5, #02a6b5) left bottom no-repeat,
-// linear-gradient(to left, #02a6b5, #02a6b5) right bottom no-repeat,
-// linear-gradient(to left, #02a6b5, #02a6b5) right bottom no-repeat;
-// background-size: 2px 20px, 20px 2px, 2px 20px, 20px 2px;
-//
-// .main-table {
-// //border: 1px red solid;
-// }
-//}
+.main-table {
+ border: 1px #02a6b5 solid;
+}
+
/deep/ .el-table td {
border-bottom: none !important;
}
@@ -133,7 +112,7 @@
border-width: 1px 0 0 1px;
}
-.main span:nth-child(2) {
+.slotChildTable span:nth-child(2) {
position: absolute;
right: -1px;
top: -1px;
@@ -143,7 +122,7 @@
border-width: 1px 1px 0 0;
}
-.main span:nth-child(3) {
+.slotChildTable span:nth-child(3) {
position: absolute;
right: -1px;
bottom: -1px;
@@ -153,7 +132,7 @@
border-width: 0 1px 1px 0;
}
-.main span:nth-child(4) {
+.slotChildTable span:nth-child(4) {
position: absolute;
left: -1px;
bottom: -1px;
diff --git a/src/components/BaseNav/WasteSolid/PublicTabs.vue b/src/components/BaseNav/WasteSolid/PublicTabs.vue
index a9908e2..1f80af7 100644
--- a/src/components/BaseNav/WasteSolid/PublicTabs.vue
+++ b/src/components/BaseNav/WasteSolid/PublicTabs.vue
@@ -36,16 +36,6 @@
StorageDate: '2021-01-17'
}]
}
- },
- methods: {
- // async getTabsData () {
- // // 鍩烘湰淇℃伅 鍜� 璇︾粏淇℃伅 灞曠ず鏁版嵁鎵�闇�鍙傛暟
- // const dataValue = {
- // StoragePlaceId: e.layer.options.totransferData.StoragePlaceId
- // }
- // // 鍩烘湰淇℃伅 tabs
- // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
- // }
}
}
</script>
diff --git a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
index 09b2ace..0b0ea0b 100644
--- a/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
+++ b/src/components/BaseNav/WasteSolid/WasteSolidIndex.vue
@@ -1,21 +1,16 @@
<template>
- <div class="public-bounced-content">
- <div class="public-bounced-content-left">
- <slot name='WasteSolidTabs'>
- <PublicTabs></PublicTabs>
- </slot>
- <div class="public-bounced-content-left-bottom">
- <slot name='WasteSolidTable'>
- <PublicTable></PublicTable>
- </slot>
- </div>
- </div>
- <div class="public-bounced-content-right">
- <slot name='WasteSolidVideo'>
- <PublicVideo></PublicVideo>
- </slot>
- </div>
- </div>
+ <public-sector>
+ <div></div>
+ <template v-slot:tabs>
+ <public-tabs></public-tabs>
+ </template>
+ <template v-slot:table>
+ <public-table ref="table"></public-table>
+ </template>
+ <template v-slot:video>
+ <public-video></public-video>
+ </template>
+ </public-sector>
</template>
<script>
@@ -24,13 +19,20 @@
import PublicTabs from '@components/BaseNav/WasteSolid/PublicTabs'
import PublicTable from '@components/BaseNav/WasteSolid/PublicTable'
import PublicVideo from '@components/BaseNav/PublicVideo'
+import PublicSector from '@components/BaseNav/PublicSector'
export default {
name: 'WasteSolidIndex',
+ props: ['title'],
components: {
+ // WasteSolid,
+ PublicSector,
PublicTabs,
PublicTable,
PublicVideo
+ },
+ mounted () {
+ console.log(this.title)
},
data () {
return {
@@ -47,21 +49,6 @@
}
},
methods: {
- closePopup () {
- this.flag = false
- },
- // async reauestData () {
- // const dataValue = {
- // StoragePlaceId: 0
- // }
- // // console.log(e.layer.options.totransferData.Name)
- // // 寮规鏍囬
- // const title = e.layer.options.totransferData.Name
- // // 鍩烘湰淇℃伅 tabs
- // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue)
- // // 璇︾粏淇℃伅灞曠ず table
- // const resultDetailed = await mapApi.getSolidWasteDetail(dataValue)
- // },
// 鍥哄簾鐩稿叧淇℃伅璁剧疆
setData (title, dataBasic, dataDetailed, value) {
this.flag = true
diff --git a/src/components/LayerController/logic/WasteSolid.js b/src/components/LayerController/logic/WasteSolid.js
index 6ca9dea..3046b2d 100644
--- a/src/components/LayerController/logic/WasteSolid.js
+++ b/src/components/LayerController/logic/WasteSolid.js
@@ -1,7 +1,7 @@
/**
* 鍥哄簾
*/
-
+const WasteSolidIndex = require('@components/BaseNav/WasteSolid/WasteSolidIndex').default
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
const defaultImg = '/assets/images/map/solidwaste/voc.png'
const setting = '/assets/images/map/solidwaste/gf_green2.png'
@@ -12,7 +12,6 @@
const AnimalService = require('../service/AnimalService').default
// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
-const PublicVideo = require('../../BaseNav/PublicVideo').default
module.exports = function () {
/**
@@ -35,7 +34,8 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚� 1.鎺ュ彛鎺ュ彛鏁版嵁鏉ヨ繘琛屾暟鎹殑鍒ゆ柇 2.鏍规嵁鏁版嵁绫诲瀷鐨勪笉鍚岋紝杩涜涓嶅悓绫诲瀷鐨勫浘鐗囨樉绀�
const judgeValue = getSolidWasteData[i].StorageQty
var iconUrl = this.differentTypes(judgeValue)
-
+ // console.log(getSolidWasteData[i].Latitude, getSolidWasteData[i].Longitude)
+ // console.log(getSolidWasteData[i])
const marker = L.marker([positionX, positionY], {
totransferData: getSolidWasteData[i],
icon: L.icon({
@@ -44,6 +44,9 @@
iconAnchor: [15, 15]
})
})
+ // console.log(L.icon)
+ // console.log(iconUrl)
+ // console.log(marker)
layer.addLayer(marker)
}
}
@@ -95,7 +98,7 @@
this.setPanTo(e.latlng, 300)
window.$layer.open({
content: {
- content: PublicVideo, // 缁勪欢
+ content: WasteSolidIndex, // 缁勪欢
parent: this, // 鐖剁粍浠�
data: { // 浼犻�掔殑鍙傛暟
info: this.info,
diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index b29753a..4b281a0 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -46,13 +46,14 @@
this.layer.close(this.id)
},
init () {
+ console.log('3333333333')
const propsData = helper.deepClone(this.content.content.data) || {}
propsData.layerid = this.id
propsData.lydata = this.content.data
propsData.lyoption = this.options
const instance = new this.content.content({
// 鍏蜂綋鍙傛暟淇℃伅锛岃鍙傝�僾ue婧愮爜
- parent: this.content.parent,
+ // parent: this.content.parent,
propsData: propsData
})
instance.vm = instance.$mount()
--
Gitblit v1.8.0