From 1d45ea75308850ad0ef575ca28ba3f93552f097c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 24 一月 2024 16:01:58 +0800
Subject: [PATCH] 设备监控页面状态反馈按钮添加二次确认功能以及调整异常设备列表项字体颜色为红色显示
---
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue | 76 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
index cc28f45..f8ee888 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue
@@ -1,15 +1,15 @@
<template>
- <a-card :bordered="false" class="device_list">
+ <div :bordered="false" class="device_list">
<!-- 鏌ヨ鍖哄煙 -->
<div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss" showTime/>
+ <a-range-picker @change="dateParamChange" v-model="dates" format="YYYY-MM-DD HH:mm:ss"/>
</a-form-item>
</a-col>
- <a-col :md="4" :sm="4">
+ <a-col :md="5" :sm="5">
<a-form-item label="璁惧缂栧彿">
<a-input placeholder="杈撳叆璁惧缂栧彿鏌ヨ" v-model="queryParams.equipmentId"></a-input>
</a-form-item>
@@ -19,12 +19,18 @@
<!--<a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>-->
<!--</a-form-item>-->
<!--</a-col>-->
- <a-col :md="2" :sm="3" :xs="3">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- </a-col>
<a-col :md="2" :sm="2" :xs="2">
- <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
</a-col>
+ <!--<a-col :md="2" :sm="3" :xs="3">-->
+ <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+ <!--</a-col>-->
+ <!--<a-col :md="2" :sm="2" :xs="2">-->
+ <!--<a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>-->
+ <!--</a-col>-->
<!--<a-col :lg="2" :md="3" :sm="3" :xs="3">-->
<!--<a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>-->
<!--</a-col>-->
@@ -54,9 +60,9 @@
</div>
<!-- table鍖哄煙-begin -->
- <div id="DeviceList">
+ <div id="DeviceList" style="flex: 1;overflow: hidden">
<a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
- :scroll="{x:1000}" :dataSource="dataSource" :pagination="ipagination" :loading="loading"
+ :scroll="{x:'max-content',y:scrollY}" :dataSource="dataSource" :pagination="ipagination" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
@@ -83,8 +89,7 @@
<!--<device-repair-model-add ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>-->
<!--<device-repair-model-edit ref="modalFormedit" @ok="modalFormOk"></device-repair-model-edit>-->
<!--<repair-model ref="repairModelFrom" @ok="modalFormOk"></repair-model>-->
-
- </a-card>
+ </div>
</template>
<script>
@@ -139,16 +144,19 @@
queryParamEquip:{},
queryParamPeople:{},
dataStartsoucre:[],
+ scrollY:465,
columns: [
{
title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentId'
+ dataIndex: 'equipmentId',
+ width:150
},
{
title: '璁惧鍚嶇О',
align: 'center',
dataIndex: 'equipmentName',
+ width:200
// defaultSortOrder:'descend',
// sorter: (a, b) => {return a.equipmentName>b.equipmentName?1:-1}
},
@@ -156,6 +164,7 @@
title: '鏃ユ湡',
align: 'center',
dataIndex: 'effectiveDate',
+ width:150
// scopedSlots:{customRender:'startTime'},
// customRender:(text,row,index) => {
// return moment(text).format("YYYY-MM-DD HH:mm:ss")
@@ -164,33 +173,39 @@
{
title: '鐝寮�濮嬫椂闂�',
align: 'center',
- dataIndex: 'startDate'
+ dataIndex: 'startDate',
+ width:150
},
{
title: '鐝缁撴潫鏃堕棿',
align: 'center',
- dataIndex: 'endDate'
+ dataIndex: 'endDate',
+ width:150
},
{
title: '鍔犵彮寮�濮嬫椂闂�',
align: 'center',
- dataIndex: 'startTime'
+ dataIndex: 'startTime',
+ width:150
},
{
title: '鍔犵彮缁撴潫鏃堕棿',
align: 'center',
- dataIndex: 'endTime'
+ dataIndex: 'endTime',
+ width:150
},
{
title: '澶囨敞',
align: 'center',
- dataIndex: 'remark'
+ dataIndex: 'remark',
+ width:150
},
{
title: '鎿嶄綔',
dataIndex: 'action',
scopedSlots: {customRender: 'action'},
align: "center",
+ fixed:'right',
width: 150
}
],
@@ -681,9 +696,25 @@
exclude_inputs: true
});
},
+
+ /**
+ * 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
+ */
+ handleWindowResize(){
+ const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0,-2)
+ const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0,-2)
+ this.scrollY = boxHeight - tableHeadHeight - 50
+ }
},
created() {
this.queryParam.typeTree = "1"
+ },
+ mounted(){
+ window.addEventListener('resize',this.handleWindowResize)
+ this.handleWindowResize()
+ },
+ beforeDestroy(){
+ window.removeEventListener('resize',this.handleWindowResize)
}
}
</script>
@@ -691,34 +722,35 @@
<style lang="less" scoped>
@import '~@assets/less/common.less';
+ .device_list{
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ }
+
@media screen and (min-width: 1920px){
.device_list{
height: 811px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1680px) and (max-width: 1920px){
.device_list{
height: 811px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1400px) and (max-width: 1680px){
.device_list{
height: 663px!important;
- overflow: scroll;
}
}
@media screen and (min-width: 1280px) and (max-width: 1400px){
.device_list{
height: 564px!important;
- overflow: scroll;
}
}
@media screen and (max-width: 1280px){
.device_list{
height: 564px!important;
- overflow: scroll;
}
}
</style>
--
Gitblit v1.9.3