From 3054bbce49457c82df9ad32523f3a0186e268d6f Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期五, 28 五月 2021 21:17:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/IndexStatistics.vue | 264 ++++++++++++++--------------------------------------
1 files changed, 74 insertions(+), 190 deletions(-)
diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue
index c82e142..f5d31f0 100644
--- a/src/components/table/components/IndexStatistics.vue
+++ b/src/components/table/components/IndexStatistics.vue
@@ -1,203 +1,87 @@
<template>
+ <div>
<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-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-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 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"
- 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-table></el-tab-pane>
+ <el-tab-pane label="鎸囨爣缁熻" name="first">
+ <el-table :data="tableData" :lock-scroll="true" class="scroll">
+ <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-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-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 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="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>
-
+ </div>
</template>
<script>
+import mapApi from '@/api/mapApi'
export default {
+ name: 'IndexStatistics',
data () {
return {
+ titleProp: '',
activeName: 'first',
- tableData: [{
- date: '闆嗗洟鍏徃',
- name: '35',
- province: '23',
- city: '11',
- address: 235,
- zip: 23
- }, {
- date: '澶╂触鐭冲寲',
- name: 32,
- province: 33,
- city: 44,
- address: 53,
- zip: 200333
- }, {
- date: '娴庡崡鐐煎寲',
- name: 35,
- province: 13,
- city: 33,
- address: 44,
- zip: 200333
- }]
+ tableData: null
+ }
+ },
+ async mounted () {
+ this.tableData = await mapApi.getIndexStatistics()
+ },
+ methods: {
+ refsDatatitle (item) {
+ this.titleProp = item
}
}
}
--
Gitblit v1.8.0