From 275ab635e9bb15e083462abf15070d601b577e62 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 13 五月 2021 14:15:21 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index d7d9af9..e85728c 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -4,12 +4,12 @@
<!--<el-card>-->
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="杩為�氭��" name="first">
- <div>
+ <el-row>
<el-button type="primary" @click="linkClickStart" size="mini" title="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠℃">璧峰绠℃</el-button>
<el-button type="primary" @click="linkClickEnd" size="mini" title="鍦板浘涓婄偣鍑讳笌鎵�閫夌娈佃繛閫氱娈�">缁撴潫绠℃</el-button>
<el-button type="primary" @click="linkQuery" size="mini" title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">杩為�氭�у垎鏋�</el-button>
<el-button type="primary" @click="handleClick" size="mini" title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">娓呴櫎</el-button>
- </div>
+ </el-row>
<!-- <el-scrollbar style="height:450px">-->
<!-- <el-card shadow="hover">-->
<span class="fixed-style">璧峰绠℃</span>
@@ -18,7 +18,7 @@
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="绠℃鍚嶇О"></el-table-column>
<el-table-column sortable width="100" prop="material" label="璧风偣缂栧彿"></el-table-column>
<el-table-column sortable width="100" prop="material" label="缁堢偣缂栧彿"></el-table-column>
- <el-table-column fixed="right" class-name="fixed-table" label="鎿嶄綔" width="40">
+ <el-table-column width="40" fixed="right" class-name="fixed-table" label="鎿嶄綔">
<template slot-scope="scope">
<el-button @click="linkSelectStart(scope.row)" type="text" size="small">閫夋嫨</el-button>
</template>
@@ -37,7 +37,7 @@
</el-table-column>
</el-table>
<span class="fixed-style">鍒嗘瀽缁撴灉:<span style="color: red;margin-left: 15px">{{ currentLinkIsTrue }}</span></span>
- <el-table class="tableBox" highlight-current-row max-height="200" :data="tableDataLinkResult" @row-click="linkResultSelect" style="width: 100%" size="mini">
+ <el-table class="tableBox" highlight-current-row max-height="200" :data="tableDataLinkResult" style="width: 100%" size="mini">
<el-table-column prop="material" label="绠℃绫诲瀷"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="绠℃鍚嶇О"></el-table-column>
<el-table-column sortable width="100" prop="material" label="璧风偣缂栧彿"></el-table-column>
@@ -261,7 +261,7 @@
}
// 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁
const res = await mapApi.findPipelineByClickPoint(param)
- console.log(res.pipesegcode)
+ console.log(res)
if (this.activeName === 'first') {
if (this.linkType === 1) {
this.tableDataLinkStart = res.data
@@ -367,7 +367,7 @@
startLineID: this.currentSelectStart.pipesegcode,
endLineID: this.currentSelectEnd.pipesegcode
}
- // console.log(param)
+ console.log(param)
// 璇锋眰鎺ュ彛鍜屾暟鎹�
const res = await mapApi.findConnectedPipelines(param)
// console.log(res)
@@ -823,6 +823,7 @@
}
/deep/ .fixed-style {
+ /*margin: 15px;*/
font-size: 12px;
display: inline-block;
color: #00fff6;
--
Gitblit v1.8.0