From be3ff5213201a3a8716f6186f5fd8b20ee264e48 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期三, 14 四月 2021 09:34:42 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 3
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 4
src/components/BaseNav/PublicBounced/common/PublicChart.vue | 10 +-
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 0
src/components/BaseNav/PublicBounced/common/PublicTabs.vue | 0
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue | 0
src/assets/css/map/map-panel-style.less | 18 +++-
src/components/BaseNav/PublicBounced/common/PublicVideo.vue | 0
src/components/BaseNav/PublicBounced/common/PublicTable.vue | 0
src/components/BaseNav/PublicBounced/PublicBounced.vue | 8 +-
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | 1
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 4
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 0
src/components/panel/topicSearch/SewersSelect/SewersHistory.vue | 143 +++++++++++++++++++++++++++++++++++
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 2
src/components/panel/topicSearch/SewersSearch.vue | 8 +
16 files changed, 178 insertions(+), 23 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index e556ee1..7431f1c 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -115,7 +115,7 @@
thead.is-group th {
background: transparent;
- padding:0
+ padding: 0
}
.el-table__expanded-cell {
@@ -565,39 +565,47 @@
.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
padding-left: 20px;
}
+
.el-tabs--border-card {
background: none;
border: none;
box-shadow: none;
}
-.el-tabs--border-card>.el-tabs__header {
+
+.el-tabs--border-card > .el-tabs__header {
background: none;
border-bottom: none;
margin: 0;
}
-.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
+
+.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
color: #409EFF;
background: none;
border: none;
}
-.el-tabs--border-card>.el-tabs__header .el-tabs__item {
+
+.el-tabs--border-card > .el-tabs__header .el-tabs__item {
border: none;
}
+
.panel-right ::-webkit-scrollbar-thumb {
background: none;
border: none;
}
+
.el-card {
margin-top: 15px;
background: rgba(0, 16, 30, 0.5);
border: 0.00521rem solid @color;
box-shadow: 0 0 0.03rem @color;
}
+
.clearfix {
display: inline-block;
color: #ffffff;
margin: 15px 0;
}
+
.fixed-table {
- background: rgba(0, 16, 30, 1);
+ background: rgba(0, 16, 30, 1) !important;
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index d635356..47b7762 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -31,10 +31,10 @@
<script>
import '@/utils/dragBoxes'
-import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
-import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-import PublicChart from './GasComponents/PublicChart'
+import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+import PublicChart from './common/PublicChart'
export default {
name: 'PublicBounced',
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
similarity index 91%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
rename to src/components/BaseNav/PublicBounced/common/PublicChart.vue
index fdb0659..ba6a2db 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/common/PublicChart.vue
@@ -27,12 +27,12 @@
</template>
<script>
-import EChartsHour from './EChartsHour'
-import EChartsDate from './EChartsDate'
-import ECharts from './Echarts'
+import EChartsHour from './echarts/EChartsHour'
+import EChartsDate from './echarts/EChartsDate'
+import ECharts from './echarts/Echarts'
// import EChartsDate from './EChartsDate'
-import EChartsHourWasteWater from './EChartsHourWasteWater'
-import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'
+import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
+import EChartsTable from '@components/BaseNav/PublicBounced/common/echarts/EChartsTable'
export default {
name: 'PublicChart',
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/common/PublicTable.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
rename to src/components/BaseNav/PublicBounced/common/PublicTable.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/common/PublicTabs.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
rename to src/components/BaseNav/PublicBounced/common/PublicTabs.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/common/PublicVideo.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
rename to src/components/BaseNav/PublicBounced/common/PublicVideo.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
similarity index 99%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index a17c565..89a4517 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -38,7 +38,7 @@
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
- <div style="width:5rem;height:2rem;" id="echarts" ref="main">
+ <div style="width:6rem;height:2rem;" id="echarts" ref="main">
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -57,7 +57,7 @@
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
export default {
name: 'ECharts',
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
similarity index 99%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index f8a7ec3..3efe3a6 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -43,7 +43,7 @@
<div class="detailbtn" @click="onSubmit">鏌ヨ</div>
<div class="detailbtn" @click="dialogVisible = true" >鏄庣粏琛�</div>
</div>
- <div style="width:5rem;height:2rem;" id="echarts" ref="main">
+ <div style="width:676px;height:200px;" id="echarts" ref="main">
</div>
</div>
<!-- 鏄庣粏寮规 -->
@@ -62,7 +62,7 @@
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
export default {
name: 'ECharts',
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
similarity index 99%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index 495445a..c7e775e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -62,7 +62,7 @@
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
export default {
name: 'ECharts',
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/EChartsTable.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/Echarts.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
similarity index 100%
rename from src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
rename to src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 5275991..ebd4277 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -242,7 +242,8 @@
.search-container {
position: relative;
//width: 1.79167rem;
- width: 2.79167rem;
+ //width: 2.39167rem;
+ width: 2.3rem;
/* height: 5.6475rem;*/
overflow: hidden;
}
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 146a06e..8d0b517 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -61,7 +61,9 @@
<el-tab-pane label="鍒嗘瀽" name="second">
<SewersAnalysis></SewersAnalysis>
</el-tab-pane>
- <el-tab-pane label="鍘嗗彶" name="third">鍘嗗彶</el-tab-pane>
+ <el-tab-pane label="鍘嗗彶" name="third">
+ <SewersHistory></SewersHistory>
+ </el-tab-pane>
</el-tabs>
</div>
</template>
@@ -78,11 +80,13 @@
// 寮曞叆鍒嗘瀽缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
+import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
export default {
name: 'SewersSearch',
components: {
- SewersAnalysis
+ SewersAnalysis,
+ SewersHistory
},
data () {
return {
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index 43788da..89504b1 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -101,5 +101,4 @@
</script>
<style lang="less" scoped>
-
</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersHistory.vue b/src/components/panel/topicSearch/SewersSelect/SewersHistory.vue
new file mode 100644
index 0000000..725bb93
--- /dev/null
+++ b/src/components/panel/topicSearch/SewersSelect/SewersHistory.vue
@@ -0,0 +1,143 @@
+<template>
+ <div class="sewers-search" v-if="judgeVisible">
+ <div class="search-panel ">
+ <el-form ref="form" :model="form" label-width="90px" class="search-form">
+ <el-form-item v-for="(item,index) in Options" :key="index" :label="item.label+'锛�'" size="mini"
+ class="search-panel-item">
+ <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
+ :popper-class="'select-down'">
+ <el-option
+ v-for="(ite,index) in item.options"
+ :key="index"
+ :label="ite.label"
+ :value="ite.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
+ </div>
+ </el-form>
+ </div>
+ <el-scrollbar style="height:286.22px">
+ <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
+ <i class="state"></i>
+ <div>
+ <h3>###鐐煎寲閮�</h3>
+ <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
+ <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
+ </div>
+ </div>
+ </el-scrollbar>
+ </div>
+</template>
+
+<script>
+
+export default {
+ name: 'SewersHistory',
+ data () {
+ return {
+ judgeVisible: true,
+ form: {
+ keyword: '鍘嗗彶鏁版嵁'
+ },
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
+ searchDataDisplay: [],
+ Options: [
+ {
+ value: '1',
+ label: '绠＄嚎绫诲瀷',
+ options: [{
+ value: '1-1',
+ layerName: '闆ㄦ按绠＄嚎',
+ key: 'yushuiguanxian',
+ label: '闆ㄦ按绠＄嚎'
+ }],
+ labelList: [{
+ label: '闆ㄦ按绠＄嚎',
+ key: 'yushuiguanxian'
+ }, {
+ label: '闀垮害(m)',
+ key: 'length'
+ }]
+ },
+ {
+ value: '2',
+ label: '鍙樻洿骞翠唤',
+ options: [{
+ value: '2-1',
+ layerName: '2004',
+ key: '2004',
+ label: '2004骞�'
+ }, {
+ value: '2-2',
+ layerName: '2005',
+ key: '2005',
+ label: '2005骞�'
+ }, {
+ value: '2-3',
+ layerName: '2006',
+ key: '2006',
+ label: '2006骞�'
+ }],
+ labelList: [{
+ label: '杈撻�佷粙璐�',
+ key: 'mediumtype'
+ }, {
+ label: '闀垮害(m)',
+ key: 'length'
+ }]
+ },
+ {
+ value: '3',
+ label: '鍙樻洿绫诲瀷',
+ options: [{
+ value: '3-1',
+ layerName: '鍏ㄩ儴',
+ key: 'type',
+ label: '鍏ㄩ儴'
+ }],
+ labelList: [{
+ label: '杈撻�佷粙璐�',
+ key: 'mediumtype'
+ }, {
+ label: '闀垮害(m)',
+ key: 'length'
+ }]
+ }
+ ]
+ }
+ },
+ methods: {
+ handlePipelineType (val) {
+ console.log(val)
+ },
+ // 鐐瑰嚮鎼滅储瀹炵幇鏁版嵁鐨勬悳绱㈠睍绀�
+ handleSearch (data) {
+ console.log(data)
+ }
+ }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>
--
Gitblit v1.8.0