From 13fbc433b66909d1e793bb9cf1dbfa8661b57d3e Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期二, 18 五月 2021 15:43:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/table/components/IndexStatistics.vue |  136 +++++++++++++++++++++------------------------
 1 files changed, 64 insertions(+), 72 deletions(-)

diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue
index 27b0797..ef47519 100644
--- a/src/components/table/components/IndexStatistics.vue
+++ b/src/components/table/components/IndexStatistics.vue
@@ -1,82 +1,74 @@
 <template>
-  <Public>
-    <template v-slot:title>
-      <span>{{ titleProp }}</span>
-    </template>
-    <template v-slot:publicTable>
-      <el-tabs v-model="activeName">
-        <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>
-    </template>
-  </Public>
+  <div>
+    <el-tabs v-model="activeName">
+      <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 Public from '@components/table/Public'
-
 export default {
   name: 'IndexStatistics',
-  components: { Public },
   data () {
     return {
       titleProp: '',

--
Gitblit v1.8.0