From 8e8340911055cea995d410d98e0eeabf84e2e53f Mon Sep 17 00:00:00 2001 From: ChenZeping <chenzeping> Date: 星期二, 27 四月 2021 17:20:47 +0800 Subject: [PATCH] 样式/接口调整 --- src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 957 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 485 insertions(+), 472 deletions(-) diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue index 4b3d479..7a9b7a5 100644 --- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue +++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue @@ -1,386 +1,392 @@ <template> <div class="sewers-analysis-tab"> - <transition name="el-fade-in-linear"> - <el-card> - <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick"> - <el-tab-pane label="杩為�氭��" name="first"> - <el-button type="primary" @click="linkClickStart" size="mini" style="margin-bottom: 5px;" - title="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠℃">璧峰绠℃ - </el-button> - <el-button type="primary" @click="linkClickEnd" size="mini" style="margin-bottom: 5px;" - title="鍦板浘涓婄偣鍑讳笌鎵�閫夌娈佃繛閫氱娈�">缁撴潫绠℃ - </el-button> - <el-button type="primary" @click="linkQuery" size="mini" style="margin-bottom: 5px;" - title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">杩為�氭�у垎鏋� - </el-button> - <el-button type="primary" @click="linkClear" size="mini" style="margin-bottom: 5px;" - title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">娓呴櫎 - </el-button> - <el-scrollbar style="height:450px"> - <el-card shadow="hover"> - <span class="fixed-style">璧峰绠℃</span> - <el-table - ref="singleTable" - highlight-current-row - :data="tableDataLinkStart" - @row-click="linkSelectStart" - 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-table" - 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="fixed-style">缁撴潫绠℃</span> - <el-table - max-height="200" - highlight-current-row - :data="tableDataLinkEnd" - @row-click="linkSelectEnd" - 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-table" - fixed="right" - label="鎿嶄綔" - > - <template slot-scope="scope"> - <el-button @click="linkSelectEnd(scope.row)" type="text" size="small">閫夋嫨</el-button> - </template> - </el-table-column> - </el-table> - <span class="fixed-style">鍒嗘瀽缁撴灉:<span style="color: red;">{{ currentLinkIsTrue }}</span></span> - <el-table - highlight-current-row - max-height="200" - :data="tableDataLinkResult" - @row-click="linkResultSelect" - style="width: 100%" size="mini"> + <!-- <transition name="el-fade-in-linear">--> + <!-- <el-card>--> + <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick"> + <el-tab-pane label="杩為�氭��" name="first"> + <el-button type="primary" @click="linkClickStart" size="mini" style="margin-bottom: 5px;" + title="鍦板浘涓婄偣鍑婚�夋嫨闇�瑕佽繘琛岃繛閫氬垎鏋愮殑绠℃">璧峰绠℃ + </el-button> + <el-button type="primary" @click="linkClickEnd" size="mini" style="margin-bottom: 5px;" + title="鍦板浘涓婄偣鍑讳笌鎵�閫夌娈佃繛閫氱娈�">缁撴潫绠℃ + </el-button> + <el-button type="primary" @click="linkQuery" size="mini" style="margin-bottom: 5px;" + title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">杩為�氭�у垎鏋� + </el-button> + <el-button type="primary" @click="linkClear" size="mini" style="margin-bottom: 5px;" + title="鏍规嵁璧峰銆佺粨鏉熺娈佃繘琛岃繛閫氭�у垎鏋�">娓呴櫎 + </el-button> + <!-- <el-scrollbar style="height:450px">--> + <!-- <el-card shadow="hover">--> + <span class="fixed-style">璧峰绠℃</span> + <el-table + ref="singleTable" + highlight-current-row + :data="tableDataLinkStart" + @row-click="linkSelectStart" + 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-table" + 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="fixed-style">缁撴潫绠℃</span> + <el-table + max-height="200" + highlight-current-row + :data="tableDataLinkEnd" + @row-click="linkSelectEnd" + 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-table" + fixed="right" + label="鎿嶄綔" + > + <template slot-scope="scope"> + <el-button @click="linkSelectEnd(scope.row)" type="text" size="small">閫夋嫨</el-button> + </template> + </el-table-column> + </el-table> + <span class="fixed-style">鍒嗘瀽缁撴灉:<span style="color: red;">{{ currentLinkIsTrue }}</span></span> + <el-table + highlight-current-row + max-height="200" + :data="tableDataLinkResult" + @row-click="linkResultSelect" + 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-table" - fixed="right" - label="鎿嶄綔" - > - <template slot-scope="scope"> - <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button> - </template> - </el-table-column> + <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-table" + fixed="right" + label="鎿嶄綔" + > + <template slot-scope="scope"> + <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button> + </template> + </el-table-column> - </el-table> - </el-card> - </el-scrollbar> - </el-tab-pane> - <el-tab-pane label="鐖嗙" name="second" style="color: #cccccc">鐖嗙锛堢浉鍏冲紑鍏筹級 - <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-card shadow="hover"> - <span class="fixed-style">鍙戠敓鐖嗚鐨勭娈�</span> - <el-table - ref="singleTable" - highlight-current-row - :data="bgPipeLine" - 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-table" - fixed="right" - label="鎿嶄綔" - > - <template slot-scope="scope"> - <el-button @click="bgSelect(scope.row)" type="text" size="small">閫夋嫨</el-button> - </template> - </el-table-column> - </el-table> - <span class="fixed-style">闇�瑕佸叧闂殑闃�闂�</span> - <el-table - highlight-current-row - :data="bgFm" - @row-click="bgFmClick" - 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> + <!-- </el-card>--> + <!-- </el-scrollbar>--> + </el-tab-pane> + <el-tab-pane label="鐖嗙" name="second" style="color: #cccccc"> + <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-row> + <!-- <el-card shadow="hover">--> + <span class="fixed-style">鍙戠敓鐖嗚鐨勭娈�:</span> + <el-table + ref="singleTable" + highlight-current-row + :data="bgPipeLine" + 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-table" + fixed="right" + label="鎿嶄綔" + > + <template slot-scope="scope"> + <el-button @click="bgSelect(scope.row)" type="text" size="small">閫夋嫨</el-button> + </template> + </el-table-column> + </el-table> + <span class="fixed-style">闇�瑕佸叧闂殑闃�闂細</span> + <el-table + highlight-current-row + :data="bgFm" + @row-click="bgFmClick" + 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-table" - fixed="right" - label="鎿嶄綔" - > - <template slot-scope="scope"> - <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button> - </template> - </el-table-column> - </el-table> - </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 - :data="tableDataLiuxiang" 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-table" - fixed="right" - label="鎿嶄綔" - width="100" - > - <template slot-scope="scope"> - <el-button @click="lxQuery(scope.row)" type="text" size="small">鏄剧ず娴佸悜</el-button> - </template> - </el-table-column> - </el-table> - <span>鍒嗘瀽缁撴灉</span> - <el-table - highlight-current-row - max-height="200" - :data="lxTableDataResult" - @row-click="lxResultSelect" - style="width: 100%" size="mini"> + <el-table-column + class-name="fixed-table" + fixed="right" + label="鎿嶄綔" + > + <template slot-scope="scope"> + <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button> + </template> + </el-table-column> + </el-table> + <!-- </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 + :data="tableDataLiuxiang" 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-table" + fixed="right" + label="鎿嶄綔" + width="100" + > + <template slot-scope="scope"> + <el-button @click="lxQuery(scope.row)" type="text" size="small">鏄剧ず娴佸悜</el-button> + </template> + </el-table-column> + </el-table> + <span class="fixed-style">鍒嗘瀽缁撴灉</span> + <el-table + highlight-current-row + max-height="200" + :data="lxTableDataResult" + @row-click="lxResultSelect" + style="width: 100%" size="mini"> - <el-table-column - prop="lineloopna" - label="绠$嚎绫诲瀷" - > - </el-table-column> - <el-table-column - sortable - prop="pipecode" - label="绠$嚎鍚嶇О" - > - </el-table-column> - <el-table-column - sortable - prop="startpoint" - label="璧风偣缂栧彿" - > - </el-table-column> - <el-table-column - sortable - prop="endpointnu" - label="缁堢偣缂栧彿" - > - </el-table-column> - <el-table-column - class-name="fixed-table" - fixed="right" - label="鎿嶄綔" - > - <template slot-scope="scope"> - <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button> - </template> - </el-table-column> + <el-table-column + prop="lineloopna" + label="绠$嚎绫诲瀷" + > + </el-table-column> + <el-table-column + width="100" + sortable + 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-table" + fixed="right" + label="鎿嶄綔" + > + <template slot-scope="scope"> + <el-button @click="linkResultSelect(scope.row)" type="text" size="small">瀹氫綅</el-button> + </template> + </el-table-column> - </el-table> - </el-tab-pane> - <el-tab-pane label="妯柇闈�" name="fourth"> - <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-card class="box-card"> - <div slot="header" class="fixed-style"> - <span>绠$嚎鏌ヨ缁撴灉</span> - </div> - <el-table - :data="tableData" - style="width: 100%" @row-click="selectRow" size="mini"> - <el-table-column - prop="name" - label="绠$嚎鍚嶇О" - width="180"> - </el-table-column> - <el-table-column - prop="type" - label="绠$嚎绫诲瀷" - width="180"> - </el-table-column> - <el-table-column - class-name="fixed-table" - fixed="right" - label="鍥捐〃鏌ョ湅" - > - <template slot-scope="scope"> - <el-button @click="selectRow(scope.row)" type="text" size="small">鏌ョ湅</el-button> - </template> - </el-table-column> - </el-table> - </el-card> - <el-card class="box-card"> - <div slot="header" class="fixed-style"> - <span>鏂潰鍥�</span> - </div> - <span v-show="!myChartShow" style="color: #909399;font-size: 12px;">鏆傛棤鏁版嵁</span> - <div v-show="myChartShow" id="echarts_box" ref="myChart" style="width: 600px;height:300px;"></div> - </el-card> - </el-tab-pane> - </el-tabs> - </el-card> - </transition> + </el-table> + </el-tab-pane> + <el-tab-pane label="妯柇闈�" name="fourth"> + <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-card class="box-card">--> + <div slot="header" class="fixed-style"> + <span>绠$嚎鏌ヨ缁撴灉</span> + </div> + <el-table + :data="tableData" + style="width: 100%" @row-click="selectRow" size="mini"> + <el-table-column + prop="name" + label="绠$嚎鍚嶇О" + width="180"> + </el-table-column> + <el-table-column + prop="type" + label="绠$嚎绫诲瀷" + width="180"> + </el-table-column> + <el-table-column + class-name="fixed-table" + fixed="right" + label="鍥捐〃鏌ョ湅" + > + <template slot-scope="scope"> + <el-button @click="selectRow(scope.row)" type="text" size="small">鏌ョ湅</el-button> + </template> + </el-table-column> + </el-table> + <!-- </el-card>--> + <el-card class="box-card"> + <div slot="header" class="fixed-style"> + <span>鏂潰鍥�</span> + </div> + <span v-show="!myChartShow" style="color: #909399;font-size: 12px;">鏆傛棤鏁版嵁</span> + <div v-show="myChartShow" id="echarts_box" ref="myChart" style="width: 600px;height:300px;"></div> + </el-card> + </el-tab-pane> + </el-tabs> + <!-- </el-card>--> + <!-- </transition>--> </div> </template> @@ -453,7 +459,7 @@ methods: { // tab鍒囨崲 handleClick (tab, event) { - console.log(tab, event) + // console.log(tab, event) this.clearLinkPipe() this.clearLX() this.linkClear() @@ -475,15 +481,56 @@ selectClick (e) { window.map.off('click', this.selectClick) const point = [e.latlng.lng, e.latlng.lat] - console.log(point) this.getPipeLine(point) }, + // 鐐瑰嚮鑾峰彇鍒ゆ柇鏁版嵁 + async getPipeLine (point) { + const param = { + x: point[0], + y: point[1], + radius: 3 + } + // 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁 + const res = await mapApi.findPipelineByClickPoint(param) + if (this.activeName === 'first') { + if (this.linkType) { + this.tableDataLinkStart = res.data + } else { + this.tableDataLinkEnd = res.data + } + } else if (this.activeName === 'second') { + this.bgPipeLine = res.data + } else if (this.activeName === 'third') { + this.tableDataLiuxiang = res.data + } else if (this.activeName === 'fourth') { - // 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃ - linkClickStart () { + } + console.log(res) + }, + + // 杩為�氭�� ===> 鍦板浘鐐瑰嚮璧峰绠℃e + linkClickStart (e) { + console.log(e) console.log('鍦板浘鐐瑰嚮璧峰绠℃') this.linkType = 1 this.selectPipeLine() + }, + // 杩為�氭�� 璧峰绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠� + linkSelectStart (e) { + console.log('閫夋嫨璧峰绠℃') + this.$refs.singleTable.setCurrentRow(e) + this.currentSelectStart = e + if (this.currentSelectStartLine != null) { + this.currentSelectStartLine.remove() + this.currentSelectStartLine = null + } + const geom = JSON.parse(e.geomText) + this.currentSelectStartLine = window.L.geoJSON(geom, { + style: function (feature) { + return { color: 'rgba(0,255,0,.6)' } + } + }).addTo(this.map) + this.map.panInsideBounds(this.currentSelectStartLine.getBounds()) }, // 杩為�氭�� ===> 鍦板浘鐐瑰嚮缁撴潫绠℃ linkClickEnd () { @@ -491,66 +538,29 @@ this.linkType = 0 this.selectPipeLine() }, - // 杩為�氭�� 璧峰绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠� - linkSelectStart (e) { - console.log('閫夋嫨璧峰绠℃') - console.log(e) - // this.$refs.singleTable.setCurrentRow(e) - // this.currentSelectStart = e - // if (this.currentSelectStartLine != null) { - // this.currentSelectStartLine.remove() - // this.currentSelectStartLine = null - // } - // const geom = JSON.parse(e.geomText) - // this.currentSelectStartLine = L.geoJSON(geom, { - // style: function (feature) { - // return { color: 'rgba(0,255,0,.6)' } - // } - // }).addTo(this.map) - // this.map.panInsideBounds(this.currentSelectStartLine.getBounds()) - }, // 杩為�氭�� 缁撴潫绠℃ table鍒楄〃鏁版嵁 閫夋嫨鏁版嵁浜嬩欢 鐨勭偣鍑讳簨浠� linkSelectEnd (e) { console.log('閫夋嫨缁撴潫绠℃') console.log(e) - // this.currentSelectEnd = e - // - // if (this.currentSelectEndLine != null) { - // this.currentSelectEndLine.remove() - // this.currentSelectEndLine = null - // } - // - // const geom = JSON.parse(e.geomText) - // this.currentSelectEndLine = L.geoJSON(geom, { - // style: function (feature) { - // return { color: 'rgba(200,0,200,.6)' } - // } - // }).addTo(this.map) - // this.map.panInsideBounds(this.currentSelectEndLine.getBounds()) - }, - // 杩為�氭�� 鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁閫夋嫨鐐瑰嚮浜嬩欢 - linkResultSelect (e) { - console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�') - console.log(e) + this.currentSelectEnd = e - // const geom = JSON.parse(e.geomText) - // if (this.currentSelectResultLine != null) { - // this.currentSelectResultLine.remove() - // this.currentSelectResultLine = null - // } - // this.currentSelectResultLine = L.geoJSON(geom, { - // style: function (feature) { - // return { - // color: 'rgba(255,0,0,.6)', - // weight: 6 - // } - // } - // }).addTo(this.map) - // this.map.panInsideBounds(this.currentSelectResultLine.getBounds()) + // 鍋氬垽鏂璻emove + if (this.currentSelectEndLine != null) { + this.currentSelectEndLine.remove() + this.currentSelectEndLine = null + } + + const geom = JSON.parse(e.geomText) + this.currentSelectEndLine = window.L.geoJSON(geom, { + style: function (feature) { + return { color: 'rgba(200,0,200,.6)' } + } + }).addTo(this.map) + this.map.panInsideBounds(this.currentSelectEndLine.getBounds()) }, // 杩為�氭�ф煡璇� async linkQuery () { - // 璁剧疆鍒嗘瀽缁撴灉涓虹┖ + // 姣忔鏌ヨ鍒嗘瀽缁撴灉涓虹┖ this.tableDataLinkResult = [] if (this.linkPipeline.length > 1) { this.linkPipeline.forEach((itm) => { @@ -568,8 +578,10 @@ startLineID: this.currentSelectStart.id, endLineID: this.currentSelectEnd.id } + console.log(param) // 璇锋眰鎺ュ彛鍜屾暟鎹� const res = await mapApi.findConnectedPipelines(param) + console.log(res) // 鍒ゆ柇鏁版嵁缁撴灉 === 0 鍒欐病鏈夎姹傚埌鏁版嵁 if (res.data.length === 0) { this.$message('娌℃湁鎵惧埌杩為�氱殑绠℃') @@ -597,14 +609,34 @@ // color: '#ffff00' // } // } - // const line = main.createFlowLine(param1) - // const createFlowLine = (param) => { - // let flowLine = L.polyline(param.points, param.option) - // flowLine.addTo(map) - // return flowLine - // } - // this.linkPipeline.push(line) + // const line = main.createFlowLine(param1) + // const createFlowLine = (param) => { + // const flowLine = window.L.polyline(param.points, param.option) + // flowLine.addTo(window.map) + // return flowLine + // } + // this.linkPipeline.push(line) // }) + }, + // 杩為�氭�� 鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁閫夋嫨鐐瑰嚮浜嬩欢 + linkResultSelect (e) { + console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�') + console.log(e) + + // const geom = JSON.parse(e.geomText) + // if (this.currentSelectResultLine != null) { + // this.currentSelectResultLine.remove() + // this.currentSelectResultLine = null + // } + // this.currentSelectResultLine = L.geoJSON(geom, { + // style: function (feature) { + // return { + // color: 'rgba(255,0,0,.6)', + // weight: 6 + // } + // } + // }).addTo(this.map) + // this.map.panInsideBounds(this.currentSelectResultLine.getBounds()) }, // 杩為�氭�х殑娓呴櫎鍔熻兘 linkClear () { @@ -769,36 +801,6 @@ this.flowPipeLine = null } }, - - // 娴佸悜鏁版嵁璇锋眰 - async getPipeLine (point) { - // const param = { - // x: point[0], - // y: point[1], - // radius: 3 - // } - // console.log(param) - - // 鏍规嵁鍙傛暟璇锋眰鎺ュ彛鏁版嵁 - // const res = await api.getPipeline(param) - // 3 娴佸悜 - - // if (this.activeName === 'first') { - // if (this.linkType) { - // this.tableDataLinkStart = res.data - // } else { - // this.tableDataLinkEnd = res.data - // } - // } else if (this.activeName === 'second') { - // this.bgPipeLine = res.data - // } else if (this.activeName === 'third') { - // this.tableDataLiuxiang = res.data - // } else if (this.activeName === 'fourth') { - // - // } - // - // console.log(res) - }, // 娴佸悜-绠$嚎閫夋嫨 selectRowLiuXiang (e) { // 閫夋嫨瑕佹樉绀虹殑娴佸悜绾� @@ -946,10 +948,12 @@ } /deep/ .el-card { - margin-top: 15px; - background: rgba(0, 16, 30, 0.5); + //width: 95%; + //margin: 5px auto; + //border: none; + //background: rgba(0, 16, 30, 0.5); //border: 0.00521rem solid @color; - box-shadow: 0 0 0.03rem @color; + //box-shadow: 0 0 0.03rem @color; } /deep/ .el-card__body { @@ -957,11 +961,20 @@ } /deep/ .fixed-style { + font-size: 12px; display: inline-block; color: #ffffff; margin: 15px; } +/deep/ th.is-leaf { + border: none !important; +} + +/deep/ .el-table__fixed-right::before, .el-table__fixed::before { + background: none; +} + /deep/ .fixed-table { background: rgba(0, 16, 30, 1) !important; } -- Gitblit v1.8.0