From 502f36219d0bd87bd60881b761089ace7630fd55 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期一, 10 五月 2021 17:28:11 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/api/host.js | 6 ++++++
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 23 +++++++++++++----------
src/api/mapUrl.js | 12 ++++++------
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/api/host.js b/src/api/host.js
index d2b8228..ec065c4 100644
--- a/src/api/host.js
+++ b/src/api/host.js
@@ -4,3 +4,9 @@
import { getSchemeHost } from '../utils/tools'
export const $HOST = getSchemeHost()
+
+// 绠＄嚎鍒嗘瀽-绾夸笂
+export const $HOSTANALYSE = 'http://xearth.cn:6202'
+
+// 绠＄嚎鍒嗘瀽-鏈湴
+// export const $HOSTANALYSE = 'http://10.238.105.124:8089'
diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js
index 98b9986..bb12e82 100644
--- a/src/api/mapUrl.js
+++ b/src/api/mapUrl.js
@@ -1,7 +1,7 @@
/**
* 璇ユ枃浠堕厤缃帴鍙ｇ殑URL鍦板潃
*/
-import { $HOST } from './host'
+import { $HOST, $HOSTANALYSE } from './host'
export const GetUser = $HOST + '/user/getUser'
@@ -30,8 +30,8 @@
export const getCompany = $HOST + '/company/getCompany'
// 绠＄嚎鍒嗘瀽
-export const findPipelineByClickPoint = 'http://xearth.cn:6202' + '/findPipelineByClickPoint'
-export const findConnectedPipelines = 'http://xearth.cn:6202' + '/findConnectedPipelines'
-export const findFlowDirection = 'http://xearth.cn:6202' + '/findFlowDirection'
-export const findLeakages = 'http://xearth.cn:6202' + '/findLeakages'
-export const getCrossSection = 'http://xearth.cn:6202' + '/getCrossSection'
+export const findPipelineByClickPoint = $HOSTANALYSE + '/findPipelineByClickPoint'
+export const findConnectedPipelines = $HOSTANALYSE + '/findConnectedPipelines'
+export const findFlowDirection = $HOSTANALYSE + '/findFlowDirection'
+export const findLeakages = $HOSTANALYSE + '/findLeakages'
+export const getCrossSection = $HOSTANALYSE + '/getCrossSection'
diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
index d835318..a717a7a 100644
--- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
+++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -55,8 +55,8 @@
<el-tab-pane label="鐖嗙" style="color: #cccccc" name="second">
<el-row>
<span>鐖嗙锛堢浉鍏冲紑鍏筹級</span>
- <el-button type="primary" @click="bgClick" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭娈�">閫夋嫨绠℃</el-button>
- <el-button type="primary" @click="handleClick" size="mini" style="margin-bottom: 5px;" title="娓呴櫎缁樺埗">娓呴櫎</el-button>
+ <el-button type="primary" @click="bgClick" size="mini" title="鍦板浘涓婄偣鍑婚�夋嫨鍙戠敓鐖嗙鐨勭娈�">閫夋嫨绠℃</el-button>
+ <el-button type="primary" @click="handleClick" size="mini" title="娓呴櫎缁樺埗">娓呴櫎</el-button>
</el-row>
<!-- <el-card shadow="hover">-->
<span class="fixed-style">鍙戠敓鐖嗚鐨勭娈�</span>
@@ -86,8 +86,8 @@
<!-- </el-card>-->
</el-tab-pane>
<el-tab-pane label="娴佸悜" name="third">
- <el-button type="primary" @click="selectPipeLine" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭娈�">閫夋嫨绠℃</el-button>
- <el-table max-height="200" class="tableBox" :data="tableDataLiuxiang" size="mini">
+ <el-button type="primary" @click="selectPipeLine" size="mini" highlight-current-row title="鍦板浘涓婄偣鍑昏鏄剧ず娴佸悜鐨勭娈�">閫夋嫨绠℃</el-button>
+ <el-table max-height="200" class="tableBox" highlight-current-row :data="tableDataLiuxiang" size="mini">
<el-table-column :show-overflow-tooltip="true" prop="pipecode" label="绠℃绫诲瀷"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="绠℃鍚嶇О"></el-table-column>
<el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="璧风偣缂栧彿"></el-table-column>
@@ -113,15 +113,15 @@
</el-tab-pane>
<el-tab-pane label="妯柇闈�" name="fourth">
<div>
- <el-button type="primary" @click="drawLine" size="mini" style="margin-bottom: 5px;" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
- <el-button type="primary" @click="jdmQuery" size="mini" style="margin-bottom: 5px;" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
- <el-button type="primary" @click="jdmClear" size="mini" style="margin-bottom: 5px;" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎</el-button>
+ <el-button type="primary" @click="drawLine" size="mini" title="鍦板浘涓婄粯鍒惰杩涜鍒嗘瀽鎴柇闈㈢殑绾�">缁樺埗绾挎</el-button>
+ <el-button type="primary" @click="jdmQuery" size="mini" title="鎴柇闈㈠垎鏋�">鎴柇闈㈠垎鏋�</el-button>
+ <el-button type="primary" @click="jdmClear" size="mini" title="娓呴櫎鎴柇闈㈠垎鏋愮粨鏋�">娓呴櫎</el-button>
</div>
- <!-- <el-card class="box-card">-->
+ <!-- <el-card class="box-card">-->
<div slot="header" class="fixed-style">
<span>绠℃鏌ヨ缁撴灉</span>
</div>
- <el-table class="tableBox" :data="tableData" max-height="200" style="width: 100%" @row-click="selectRow" size="mini">
+ <el-table class="tableBox" :data="tableData" max-height="200" highlight-current-row style="width: 100%" @row-click="selectRow" size="mini">
<el-table-column prop="pipename" label="绠℃鍚嶇О"></el-table-column>
<el-table-column prop="mediumtype" label="绠℃绫诲瀷" width="80"></el-table-column>
<el-table-column class-name="fixed-table" fixed="right" label="鍥捐〃" width="40">
@@ -130,7 +130,7 @@
</template>
</el-table-column>
</el-table>
- <!-- </el-card>-->
+ <!-- </el-card>-->
<!-- <el-card class="box-card">
<div slot="header" class="fixed-style">
<span>鏂潰鍥�</span>
@@ -671,6 +671,7 @@
},
// 妯柇闈㈡暟鎹姹�
async jdmQuery () {
+ this.tableData = []
if (this.hdmParam == null) {
this.$message('璇峰厛鍦ㄥ湴鍥句笂缁樺埗鎴柇绾�')
return false
@@ -685,6 +686,7 @@
}
this.tableData.push(obj)
}
+ // console.log(this.tableData, 'this.tableData')
this.dealWithData(res)
},
dealWithData (e) {
@@ -846,6 +848,7 @@
/deep/ .el-table__body .el-table__row.hover-row td {
background: none !important;
+ color:yellow;
}
/deep/ .el-table__body tr.current-row > td {
--
Gitblit v1.8.0