From 5330eb812cdcc02cace0648b008092b24c6e2236 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 17:44:50 +0800
Subject: [PATCH] 1、利用率走势分析和利用率分段分析页面优化表格数据加载方式，实现滚动条触底加载，解决数据量较大时网页请求速度慢问题 2、报警分析页面调整图表样式，更换表格组件为ant-design表格 3、登录页面登录后若用户密码为初始密码或密码已过期则出现修改密码弹窗
---
src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue | 232 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 179 insertions(+), 53 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
index cbb9217..479b163 100644
--- a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
+++ b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
@@ -19,43 +19,57 @@
</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>
+ <!--<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-table :columns="columns" :data-source="dataList" bordered :pagination="false" :scroll="{y:168}"
+ :customRow="customRow"
+ rowKey="alarmCode">
+ <span slot="timeCount" slot-scope="text">{{getFormattedTime(text)}}</span>
+ <!--<a-table-->
+ <!--slot="expandedRowRender"-->
+ <!--slot-scope="row"-->
+ <!--:columns="innerColumns"-->
+ <!--:data-source="row.innerDataList"-->
+ <!--:pagination="false"-->
+ <!-->-->
+ <!--<span slot="duration" slot-scope="text">{{getFormattedTime(text)}}</span>-->
+ <!--</a-table>-->
+ </a-table>
</div>
<div style="width: 100%;height: 55%;display: flex;">
<div id="MdcEquipmentWarningPie" style="height: 100%;width: 35%;"></div>
@@ -75,6 +89,33 @@
import {
JeecgListMixin
} from '@/mixins/JeecgListMixin'
+
+ const columns = [
+ { title: '鎶ヨ鍙�', dataIndex: 'alarmCode', key: 'alarmCode', align: 'center' },
+ { title: '鍑虹幇娆℃暟', dataIndex: 'count', key: 'count', align: 'center' },
+ {
+ title: '鍚堣鎸佺画鏃堕棿',
+ dataIndex: 'timeCount',
+ key: 'timeCount',
+ scopedSlots: { customRender: 'timeCount' },
+ align: 'center'
+ },
+ { title: '鎶ヨ淇℃伅', dataIndex: 'alarmContent', key: 'alarmContent', align: 'center' }
+ ]
+
+ const innerColumns = [
+ { title: '璁惧缂栧彿', dataIndex: 'equipmentId', key: 'equipmentId', align: 'center' },
+ { title: '璁惧鍚嶇О', dataIndex: 'equipmentName', key: 'equipmentName', align: 'center' },
+ { title: '鎶ヨ鏃堕棿', dataIndex: 'alarmTime', key: 'alarmTime', align: 'center' },
+ { title: '缁撴潫鏃堕棿', dataIndex: 'endTime', key: 'endTime', align: 'center' },
+ {
+ title: '鎸佺画鏃堕棿',
+ dataIndex: 'duration',
+ key: 'duration',
+ scopedSlots: { customRender: 'duration' },
+ align: 'center'
+ }
+ ]
export default {
// mixins: [JeecgListMixin],
@@ -115,7 +156,9 @@
tableHeads: [],
pieDate: [0],
XData: [0],
- YData: [0]
+ YData: [0],
+ columns,
+ innerColumns
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -344,6 +387,15 @@
if (res.success) {
// this.tableHeads = res.result.dates
this.dataList = res.result
+ this.dataList.forEach(item => item.innerDataList = [
+ {
+ equipmentId: '11234',
+ equipmentName: '绔嬩綋鏈哄簥',
+ alarmTime: 20,
+ endTime: 20,
+ duration: 123
+ }
+ ])
// this.draw()
// this.checkSameData(this.dataList)
// this.checkSameData1(this.dataList)
@@ -360,7 +412,10 @@
title: {
text: '鍚勮澶囧嚭鐜版鎶ヨ鐨勬瘮渚�',
x: 'center',
- y: 'bottom'
+ y: 'bottom',
+ textStyle: {
+ color: '#4FAEDC'
+ }
},
tooltip: {
trigger: 'item',
@@ -372,14 +427,18 @@
radius: '60%',
itemStyle: {
normal: {
- /*color: function (params) {
- var colorList = ['#4169E1', '#A8A8A8'];
- return colorList[params.dataIndex]
- },*/
+ color: function(params) {
+ var colorList = ['#5AB1EF', '#2EC7C9', '#B6A2DE', '#FFB980', '#D87A80', '#8D98B3']
+ return colorList[params.dataIndex]
+ },
label: {
show: true,
- position: 'top',
- formatter: '{b}\n{c}'
+ // position: 'top',
+ formatter: '{b}\n{c}',
+ color: function(params) {
+ var colorList = ['#5AB1EF', '#2EC7C9', '#B6A2DE', '#FFB980', '#D87A80', '#8D98B3']
+ return colorList[params.dataIndex]
+ }
}
}
},
@@ -393,7 +452,10 @@
title: {
text: '姣忓ぉ鍑虹幇姝ゆ姤璀︾殑鏁伴噺璧板娍',
x: 'center',
- y: 'bottom'
+ y: 'bottom',
+ textStyle: {
+ color: '#4FAEDC'
+ }
},
tooltip: {
trigger: 'axis'
@@ -406,13 +468,29 @@
data: this.XData
/*axisLabel :{
interval:0
- }*/
+ }*/,
+ axisLine: {
+ //x杞寸嚎鐨勯鑹蹭互鍙婂搴�
+ show: true,
+ lineStyle: {
+ width: 2,
+ color: '#4FAEDC'
+ }
+ }
}
],
yAxis: [
{
type: 'value',
- name: '娆℃暟'
+ name: '娆℃暟',
+ axisLine: {
+ //x杞寸嚎鐨勯鑹蹭互鍙婂搴�
+ show: true,
+ lineStyle: {
+ width: 2,
+ color: '#4FAEDC'
+ }
+ }
}
],
series: [
@@ -424,7 +502,15 @@
data: [
{ type: 'max', name: '鏈�澶у��' },
{ type: 'min', name: '鏈�灏忓��' }
- ]
+ ],
+ label: {
+ color: '#fff'
+ }
+ },
+ itemStyle: {
+ normal: {
+ color: '#2EC7C9'
+ }
}
}
]
@@ -432,12 +518,46 @@
equipmentWarningLine.setOption(equipmentWarningLineOption, true)
},
- getFormattedTime(seconds){
- var hours = Math.floor(seconds / 3600);
- var minutes = Math.floor((seconds % 3600) / 60);
- var secs = seconds % 60;
+ /**
+ * 鏍煎紡鍖栨椂闂�
+ * @param seconds 绉掓暟
+ * @returns 鏍煎紡鍖栧悗鏃堕棿瀛楃涓�
+ */
+ getFormattedTime(seconds) {
+ var hours = Math.floor(seconds / 3600)
+ var minutes = Math.floor((seconds % 3600) / 60)
+ var secs = seconds % 60
+ if (hours == 0) {
+ if (minutes == 0) {
+ return `${secs}绉抈
+ } else {
+ return `${minutes}鍒� ${secs}绉抈
+ }
+ } else {
+ if (minutes == 0 && secs == 0) {
+ return `${hours}灏忔椂`
+ } else if (minutes != 0 && secs == 0) {
+ return `${hours}灏忔椂 ${minutes}鍒哷
+ }
+ }
return `${hours}灏忔椂 ${minutes}鍒� ${secs}绉抈
+ },
+
+ /**
+ * 鑷畾涔夎〃鏍艰瑙﹀彂
+ * @param record 褰撳墠琛屼俊鎭�
+ * @param index 褰撳墠琛屼笅鏍�
+ * @returns {{on: {click: on.click}}} 杩斿洖瀵硅薄
+ */
+ customRow(record, index) {
+ return {
+ on: {
+ click: () => {
+ this.TableDraw(index, record)
+ }
+ }
+ }
}
}
}
@@ -655,4 +775,10 @@
.efficiency_list #DeviceList {
height: 90% !important;
}
+
+ /deep/ .ant-table-body .ant-table-row td {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ cursor: pointer;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3