From ce658042246b6425bbb015c2d271e2b3f9c9d83e Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 15 三月 2021 09:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/components/table/summarySheets.vue | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 2a45071..e4bd2ef 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,17 +1,18 @@
<template>
<div class="summary-sheets">
+ <div id="summary">
<el-row type="flex" class="head-area" align="middle">
<el-col>
<span>浼佷笟鎸囨爣鍒嗙被缁熻</span>
</el-col>
<el-col class="head-area-button">
- <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info"></el-button>
+ <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info" @click="closebtn"></el-button>
</el-col>
</el-row>
<!-- <el-tabs class="tabs-text">-->
<el-row :gutter="20" class="el-rowscol">
<el-col>
- <el-tabs class="tabs-text" v-model="activeName" type="card" @tab-click="handleClick">
+ <el-tabs class="tabs-text" v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="搴熸按" name="first">
<waste-water></waste-water>
</el-tab-pane>
@@ -27,6 +28,7 @@
</el-tabs>
</el-col>
</el-row>
+ </div>
</div>
</template>
@@ -51,6 +53,11 @@
methods: {
handleClick (tab, event) {
console.log(tab, event)
+ },
+ closebtn () {
+ const summary = document.getElementById('summary')
+ summary.style.display = 'none'
+ console.log(1)
}
}
}
@@ -58,12 +65,11 @@
<style>
.summary-sheets {
- /*overflow: hidden;*/
position: absolute;
top: 50px;
left: 50px;
- width: 850px;
- height: 265px;
+ /*width: 850px;*/
+ /*height: 265px;*/
border: #90c8e0 1px solid;
z-index:9999999;
background-color: rgba(26, 73, 81, 0.901960784313726);
@@ -82,8 +88,7 @@
.head-area-button{
margin-right: 5px;
}
- .el-rowscol{
- width: 100%;
- height: 100%;
+ .tabs-text{
+ background-color: rgba(26, 73, 81, 0.901960784313726);
}
</style>
--
Gitblit v1.8.0