From bacd67f317f8f3851f2f6e8b460d95f25bb5988e Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期一, 10 五月 2021 17:07:06 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | 103 +++++++++------------------------------------------
1 files changed, 18 insertions(+), 85 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
index 46fbf24..1588a23 100644
--- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
+++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -9,99 +9,32 @@
<el-card class="box-card">
<el-scrollbar style="height:2rem">
<span class="clearfix">璧峰绠℃</span>
- <el-table
- ref="singleTable"
- highlight-current-row
- :data="startingSection"
- 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="鎿嶄綔"
- >
+ <el-table ref="singleTable" highlight-current-row :data="startingSection" max-height="200" 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-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 :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 :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>
--
Gitblit v1.8.0