From 811fc5e4e89c9a5222e895587bfa1c2e9fcc08f4 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 15 三月 2021 19:37:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/table/components/Warn.vue | 152 +++++++++++++++++---------------------------------
1 files changed, 53 insertions(+), 99 deletions(-)
diff --git a/src/components/table/components/Warn.vue b/src/components/table/components/Warn.vue
index efc2577..fee998e 100644
--- a/src/components/table/components/Warn.vue
+++ b/src/components/table/components/Warn.vue
@@ -1,169 +1,144 @@
<template>
<el-tabs v-model="activeName">
<el-tab-pane label="瀹炴椂缁熻" name="first">
+ <el-scrollbar style="width:100%">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
+ </el-scrollbar>
</el-tab-pane>
<el-tab-pane label="褰撴湀缁熻" name="second">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="涓婃湀缁熻" name="third">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
@@ -177,54 +152,33 @@
return {
activeName: 'first',
tableData: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: '闆嗗洟鍏徃',
+ name: 1,
+ province: 1,
+ city: 0,
+ address: 1,
+ zip: 0
}, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: '澶╂触鐭冲寲',
+ name: 1,
+ province: 0,
+ city: 1,
+ address: 1,
+ zip: 2
}, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: 'XXX鐐煎寲',
+ name: 1,
+ province: 2,
+ city: 0,
+ address: 0,
+ zip: 1
}, {
- 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
+ date: 'XXX鐐煎寲2',
+ name: 1,
+ province: 2,
+ city: 0,
+ address: 0,
+ zip: 1
}]
}
}
--
Gitblit v1.8.0