From c7a549da66df42d4ec5c78ddf2cc138772616941 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期一, 19 四月 2021 14:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue | 127 ++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 55 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
index f973a19..c1deb22 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
@@ -2,72 +2,89 @@
<div class="connectivity">
<el-row>
<span class="tube-span">鐖嗙(鐩稿叧寮�鍏�)</span>
- <el-button type="primary" size="mini">閫夋嫨绠＄嚎</el-button>
- <el-button type="primary" size="mini">娓呴櫎</el-button>
+ <el-button type="primary" size="mini" @click="bgClick">閫夋嫨绠＄嚎</el-button>
+ <el-button type="primary" size="mini" @click="handleClick('czp')">娓呴櫎</el-button>
</el-row>
<el-card class="box-card">
- <span class="clearfix">鍙戠敓鐖嗚鐨勭娈�</span>
- <el-table
- :data="tableData"
- style="width: 100%">
- <el-table-column
- prop="date"
- label="绠＄嚎绫诲瀷">
- </el-table-column>
- <el-table-column
- prop="name"
- label="绠＄嚎鍚嶇О">
- </el-table-column>
- <el-table-column
- 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>
- <span class="clearfix">闇�瑕佸叧闂殑闃�闂�</span>
- <el-table
- :data="tableData"
- style="width: 100%">
- <el-table-column
- prop="date"
- label="绠＄嚎绫诲瀷">
- </el-table-column>
- <el-table-column
- prop="name"
- label="绠＄嚎鍚嶇О">
- </el-table-column>
- <el-table-column
- 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>
+ <el-scrollbar style="height:350px">
+ <span class="clearfix">鍙戠敓鐖嗚鐨勭娈�</span>
+ <el-table
+ :data="tableData"
+ style="width: 100%">
+ <el-table-column
+ prop="date"
+ label="绠＄嚎绫诲瀷">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="绠＄嚎鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ 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>
+ <span class="clearfix">闇�瑕佸叧闂殑闃�闂�</span>
+ <el-table
+ :data="tableData"
+ style="width: 100%">
+ <el-table-column
+ prop="date"
+ label="绠＄嚎绫诲瀷">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="绠＄嚎鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ 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>
+ </el-scrollbar>
</el-card>
</div>
</template>
<script>
+
+// import PublicWay from '@components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay'
+
export default {
name: 'Tube',
data () {
return {
- tableData: []
+ tableData: [],
+ tube: []
+ }
+ },
+ methods: {
+ // 閫夋寚绠＄嚎
+ bgClick () {
+ this.selectPipeLine()
+ },
+ // 娓呮缁樺埗
+ handleClick (val) {
+ console.log(val)
+ // PublicWay.handleClick(val)
}
}
}
--
Gitblit v1.8.0