From 69fa4c84656dca30f92d605221c0098917cb613d Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期一, 15 三月 2021 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/table/components/IndexStatistics.vue | 189 ++++++++++++++++-------------------------------
1 files changed, 65 insertions(+), 124 deletions(-)
diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue
index f38b288..c82e142 100644
--- a/src/components/table/components/IndexStatistics.vue
+++ b/src/components/table/components/IndexStatistics.vue
@@ -1,103 +1,85 @@
<template>
<el-tabs v-model="activeName">
<el-tab-pane label="鎸囨爣缁熻" name="first"><el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
- prop="date"
- label="搴忓彿"
- width="150">
+ type="index"
+ label="搴忓彿">
</el-table-column>
<el-table-column
prop="date"
- label="鍗曚綅鍚嶇О"
- width="150">
+ label="鍗曚綅鍚嶇О">
</el-table-column>
<el-table-column
- prop="date"
- label="宸ヤ笟鍙栨按閲�(m3)"
- width="150">
+ prop="province"
+ label="宸ヤ笟鍙栨按閲�(m3)">
</el-table-column>
<el-table-column
- prop="date"
- label="澶栨帓搴熸按閲�(m3)"
- width="150">
+ prop="province"
+ label="澶栨帓搴熸按閲�(m3)">
</el-table-column>
<el-table-column
- prop="date"
- label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)"
- width="150">
+ prop="province"
+ label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)">
</el-table-column>
<el-table-column label="COD(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="姘ㄦ爱(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="浜屾哀鍖栫～(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="姘哀鍖栫墿(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="VOCs(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
</el-table></el-tab-pane>
@@ -106,96 +88,83 @@
style="width: 100%"
max-height="250">
<el-table-column
- fixed
+ type="index"
+ label="搴忓彿">
+ </el-table-column>
+ <el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column
prop="name"
- label="搴熸按杈炬爣鐜�"
- width="120">
+ label="搴熸按杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="province"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="city"
- label="搴熸皵杈炬爣鐜�"
- width="120">
+ label="搴熸皵杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="address"
- label="鍚嶆"
- width="300">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="浼犺緭鐜�"
- width="120">
+ label="浼犺緭鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="璁惧瀹屽ソ鐜�"
- width="120">
+ label="璁惧瀹屽ソ鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鎺掑悕"
- width="120">
+ label="鎺掑悕">
</el-table-column>
</el-table></el-tab-pane>
<el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third"><el-table
- :data="tableData"
- style="width: 100%"
- max-height="250">
+ :data="tableData">
<el-table-column
- fixed
+ type="index"
+ label="搴忓彿">
+ </el-table-column>
+ <el-table-column
prop="date"
- label="鎺掓斁鐐瑰悕绉�"
- width="150">
+ label="鎺掓斁鐐瑰悕绉�">
</el-table-column>
<el-table-column
prop="name"
- label="鎺掓斁绫诲瀷"
- width="120">
+ label="鎺掓斁绫诲瀷">
</el-table-column>
<el-table-column
prop="province"
- label="杈炬爣鐜�"
- width="120">
+ label="杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="city"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="address"
- label="浼犺緭鐜�"
- width="300">
+ label="浼犺緭鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="璁惧瀹屽ソ鐜�"
- width="120">
+ label="璁惧瀹屽ソ鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
</el-table></el-tab-pane>
</el-tabs>
@@ -208,53 +177,25 @@
return {
activeName: 'first',
tableData: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ date: '闆嗗洟鍏徃',
+ name: '35',
+ province: '23',
+ city: '11',
+ address: 235,
+ zip: 23
+ }, {
+ date: '澶╂触鐭冲寲',
+ name: 32,
+ province: 33,
+ city: 44,
+ address: 53,
zip: 200333
}, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-08',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-06',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-07',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ date: '娴庡崡鐐煎寲',
+ name: 35,
+ province: 13,
+ city: 33,
+ address: 44,
zip: 200333
}]
}
--
Gitblit v1.8.0