From c98cd1d07a99883d4bd2b9833ce7e91e56a6f1fb Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 19 四月 2021 14:06:08 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/plugin/DialogDrag.js | 8 ++--
src/conf/Topic.js | 6 +-
src/components/BaseNav/pipeline/AffiliatedFacilities.vue | 59 +++++++++++++++++++++++++++++
src/assets/css/map/map-panel-style.less | 21 ++++++++++
src/utils/dialogDrag.js | 8 +++-
src/components/panel/topicSearch/SewersSearch.vue | 12 +++++-
6 files changed, 102 insertions(+), 12 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 7bcc3d5..7c2e6f6 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -14,7 +14,26 @@
list-style: none;
}
-
+.rt{
+ float:right;
+}
+.lt{
+ float:left;
+}
+.el-button--mini, .el-button--mini.is-round{
+ padding: 0.02rem 0.04rem;
+}
+/*闅愯棌*/
+.el-dialog__wrapper{
+ height: 0;
+}
+.el-dialog{
+ margin: 0 !important;
+ position: fixed;
+ z-index: 2000;
+// left: 50%;
+ //bottom:15px;
+}
i {
font-style: normal
}
diff --git a/src/components/BaseNav/pipeline/AffiliatedFacilities.vue b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
new file mode 100644
index 0000000..3cc7ce3
--- /dev/null
+++ b/src/components/BaseNav/pipeline/AffiliatedFacilities.vue
@@ -0,0 +1,59 @@
+<template>
+ <!-- 闄勫睘璁炬柦 -寮规 -->
+ <div class="affiliatedFacilities">
+ <el-dialog
+ custom-class="affiliatedFacilities-dialog"
+ title="鎻愮ず"
+ :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :modal="false"
+ v-dialogDrag
+ >
+ <div>
+ <h3>闄勫睘璁炬柦鍒嗙被</h3>
+ <ul>
+ <li>闄勫睘璁炬柦瀛愮被</li>
+ <li>闄勫睘璁炬柦瀛愮被</li>
+ <li>闄勫睘璁炬柦瀛愮被</li>
+ <li>闄勫睘璁炬柦瀛愮被</li>
+ <li>闄勫睘璁炬柦瀛愮被</li>
+ </ul>
+ </div>
+
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'AffiliatedFacilities',
+ data () {
+ return {
+ dialogVisible: true
+ }
+ },
+ methods: {
+ handleClose (done) {
+ this.$confirm('纭鍏抽棴锛�')
+ .then(_ => {
+ done()
+ })
+ .catch(_ => {})
+ }
+ }
+}
+</script>
+
+<style lang="less">
+.affiliatedFacilities-dialog{
+ width: calc(30% - 15px) !important; // calc(30% - 15px);
+ left: 50%;
+ .el-dialog__body{
+ padding: 0.04rem;
+ h3{color:#fff;}
+ ul {display: flex;flex-wrap: wrap;
+ li{margin-left:0.04rem;margin-bottom: 0.04rem;cursor: pointer;color:#00fff6}
+ }
+ }
+}
+</style >
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index b30e701..e44b703 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -40,7 +40,7 @@
<div>
<h3 @click="handleLocation(item)">{{ item.properties.pipename }}</h3>
<p>鎵�灞炰紒涓氾細<span>{{ item.properties.orgcode }}</span>
- <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.teetype }}</span></p>
+ <p>璁炬柦绫诲瀷锛�<span>{{ item.properties.teetype }}</span> <el-button class="rt" size="mini" style="margin-right: 0.04rem" @click="btnAffiliatedFacilities(item)" >闄勫睘璁炬柦</el-button></p>
</div>
</div>
</el-scrollbar>
@@ -64,6 +64,8 @@
<SewersHistory></SewersHistory>
</el-tab-pane>
</el-tabs>
+ <!-- 闄勫睘璁炬柦闈㈡澘 -->
+ <affiliated-facilities></affiliated-facilities>
</div>
</template>
@@ -77,6 +79,8 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
+import AffiliatedFacilities from '@components/BaseNav/pipeline/AffiliatedFacilities'
+
// 寮曞叆缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
@@ -85,7 +89,8 @@
name: 'SewersSearch',
components: {
SewersAnalysis,
- SewersHistory
+ SewersHistory,
+ AffiliatedFacilities
},
data () {
return {
@@ -139,6 +144,9 @@
handleLocation (val) {
window.layerFactory.flyByFeature(val, this.form.dataType.code)
// layer && layer.openPopup()
+ },
+ btnAffiliatedFacilities (item) {
+ console.log(item)
}
}
}
diff --git a/src/components/plugin/DialogDrag.js b/src/components/plugin/DialogDrag.js
index 2972234..c63717f 100644
--- a/src/components/plugin/DialogDrag.js
+++ b/src/components/plugin/DialogDrag.js
@@ -5,8 +5,8 @@
bind (el, binding, vnode, oldVnode) {
const dialogHeaderEl = el.querySelector('.el-dialog__header')
const dragDom = el.querySelector('.el-dialog')
+ debugger
dialogHeaderEl.style.cursor = 'move'
-
// 鑾峰彇鍘熸湁灞炴�� ie dom鍏冪礌.currentStyle 鐏嫄璋锋瓕 window.getComputedStyle(dom鍏冪礌, null);
const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
@@ -34,10 +34,10 @@
// 绉诲姩褰撳墠鍏冪礌
dragDom.style.left = `${l + styL}px`
- dragDom.style.top = `${t + styT}px`
-
+ // dragDom.style.top = `${t + styT}px`
+ dragDom.style.bottom = `${t - styT}px`
// 灏嗘鏃剁殑浣嶇疆浼犲嚭鍘�
- // binding.value({x:e.pageX,y:e.pageY})
+ // binding.value({ x: e.pageX, y: e.pageY })
}
document.onmouseup = function (e) {
diff --git a/src/conf/Topic.js b/src/conf/Topic.js
index bf99dfd..5d8cd46 100644
--- a/src/conf/Topic.js
+++ b/src/conf/Topic.js
@@ -44,7 +44,7 @@
id: 5,
checked: false,
isShow: true,
- icon: 'iconditu1',
+ icon: 'iconditu',
comp: ''
}, {
name: '鍦熷￥鍙婂湴涓嬫按',
@@ -60,7 +60,7 @@
isShow: true,
icon: 'iconguanxianxuncha',
comp: ''
-}/*, {
+}, {
name: '绠￠亾鍙樻洿',
id: 8,
checked: false,
@@ -74,4 +74,4 @@
isShow: true,
icon: 'iconguanxianbiaozhu',
comp: ''
-} */]
+}]
diff --git a/src/utils/dialogDrag.js b/src/utils/dialogDrag.js
index 6f845f5..a797fe8 100644
--- a/src/utils/dialogDrag.js
+++ b/src/utils/dialogDrag.js
@@ -8,7 +8,9 @@
const dragDom = el.querySelector('.el-dialog')
// dialogHeaderEl.style.cursor = 'move';
dialogHeaderEl.style.cssText += ';cursor:move;'
- dragDom.style.cssText += ';top:0px;'
+ //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 () {
@@ -68,7 +70,9 @@
}
// 绉诲姩褰撳墠鍏冪礌
- dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
+ //dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
+ dragDom.style.cssText = `;left:${left + styL}px;top:${top + styT}px;`
+ //console.log(left , styL,top , styT)
}
document.onmouseup = function (e) {
--
Gitblit v1.8.0