From a9f005e2af294c47d7cd1e4b6ed401bf65f5b080 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 04 三月 2025 16:44:09 +0800
Subject: [PATCH] art: 所有设备 台账 二保工单 根据设备id查询二保工单,并过滤掉已完成和已取消的二保工单
---
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 420 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 222 insertions(+), 198 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index bd07f4b..faa9c8b 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -6,12 +6,34 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="4" :sm="4">
+ <a-col :md="5" :sm="5">
<a-form-item label="璁惧绫诲瀷">
- <a-select placeholder="璇烽�夋嫨璁惧绫诲瀷" :triggerChange="true" v-model="queryParam.equipmentType"
- :allowClear="true">
- <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
- {{item.equipmentTypeName}}
+ <a-select
+ :value="queryParams.equipmentType"
+ mode="multiple"
+ placeholder="璇烽�夋嫨璁惧绫诲瀷"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'equipmentType')"
+ >
+ <a-select-option v-for="(item,index) in equipmentTypeList" :value="item.value" :key="index">
+ {{item.label}}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="6" :sm="6">
+ <a-form-item label="椹卞姩绫诲瀷">
+ <a-select
+ :value="queryParams.driveType"
+ mode="multiple"
+ placeholder="璇烽�夋嫨椹卞姩绫诲瀷"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'driveType')"
+ >
+ <a-select-option v-for="(item,index) in driveTypeList" :value="item.value" :key="index">
+ {{item.label}}
</a-select-option>
</a-select>
</a-form-item>
@@ -19,51 +41,89 @@
<a-col :md="6" :sm="6">
<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 :md="14" :sm="14" style="display: flex;align-items: flex-start;-webkit-align-items: flex-start;justify-content: space-between;">
- <a-space>
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
- <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
- </a-space>
- <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;margin-left: 24px">
+ <a-col :md="5" :sm="5" :xs="5">
+ <a-form-item label="璁惧绾у埆">
+ <a-select
+ :value="queryParams.deviceLevel"
+ mode="multiple"
+ placeholder="璇烽�夋嫨璁惧绾у埆"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'deviceLevel')"
+ >
+ <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
+ {{item.label}}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="2" :sm="2">
+ <a
+ @click="toggleSearchStatus=!toggleSearchStatus"
+ @selectstart="$event.preventDefault()"
+ style="display: inline-block;height: 32px;line-height: 32px"
+ >
+ {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24" v-if="toggleSearchStatus">
+
+ <a-col :md="5" :sm="5" :xs="5">
+ <a-form-item label="閲嶈绋嬪害">
+ <a-select
+ :value="queryParams.deviceImportanceLevel"
+ mode="multiple"
+ placeholder="璇烽�夋嫨璁惧閲嶈绋嬪害"
+ allow-clear
+ :maxTagCount="1"
+ @change="selectChange($event,'deviceImportanceLevel')"
+ >
+ <a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
+ :key="index">
+ {{item.label}}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24" type="flex" align="middle">
+ <a-col :md="24" :sm="24" :xs="24"
+ style="display: flex;justify-content: space-between;align-items: flex-start">
+ <div>
+ <a-space style="margin-right: 20px">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
+ <a-button type="primary" icon="printer" v-print="'#Efficiency'"
+ v-has="'efficiency:print'">鎵撳嵃
+ </a-button>
+ </a-space>
+ <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
+ @change="efficiencyOptionsOnChange"/>
+ </div>
+ <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
<tr>
- <td v-for="(item, index) in identifying">{{item.title}}</td>
+ <td v-for="(item, index) in identifying"
+ style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap">{{item.title}}
+ </td>
</tr>
<tr>
<td style="text-align:center;" v-for="(item, index) in identifying">
<div class="identifyingclass" :style="{background: item.color}"></div>
</td>
- <!--<td style="text-align:center;"><div style="width: 55px;height: 15px;background-color: #e8ff37;display:inline-block"></div></td>-->
- <!--<td style="text-align:center;"><div style="width: 55px;height: 15px;background-color: #99ff4e;display:inline-block"></div></td>-->
</tr>
</table>
</a-col>
</a-row>
- <a-row :gutter="24">
- <a-col :md="15" :sm="15">
- <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
- @change="efficiencyOptionsOnChange"/>
- </a-col>
- </a-row>
</a-form>
</div>
- <!--<div style="width: 530px;position: absolute;top: 0; right: 1.5%;">-->
- <!--<table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">-->
- <!--<tr>-->
- <!--<td v-for="(item, index) in identifying">{{item.title}}</td>-->
- <!--</tr>-->
- <!--<tr>-->
- <!--<td style="text-align:center;" v-for="(item, index) in identifying">-->
- <!--<div class="identifyingclass" :style="{background: item.color}"></div>-->
- <!--</td>-->
- <!--<!–<td style="text-align:center;"><div style="width: 55px;height: 15px;background-color: #e8ff37;display:inline-block"></div></td>–>-->
- <!--<!–<td style="text-align:center;"><div style="width: 55px;height: 15px;background-color: #99ff4e;display:inline-block"></div></td>–>-->
- <!--</tr>-->
- <!--</table>-->
- <!--</div>-->
</div>
<a-spin :spinning="spinning">
@@ -73,7 +133,9 @@
v-if="dataList.length>0">
<thead>
<tr class="thead fixed equipname">
- <th class="thgu dong1 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">鍏徃</th>
+ <th class="thgu dong1 name" rowspan="2"
+ style="min-width: 50px; max-width: 50px;width: 50px;height: 66px">鍏徃
+ </th>
<th class="thgu dong2 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">杞﹂棿</th>
<th class="thgu dong3 name" rowspan="2" style="min-width: 50px; max-width: 50px;width: 50px;">宸ユ</th>
<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧缂栧彿
@@ -82,6 +144,8 @@
</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
</th>
+ <th class="thgu dong7 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">璁惧鍨嬪彿
+ </th>
<!--<th rowspan="2">缁勫埆</th>-->
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -89,7 +153,7 @@
</tr>
<tr class="thead notfixed gudingth">
<template v-for="(tableHead, index) in tableHeads">
- <th>鍒╃敤鐜�(%)</th>
+ <th v-if="checkedList.indexOf('lyl') > -1">TEEP(%)</th>
<th v-if="checkedList.indexOf('kjl') > -1">寮�鏈虹巼(%)</th>
<th v-if="checkedList.indexOf('kjsj') > -1">寮�鏈烘椂闂�(灏忔椂)</th>
<th v-if="checkedList.indexOf('jgsj') > -1">鍔犲伐鏃堕棿(灏忔椂)</th>
@@ -122,17 +186,22 @@
</div>
</td>
<td class="tdgu3 kaitou">{{item.equipmentId}}</td>
- <td class="tdgu4 kaitou" style="min-width: 162px; max-width: 162px;width: 162px;">{{item.equipmentName}}</td>
+ <td class="tdgu4 kaitou" style="min-width: 162px; max-width: 162px;width: 162px;">
+ {{item.equipmentName}}
+ </td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu6 kaitou">{{item.equipmentModel}}</td>
</template>
<!--鍚堣涓庡钩鍧囧�煎尯鍩�-->
<template v-else>
- <td colspan="6" class="tdgu kaitou">{{item.level1}}</td>
+ <td colspan="7" class="tdgu kaitou">{{item.level1}}</td>
</template>
<template v-for="(tableHead, index) in item.dataList">
- <td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>
+ <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('lyl') > -1">
+ {{tableHead.utilizationRate | numFilter}}
+ </td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
{{tableHead.openRate | numFilter}}
</td>
@@ -168,6 +237,7 @@
import $ from 'jquery'
import '@/components/table2excel/table2excel'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
+ import api from '@/api/mdc'
export default {
name: 'EfficiencyList',
@@ -181,14 +251,23 @@
TreeIDTwo: 2,
deviceTypeDict: '',
dates: [],
- selectList: [],
+ equipmentTypeList: [],
+ driveTypeList: [],
+ device_level_list: [],
+ device_category_list: [],
identifying: [],
queryParam: {},
- queryParams: {},
+ queryParams: {
+ equipmentType: [],
+ driveType: [],
+ deviceLevel: [],
+ deviceCategory: [],
+ deviceImportanceLevel: []
+ },
queryParamEquip: {},
queryParamPeople: {},
efficiencyOptions: [
- { label: '鍒╃敤鐜�', value: 'lyl' },
+ { label: 'TEEP', value: 'lyl' },
{ label: '寮�鏈虹巼', value: 'kjl' },
{ label: '寮�鏈烘椂闂�', value: 'kjsj' },
{ label: '鍔犲伐鏃堕棿', value: 'jgsj' },
@@ -210,7 +289,8 @@
processLongRowAverage: '',
waitLongRowAverage: '',
closeLongRowAverage: '',
- spinning: false
+ spinning: false,
+ toggleSearchStatus: false
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -222,6 +302,14 @@
this.queryParam.typeTree = '1'
this.loadData()
this.queryGroup()
+ this.getDriveTypeByApi()
+ this.initDictData('device_level')
+ this.initDictData('device_category')
+ this.initDictData('device_importance_level')
+ },
+ mounted() {
+ window.addEventListener('resize', this.handleWindowResize)
+ this.handleWindowResize()
},
watch: {
Type(valmath) {
@@ -277,6 +365,23 @@
},
computed: {},
methods: {
+ initDictData(dictCode) {
+ // //浼樺厛浠庣紦瀛樹腑璇诲彇瀛楀吀閰嶇疆
+ if (getDictItemsFromCache(dictCode)) {
+ this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
+ return
+ }
+ //鏍规嵁瀛楀吀Code, 鍒濆鍖栧瓧鍏告暟缁�
+ ajaxGetDictItems(dictCode, null).then((res) => {
+ if (res.success) {
+ this[dictCode + '_list'] = res.result
+ return
+ }
+ })
+ },
+ selectChange(value, key) {
+ this.queryParams[key] = value
+ },
checkSameData(dataList) {
let cache = {} //瀛樺偍鐨勬槸閿槸kclx 鐨勫�硷紝鍊兼槸kclx 鍦╥ndeces涓暟缁勭殑涓嬫爣
let indices = [] //鏁扮粍涓瘡涓�涓�兼槸涓�涓暟缁勶紝鏁扮粍涓殑姣忎竴涓厓绱犳槸鍘熸暟缁勪腑鐩稿悓kclx鐨勪笅鏍�
@@ -399,7 +504,7 @@
$('#Efficiency').table2excel({
exclude: '.noExl',
name: 'Excel Document Name',
- filename: '璁惧鍒╃敤鐜�',
+ filename: '璁惧TEEP',
exclude_img: true,
fileext: '.xls',
exclude_links: true,
@@ -420,69 +525,50 @@
if (!this.queryParam.startTime && !this.queryParam.endTime) this.searchReset()
},
efficiencyOptionsOnChange(checkedList) {
- let index = checkedList.indexOf('lyl')
- if (index < 0) {
- // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ寮�鍔ㄧ巼')
- this.$notification.warning({
- message: '娑堟伅',
- description: '涓嶈兘鍙栨秷鏌ヨ寮�鍔ㄧ巼'
- })
-
- return false
- }
+ // let index = checkedList.indexOf('lyl')
+ // if (index < 0) {
+ // // this.$message.warn('涓嶈兘鍙栨秷鏌ヨ寮�鍔ㄧ巼')
+ // this.$notification.warning({
+ // message: '娑堟伅',
+ // description: '涓嶈兘鍙栨秷鏌ヨ寮�鍔ㄧ巼'
+ // })
+ //
+ // return false
+ // }
this.checkedList = checkedList
},
- // searchQuery() {
- // if(this.queryParam.typeTree == "1"){
- // // this.queryParam.TreeIDTwo = ""
- // this.queryParam.parentId = this.queryParamEquip.parentId
- // this.queryParam.equipmentId = this.queryParamEquip.equipmentId
- // }else{
- // // this.queryParam.TreeIDOne = ""
- // this.queryParam.parentId = this.queryParamPeople.parentId
- // this.queryParam.equipmentId = ""
- // }
- // this.loadData()
- // // this.onClearSelected()
- // },
- // searchReset() {
- // this.typeTree = this.queryParam.typeTree
- // this.typeParent = this.queryParams.parentId
- // this.queryParam = {}
- // this.dates = []
- // this.queryParam.typeTree = this.typeTree
- // this.queryParam.parentId = this.typeParent
- // this.loadData()
- // // this.onClearSelected()
- // },
searchQuery() {
- console.log('dates', this.dates)
- if (this.dates != '') {
- 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.loadData()
+ 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()
+ Object.keys(this.queryParams).forEach(item => {
+ this.queryParam[item] = this.queryParams[item].join()
+ // 姝ゅ涓轰繚璇佹帴鍙ｅ弬鏁颁笉澶氫綑锛屽彲鐪佺暐
+ if (this.queryParams[item].length === 0) delete this.queryParam[item]
+ })
+ this.loadData()
},
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.dates = [moment().subtract('days', 8), moment().subtract('days', 1)]
+ this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
+ this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
+ this.queryParams = {
+ equipmentType: [],
+ driveType: [],
+ deviceLevel: [],
+ deviceCategory: []
+ }
// this.ipagination.current = 1
this.loadData()
// this.queryParam = {}
@@ -498,6 +584,12 @@
if (res.success) {
this.tableHeads = res.result.dates
this.dataList = res.result.mdcEfficiencyList
+ if (res.result.mdcEfficiencyList && !res.result.mdcEfficiencyList.length) {
+ this.$notification.info({
+ message: '娑堟伅',
+ description: '鏆傛棤璇ョ被鍨嬫暟鎹�'
+ })
+ }
this.distinguishColorList = res.result.utilizationRateList
this.checkSameData(this.dataList)
this.checkSameData1(this.dataList)
@@ -513,21 +605,39 @@
queryGroup() {
getAction(this.url.queryEquipmentType).then(res => {
if (res.success) {
- this.selectList = res.result
- // this.selectList = res.result.map((item, index, arr) => {
- // return { label: item.id, value: item.equipmentTypeName + '' }
- // })
+ this.equipmentTypeList = res.result.map(item => {
+ return {
+ label: item.equipmentTypeName,
+ value: item.equipmentTypeName
+ }
+ })
} else {
- // this.$message.warning(res.message)
this.$notification.warning({
message: '娑堟伅',
description: res.message
})
}
- }).finally(() => {
- this.loading = false
})
},
+
+ /**
+ * 璋冪敤鎺ュ彛鑾峰彇鎺у埗绯荤粺绫诲瀷
+ */
+ getDriveTypeByApi() {
+ api.getDriveTypeApi().then((res) => {
+ if (res.success) this.driveTypeList = res.result
+ })
+ },
+
+ /**
+ * 鍒嗚鲸鐜囨敼鍙樻椂鍚屾椂鏀瑰彉琛ㄦ牸楂樺害宸蹭繚璇侀椤典竴杩涘叆涓嶆嫋鍔ㄥ瀭鐩存粴鍔ㄦ潯鏃跺嵆鍙嫋鍔ㄨ〃鏍兼按骞虫粴鍔ㄦ潯
+ */
+ handleWindowResize() {
+ const tableContainer = document.getElementById('Efficiency') // 琛ㄦ牸瀹瑰櫒
+ const clientHeight = document.documentElement.clientHeight || document.body.clientHeight // 娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴�
+ const containerTopToClientTopHeight = tableContainer.getBoundingClientRect().top // 琛ㄦ牸瀹瑰櫒椤堕儴鍒版祻瑙堝櫒鍙鍖哄煙椤堕儴鐨勯棿璺�
+ tableContainer.style.height = (clientHeight - containerTopToClientTopHeight - 32) + 'px'
+ }
}
}
</script>
@@ -588,6 +698,12 @@
z-index: 2;
}
+ .table tbody tr .tdgu6 {
+ position: sticky;
+ left: 512px;
+ z-index: 2;
+ }
+
.table2 thead tr .timeth,
.table2 thead tr .thgu {
position: sticky;
@@ -608,7 +724,6 @@
.table2 thead .equipname .dong1 {
z-index: 4;
left: 0;
- /*border: 1px solid #000;*/
}
.table2 thead .equipname .dong2 {
@@ -636,50 +751,13 @@
left: 412px;
}
- @media screen and (min-width: 1920px) {
- #Efficiency {
- height: 687px !important;
- overflow: scroll;
- }
+ .table2 thead .equipname .dong7 {
+ z-index: 5;
+ left: 512px;
}
- @media screen and (min-width: 1680px) and (max-width: 1920px) {
- #Efficiency {
- height: 687px !important;
- overflow: scroll;
- }
- }
-
- @media screen and (min-width: 1400px) and (max-width: 1680px) {
- #Efficiency {
- height: 540px !important;
- overflow: scroll;
- }
- }
-
- @media screen and (min-width: 1280px) and (max-width: 1400px) {
- #Efficiency {
- height: 440px !important;
- overflow: scroll;
- }
- }
-
- @media screen and (max-width: 1280px) {
- #Efficiency {
- height: 440px !important;
- overflow: scroll;
- }
- }
-
- #Efficiency .table_guding1 {
- position: absolute;
+ #Efficiency {
overflow: hidden;
- width: 500px;
- }
-
- #Efficiency .table_guding2 {
- overflow-x: scroll;
- width: 500px;
}
.identifyingclass {
@@ -704,10 +782,6 @@
text-align: center;
}
- /*.dataContent .fixed th {*/
- /*width: 50px;*/
- /*}*/
-
.dataContent .thead th {
background-color: #fafafa;
text-align: center;
@@ -715,61 +789,11 @@
padding: 5px;
}
- .dataContent .notfixed th {
- /*width: auto;*/
- }
-
- /*.dataContent tr td {*/
- /*height: 35px;*/
- /*}*/
-
.dataContent .mathData td {
- padding: 10px;
- /*display: none;*/
- }
-
- .dataContent .mathData .td {
- /*background-color: #ff9bd2;*/
- display: inline-block;
padding: 10px;
}
td {
vertical-align: middle;
}
-
- .pink {
- background-color: #ff9bd2;
- }
-
- .yellow {
- background-color: #e8ff37;
- }
-
- .green {
- background-color: #99ff4e;
- }
-
- .vertical-text {
- writing-mode: vertical-rl;
- }
-
- /*/deep/ .ant-table-body .ant-table-row td {*/
- /*padding-top: 10px;*/
- /*padding-bottom: 10px;*/
- /*}*/
-
- /deep/ .ant-table-body .ant-table-row td.data {
- min-width: 150px;
- max-width: 150px;
- }
-
- /deep/ .ant-table-tbody > tr.ant-table-row:hover > td {
- background: none !important;
- }
-
- /deep/ .ant-table-thead th {
- text-align: center;
- }
-
</style>
\ No newline at end of file
--
Gitblit v1.9.3