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/Warn.vue | 297 ++++++++++++++++++++++++++---------------------------------
1 files changed, 132 insertions(+), 165 deletions(-)
diff --git a/src/components/table/components/Warn.vue b/src/components/table/components/Warn.vue
index faf893a..f5f12e8 100644
--- a/src/components/table/components/Warn.vue
+++ b/src/components/table/components/Warn.vue
@@ -1,199 +1,166 @@
<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-scrollbar style="width:100%">
- <el-table
- :data="tableData">
+ <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
+ </el-table-column>
+ <el-table-column label="搴熸按(涓�)">
+ <el-table-column
prop="name"
label="棰勮">
- </el-table-column>
- <el-table-column
+ </el-table-column>
+ <el-table-column
prop="name"
label="鎶ヨ">
- </el-table-column>
- </el-table-column>
- <el-table-column label="搴熸皵(涓�)">
- <el-table-column
+ </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>
+ <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>
+ </el-table-column>
+ <el-table-column label="鍥哄簾(涓�)">
<el-table-column
- prop="date"
- label="浼佷笟鍚嶇О">
+ prop="name"
+ 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>
+ <el-table-column label="纭寲姘�(涓�)">
<el-table-column
- prop="date"
- label="浼佷笟鍚嶇О">
+ prop="name"
+ 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 label="搴熸皵(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
- <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 label="鍥哄簾(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
</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 label="鍙噧姘斾綋(涓�)">
- <el-table-column
- prop="name"
- label="棰勮">
- </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ヨ">
</el-table-column>
- </el-table>
- </el-tab-pane>
- </el-tabs>
- </template>
- </Public>
+ </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 Public from '@components/table/Public'
-
+import mapApi from '@/api/mapApi'
export default {
data () {
return {
titleProp: '',
activeName: 'first',
- tableData: [{
- date: '闆嗗洟鍏徃',
- name: 1,
- province: 1,
- city: 0,
- address: 1,
- zip: 0
- }, {
- date: '澶╂触鐭冲寲',
- name: 1,
- province: 0,
- city: 1,
- address: 1,
- zip: 2
- }, {
- date: 'XXX鐐煎寲',
- name: 1,
- province: 2,
- city: 0,
- address: 0,
- zip: 1
- }, {
- date: 'XXX鐐煎寲2',
- name: 1,
- province: 2,
- city: 0,
- address: 0,
- zip: 1
- }]
+ tableData: null
}
},
- components: { Public },
+ async mounted () {
+ this.tableData = await mapApi.getwarnStatistics()
+ },
methods: {
refsDatatitle (item) {
this.titleProp = item
--
Gitblit v1.8.0