From 12ac24e91636c9723b2e89fc354735aa27e10c69 Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期二, 13 四月 2021 16:00:24 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/table/components/IndexStatistics.vue | 207 ++++++++++++--------------------------------------- 1 files changed, 48 insertions(+), 159 deletions(-) diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue index c82e142..04b1a37 100644 --- a/src/components/table/components/IndexStatistics.vue +++ b/src/components/table/components/IndexStatistics.vue @@ -1,171 +1,60 @@ <template> <el-tabs v-model="activeName"> - <el-tab-pane label="鎸囨爣缁熻" name="first"><el-table - :data="tableData"> - <el-table-column - type="index" - label="搴忓彿"> - </el-table-column> - <el-table-column - prop="date" - label="鍗曚綅鍚嶇О"> - </el-table-column> - <el-table-column - prop="province" - label="宸ヤ笟鍙栨按閲�(m3)"> - </el-table-column> - <el-table-column - prop="province" - label="澶栨帓搴熸按閲�(m3)"> - </el-table-column> - <el-table-column - prop="province" - label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)"> - </el-table-column> - <el-table-column label="COD(t)"> - <el-table-column - prop="province" - label="绱浜х敓閲�"> - </el-table-column> - <el-table-column - prop="city" - label="褰撴湀浜х敓閲�"> - </el-table-column> - </el-table-column> - <el-table-column label="姘ㄦ爱(t)"> - <el-table-column - prop="province" - label="绱浜х敓閲�"> + <el-tab-pane label="鎸囨爣缁熻" name="first"> + <el-table :data="tableData" > + <el-table-column type="index" label="搴忓彿"></el-table-column> + <el-table-column prop="date" label="鍗曚綅鍚嶇О"></el-table-column> + <el-table-column prop="province" label="宸ヤ笟鍙栨按閲�(m3)"></el-table-column> + <el-table-column prop="province" label="澶栨帓搴熸按閲�(m3)"></el-table-column> + <el-table-column prop="province" label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)"></el-table-column> + <el-table-column label="COD(t)"> + <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column> + <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column> </el-table-column> - <el-table-column - prop="city" - label="褰撴湀浜х敓閲�"> + <el-table-column label="姘ㄦ爱(t)"> + <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column> + <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column> </el-table-column> - </el-table-column> - <el-table-column label="浜屾哀鍖栫~(t)"> - <el-table-column - prop="province" - label="绱浜х敓閲�"> + <el-table-column label="浜屾哀鍖栫~(t)"> + <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column> + <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column> </el-table-column> - <el-table-column - prop="city" - label="褰撴湀浜х敓閲�"> + <el-table-column label="姘哀鍖栫墿(t)"> + <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column> + <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column> </el-table-column> - </el-table-column> - <el-table-column label="姘哀鍖栫墿(t)"> - <el-table-column - prop="province" - label="绱浜х敓閲�"> + <el-table-column label="VOCs(t)"> + <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column> + <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column> </el-table-column> - <el-table-column - prop="city" - label="褰撴湀浜х敓閲�"> + <el-table-column label="鍥哄簾(t)"> + <el-table-column prop="province" label="绱浜х敓閲�"></el-table-column> + <el-table-column prop="city" label="褰撴湀浜х敓閲�"></el-table-column> </el-table-column> - </el-table-column> - <el-table-column label="VOCs(t)"> - <el-table-column - prop="province" - label="绱浜х敓閲�"> - </el-table-column> - <el-table-column - prop="city" - label="褰撴湀浜х敓閲�"> - </el-table-column> - </el-table-column> - <el-table-column label="鍥哄簾(t)"> - <el-table-column - prop="province" - label="绱浜х敓閲�"> - </el-table-column> - <el-table-column - prop="city" - label="褰撴湀浜х敓閲�"> - </el-table-column> - </el-table-column> + </el-table> + </el-tab-pane> + <el-tab-pane label="浼佷笟鎺掑悕" name="second"><el-table :data="tableData"> + <el-table-column type="index" label="搴忓彿"></el-table-column> + <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 prop="address" label="鍚嶆"></el-table-column> + <el-table-column prop="zip" label="浼犺緭鐜�"></el-table-column> + <el-table-column prop="zip" label="鍚嶆"></el-table-column> + <el-table-column prop="zip" label="璁惧瀹屽ソ鐜�"></el-table-column> + <el-table-column prop="zip" label="鎺掑悕"></el-table-column> </el-table></el-tab-pane> - <el-tab-pane label="浼佷笟鎺掑悕" name="second"><el-table - :data="tableData" - style="width: 100%" - max-height="250"> - <el-table-column - type="index" - label="搴忓彿"> - </el-table-column> - <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 - prop="address" - label="鍚嶆"> - </el-table-column> - <el-table-column - prop="zip" - label="浼犺緭鐜�"> - </el-table-column> - <el-table-column - prop="zip" - label="鍚嶆"> - </el-table-column> - <el-table-column - prop="zip" - label="璁惧瀹屽ソ鐜�"> - </el-table-column> - <el-table-column - prop="zip" - label="鎺掑悕"> - </el-table-column> - </el-table></el-tab-pane> - <el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third"><el-table - :data="tableData"> - <el-table-column - type="index" - label="搴忓彿"> - </el-table-column> - <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 - prop="address" - label="浼犺緭鐜�"> - </el-table-column> - <el-table-column - prop="zip" - label="鍚嶆"> - </el-table-column> - <el-table-column - prop="zip" - label="璁惧瀹屽ソ鐜�"> - </el-table-column> - <el-table-column - prop="zip" - label="鍚嶆"> - </el-table-column> + <el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third"><el-table :data="tableData"> + <el-table-column type="index" label="搴忓彿"></el-table-column> + <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 prop="address" label="浼犺緭鐜�"></el-table-column> + <el-table-column prop="zip" label="鍚嶆"></el-table-column> + <el-table-column prop="zip" label="璁惧瀹屽ソ鐜�"></el-table-column> + <el-table-column prop="zip" label="鍚嶆"></el-table-column> </el-table></el-tab-pane> </el-tabs> -- Gitblit v1.8.0