From a751e547d67c4f8e2c6fddf958c1559f792515bd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 16:11:50 +0800
Subject: [PATCH] 添加工作流
---
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 697 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 424 insertions(+), 273 deletions(-)
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index c7adad0..d4449e2 100644
--- a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
+++ b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
@@ -4,108 +4,181 @@
<!-- 鏌ヨ鍖哄煙 -->
<div class="seach-content">
<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-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-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="鏃堕棿">
- <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
- </a-form-item>
- </a-col>
- <a-col :md="4" :sm="4" :xs="4">
- <a-form-item label="鐝埗">
- <a-select v-model="queryParam.shiftId" placeholder="璇烽�夋嫨鐝埗"
- @change="initShiftSubList" :allowClear = "allowClear">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :md="4" :sm="4" :xs="4">
- <a-form-item label="鐝">
- <a-select v-model="queryParam.shiftSubId" placeholder="璇烽�夋嫨鐝" @change="initShiftSubListChange" :allowClear = "allowClearSu">
- <a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :md="7" :sm="7" :xs="7">
- <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>
- </a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :md="24" :sm="24" :xs="24" style="display: flex;justify-content: space-between">
- <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
- @change="efficiencyOptionsOnChange"/>
- <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>
- </tr>
- </table>
- </a-col>
- </a-row>
- </a-form>
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :md="5" :sm="5">
+ <a-form-item label="璁惧绫诲瀷">
+ <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="5" :sm="5">
+ <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>
+ </a-col>
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-form-item label="鏃堕棿">
+ <a-range-picker @change="dateParamChange" :disabledDate="disabledDate"
+ @calendarChange="handleCalendarChange" @openChange="handleCalendarOpenChange"
+ format="YYYYMMDD"
+ v-model="dates" :allowClear="false"/>
+ </a-form-item>
+ </a-col>
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-form-item label="鐝埗">
+ <a-select v-model="queryParam.shiftId" placeholder="璇烽�夋嫨鐝埗"
+ @change="initShiftSubList" :allowClear="allowClear">
+ <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
+ {{ em.label }}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="4" :sm="4" :xs="4">
+ <a-form-item label="鐝">
+ <a-select v-model="queryParam.shiftSubId" placeholder="璇烽�夋嫨鐝" @change="initShiftSubListChange"
+ :allowClear="allowClearSu">
+ <a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
+ {{ em.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.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="5" :sm="5" :xs="5">
+ <a-form-item label="閲嶈绋嬪害">
+ <a-select
+ v-model="queryParam.deviceImportanceLevel"
+ placeholder="璇烽�夋嫨璁惧閲嶈绋嬪害"
+ allow-clear
+ >
+ <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" @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>
+ </div>
+ <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>
+ </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>
</div>
- <!--<div style="width: 530px;position:absolute;top: 10px; right: 0;">-->
- <!--<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>-->
- <!--</tr>-->
- <!--</table>-->
- <!--</div>-->
</div>
+
<a-spin :spinning="spinning">
<div class="container" id="EfficiencyShift" style="margin-top: 20px;">
<div class="table2">
- <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap" v-if="dataList.length>0">
+ <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap"
+ 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 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;">璁惧缂栧彿</th>
- <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О</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 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;">璁惧缂栧彿
+ </th>
+ <th class="thgu dong5 name" rowspan="2" style="min-width: 162px; max-width: 162px;width: 162px;">璁惧鍚嶇О
+ </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: 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>
+ <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
</template>
- <!--average-->
- <!--<th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 150px;width: 150px;">骞冲潎鍊�(鐝鍒╃敤鐜�)</th>-->
</tr>
<tr class="thead notfixed gudingth">
<template v-for="(tableHead, index) in tableHeads">
- <th>鐝鍒╃敤鐜�(%)</th>
- <!--<th v-if="checkedList.indexOf('gzl') > -1">鏁呴殰鐜�(%)</th>-->
- <!--<th v-if="checkedList.indexOf('processingLong') > -1">杩愯鏃堕棿(s)</th>-->
- <!--<th v-if="checkedList.indexOf('totalLong') > -1">鏈夋晥鏃堕棿(s)</th>-->
- <!--<th v-if="checkedList.indexOf('faultLong') > -1">鏁呴殰鏃堕棿(s)</th>-->
- <!--<!–<th v-if="checkedList.indexOf('gjsj') > -1">鍏虫満鏃堕棿(s)</th>–>-->
+ <th v-if="checkedList.indexOf('lyl') > -1">鐝鍒╃敤鐜�(%)</th>
<th v-if="checkedList.indexOf('kjsj') > -1">寮�鏈烘椂闂�(灏忔椂)</th>
<th v-if="checkedList.indexOf('jgsj') > -1">鍔犲伐鏃堕棿(灏忔椂)</th>
<th v-if="checkedList.indexOf('djsj') > -1">寰呮満鏃堕棿(灏忔椂)</th>
@@ -116,41 +189,41 @@
<tbody>
<tr class="mathData" v-for="(item, index) in dataList">
<template v-if="item.level1!=='鍚堣'&&item.level1!=='骞冲潎鍊�'">
- <td class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">
+ <td class="tdgu kaitou" :rowspan="item.level1span"
+ :class="{hidden: item.level1dis,noExl:item.level1dis}" v-show="!item.level1dis">
<div class="wenzi">
- {{item.level1}}
- </div></td>
- <td class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">
+ {{item.level1}}
+ </div>
+ </td>
+ <td class="tdgu1 kaitou" :rowspan="item.level2span"
+ :class="{hidden: item.level2dis,noExl:item.level2dis}" v-show="!item.level2dis">
<div class="wenzi">
{{item.level2}}
</div>
</td>
- <td class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis,noExl:item.level3dis}" v-show="!item.level3dis">
+ <td class="tdgu2 kaitou" :rowspan="item.level3span"
+ :class="{hidden: item.level3dis,noExl:item.level3dis}" v-show="!item.level3dis">
<div class="wenzi">
{{item.level3}}
</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.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">
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.utilizationRate !== 0'>{{tableHead.utilizationRate | numFilter}}</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 1'>缁翠慨</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 2'>浼戠彮</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 10'>{{tableHead.lyl | numFilter}}</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 11'>鏈绠�</td>-->
- <!--<td :style="{background:tableHead.color }" v-if='tableHead.lyl == 0 && tableHead.status == 12'>鏃犵彮娆�</td>-->
- <td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>
- <!--<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gzl') > -1">-->
- <!--{{tableHead.gzl | 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('kjsj') > -1">
{{tableHead.openLong | getFormattedTime}}
</td>
@@ -163,11 +236,7 @@
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('gjsj') > -1">
{{tableHead.closeLong | getFormattedTime}}
</td>
- <!--<td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('gjsj') > -1">-->
- <!--{{item[tableHead].gjsj}}-->
- <!--</td>-->
</template>
- <!--<td :style="{background:item.average.color }" >{{item.average.lyl | numFilter}}</td>-->
</tr>
</tbody>
</table>
@@ -175,6 +244,8 @@
</div>
</a-spin>
</div>
+
+ <mdc-message-approval-modal ref="modalForm" :visible="modalVisible" @closeModal="modalVisible = false"/>
</div>
</template>
@@ -184,22 +255,33 @@
import $ from 'jquery'
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:"",
- typeParent:1,
- typeEquipment:1,
- allowClear:true,
- allowClearSu:true,
+ typeTree: '',
+ typeParent: 1,
+ typeEquipment: 1,
+ allowClear: true,
+ allowClearSu: true,
dates: [],
- selectList:[],
+ equipmentTypeList: [],
+ driveTypeList: [],
+ device_level_list: [],
+ device_importance_level_list: [],
identifying: [],
queryParam: {},
- queryParamEquip:{},
- queryParamPeople:{},
+ queryParams: {
+ equipmentType: [],
+ driveType: [],
+ deviceLevel: []
+ },
+ queryParamEquip: {},
+ queryParamPeople: {},
efficiencyOptions: [
{ label: '鐝鍒╃敤鐜�', value: 'lyl' },
// { label: '鏁呴殰鐜�', value: 'gzl' },
@@ -224,27 +306,38 @@
tableHeads: [],
shiftList: [],
shiftSubList: [],
- spinning:false
+ spinning: false,
+ toggleSearchStatus: false,
+ modalVisible: false,// 寮傚父鍙嶉寮圭獥鏄惁寮瑰嚭
+ preSelectFirstDate: null
}
},
- props: { nodeTree: '', Type:'',nodePeople: '' },
+ props: { nodeTree: '', Type: '', nodePeople: '' },
created() {
this.initShiftList()
this.showIdentifying()
this.dates = [moment().subtract('days', 7), moment().subtract('days', 1)]
this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
- this.queryParam.typeTree = "1"
- this.loadData();
+ 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){
- this.dataList = [];
+ Type(valmath) {
+ this.dataList = []
this.queryParam.typeTree = valmath
},
nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
- console.log(val);
+ console.log(val)
if (JSON.stringify(val) != '{}') {
if (val.equipmentId != null) {
this.queryParamEquip.parentId = ''
@@ -256,7 +349,7 @@
this.searchQuery()
}
},
- nodePeople(val){
+ nodePeople(val) {
if (JSON.stringify(val) != '{}') {
if (val.equipmentId != null) {
this.queryParamPeople.parentId = val.equipmentId
@@ -289,67 +382,84 @@
} else {
return '0'
}
- },
+ }
},
methods: {
- checkSameData(dataList){
- let cache = {}; //瀛樺偍鐨勬槸閿槸kclx 鐨勫�硷紝鍊兼槸kclx 鍦╥ndeces涓暟缁勭殑涓嬫爣
- let indices = []; //鏁扮粍涓瘡涓�涓�兼槸涓�涓暟缁勶紝鏁扮粍涓殑姣忎竴涓厓绱犳槸鍘熸暟缁勪腑鐩稿悓kclx鐨勪笅鏍�
- dataList.map((item,index)=>{
- let level1 = item.level1;
- let _index = cache[level1];
- if(_index!==undefined){
+ 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鐨勪笅鏍�
+ dataList.map((item, index) => {
+ let level1 = item.level1
+ let _index = cache[level1]
+ if (_index !== undefined) {
indices[_index].push(index)
- }else{
+ } else {
cache[level1] = indices.length
indices.push([index])
}
})
- let result = [];
- indices.map((item)=>{
- item.map((index)=>{
+ let result = []
+ indices.map((item) => {
+ item.map((index) => {
result.push(dataList[index])
})
})
this.dataList = result
},
- checkSameData1(dataList){
- let cache = {}; //瀛樺偍鐨勬槸閿槸kclx 鐨勫�硷紝鍊兼槸kclx 鍦╥ndeces涓暟缁勭殑涓嬫爣
- let indices = []; //鏁扮粍涓瘡涓�涓�兼槸涓�涓暟缁勶紝鏁扮粍涓殑姣忎竴涓厓绱犳槸鍘熸暟缁勪腑鐩稿悓kclx鐨勪笅鏍�
- dataList.map((item,index)=>{
- let level2 = item.level2;
- let _index = cache[level2];
- if(_index!==undefined){
+ checkSameData1(dataList) {
+ let cache = {} //瀛樺偍鐨勬槸閿槸kclx 鐨勫�硷紝鍊兼槸kclx 鍦╥ndeces涓暟缁勭殑涓嬫爣
+ let indices = [] //鏁扮粍涓瘡涓�涓�兼槸涓�涓暟缁勶紝鏁扮粍涓殑姣忎竴涓厓绱犳槸鍘熸暟缁勪腑鐩稿悓kclx鐨勪笅鏍�
+ dataList.map((item, index) => {
+ let level2 = item.level2
+ let _index = cache[level2]
+ if (_index !== undefined) {
indices[_index].push(index)
- }else{
+ } else {
cache[level2] = indices.length
indices.push([index])
}
})
- let result = [];
- indices.map((item)=>{
- item.map((index)=>{
+ let result = []
+ indices.map((item) => {
+ item.map((index) => {
result.push(dataList[index])
})
})
this.dataList = result
},
- checkSameData2(dataList){
- let cache = {}; //瀛樺偍鐨勬槸閿槸kclx 鐨勫�硷紝鍊兼槸kclx 鍦╥ndeces涓暟缁勭殑涓嬫爣
- let indices = []; //鏁扮粍涓瘡涓�涓�兼槸涓�涓暟缁勶紝鏁扮粍涓殑姣忎竴涓厓绱犳槸鍘熸暟缁勪腑鐩稿悓kclx鐨勪笅鏍�
- dataList.map((item,index)=>{
- let level3 = item.level3;
- let _index = cache[level3];
- if(_index!==undefined){
+ checkSameData2(dataList) {
+ let cache = {} //瀛樺偍鐨勬槸閿槸kclx 鐨勫�硷紝鍊兼槸kclx 鍦╥ndeces涓暟缁勭殑涓嬫爣
+ let indices = [] //鏁扮粍涓瘡涓�涓�兼槸涓�涓暟缁勶紝鏁扮粍涓殑姣忎竴涓厓绱犳槸鍘熸暟缁勪腑鐩稿悓kclx鐨勪笅鏍�
+ dataList.map((item, index) => {
+ let level3 = item.level3
+ let _index = cache[level3]
+ if (_index !== undefined) {
indices[_index].push(index)
- }else{
+ } else {
cache[level3] = indices.length
indices.push([index])
}
})
- let result = [];
- indices.map((item)=>{
- item.map((index)=>{
+ let result = []
+ indices.map((item) => {
+ item.map((index) => {
result.push(dataList[index])
})
})
@@ -358,31 +468,58 @@
// 鍚堝苟
combineCell() {
console.log(this.dataList)
- let list =this.dataList;
+ let list = this.dataList
for (let field in list[0]) {
- var k = 0;
+ var k = 0
while (k < list.length) {
- list[k][field + 'span'] = 1;
- list[k][field + 'dis'] = false;
+ list[k][field + 'span'] = 1
+ list[k][field + 'dis'] = false
for (var i = k + 1; i <= list.length - 1; i++) {
if (list[k][field] == list[i][field] && list[k][field] != '') {
- list[k][field + 'span']++;
- list[k][field + 'dis'] = false;
- list[i][field + 'span'] = 1;
- list[i][field + 'dis'] = true;
+ list[k][field + 'span']++
+ list[k][field + 'dis'] = false
+ list[i][field + 'span'] = 1
+ list[i][field + 'dis'] = true
} else {
- break;
+ break
}
}
- k = i;
+ k = i
}
}
- return list;
+ return list
},
- disabledDate(current){
- //Can not slect days before today and today
- return current && current > moment().subtract('days', 1);
+
+ /**
+ * 鏃堕棿閫夋嫨鍣ㄩ潰鏉夸笂鐨勫�煎彂鐢熸敼鍙樻椂瑙﹀彂
+ * @param dates 闈㈡澘涓婄殑涓や釜鍊肩粍鎴愮殑鏁扮粍
+ */
+ handleCalendarChange(dates) {
+ if (dates.length === 1) this.preSelectFirstDate = dates[0]
},
+
+ /**
+ * 鎺у埗鏃堕棿閫夋嫨鍣ㄩ潰鏉垮紑鍚笌鍏抽棴
+ * @param status 寮�鍚姸鎬�
+ */
+ handleCalendarOpenChange(status) {
+ if (status) this.preSelectFirstDate = null
+ },
+
+ /**
+ * 闈㈡澘涓婄姝㈤�夋嫨鐨勬棩鏈�
+ * @param current 绂佹鐨勬椂闂磋寖鍥�
+ */
+ disabledDate(current) {
+ if (!this.preSelectFirstDate) {
+ return current > moment().startOf('days')
+ } else {
+ return current < moment(this.preSelectFirstDate).subtract(365, 'days').startOf('days')
+ || current > moment().startOf('days')
+ || current > moment(this.preSelectFirstDate).add(365, 'days').endOf('days')
+ }
+ },
+
initDeviceType(deviceList) {
let dictCode = 'mdc_equipmentType'
let items = []
@@ -419,17 +556,17 @@
},
initShiftSubList(val) {
//姣忔閲嶆柊閫夋嫨鐝埗鏃剁彮娆℃竻绌轰笖鏄剧ずplaceholder鍐呭
- this.queryParam.shiftSubId = undefined;
+ this.queryParam.shiftSubId = undefined
getAction(this.url.initShiftSubList, { shiftId: val }).then((res) => {
if (res.success) {
- this.shiftSubList = res.result;
+ this.shiftSubList = res.result
}
})
},
initShiftSubListChange() {
getAction(this.url.initShiftSubList, { shiftId: this.queryParam.shiftId }).then((res) => {
if (res.success) {
- this.shiftSubList = res.result;
+ this.shiftSubList = res.result
}
})
},
@@ -454,228 +591,242 @@
dateParamChange(v1, v2) {
this.queryParam.startTime = v2[0]
this.queryParam.endTime = v2[1]
- // 鐐瑰嚮鏃堕棿閫夋嫨鍣ㄧ殑娓呯┖鎸夐挳鏃朵細瑙﹀彂姝ゅ垽鏂�(鐐瑰嚮閲嶇疆鎸夐挳涓嶄細瑙﹀彂)锛屽疄鐜伴噸缃垪琛ㄥ姛鑳斤紝鍒囧疄鏀瑰彉鍒楄〃鏄剧ず鏁堟灉
- 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() {
- 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()
- }else{
- // this.$message.warning("璇烽�夋嫨鏃堕棿")
- this.$notification.warning({
- message:'娑堟伅',
- description:"璇烽�夋嫨鏃堕棿"
- });
+ 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.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.typeParent = this.queryParam.parentId
this.typeEquipment = this.queryParam.equipmentId
this.queryParam = {}
- this.dates = []
+ this.dates = [moment().subtract('days', 7), moment().subtract('days', 1)]
+ this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
+ this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
this.queryParam.typeTree = this.typeTree
this.queryParam.parentId = this.typeParent
- this.queryParam.equipmentId = this.typeEquipment
+ this.queryParam.equipmentId = this.typeEquipment
+ this.queryParams = {
+ equipmentType: [],
+ driveType: [],
+ deviceLevel: []
+ }
this.loadData()
// this.onClearSelected()
},
loadData() {
- this.spinning=true
+ this.spinning = true
this.tableHeads = []
this.dataList = []
getAction(this.url.list, this.queryParam).then(res => {
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.checkSameData(this.dataList)
this.checkSameData1(this.dataList)
this.checkSameData2(this.dataList)
- this.combineCell();
+ this.combineCell()
// this.initDeviceType(this.dataList)
}
- }).finally(()=>{
- this.spinning=false
+ }).finally(() => {
+ this.spinning = false
})
},
+
+ // 鎺у埗寮傚父鍙嶉寮圭獥寮瑰嚭
+ handleShowFeedbackModal() {
+ this.$refs.modalForm.formParams = {}
+ this.modalVisible = true
+ },
+
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('EfficiencyShift') // 琛ㄦ牸瀹瑰櫒
+ const clientHeight = document.documentElement.clientHeight || document.body.clientHeight // 娴忚鍣ㄥ彲瑙嗗尯鍩熼珮搴�
+ const containerTopToClientTopHeight = tableContainer.getBoundingClientRect().top // 琛ㄦ牸瀹瑰櫒椤堕儴鍒版祻瑙堝櫒鍙鍖哄煙椤堕儴鐨勯棿璺�
+ tableContainer.style.height = (clientHeight - containerTopToClientTopHeight - 32) + 'px'
}
}
}
</script>
<style scoped>
- .table2{
+ .table2 {
width: 100%;
height: 100%;
overflow: auto;
}
+
.table2 thead tr th:first-child,
- .table tbody tr .tdgu{
+ .table tbody tr .tdgu {
position: sticky;
left: 0;
z-index: 1;
}
- .table tbody tr .wenzi{
+
+ .table tbody tr .wenzi {
/*writing-mode: vertical-lr;*/
/*text-orientation: upright;*/
transform: rotate(360deg);
writing-mode: vertical-lr;
letter-spacing: 2px;
}
- .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: 50px;
z-index: 2;
}
- .table tbody tr .tdgu2{
+
+ .table tbody tr .tdgu2 {
position: sticky;
left: 100px;
z-index: 2;
}
- .table tbody tr .tdgu3{
+
+ .table tbody tr .tdgu3 {
position: sticky;
left: 150px;
z-index: 2;
}
- .table tbody tr .tdgu4{
+
+ .table tbody tr .tdgu4 {
position: sticky;
left: 250px;
z-index: 2;
}
- .table tbody tr .tdgu5{
+
+ .table tbody tr .tdgu5 {
position: sticky;
left: 412px;
z-index: 2;
}
- .table tbody tr .tdgu6{
+
+ .table tbody tr .tdgu6 {
position: sticky;
left: 512px;
z-index: 2;
}
- .table2 thead tr .timeth,
- .table2 thead tr .thgu {
+ .table tbody tr .tdgu7 {
position: sticky;
- top:0;
+ left: 632px;
+ z-index: 2;
+ }
+
+ .table2 thead tr .timeth,
+ .table2 thead tr .thgu {
+ position: sticky;
+ top: 0;
z-index: 3;
}
- .table2 thead .gudingth th{
+ .table2 thead .gudingth th {
position: sticky;
top: 32px;
z-index: 2;
}
- .table2 thead .equipname .name{
+ .table2 thead .equipname .name {
z-index: 3;
}
- .table2 thead .equipname .dong1{
+ .table2 thead .equipname .dong1 {
z-index: 4;
left: 0;
}
- .table2 thead .equipname .dong2{
+ .table2 thead .equipname .dong2 {
z-index: 5;
left: 50px;
}
- .table2 thead .equipname .dong3{
+ .table2 thead .equipname .dong3 {
z-index: 5;
left: 100px;
}
- .table2 thead .equipname .dong4{
+ .table2 thead .equipname .dong4 {
z-index: 5;
left: 150px;
}
- .table2 thead .equipname .dong5{
+
+ .table2 thead .equipname .dong5 {
z-index: 5;
left: 250px;
}
- .table2 thead .equipname .dong6{
+ .table2 thead .equipname .dong6 {
z-index: 5;
left: 412px;
}
- .table2 thead .equipname .dong7{
+ .table2 thead .equipname .dong7 {
z-index: 6;
left: 512px;
}
- #EfficiencyShift{
+ .table2 thead .equipname .dong8 {
+ z-index: 6;
+ left: 632px;
+ }
+
+ #EfficiencyShift {
overflow: hidden;
- }
-
- @media screen and (min-width: 1920px){
- #EfficiencyShift{
- height: 670px!important;
- }
- }
-
- @media screen and (min-width: 1680px) and (max-width: 1920px){
- #EfficiencyShift{
- height: 670px!important;
- }
- }
-
- @media screen and (min-width: 1400px) and (max-width: 1680px){
- #EfficiencyShift{
- height: 522px!important;
- }
- }
-
- @media screen and (min-width: 1280px) and (max-width: 1400px){
- #EfficiencyShift{
- height: 414px!important;
- }
- }
-
- @media screen and (max-width: 1280px){
- #EfficiencyShift{
- height: 414px!important;
- }
}
.identifyingclass {
--
Gitblit v1.9.3