From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001 From: chenyabin <Chenab123!> Date: 星期二, 27 四月 2021 09:27:22 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue | 82 +++++++++++++++++++++------------------- 1 files changed, 43 insertions(+), 39 deletions(-) diff --git a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue index b417149..f6c0928 100644 --- a/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue +++ b/src/components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional.vue @@ -5,26 +5,38 @@ <el-button type="primary" size="mini">鎴柇闈㈠垎鏋�</el-button> <el-button type="primary" size="mini">娓呴櫎</el-button> </el-row> - <el-table - :data="tableData" - height="250" - border - style="width: 100%"> - <el-table-column - prop="date" - label="绠$嚎鍚嶇О" - width="180"> - </el-table-column> - <el-table-column - prop="name" - label="绠$嚎绫诲瀷" - width="180"> - </el-table-column> - <el-table-column - prop="address" - label="鎿嶄綔"> - </el-table-column> - </el-table> + <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> + <div class="cross-section"> + <span>鏆傛棤鏁版嵁</span> + </div> + </el-card> </div> </template> @@ -33,30 +45,22 @@ name: 'CrossSectional', data () { return { - tableData: [{ - date: '2016-05-02', - name: '鐜嬪皬铏�', - address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�' - }, { - date: '2016-05-04', - name: '鐜嬪皬铏�', - address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�' - }, { - date: '2016-05-01', - name: '鐜嬪皬铏�', - address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�' - }, { - date: '2016-05-03', - name: '鐜嬪皬铏�', - address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�' - }] + tableData: [] } } } </script> <style lang="less" scoped> -/deep/ .el-table { - margin-top: 15px; +.cross-section { + background: rgba(0, 16, 30, 0.5); + border: 0.00521rem solid @color; + box-shadow: 0 0 0.03rem @color; + color: #ffffff; + width: 100%; + height: 50px; + border-radius: 3px; + text-align: center; + line-height: 50px; } </style> -- Gitblit v1.8.0