From 93a9b3228d214602a899791992726a01925c5ac4 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期四, 13 五月 2021 14:20:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/components/componented/ChemicalWastewater.vue | 111 +++++++++++++------------------------------------------
1 files changed, 26 insertions(+), 85 deletions(-)
diff --git a/src/components/table/components/componented/ChemicalWastewater.vue b/src/components/table/components/componented/ChemicalWastewater.vue
index 4bdfdd7..214f59c 100644
--- a/src/components/table/components/componented/ChemicalWastewater.vue
+++ b/src/components/table/components/componented/ChemicalWastewater.vue
@@ -1,67 +1,31 @@
<template>
<div class="Chemical-Waste-water" id="Chemical-Waste-water">
- <el-row type="flex" class="head-area" align="middle">
+ <!-- <el-row type="flex" class="head-area" align="middle">
<el-col>
- <span>浼佷笟鎸囨爣鍒嗙被缁熻</span>
+ <span>鐩戞祴鐐规帓鏀炬槑缁�</span>
</el-col>
- <el-col class="head-area-button">
- <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info" @click="closebtns"></el-button>
- </el-col>
- </el-row>
- <el-table
- class="tableBox"
- :data="tableData"
- >
- <el-table-column
- label="搴忓彿"
- width="60px"
- type="index">
- </el-table-column>
- <el-table-column
- prop="UserName"
- label="浼佷笟鍚嶇О"
- width="120px">
- </el-table-column>
- <el-table-column
- prop="WasteWaters"
- label="宸ヤ笟澶栨帓搴熸按閲忥紙m鲁锛�"
- width="200px">
+ </el-row> -->
+ <div class="panel-title">鐩戞祴鐐规帓鏀炬槑缁�</div>
+ <el-table class="tableBox" :data="tableData">
+ <el-table-column label="搴忓彿" width="60px" type="index"></el-table-column>
+ <el-table-column prop="UserName" label="浼佷笟鍚嶇О" width="120"></el-table-column>
+ <el-table-column prop="WasteWaters" width="100">
+ <div slot="header">
+ <span>宸ヤ笟澶栨帓搴熸按閲�</span>
+ <div>锛坢鲁锛�</div>
+ </div>
</el-table-column>
<el-table-column label="浜х敓閲� 锛堝惃锛�">
- <el-table-column
- prop="AddOutPut"
- label="涓�鑸浐搴�"
- width="100px">
- </el-table-column>
- <el-table-column
- prop="MonthOutPut"
- label="鍗遍櫓搴熺墿"
- width="100px">
- </el-table-column>
+ <el-table-column prop="AddOutPut" label="涓�鑸浐搴�" width="65"></el-table-column>
+ <el-table-column prop="MonthOutPut" label="鍗遍櫓搴熺墿" width="65"></el-table-column>
</el-table-column>
<el-table-column label="璐瓨鐘舵�侊紙涓級">
- <el-table-column
- prop="normal"
- label="姝ｅ父"
- width="100px">
- </el-table-column>
- <el-table-column
- prop="warning"
- label="棰勮"
- width="100px">
- </el-table-column>
+ <el-table-column prop="normal" label="姝ｅ父" width="60"></el-table-column>
+ <el-table-column prop="warning" label="棰勮" width="60"></el-table-column>
</el-table-column>
<el-table-column label="璐瓨鐘舵�侊紙涓級">
- <el-table-column
- prop="normal"
- label="姝ｅ父"
- width="100px">
- </el-table-column>
- <el-table-column
- prop="warning"
- label="棰勮"
- width="100px">
- </el-table-column>
+ <el-table-column prop="normal" label="姝ｅ父" width="60"></el-table-column>
+ <el-table-column prop="warning" label="棰勮" width="60"></el-table-column>
</el-table-column>
</el-table>
</div>
@@ -83,38 +47,15 @@
}
},
methods: {
- closebtns () {
- // const summary = document.getElementById('Chemical-Waste-water')
- // summary.style.display = 'none'
- // console.log(1)
- this.$emit('isshow')
- }
+ // closeBtns () {
+ // this.$emit('isShow')
+ // }
}
}
</script>
-<style scoped>
- /*.Chemical-Waste-water {*/
- /* position:fixed;*/
- /* top: 330px;*/
- /* left: 65px;*/
- /* !*width: 850px;*!*/
- /* !*height: 265px;*!*/
- /* border: #90c8e0 1px solid;*/
- /* z-index:3000;*/
- /* background-color: rgba(26, 73, 81, 0.901960784313726);*/
- /* !*color: #fff;*!*/
- /*}*/
- /*.head-area{*/
- /* color: #fff;*/
- /* width: 100%;*/
- /* height: 40px;*/
- /* background-color: #002433;*/
- /* font-size: 16px;*/
- /* border-bottom: #90c8e0 2px solid;*/
- /* padding-left: 16px;*/
- /* !*line-height: 40px;*!*/
- /*}*/
- /*.head-area-button{*/
- /* margin-right: 5px;*/
- /*}*/
+<style lang="less">
+ .Chemical-Waste-water {
+ text-align: center;background:@background-color;
+ color: #fff;
+ }
</style>
--
Gitblit v1.8.0