From 1b90ab69c77b1e4717bc9be45ea1acb36b2f6873 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 25 五月 2021 11:38:41 +0800
Subject: [PATCH] 企业应急事件上报页面修改
---
src/utils/dragBoxes.js | 77 +++++++++++++++++++
src/components/base-page/enterprise-emergency/PipelineFile.vue | 16 +++
src/components/base-page/enterprise-emergency/AsWhole.vue | 14 +++
src/components/panel/topicSearch/sewers-select/analysis-choose/CrossSectional.vue | 20 ----
src/components/panel/topicSearch/SewersSearch.vue | 14 +-
src/components/base-page/enterprise-emergency/PositionChange.vue | 30 +++++-
src/components/panel/topicSearch/sewers-select/SewersAnalysis.vue | 40 ----------
src/components/panel/topicSearch/sewers-select/analysis-choose/Connectivity.vue | 2
8 files changed, 137 insertions(+), 76 deletions(-)
diff --git a/src/components/base-page/enterprise-emergency/AsWhole.vue b/src/components/base-page/enterprise-emergency/AsWhole.vue
new file mode 100644
index 0000000..bf3a8cf
--- /dev/null
+++ b/src/components/base-page/enterprise-emergency/AsWhole.vue
@@ -0,0 +1,14 @@
+<template>
+ <div class="as-whole">
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'AsWhole'
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
diff --git a/src/components/base-page/enterprise-emergency/PipelineFile.vue b/src/components/base-page/enterprise-emergency/PipelineFile.vue
index 08998d1..88f5d75 100644
--- a/src/components/base-page/enterprise-emergency/PipelineFile.vue
+++ b/src/components/base-page/enterprise-emergency/PipelineFile.vue
@@ -1,6 +1,13 @@
<template>
<div class="pipeline-file map-background" v-show="pipelineFile">
- <span>绠＄嚎鏂囦欢閫夋嫨</span>
+ <el-form ref="form" :model="form" label-width="80px">
+ <el-form-item label="绠＄嚎鍚嶇О">
+ <el-input v-model="form.pipeName" suffix-icon="el-icon-search"></el-input>
+ </el-form-item>
+ <el-form-item label="绠℃缂栫爜">
+ <el-input v-model="form.pipeCode" suffix-icon="el-icon-search"></el-input>
+ </el-form-item>
+ </el-form>
</div>
</template>
@@ -10,11 +17,16 @@
name: 'PipelineFile',
data () {
return {
- pipelineFile: false
+ pipelineFile: false,
+ form: {
+ pipeName: '',
+ pipeCode: ''
+ }
}
},
mounted () {
eventBus.$on('pipelineFile-choose', (obj) => {
+ // console.log(obj)
this.pipelineFile = obj
})
}
diff --git a/src/components/base-page/enterprise-emergency/PositionChange.vue b/src/components/base-page/enterprise-emergency/PositionChange.vue
index af37112..3911ebb 100644
--- a/src/components/base-page/enterprise-emergency/PositionChange.vue
+++ b/src/components/base-page/enterprise-emergency/PositionChange.vue
@@ -4,7 +4,7 @@
<el-tab-pane label="鐐瑰嚮瀹氫綅" name="first">
<div class="click-location">
<el-input v-model="clickLocation"></el-input>
- <el-button type="primary">纭</el-button>
+ <el-button type="primary" @click="confirm">纭</el-button>
</div>
</el-tab-pane>
<el-tab-pane label="绠＄嚎瀹氫綅" name="second">
@@ -18,7 +18,7 @@
</el-form-item>
</el-form>
<el-button type="primary" size="mini">鎼滅储</el-button>
- <el-button type="primary">纭</el-button>
+ <el-button type="primary" @click="confirm">纭</el-button>
</div>
</el-tab-pane>
<el-tab-pane label="缁忕含搴﹀畾浣�" name="third">
@@ -34,7 +34,7 @@
</el-form>
<el-button type="primary" size="mini">瀹氫綅</el-button>
</div>
- <el-button type="primary">纭</el-button>
+ <el-button type="primary" @click="confirm">纭</el-button>
</div>
</el-tab-pane>
</el-tabs>
@@ -61,18 +61,34 @@
linePos: {
lineName: '',
affFac: ''
- }
+ },
+ tabLabel: ''
}
},
+ mounted () {
+ // 鎺ユ敹瑙勫畾 姣忔閲嶆柊閫夋嫨瀹氫綅 閮芥寚瀹� 閫夋嫨绗竴涓紑濮�
+ eventBus.$on('tab-change', (obj) => {
+ this.activeName = obj
+ })
+ },
methods: {
- handleClick (tab, event) {
- // console.log(tab)
- // console.log(event)
+ // tab 鍒囨崲鐢ㄤ簬鍒ゆ柇
+ handleClick (tab) {
+ // 鎺у埗绗笁灞傞〉闈� 绠＄嚎鍚嶇О/绠℃浠ｇ爜閫夋嫨椤甸潰
if (tab.label === '绠＄嚎瀹氫綅') {
+ // 濡傛灉 鏄绾垮畾浣� 鏄剧ず涓夌骇闄勫睘妗� 杩涜閫夋嫨鏂囦欢鎿嶄綔
eventBus.$emit('pipelineFile-choose', true)
} else {
+ // eles 涓嶈繘琛屾樉绀�
eventBus.$emit('pipelineFile-choose', false)
}
+ },
+ // 鐐瑰嚮纭鎸夐挳浜嬩欢
+ confirm () {
+ // 瀛愮粍浠堕�氳繃浜嬩欢 浼犻�掓暟鎹� 鎺у埗鑷韩鏄剧ず闅愯棌
+ this.$emit('localCation', false)
+ // 閫氳繃bus 鎺у埗涓夌骇闄勫睘寮规鐨勯殣钘�
+ eventBus.$emit('pipelineFile-choose', false)
}
}
}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 7440f01..b77c2be 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -148,13 +148,13 @@
// tab鍒囨崲
handleClick (tab, event) {
console.log(tab, event)
- // if (tab.label === '鍒嗘瀽') {
- // // 鍏抽棴寮圭獥
- // window.mapManager.clickDialogSwitch = false
- // } else {
- // // 鎵撳紑寮圭獥
- // window.mapManager.clickDialogSwitch = true
- // }
+ if (tab.label === '鍒嗘瀽') {
+ // 鍏抽棴寮圭獥
+ window.mapManager.clickDialogSwitch = false
+ } else {
+ // 鎵撳紑寮圭獥
+ window.mapManager.clickDialogSwitch = true
+ }
},
// 鏍规嵁杩斿洖鏁版嵁 纭灞曠ず鍥剧墖
getImgSrc () {
diff --git a/src/components/panel/topicSearch/sewers-select/SewersAnalysis.vue b/src/components/panel/topicSearch/sewers-select/SewersAnalysis.vue
index 7c522ee..2e90737 100644
--- a/src/components/panel/topicSearch/sewers-select/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/sewers-select/SewersAnalysis.vue
@@ -110,44 +110,4 @@
/deep/ .el-tab-pane {
min-height: 506.19px;
}
-
- /*/deep/ .el-tabs--top .el-tabs__item.is-top:nth-child(2) {*/
- /* padding-left: 20px;*/
- /*}*/
-
- /*/deep/ .el-tabs--border-card {*/
- /* background: none;*/
- /* border: none;*/
- /* box-shadow: none;*/
- /*}*/
-
- /*/deep/ .el-tabs--border-card > .el-tabs__header {*/
- /* background: none;*/
- /* border-bottom: none;*/
- /* margin: 0;*/
- /*}*/
-
- /*/deep/ .el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {*/
- /* color: #409EFF;*/
- /* background: none;*/
- /* border: none;*/
- /*}*/
-
- /*/deep/ .el-tabs--border-card > .el-tabs__header .el-tabs__item {*/
- /* border: none;*/
- /*}*/
-
- /*/deep/ .panel-right ::-webkit-scrollbar-thumb {*/
- /* background: none;*/
- /* border: none;*/
- /*}*/
-
- /*/deep/ .el-card__body {*/
- /* padding: 0;*/
- /*}*/
- /*/deep/ .el-table__fixed-right {*/
- /* bottom: 0;*/
- /* padding: 0;*/
- /* margin: 0;*/
- /*}*/
</style>
diff --git a/src/components/panel/topicSearch/sewers-select/analysis-choose/Connectivity.vue b/src/components/panel/topicSearch/sewers-select/analysis-choose/Connectivity.vue
index 6812567..f630052 100644
--- a/src/components/panel/topicSearch/sewers-select/analysis-choose/Connectivity.vue
+++ b/src/components/panel/topicSearch/sewers-select/analysis-choose/Connectivity.vue
@@ -95,7 +95,7 @@
// 鍦板浘涓婄偣鍑�
selectPipeLine () {
window.map.on('click', this.selectClick)
- window.mapManager.clickDialogSwitch = false
+ // window.mapManager.clickDialogSwitch = false
},
// 鍦板浘涓婄偣鍑诲洖璋�
selectClick (e) {
diff --git a/src/components/panel/topicSearch/sewers-select/analysis-choose/CrossSectional.vue b/src/components/panel/topicSearch/sewers-select/analysis-choose/CrossSectional.vue
index ddfc644..3eb57c8 100644
--- a/src/components/panel/topicSearch/sewers-select/analysis-choose/CrossSectional.vue
+++ b/src/components/panel/topicSearch/sewers-select/analysis-choose/CrossSectional.vue
@@ -139,30 +139,12 @@
},
// 瀵硅幏鍙栧埌鐨勬暟鎹繘琛屽鐞�
dealWithData (dataList) {
- console.log(dataList)
- // const dataPoint = e.data.point
- // const spacingList = e.data.pointInterval.reverse()
- // const dataList = []
- // for (let i = 0; i < dataPoint.length; i++) {
- // const obj = {
- // mediumtype: dataPoint[i].pipelines.extraData.mediumtype,
- // startpointz: dataPoint[i].pipelines.extraData.startpointz,
- // diameter: dataPoint[i].pipelines.extraData.diameter,
- // spacing: spacingList[i - 1],
- // x: parseFloat(dataPoint[i].crossPoint3D.x).toFixed(8),
- // y: parseFloat(dataPoint[i].crossPoint3D.y).toFixed(8),
- // z: parseFloat(dataPoint[i].crossPoint3D.z).toFixed(2)
- // }
- // dataList.push(obj)
- // }
+ // console.log(dataList)
// 妯悜鍧愭爣鏁版嵁
const xAxisData = []
const dataObj = []
for (let i = 0; i < dataList.length; i++) {
xAxisData.push(dataList[i].mediumtype)
- // if (dataList[i].mediumtype === '闆ㄦ按') {
- // dataObj.color = 'red'
- // }
dataObj.push(dataList[i].startpointz)
}
this.selectRow(xAxisData, dataObj)
diff --git a/src/utils/dragBoxes.js b/src/utils/dragBoxes.js
index e2c8225..649bc0a 100644
--- a/src/utils/dragBoxes.js
+++ b/src/utils/dragBoxes.js
@@ -38,3 +38,80 @@
}
})
export default drag
+
+// function dialogDragBox (el) {
+// const dialogHeaderEl = el.querySelector('.public-bounced-title')
+// const dragDom = el.querySelector('.report-box')
+//
+// dialogHeaderEl.style.cssText += ';cursor:move;'
+// dragDom.style.cssText += ';top:0px;'
+//
+// // 鑾峰彇鍘熸湁灞炴�� ie dom鍏冪礌.currentStyle 鐏嫄璋锋瓕 window.getComputedStyle(dom鍏冪礌, null);
+// const sty = (() => {
+// if (window.document.currentStyle) {
+// return (dom, attr) => dom.currentStyle[attr]
+// } else {
+// return (dom, attr) => getComputedStyle(dom, false)[attr]
+// }
+// })()
+//
+// dialogHeaderEl.onmousedown = (e) => {
+// // 榧犳爣鎸変笅锛岃绠楀綋鍓嶅厓绱犺窛绂诲彲瑙嗗尯鐨勮窛绂�
+// const disX = e.clientX - dialogHeaderEl.offsetLeft
+// const disY = e.clientY - dialogHeaderEl.offsetTop
+//
+// const screenWidth = document.body.clientWidth // body褰撳墠瀹藉害
+// const screenHeight = document.documentElement.clientHeight // 鍙鍖哄煙楂樺害(搴斾负body楂樺害锛屽彲鏌愪簺鐜涓嬫棤娉曡幏鍙�)
+//
+// const dragDomWidth = dragDom.offsetWidth // 瀵硅瘽妗嗗搴�
+// const dragDomheight = dragDom.offsetHeight // 瀵硅瘽妗嗛珮搴�
+//
+// const minDragDomLeft = dragDom.offsetLeft
+// const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth
+//
+// const minDragDomTop = dragDom.offsetTop
+// const maxDragDomTop = screenHeight - dragDom.offsetTop - dragDomheight
+//
+// // 鑾峰彇鍒扮殑鍊煎甫px 姝ｅ垯鍖归厤鏇挎崲
+// let styL = sty(dragDom, 'left')
+// let styT = sty(dragDom, 'top')
+//
+// // 娉ㄦ剰鍦╥e涓� 绗竴娆¤幏鍙栧埌鐨勫�间负缁勪欢鑷甫50% 绉诲姩涔嬪悗璧嬪�间负px
+// if (styL.includes('%')) {
+// styL = +document.body.clientWidth * (+styL.replace(/%/g, '') / 100)
+// styT = +document.body.clientHeight * (+styT.replace(/%/g, '') / 100)
+// } else {
+// styL = +styL.replace(/px/g, '')
+// styT = +styT.replace(/px/g, '')
+// }
+//
+// document.onmousemove = function (e) {
+// // 閫氳繃浜嬩欢濮旀墭锛岃绠楃Щ鍔ㄧ殑璺濈
+// let left = e.clientX - disX
+// let top = e.clientY - disY
+//
+// // 杈圭晫澶勭悊
+// if (-(left) > minDragDomLeft) {
+// left = -(minDragDomLeft)
+// } else if (left > maxDragDomLeft) {
+// left = maxDragDomLeft
+// }
+//
+// if (-(top) > minDragDomTop) {
+// top = -(minDragDomTop)
+// } else if (top > maxDragDomTop) {
+// top = maxDragDomTop
+// }
+//
+// // 绉诲姩褰撳墠鍏冪礌
+// dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
+// }
+//
+// document.onmouseup = function (e) {
+// document.onmousemove = null
+// document.onmouseup = null
+// }
+// }
+// }
+//
+// export default dialogDragBox
--
Gitblit v1.8.0