From a312e0dd96d8f7e96fb3341f1a55561b12394405 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 12:29:48 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/Warn.vue | 377 ++++++++++++++++++++++-------------------------------
1 files changed, 158 insertions(+), 219 deletions(-)
diff --git a/src/components/table/components/Warn.vue b/src/components/table/components/Warn.vue
index 31c3e3d..f5f12e8 100644
--- a/src/components/table/components/Warn.vue
+++ b/src/components/table/components/Warn.vue
@@ -1,230 +1,169 @@
<template>
- <el-tabs>
- <el-tab-pane label="瀹炴椂缁熻" name="first">
- <el-table
- :data="tableData"
- style="width: 100%">
- <el-table-column
- prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
- </el-table-column>
- <el-table-column label="搴熸按(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="搴熸皵(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍥哄簾(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="纭寲姘�(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍙噧姘斾綋(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- </el-table>
- </el-tab-pane>
- <el-tab-pane label="褰撴湀缁熻" name="second">
- <el-table
- :data="tableData"
- style="width: 100%">
- <el-table-column
- prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
- </el-table-column>
- <el-table-column label="搴熸按(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="搴熸皵(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍥哄簾(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="纭寲姘�(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍙噧姘斾綋(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- </el-table>
- </el-tab-pane>
- <el-tab-pane label="涓婃湀缁熻" name="third">
- <el-table
- :data="tableData"
- style="width: 100%">
- <el-table-column
- prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
- </el-table-column>
- <el-table-column label="搴熸按(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="搴熸皵(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鎶ヨ"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍥哄簾(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="纭寲姘�(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- <el-table-column label="鍙噧姘斾綋(涓�)">
- <el-table-column
- prop="name"
- label="棰勮"
- width="120">
- </el-table-column>
- </el-table-column>
- </el-table>
- </el-tab-pane>
+ <div>
+ <el-tabs v-model="activeName">
+ <el-tab-pane label="瀹炴椂缁熻" name="first">
+ <el-scrollbar style="width:100%">
+ <el-table
+ :data="tableData">
+ <el-table-column
+ prop="date"
+ label="浼佷笟鍚嶇О">
+ </el-table-column>
+ <el-table-column label="搴熸按(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="搴熸皵(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍥哄簾(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="纭寲姘�(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍙噧姘斾綋(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ </el-scrollbar>
+ </el-tab-pane>
+ <el-tab-pane label="褰撴湀缁熻" name="second">
+ <el-table
+ :data="tableData">
+ <el-table-column
+ prop="date"
+ label="浼佷笟鍚嶇О">
+ </el-table-column>
+ <el-table-column label="搴熸按(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="搴熸皵(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍥哄簾(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="纭寲姘�(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍙噧姘斾綋(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="涓婃湀缁熻" name="third">
+ <el-table
+ :data="tableData">
+ <el-table-column
+ prop="date"
+ label="浼佷笟鍚嶇О">
+ </el-table-column>
+ <el-table-column label="搴熸按(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="搴熸皵(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍥哄簾(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="纭寲姘�(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column label="鍙噧姘斾綋(涓�)">
+ <el-table-column
+ prop="name"
+ label="棰勮">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
</el-tabs>
+ </div>
</template>
<script>
+import mapApi from '@/api/mapApi'
export default {
data () {
return {
- tableData: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- 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 寮�',
- zip: 200333
- }]
+ titleProp: '',
+ activeName: 'first',
+ tableData: null
+ }
+ },
+ async mounted () {
+ this.tableData = await mapApi.getwarnStatistics()
+ },
+ methods: {
+ refsDatatitle (item) {
+ this.titleProp = item
}
}
}
--
Gitblit v1.8.0