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/Connectivity.vue | 217 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 135 insertions(+), 82 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index 89504b1..7eb985a 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -1,90 +1,109 @@
<template>
<div class="connectivity">
<el-row>
- <el-button type="primary" size="mini">璧峰绠℃</el-button>
- <el-button type="primary" size="mini">缁撴潫绠℃</el-button>
- <el-button type="primary" size="mini">杩為�氭�у垎鏋�</el-button>
- <el-button type="primary" size="mini">娓呴櫎</el-button>
+ <el-button type="primary" size="mini" @click="linkClickStart" title="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠℃">璧峰绠℃</el-button>
+ <el-button type="primary" size="mini" @click="linkClickEnd" title="鍦板浘涓婄偣鍑讳笌鎵�閫夌娈佃繛閫氱娈�">缁撴潫绠℃</el-button>
+ <el-button type="primary" size="mini" @click="linkQuery" title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">杩為�氭�у垎鏋�</el-button>
+ <el-button type="primary" size="mini" @click="linkClear" title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">娓呴櫎</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>
- <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:2rem">
+ <span class="clearfix">璧峰绠℃</span>
+ <el-table
+ ref="singleTable"
+ highlight-current-row
+ :data="tableData"
+ max-height="200"
+ style="width: 100%" size="mini">
+ <el-table-column
+ prop="lineloopna"
+ label="绠＄嚎绫诲瀷"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="pipecode"
+ label="绠＄嚎鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="startpoint"
+ label="璧风偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ sortable
+ width="100"
+ prop="endpointnu"
+ label="缁堢偣缂栧彿"
+ >
+ </el-table-column>
+ <el-table-column
+ class-name="fixed-tablea"
+ fixed="right"
+ label="鎿嶄綔"
+ >
+ <template slot-scope="scope">
+ <el-button @click="linkSelectStart(scope.row)" type="text" size="small">閫夋嫨</el-button>
+ </template>
+ </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>
+ <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>
@@ -94,11 +113,45 @@
name: 'Connectivity',
data () {
return {
+ // 杩為�氭��
+ linkType: 1, // 1 杩為�氭�ц捣濮嬬娈� 0 杩為�氭�х粨鏉熺娈� 鐢ㄦ潵鍒ゆ柇鏄偣鍑讳簡璧峰 杩樻槸缁撴潫绠℃
tableData: []
+ }
+ },
+ methods: {
+ // 鍦板浘鐐瑰嚮璧峰绠℃
+ linkClickStart () {
+ console.log('鍦板浘鐐瑰嚮璧峰绠℃')
+ this.linkType = 1
+ // this.selectPipeLine()
+ },
+ // 鍦板浘鐐瑰嚮缁撴潫绠℃
+ linkClickEnd () {
+ console.log('鍦板浘鐐瑰嚮缁撴潫绠℃')
+ this.linkType = 0
+ // this.selectPipeLine()
+ },
+ // 杩為�氭�у垎鏋�
+ linkQuery () {
+ console.log('鐐瑰嚮杩為�氭�у垎鏋�')
+ },
+ // 娓呴櫎鍔熻兘
+ linkClear () {
+ console.log('鐐瑰嚮娓呴櫎')
+ },
+ // 閫夋嫨璧峰绠℃
+ linkSelectStart () {
+ console.log('閫夋嫨璧峰绠℃')
}
}
}
</script>
<style lang="less" scoped>
+/deep/ .fixed-tablea {
+ background: rgba(0, 16, 30, 1) !important;
+}
+/deep/ .el-table__fixed-right::before {
+ background: none;
+}
</style>
--
Gitblit v1.8.0