From 040ae93ad865e102322ceb5582982c1549422bf4 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 13 四月 2021 16:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/RightSearchPanel.vue | 2
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue | 34 ++++++++---
src/assets/css/map/map-panel-style.less | 3 +
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue | 34 ++++++++---
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue | 17 ++++-
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | 52 ++++++++++++-----
6 files changed, 101 insertions(+), 41 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index ae025ac..e556ee1 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -598,3 +598,6 @@
color: #ffffff;
margin: 15px 0;
}
+.fixed-table {
+ background: rgba(0, 16, 30, 1);
+}
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index fb58637..5275991 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -242,7 +242,7 @@
.search-container {
position: relative;
//width: 1.79167rem;
- width: 4.7rem;
+ width: 2.79167rem;
/* height: 5.6475rem;*/
overflow: hidden;
}
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index 2b45355..43788da 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -13,16 +13,23 @@
style="width: 100%">
<el-table-column
prop="date"
- label="绠＄嚎鍚嶇О"
- width="180">
+ label="绠＄嚎绫诲瀷">
</el-table-column>
<el-table-column
prop="name"
- label="绠＄嚎绫诲瀷"
- width="180">
+ label="绠＄嚎鍚嶇О">
</el-table-column>
<el-table-column
- prop="address"
+ prop="province"
+ label="璧风偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="缁堢偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
label="鎿嶄綔">
</el-table-column>
</el-table>
@@ -32,16 +39,23 @@
style="width: 100%">
<el-table-column
prop="date"
- label="绠＄嚎鍚嶇О"
- width="180">
+ label="绠＄嚎绫诲瀷">
</el-table-column>
<el-table-column
prop="name"
- label="绠＄嚎绫诲瀷"
- width="180">
+ label="绠＄嚎鍚嶇О">
</el-table-column>
<el-table-column
- prop="address"
+ prop="province"
+ label="璧风偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="缁堢偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
label="鎿嶄綔">
</el-table-column>
</el-table>
@@ -51,16 +65,23 @@
style="width: 100%">
<el-table-column
prop="date"
- label="绠＄嚎鍚嶇О"
- width="180">
+ label="绠＄嚎绫诲瀷">
</el-table-column>
<el-table-column
prop="name"
- label="绠＄嚎绫诲瀷"
- width="180">
+ label="绠＄嚎鍚嶇О">
</el-table-column>
<el-table-column
- prop="address"
+ prop="province"
+ label="璧风偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="缁堢偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
label="鎿嶄綔">
</el-table-column>
</el-table>
@@ -80,4 +101,5 @@
</script>
<style lang="less" scoped>
+
</style>
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
index c6c5206..f6c0928 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue
@@ -12,16 +12,23 @@
style="width: 100%">
<el-table-column
prop="date"
- label="绠＄嚎鍚嶇О"
- width="180">
+ label="绠＄嚎绫诲瀷">
</el-table-column>
<el-table-column
prop="name"
- label="绠＄嚎绫诲瀷"
- width="180">
+ label="绠＄嚎鍚嶇О">
</el-table-column>
<el-table-column
- prop="address"
+ prop="province"
+ label="璧风偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="缁堢偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
label="鎿嶄綔">
</el-table-column>
</el-table>
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue
index 2cfbacd..c221866 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow.vue
@@ -9,16 +9,23 @@
style="width: 100%">
<el-table-column
prop="date"
- label="绠＄嚎鍚嶇О"
- width="180">
+ label="绠＄嚎绫诲瀷">
</el-table-column>
<el-table-column
prop="name"
- label="绠＄嚎绫诲瀷"
- width="180">
+ label="绠＄嚎鍚嶇О">
</el-table-column>
<el-table-column
- prop="address"
+ prop="province"
+ label="璧风偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="缁堢偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
label="鎿嶄綔">
</el-table-column>
</el-table>
@@ -28,16 +35,23 @@
style="width: 100%">
<el-table-column
prop="date"
- label="绠＄嚎鍚嶇О"
- width="180">
+ label="绠＄嚎绫诲瀷">
</el-table-column>
<el-table-column
prop="name"
- label="绠＄嚎绫诲瀷"
- width="180">
+ label="绠＄嚎鍚嶇О">
</el-table-column>
<el-table-column
- prop="address"
+ prop="province"
+ label="璧风偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="缁堢偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
label="鎿嶄綔">
</el-table-column>
</el-table>
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
index 20f108c..f973a19 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
@@ -12,16 +12,23 @@
style="width: 100%">
<el-table-column
prop="date"
- label="绠＄嚎鍚嶇О"
- width="180">
+ label="绠＄嚎绫诲瀷">
</el-table-column>
<el-table-column
prop="name"
- label="绠＄嚎绫诲瀷"
- width="180">
+ label="绠＄嚎鍚嶇О">
</el-table-column>
<el-table-column
- prop="address"
+ prop="province"
+ label="璧风偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="缁堢偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
label="鎿嶄綔">
</el-table-column>
</el-table>
@@ -31,16 +38,23 @@
style="width: 100%">
<el-table-column
prop="date"
- label="绠＄嚎鍚嶇О"
- width="180">
+ label="绠＄嚎绫诲瀷">
</el-table-column>
<el-table-column
prop="name"
- label="绠＄嚎绫诲瀷"
- width="180">
+ label="绠＄嚎鍚嶇О">
</el-table-column>
<el-table-column
- prop="address"
+ prop="province"
+ label="璧风偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ prop="city"
+ label="缁堢偣缂栧彿">
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-table"
+ fixed="right"
label="鎿嶄綔">
</el-table-column>
</el-table>
--
Gitblit v1.8.0