From 4df0471b7dff0494625ff09969b1a13b5359a26e Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期一, 31 五月 2021 22:41:47 +0800
Subject: [PATCH] 统计表弹框UI优化；增加点击企业名称缩放至企业；二级表展示功能优化。
---
src/components/table/components/WasteGas.vue | 102 ++++++++++++++++++++++----------------------------
1 files changed, 45 insertions(+), 57 deletions(-)
diff --git a/src/components/table/components/WasteGas.vue b/src/components/table/components/WasteGas.vue
index 1bbe3b1..e8400ea 100644
--- a/src/components/table/components/WasteGas.vue
+++ b/src/components/table/components/WasteGas.vue
@@ -6,18 +6,16 @@
<!-- <i class="el-icon-caret-right" v-if="$index ===1"></i>-->
<el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" popper-class="popovers">
<ChemicalWastewater v-show="$index ===1"></ChemicalWastewater>
- <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
+ <i class="el-icon-caret-right showBottomTableBtn" @click="showBottomTable" slot="reference"></i>
<!-- <i class="el-icon-caret-bottom" slot="reference" v-else @click="doIcon($index)"></i>-->
</el-popover>
</template>
</el-table-column>
<el-table-column label="搴忓彿" width="45px" type="index"></el-table-column>
<el-table-column prop="UserName" label="浼佷笟鍚嶇О">
- <template slot-scope="scope">
- <div v-if="scope.row.UserName==='闆嗗洟鍚嶇О'" style="color: #00ffff">{{scope.row.UserName}}</div>
- <div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{scope.row.UserName}}</div>
- <div v-else >{{scope.row.UserName}}</div>
- </template>
+ <template slot-scope="{row}">
+ <u @click="searchNameToPosition" style="cursor: pointer">{{row.UserName}}</u>
+ </template>
</el-table-column>
<el-table-column prop="WasteWaters" label="宸ヤ笟澶栨帓搴熸按閲忥紙m鲁锛�" width="100px"></el-table-column>
<el-table-column label="浜屾哀鍖栫～ (浜х敓閲�/t)">
@@ -63,6 +61,7 @@
import ChemicalWastewater from '@components/table/components/componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
+import mapApi from '@/api/mapApi'
export default {
name: 'WasteGas',
components: {
@@ -70,59 +69,16 @@
Refinery,
ChemicalWastewater
},
+ props: {
+ searchNameToPosition: {
+ type: Function
+ }
+ },
data () {
return {
isActive: '',
isShowIcon: false,
- tableData: [{
- UserName: '闆嗗洟鍚嶇О',
- WasteWaters: '',
- AddOutPut: '',
- MonthOutPut: '',
- NH4NPut: '',
- NH4NMonth: '',
- normal: '',
- overProof: '',
- Abnormal: '',
- StopProduction: '',
- deficiency: ''
- }, {
- UserName: '澶╂触鐭冲寲',
- WasteWaters: '116.6',
- AddOutPut: '58.3',
- MonthOutPut: '13.1',
- NH4NPut: '58.3',
- NH4NMonth: '13.1',
- normal: '21',
- overProof: '2',
- Abnormal: '2',
- StopProduction: '2',
- deficiency: '2'
- }, {
- UserName: 'xxxx鐐煎寲3',
- WasteWaters: '116.6',
- MonthOutPut: '13.1',
- NH4NPut: '58.3',
- NH4NMonth: '13.1',
- normal: '21',
- overProof: '2',
- Abnormal: '2',
- StopProduction: '2',
- deficiency: '2'
- }, {
- UserName: 'xxxx4',
- WasteWaters: '116.6',
- AddOutPut: '58.3',
- MonthOutPut: '13.1',
- NH4NPut: '58.3',
- NH4NMonth: '13.1',
- normal: '21',
- overProof: '2',
- Abnormal: '2',
- StopProduction: '2',
- deficiency: '2'
-
- }],
+ tableData: null,
tableHeader1: [
{ name: '鎺掓斁鐐�', width: '140', propS: 'value1' },
{ name: '鍗曚綅閮ㄩ棬', width: '80', propS: 'value2' },
@@ -137,13 +93,16 @@
]
}
},
+ async mounted () {
+ this.tableData = await mapApi.getWasteGasStatistics()
+ },
methods: {
tableHeaderColor ({ columnIndex }) {
// return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
},
// 琛ㄥご鏍峰紡璁剧疆
rowClass () {
- // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ return 'height:.3rem'
},
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
handle (row, column, event, cell) {
@@ -161,14 +120,43 @@
return
}
this.isActive = index
+ },
+ showBottomTable (e) {
+ if (e.path[0].classList.contains('go') === true) {
+ e.path[0].classList.remove('go')
+ e.path[0].classList.add('aa')
+ } else {
+ const newList = document.querySelectorAll('i.showBottomTableBtn')
+ for (let i = 0; i < newList.length; i++) {
+ newList[i].classList.remove('go')
+ }
+ e.path[0].classList.remove('aa')
+ e.path[0].classList.add('go')
+ }
}
}
}
</script>
-<style scoped>
+<style scoped lang="less">
.active {
/*color: red;*/
transform:rotate(90deg);
}
+.Waste-water{
+.el-icon-caret-right{
+ position: absolute;
+ top: .11rem;
+ left: .04rem;
+ font-size: .14rem;
+ cursor: pointer;
+}
+}
+.aa{
+ transition: all .2s;
+}
+.go{
+ transform:rotate(90deg);
+ transition: all .2s;
+}
</style>
--
Gitblit v1.8.0