From fe470128a5432662cc3f394280c652c5ab023161 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 28 五月 2025 09:22:59 +0800
Subject: [PATCH] 1、设备TEEP/设备开动率/班次利用率页面新增异常反馈功能 2、设备TEEP页面实现滚动加载（每次滚动加载15条） 3、异常反馈页面增加手动新增反馈异常功能 4、利用率分段与走势分析页面解决重置按钮后请求日期与显示日期不相等问题
---
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 99 ++++++++++++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 42 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 44422dc..a112342 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -77,22 +77,22 @@
</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.deviceCategory"
- mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
- allow-clear
- :maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
- >
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
- {{item.label}}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
+ <!-- <a-col :md="5" :sm="5" :xs="5">-->
+ <!-- <a-form-item label="璁惧绉嶇被">-->
+ <!-- <a-select-->
+ <!-- :value="queryParams.deviceCategory"-->
+ <!-- mode="multiple"-->
+ <!-- placeholder="璇烽�夋嫨璁惧绉嶇被"-->
+ <!-- allow-clear-->
+ <!-- :maxTagCount="1"-->
+ <!-- @change="selectChange($event,'deviceCategory')"-->
+ <!-- >-->
+ <!-- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
+ <!-- {{item.label}}-->
+ <!-- </a-select-option>-->
+ <!-- </a-select>-->
+ <!-- </a-form-item>-->
+ <!-- </a-col>-->
<a-col :md="5" :sm="5" :xs="5">
<a-form-item label="璁惧绾у埆">
<a-select
@@ -112,12 +112,9 @@
<a-col :md="5" :sm="5" :xs="5">
<a-form-item label="閲嶈绋嬪害">
<a-select
- :value="queryParams.deviceImportanceLevel"
- mode="multiple"
+ v-model="queryParam.deviceImportanceLevel"
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">
@@ -136,12 +133,11 @@
<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" @click="handleShowFeedbackModal" icon="plus" v-has="'efficiencyShiftReport:feedback'">寮傚父鍙嶉</a-button>
<a-button type="primary" icon="printer" v-print="'#EfficiencyShift'"
v-has="'efficiencyShiftReport: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>
@@ -153,6 +149,13 @@
</td>
</tr>
</table>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col>
+ <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
+ @change="efficiencyOptionsOnChange"/>
</a-col>
</a-row>
</a-form>
@@ -177,7 +180,9 @@
</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: 100px; max-width: 100px;width: 100px;">鐝</th>
+ <th class="thgu dong7 name" rowspan="2" style="min-width: 120px; max-width: 120px;width: 120px;">璁惧鍨嬪彿
+ </th>
+ <th class="thgu dong8 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>
@@ -219,11 +224,12 @@
{{item.equipmentName}}
</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
- <td class="tdgu6 kaitou">{{item.shiftSubName}}</td>
+ <td class="tdgu6 kaitou">{{item.equipmentModel}}</td>
+ <td class="tdgu7 kaitou">{{item.shiftSubName}}</td>
</template>
<template v-else>
- <td colspan="7" class="tdgu kaitou">{{item.level1}}</td>
+ <td colspan="8" class="tdgu kaitou">{{item.level1}}</td>
</template>
<!--<td>{{item.tierType}}</td>-->
<template v-for="(tableHead, index) in item.dataList">
@@ -250,6 +256,8 @@
</div>
</a-spin>
</div>
+
+ <mdc-message-approval-modal ref="modalForm" :visible="modalVisible" @closeModal="modalVisible = false"/>
</div>
</template>
@@ -260,10 +268,11 @@
import '@/components/table2excel/table2excel'
import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
import api from '@/api/mdc'
+ import MdcMessageApprovalModal from '../MdcMessageApproval/MdcMessageApprovalModal'
export default {
name: 'EfficiencyShiftList',
- components: {},
+ components: { MdcMessageApprovalModal },
data() {
return {
typeTree: '',
@@ -275,16 +284,13 @@
equipmentTypeList: [],
driveTypeList: [],
device_level_list: [],
- device_category_list: [],
device_importance_level_list: [],
identifying: [],
queryParam: {},
queryParams: {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: [],
- deviceImportanceLevel: []
+ deviceLevel: []
},
queryParamEquip: {},
queryParamPeople: {},
@@ -313,7 +319,8 @@
shiftList: [],
shiftSubList: [],
spinning: false,
- toggleSearchStatus: false
+ toggleSearchStatus: false,
+ modalVisible: false// 寮傚父鍙嶉寮圭獥鏄惁寮瑰嚭
}
},
props: { nodeTree: '', Type: '', nodePeople: '' },
@@ -572,15 +579,6 @@
// 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
- // }
this.checkedList = checkedList
},
searchQuery() {
@@ -613,8 +611,7 @@
this.queryParams = {
equipmentType: [],
driveType: [],
- deviceLevel: [],
- deviceCategory: []
+ deviceLevel: []
}
this.loadData()
// this.onClearSelected()
@@ -643,6 +640,13 @@
this.spinning = false
})
},
+
+ // 鎺у埗寮傚父鍙嶉寮圭獥寮瑰嚭
+ handleShowFeedbackModal() {
+ this.$refs.modalForm.formParams = {}
+ this.modalVisible = true
+ },
+
queryGroup() {
getAction(this.url.queryEquipmentType).then(res => {
if (res.success) {
@@ -745,6 +749,12 @@
z-index: 2;
}
+ .table tbody tr .tdgu7 {
+ position: sticky;
+ left: 632px;
+ z-index: 2;
+ }
+
.table2 thead tr .timeth,
.table2 thead tr .thgu {
position: sticky;
@@ -797,6 +807,11 @@
left: 512px;
}
+ .table2 thead .equipname .dong8 {
+ z-index: 6;
+ left: 632px;
+ }
+
#EfficiencyShift {
overflow: hidden;
}
--
Gitblit v1.9.3