From 575a75a0519e53ceec6bb5d31f682124596c3bae Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 24 十月 2023 10:57:34 +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 | 233 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 136 insertions(+), 97 deletions(-)
diff --git a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
index ec4ca0b..e923eb5 100644
--- a/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
+++ b/src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue
@@ -1,13 +1,14 @@
<template>
<div class="efficiency_list" style="width: 100%;height: 100%;">
- <a-card :bordered="false">
+ <div :bordered="false" style="height: 100%">
<!-- 鏌ヨ鍖哄煙 -->
<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-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
+ <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD"
+ v-model="dates"/>
</a-form-item>
</a-col>
<a-col :lg="2" :md="3" :sm="3" :xs="3">
@@ -20,26 +21,34 @@
<div class="openRateTrendDg">
<div id="Efficiency" class="container" style="margin-top: 20px;">
<div class="table2">
- <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap;text-align: left;">
+ <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>
+ <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>-->
+ <!--<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">{{item.timeCount}}</td>
- <td class="tdgu3 kaitou">{{item.alarmContent}}</td>
+ <td class="tdgu kaitou">{{item.alarmCode}}</td>
+ <td class="tdgu1 kaitou">{{item.count}}</td>
+ <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>-->
+ <!--<td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>-->
<!--</template>-->
</tr>
</tbody>
@@ -52,7 +61,7 @@
<div id="MdcEquipmentWarningLine" style="height: 100%;width: 65%;"></div>
</div>
</div>
- </a-card>
+ </div>
</div>
</template>
@@ -65,6 +74,7 @@
import {
JeecgListMixin
} from '@/mixins/JeecgListMixin'
+
export default {
// mixins: [JeecgListMixin],
name: 'alarmAnalysisMain',
@@ -74,7 +84,7 @@
dataSource: [],
/* table鍔犺浇鐘舵�� */
loading: false,
- typeTree: "",
+ typeTree: '',
typeParent: 1,
typeEquipment: 1,
TreeIDOne: 1,
@@ -102,9 +112,9 @@
alarmTrend: '/mdc/alarmAnalyze/alarmTrend'
},
tableHeads: [],
- pieDate:[0],
- XData:[0],
- YData:[0],
+ pieDate: [0],
+ XData: [0],
+ YData: [0]
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -115,16 +125,16 @@
this.dates = [moment().subtract('days', 8), moment().subtract('days', 1)]
this.queryParam.startDate = moment(this.dates[0]).format('YYYYMMDD')
this.queryParam.endDate = moment(this.dates[1]).format('YYYYMMDD')
- this.queryParam.typeTree = "1"
+ this.queryParam.typeTree = '1'
this.loadData1()
},
- mounted(){
+ mounted() {
this.drawWrin()
},
watch: {
Type(valmath) {
- this.dataList = [];
+ this.dataList = []
this.queryParam.typeTree = valmath
},
nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
@@ -163,14 +173,14 @@
}
},
methods: {
- numBerTwo(value){
+ numBerTwo(value) {
if (value) {
return parseFloat((value * 100).toFixed(2))
} else {
return '0'
}
},
- TableDraw(key,val) {
+ TableDraw(key, val) {
let that = this
that.queryParam.alarmCode = val.alarmCode
console.log(this.queryParam)
@@ -179,10 +189,13 @@
that.YData = []
getAction(that.url.alarmTrend, that.queryParam).then(res => {
if (res.success) {
- for (var i = 0;i<res.result.equipmentCountList.length;i++){
- that.pieDate.push({name:res.result.equipmentCountList[i].key,value:res.result.equipmentCountList[i].count})
+ for (var i = 0; i < res.result.equipmentCountList.length; i++) {
+ that.pieDate.push({
+ name: res.result.equipmentCountList[i].key,
+ value: res.result.equipmentCountList[i].count
+ })
}
- for (var j = 0;j<res.result.dateCountList.length;j++){
+ for (var j = 0; j < res.result.dateCountList.length; j++) {
that.XData.push(res.result.dateCountList[j].key)
that.YData.push(res.result.dateCountList[j].count)
}
@@ -202,7 +215,7 @@
},
disabledDate(current) {
//Can not slect days before today and today
- return current && current > moment().subtract('days', 1);
+ return current && current > moment().subtract('days', 1)
},
initDeviceType(deviceList) {
let dictCode = 'mdc_equipmentType'
@@ -236,19 +249,19 @@
this.queryParam.endDate = v2[1]
},
searchQuery() {
- if (this.dates&&this.dates.length>0){
- if (this.queryParam.typeTree == "1") {
+ 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.queryParam.equipmentId = ''
}
this.loadData1()
- } else{
+ } else {
this.$notification.warning({
- message:'鎻愮ず',
- description:'璇烽�夋嫨鏃堕棿'
+ message: '鎻愮ず',
+ description: '璇烽�夋嫨鏃堕棿'
})
}
@@ -340,8 +353,8 @@
}
})
},
- drawWrin(){
- let equipmentWarningPie = this.$echarts.init(document.getElementById('MdcEquipmentWarningPie'), 'macarons');
+ drawWrin() {
+ let equipmentWarningPie = this.$echarts.init(document.getElementById('MdcEquipmentWarningPie'), 'macarons')
let equipmentWarningPieOption = {
title: {
text: '鍚勮澶囧嚭鐜版鎶ヨ鐨勬瘮渚�',
@@ -350,13 +363,12 @@
},
tooltip: {
trigger: 'item',
- formatter: "<br/>{b} : {c} ({d}%)"
+ formatter: '<br/>{b} : {c} ({d}%)'
},
calculable: true,
series: [{
type: 'pie',
radius: '60%',
- center: ['55%', '55%'],
itemStyle: {
normal: {
/*color: function (params) {
@@ -370,27 +382,27 @@
}
}
},
- data:this.pieDate
+ data: this.pieDate
// data:[{name:'jjjjjjj',value:'2'}]
}]
- };
- equipmentWarningPie.setOption(equipmentWarningPieOption,true);
- let equipmentWarningLine = this.$echarts.init(document.getElementById('MdcEquipmentWarningLine'), 'macarons');
+ }
+ equipmentWarningPie.setOption(equipmentWarningPieOption, true)
+ let equipmentWarningLine = this.$echarts.init(document.getElementById('MdcEquipmentWarningLine'), 'macarons')
let equipmentWarningLineOption = {
- title : {
+ title: {
text: '姣忓ぉ鍑虹幇姝ゆ姤璀︾殑鏁伴噺璧板娍',
x: 'center',
y: 'bottom'
},
- tooltip:{
- trigger: 'item'
+ tooltip: {
+ trigger: 'axis'
},
calculable: true,
xAxis: [
{
type: 'category',
show: true,
- data:this.XData
+ data: this.XData
/*axisLabel :{
interval:0
}*/
@@ -407,16 +419,16 @@
name: '鎶ヨ鏁伴噺',
type: 'line',
data: this.YData,
- markPoint : {
- data : [
- {type : 'max', name: '鏈�澶у��'},
- {type : 'min', name: '鏈�灏忓��'}
+ markPoint: {
+ data: [
+ { type: 'max', name: '鏈�澶у��' },
+ { type: 'min', name: '鏈�灏忓��' }
]
}
}
]
- };
- equipmentWarningLine.setOption(equipmentWarningLineOption,true);
+ }
+ equipmentWarningLine.setOption(equipmentWarningLineOption, true)
}
}
}
@@ -456,28 +468,31 @@
.dataContent tr td {
height: 35px;
}
- .dataContent .mathData:hover td{
+
+ .dataContent .mathData:hover td {
background-color: #e6f7ff;
}
+
.dataContent .mathData td {
padding: 10px;
/*display: none;*/
}
- .dataContent .mathData .td {
+ .dataContent .mathData td {
/*background-color: #ff9bd2;*/
- display: inline-block;
- padding: 10px;
+ cursor: pointer;
}
.dataContent .mathData .tdd {
/*display: none;*/
}
- .table2{
+
+ .table2 {
width: 100%;
height: 100%;
overflow: auto;
}
+
/*tr th {*/
/*height: 50px!important;*/
/*}*/
@@ -485,126 +500,150 @@
/*height: 50px!important;*/
/*}*/
.table2 thead tr th:first-child,
- .table tbody tr .tdgu{
+ .table tbody tr .tdgu {
position: sticky;
left: 0;
z-index: 1;
}
- .table tbody tr .kaitou{
+
+ .table tbody tr .kaitou {
z-index: 1;
background-color: white;
}
- .table tbody tr .tdgu1{
+
+ .table tbody tr .tdgu1 {
position: sticky;
left: 150px;
z-index: 2;
}
- .table tbody tr .tdgu2{
+
+ .table tbody tr .tdgu2 {
position: sticky;
left: 300px;
z-index: 2;
}
- .table tbody tr .tdgu3{
+
+ .table tbody tr .tdgu3 {
position: sticky;
left: 450px;
z-index: 2;
}
- .table tbody tr .tdgu4{
+
+ .table tbody tr .tdgu4 {
position: sticky;
left: 550px;
z-index: 2;
}
- .table tbody tr .tdgu5{
+
+ .table tbody tr .tdgu5 {
position: sticky;
left: 700px;
z-index: 2;
}
+
.table2 thead tr .timeth,
- .table2 thead tr .thgu {
+ .table2 thead tr .thgu {
position: sticky;
- top:0;
+ top: 0;
z-index: 3;
}
- .table2 thead .gudingth th{
+
+ .table2 thead .gudingth th {
position: sticky;
top: 32px;
- z-index: 6!important;
+ z-index: 6 !important;
}
- .table2 thead .equipname .name{
+
+ .table2 thead .equipname .name {
z-index: 3;
}
- .table2 thead .equipname .dong1{
+
+ .table2 thead .equipname .dong1 {
z-index: 4;
left: 0;
/*border: 1px solid #000;*/
}
- .table2 thead .equipname .dong2{
+
+ .table2 thead .equipname .dong2 {
z-index: 5;
left: 150px;
}
- .table2 thead .equipname .dong3{
+
+ .table2 thead .equipname .dong3 {
z-index: 5;
left: 300px;
}
- .table2 thead .equipname .dong4{
+
+ .table2 thead .equipname .dong4 {
z-index: 5;
left: 450px;
}
- .table2 thead .equipname .dong5{
+
+ .table2 thead .equipname .dong5 {
z-index: 5;
left: 550px;
}
- .table2 thead .equipname .dong6{
+
+ .table2 thead .equipname .dong6 {
z-index: 5;
left: 700px;
}
- @media screen and (min-width: 1920px){
- #Efficiency{
- height: 337px!important;
+ @media screen and (min-width: 1920px) {
+ #Efficiency {
+ height: 337px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1680px) and (max-width: 1920px){
- #Efficiency{
- height: 337px!important;
+
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ #Efficiency {
+ height: 337px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1400px) and (max-width: 1680px){
- #Efficiency{
- height: 190px!important;
+
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ #Efficiency {
+ height: 190px !important;
overflow: scroll;
}
}
- @media screen and (min-width: 1280px) and (max-width: 1400px){
- #Efficiency{
- height: 90px!important;
+
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ #Efficiency {
+ height: 90px !important;
overflow: scroll;
}
}
- @media screen and (max-width: 1280px){
- #Efficiency{
- height: 90px!important;
+
+ @media screen and (max-width: 1280px) {
+ #Efficiency {
+ height: 90px !important;
overflow: scroll;
}
}
- #Efficiency .table_guding1{
+
+ #Efficiency .table_guding1 {
position: absolute;
overflow: hidden;
width: 500px;
}
- #Efficiency .table_guding2{
+
+ #Efficiency .table_guding2 {
overflow-x: scroll;
width: 500px;
}
- /deep/ .ant-card{
- height: 100%!important;
+
+ /deep/ .ant-card {
+ height: 100% !important;
}
- /deep/ .ant-card .ant-card-body{
- height: 100%!important;
+
+ /deep/ .ant-card .ant-card-body {
+ height: 100% !important;
}
- .efficiency_list #DeviceList{
- height: 90%!important;
+
+ .efficiency_list #DeviceList {
+ height: 90% !important;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3