From 7cb769fa01008d3ad0d5ec3cf3ad56c0156f9153 Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期一, 29 三月 2021 18:31:07 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue index bbbb219..6db1047 100644 --- a/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue +++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTable.vue @@ -7,17 +7,15 @@ <div class="border_corner border_corner_left_bottom"></div> <div class="border_corner border_corner_right_bottom"></div> <div class="main"> - <el-row> - <el-row> - <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{name}}</el-col> - <el-col :span="8">鐢熶骇鍗曚綅:{{ DeptSname }}</el-col> - <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{EmissTypeName}}</el-col> - </el-row> - <el-row> - <el-col :span="8">鎺掓斁鍘诲悜:{{EmissTypeDirectName}}</el-col> - <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ContrLevelShowName}}</el-col> - <el-col :span="8">鍐�/澶栨帓鍙�:{{OrOutPortName}}</el-col> - </el-row> + <el-row type="flex" class="row-bg" justify="space-around"> + <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col> + <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContent.DeptSname }}</el-col> + <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.EmissTypeName }}</el-col> + </el-row> + <el-row type="flex" class="row-bg" justify="space-around"> + <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContent.EmissTypeDirectName }}</el-col> + <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col> + <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col> </el-row> </div> </div> @@ -28,14 +26,7 @@ name: 'GasTable', props: ['displayContent'], data () { - return { - name: '鑱氶叝鐑獟鐐�03鐑熸皵鎺掓斁鍙�', - DeptSname: '澶ц姵鐑冭缃�', - EmissTypeName: '搴熸皵', - EmissTypeDirectName: '澶ф皵', - ContrLevelShowName: '甯傛帶', - OrOutPortName: '澶栨帓' - } + return {} } } </script> -- Gitblit v1.8.0