From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/Warn.vue | 263 +++++++++++++++++++++++++---------------------------
1 files changed, 127 insertions(+), 136 deletions(-)
diff --git a/src/components/table/components/Warn.vue b/src/components/table/components/Warn.vue
index faf893a..0308373 100644
--- a/src/components/table/components/Warn.vue
+++ b/src/components/table/components/Warn.vue
@@ -1,162 +1,154 @@
<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'
-
export default {
data () {
return {
@@ -193,7 +185,6 @@
}]
}
},
- components: { Public },
methods: {
refsDatatitle (item) {
this.titleProp = item
--
Gitblit v1.8.0