From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue | 367 +++------------------------------------------------
1 files changed, 27 insertions(+), 340 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
index 7150831..8ee1144 100644
--- a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
+++ b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
@@ -5,13 +5,13 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="6" :sm="6">
+ <a-col :md="7" :sm="7">
<a-form-item label="鏃堕棿">
<a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
- v-model="dates"/>
+ v-model="dates" :allowClear="false"/>
</a-form-item>
</a-col>
- <a-col :lg="2" :md="3" :sm="3" :xs="3">
+ <a-col :lg="2" :md="2" :sm="2" :xs="2">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
</a-col>
</a-row>
@@ -19,44 +19,6 @@
</div>
<div id="DeviceList">
<div class="openRateTrendDg">
- <!--<div id="Efficiency" class="container">-->
- <!--<div class="table2">-->
- <!--<table class="dataContent table" border="1" cellspacing="0" cellpadding="0"-->
- <!--style="white-space: nowrap;text-align: left;">-->
- <!--<thead>-->
- <!--<tr class="thead fixed equipname">-->
- <!--<th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">鎶ヨ鍙�-->
- <!--</th>-->
- <!--<th class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">-->
- <!--鍑虹幇娆℃暟-->
- <!--</th>-->
- <!--<th class="thgu dong3 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">-->
- <!--鍚堣鎸佺画鏃堕棿-->
- <!--</th>-->
- <!--<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">-->
- <!--鎶ヨ淇℃伅-->
- <!--</th>-->
- <!--<!–<template v-for="(tableHead, index) in tableHeads">–>-->
- <!--<!–<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>–>-->
- <!--<!–</template>–>-->
- <!--</tr>-->
- <!--</thead>-->
- <!--<tbody>-->
- <!--<tr class="mathData" v-for="(item, index) in dataList" @click="TableDraw(index,item)">-->
- <!--<td class="tdgu kaitou">{{item.alarmCode}}</td>-->
- <!--<td class="tdgu1 kaitou">{{item.count}}</td>-->
- <!--<td class="tdgu2 kaitou">{{getFormattedTime(item.timeCount)}}-->
- <!--<!–<td class="tdgu2 kaitou">{{item.timeCount}}</td>–>-->
- <!--<td class="tdgu3 kaitou">{{item.alarmContent}}</td>-->
- <!--<!–<template v-for="(tableHead, index) in item.dataList">–>-->
- <!--<!–<td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>–>-->
- <!--<!–</template>–>-->
- <!--</tr>-->
- <!--</tbody>-->
- <!--</table>-->
- <!--</div>-->
- <!--</div>-->
- <!--<a-spin :spinning=""></a-spin>-->
<a-table :columns="columns" :data-source="dataList" bordered :pagination="false" :scroll="{y:210}"
:customRow="customRow"
rowKey="alarmCode" @expand="handleExpandChange" :loading="outerDataLoading"
@@ -197,6 +159,10 @@
},
mounted() {
this.drawWrin()
+ window.addEventListener('resize', this.handleWindowResize)
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.handleWindowResize)
},
watch: {
Type(valmath) {
@@ -345,93 +311,15 @@
this.queryParam.endDate = v2[1]
},
searchQuery() {
- if (this.dates && this.dates.length > 0) {
- if (this.queryParam.typeTree == '1') {
- this.queryParam.parentId = this.queryParamEquip.parentId
- this.queryParam.equipmentId = this.queryParamEquip.equipmentId
- } else {
- this.queryParam.parentId = this.queryParamPeople.parentId
- this.queryParam.equipmentId = ''
- }
- this.loadData1()
+ if (this.queryParam.typeTree == '1') {
+ this.queryParam.parentId = this.queryParamEquip.parentId
+ this.queryParam.equipmentId = this.queryParamEquip.equipmentId
} else {
- this.$notification.warning({
- message: '鎻愮ず',
- description: '璇烽�夋嫨鏃堕棿'
- })
+ this.queryParam.parentId = this.queryParamPeople.parentId
+ this.queryParam.equipmentId = ''
}
-
- // this.onClearSelected()
+ this.loadData1()
},
- // searchReset() {
- // this.typeTree = this.queryParam.typeTree
- // this.typeParent = this.queryParam.parentId
- // this.typeEquipment = this.queryParam.equipmentId
- // this.queryParam = {}
- // this.dates = []
- // this.queryParam.typeTree = this.typeTree
- // this.queryParam.parentId = this.typeParent
- // this.queryParam.equipmentId = this.typeEquipment
- // // this.ipagination.current = 1
- // this.loadData1();
- // // this.queryParam = {}
- // // this.dates = []
- // // this.loadData()
- // // this.onClearSelected()
- // },
- // loadData1() {
- // let that = this
- // that.columns=[
- // {
- // title: '璁惧缂栧彿',
- // align: 'center',
- // dataIndex: 'equipmentId',
- // width:'150px'
- // },
- // {
- // title: '璁惧鍚嶇О',
- // align: 'center',
- // dataIndex: 'equipmentName',
- // width:'150px'
- // },
- // ]
- // that.tableHeads = []
- // that.dataList = []
- // getAction(this.url.efficiencyList, that.queryParam).then(res => {
- // var tmp = {}
- // console.log(res)
- // if (res.success)
- //
- // that.dataSource = res.result.mdcEfficiencyList
- // for(var k = 0;k<that.dataSource[0].dataList.length;k++){
- // that.columns.push(
- // {
- // title:that.dataSource[0].dataList.theDate,
- // align: 'center',
- // width:'120px',
- // // dataIndex:'utilizationRate',
- // }
- // )
- // }
- // for(var i = 0;i<that.dataSource.length;i++){
- // for (var j = 0; j < that.dataSource[i].dataList.length;j++){
- // // that.columns.push(
- // // {
- // // title:that.dataSource[0].dataList[j].theDate,
- // // align: 'center',
- // // width:'120px',
- // // dataIndex:'utilizationRate',
- // // }
- // // )
- // }
- //
- // }
- // console.log(that.columns)
- // console.log(that.dataSource)
- // // this.initDeviceType(this.dataList)
- // this.draw()
- // }
- // }
loadData1() {
this.outerDataLoading = true
this.tableHeads = []
@@ -454,7 +342,7 @@
})
},
drawWrin() {
- let equipmentWarningPie = this.$echarts.init(document.getElementById('MdcEquipmentWarningPie'), 'macarons')
+ this.equipmentWarningPie = this.$echarts.init(document.getElementById('MdcEquipmentWarningPie'), 'macarons')
let equipmentWarningPieOption = {
title: {
text: '鍚勮澶囧嚭鐜版鎶ヨ鐨勬瘮渚�',
@@ -493,8 +381,8 @@
// data:[{name:'jjjjjjj',value:'2'}]
}]
}
- equipmentWarningPie.setOption(equipmentWarningPieOption, true)
- let equipmentWarningLine = this.$echarts.init(document.getElementById('MdcEquipmentWarningLine'), 'macarons')
+ this.equipmentWarningPie.setOption(equipmentWarningPieOption, true)
+ this.equipmentWarningLine = this.$echarts.init(document.getElementById('MdcEquipmentWarningLine'), 'macarons')
let equipmentWarningLineOption = {
title: {
text: '姣忓ぉ鍑虹幇姝ゆ姤璀︾殑鏁伴噺璧板娍',
@@ -562,7 +450,7 @@
}
]
}
- equipmentWarningLine.setOption(equipmentWarningLineOption, true)
+ this.equipmentWarningLine.setOption(equipmentWarningLineOption, true)
},
/**
@@ -594,10 +482,10 @@
handleExpandChange(expanded, record) {
let _this = this
// 褰撳睍寮�鏃惰嫢璇ヨ鏈灞曞紑杩囨墠浼氳姹傚悗鍙版暟鎹紝灞曞紑杩囩殑鏁版嵁浼氳缂撳瓨鏃犻渶閲嶅璇锋眰
- const param = Object.assign({ alarmCode: record.alarmCode }, this.queryParam)
+ this.queryParam.alarmCode = record.alarmCode
if (expanded && !this.hasRequsetAlarmCodeList.includes(record.alarmCode)) {
this.innerDataLoading = true
- getAction(this.url.equipmentAlarmList, param).then(res => {
+ getAction(this.url.equipmentAlarmList, this.queryParam).then(res => {
if (res.success) {
_this.dataList.forEach(item => {
if (item.alarmCode === record.alarmCode) {
@@ -611,220 +499,19 @@
_this.innerDataLoading = false
})
}
+ },
+
+ /**
+ * 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
+ */
+ handleWindowResize() {
+ if (this.equipmentWarningPie) this.equipmentWarningPie.resize()
+ if (this.equipmentWarningLine) this.equipmentWarningLine.resize()
}
}
}
</script>
<style scoped>
- .dataContent {
- white-space: nowrap;
- /*margin: 0;*/
- /*border: none;*/
- border-collapse: separate;
- border-spacing: 0;
- /*table-layout: fixed;*/
- border: 1px solid #ccc;
- /*border: 1px solid #ccc;*/
- width: 100%;
- /*height: 100%;*/
- /*overflow: hidden;*/
- /*overflow-y: auto;*/
- text-align: center;
- }
-
- /*.dataContent .fixed th {*/
- /*width: 50px;*/
- /*}*/
-
- .dataContent .thead th {
- background-color: #fafafa;
- text-align: center;
- height: 30px;
- padding: 5px;
- }
-
- .dataContent .notfixed th {
- /*width: auto;*/
- }
-
- .dataContent tr td {
- height: 35px;
- }
-
- .dataContent .mathData:hover td {
- background-color: #e6f7ff;
- }
-
- .dataContent .mathData td {
- padding: 10px;
- /*display: none;*/
- }
-
- .dataContent .mathData td {
- /*background-color: #ff9bd2;*/
- cursor: pointer;
- }
-
- .dataContent .mathData .tdd {
- /*display: none;*/
- }
-
- .table2 {
- width: 100%;
- height: 100%;
- overflow: auto;
- }
-
- /*tr th {*/
- /*height: 50px!important;*/
- /*}*/
- /*tr td{*/
- /*height: 50px!important;*/
- /*}*/
- .table2 thead tr th:first-child,
- .table tbody tr .tdgu {
- position: sticky;
- left: 0;
- z-index: 1;
- }
-
- .table tbody tr .kaitou {
- z-index: 1;
- background-color: white;
- }
-
- .table tbody tr .tdgu1 {
- position: sticky;
- left: 150px;
- z-index: 2;
- }
-
- .table tbody tr .tdgu2 {
- position: sticky;
- left: 300px;
- z-index: 2;
- }
-
- .table tbody tr .tdgu3 {
- position: sticky;
- left: 450px;
- z-index: 2;
- }
-
- .table tbody tr .tdgu4 {
- position: sticky;
- left: 550px;
- z-index: 2;
- }
-
- .table tbody tr .tdgu5 {
- position: sticky;
- left: 700px;
- z-index: 2;
- }
-
- .table2 thead tr .timeth,
- .table2 thead tr .thgu {
- position: sticky;
- top: 0;
- z-index: 3;
- }
-
- .table2 thead .gudingth th {
- position: sticky;
- top: 32px;
- z-index: 6 !important;
- }
-
- .table2 thead .equipname .name {
- z-index: 3;
- }
-
- .table2 thead .equipname .dong1 {
- z-index: 4;
- left: 0;
- /*border: 1px solid #000;*/
- }
-
- .table2 thead .equipname .dong2 {
- z-index: 5;
- left: 150px;
- }
-
- .table2 thead .equipname .dong3 {
- z-index: 5;
- left: 300px;
- }
-
- .table2 thead .equipname .dong4 {
- z-index: 5;
- left: 450px;
- }
-
- .table2 thead .equipname .dong5 {
- z-index: 5;
- left: 550px;
- }
-
- .table2 thead .equipname .dong6 {
- z-index: 5;
- left: 700px;
- }
-
- @media screen and (min-width: 1920px) {
- #Efficiency {
- height: 258px !important;
- overflow: scroll;
- }
- }
-
- @media screen and (min-width: 1680px) and (max-width: 1920px) {
- #Efficiency {
- height: 258px !important;
- overflow: scroll;
- }
- }
-
- @media screen and (min-width: 1400px) and (max-width: 1680px) {
- #Efficiency {
- height: 160px !important;
- overflow: scroll;
- }
- }
-
- @media screen and (min-width: 1280px) and (max-width: 1400px) {
- #Efficiency {
- height: 60px !important;
- overflow: scroll;
- }
- }
-
- @media screen and (max-width: 1280px) {
- #Efficiency {
- height: 90px !important;
- overflow: scroll;
- }
- }
-
- #Efficiency .table_guding1 {
- position: absolute;
- overflow: hidden;
- width: 500px;
- }
-
- #Efficiency .table_guding2 {
- overflow-x: scroll;
- width: 500px;
- }
-
- /deep/ .ant-card {
- height: 100% !important;
- }
-
- /deep/ .ant-card .ant-card-body {
- height: 100% !important;
- }
-
.efficiency_list #DeviceList {
height: 90% !important;
}
--
Gitblit v1.9.3