From 5a9630b08ae608e2248c44271d8c08e140a4487b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 26 九月 2024 15:55:13 +0800
Subject: [PATCH] update
---
src/views/dashboard/EquipmentSignage.vue | 8 +-
src/views/dashboard/BranchFactorySignage.vue | 8 +-
src/views/dashboard/IndexSignage.vue | 8 +-
src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue | 46 ++++++-----
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue | 43 +++++-----
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue | 35 ++------
src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue | 35 ++++----
src/views/dashboard/WorkshopSectionSignage.vue | 8 +-
8 files changed, 92 insertions(+), 99 deletions(-)
diff --git a/src/views/dashboard/BranchFactorySignage.vue b/src/views/dashboard/BranchFactorySignage.vue
index 50cf1ed..2cc6394 100644
--- a/src/views/dashboard/BranchFactorySignage.vue
+++ b/src/views/dashboard/BranchFactorySignage.vue
@@ -546,7 +546,7 @@
data: data
}],
series: [{
- name: '鍒╃敤鐜�',
+ name: 'TEEP',
type: 'bar',
zlevel: 1,
itemStyle: {
@@ -608,7 +608,7 @@
}
]
}
- option.title.text = `${moment().subtract(1, 'days').format('M鏈圖鏃�')}鍒╃敤鐜嘸
+ option.title.text = `${moment().subtract(1, 'days').format('M鏈圖鏃�')}TEEP`
this.efficiencyChart.setOption(option, true)
this.efficiencyChart.hideLoading()
@@ -1018,7 +1018,7 @@
}
}
},
- data: ['OEE', '鍒╃敤鐜�']
+ data: ['OEE', 'TEEP']
},
xAxis: {
type: 'category',
@@ -1108,7 +1108,7 @@
type: 'bar',
barWidth: 15,
itemStyle: { barBorderRadius: 100 },
- name: '鍒╃敤鐜�',
+ name: 'TEEP',
data: this.doubleBarChartData.utilizationList,
label: {
show: false,
diff --git a/src/views/dashboard/EquipmentSignage.vue b/src/views/dashboard/EquipmentSignage.vue
index 49db1cf..6fb7ba7 100644
--- a/src/views/dashboard/EquipmentSignage.vue
+++ b/src/views/dashboard/EquipmentSignage.vue
@@ -623,8 +623,8 @@
}
})
.finally(() => {
- option.title.text = moment().subtract(1, 'days').format('M鏈圖鏃�') + '鍒╃敤鐜�'
- option.series[0].name = '鍒╃敤鐜�'
+ option.title.text = moment().subtract(1, 'days').format('M鏈圖鏃�') + 'TEEP'
+ option.series[0].name = 'TEEP'
option.series[0].data = [this.gaugeChartData.utilizationRate]
this.gaugeChart1.setOption(option, true)
setTimeout(() => this.gaugeChart1.hideLoading(), this.hideLoadingDelayTime)
@@ -749,7 +749,7 @@
xAxis: this.lineChartData.dateList,
yAxis: [
{
- name: '鍒╃敤鐜�',
+ name: 'TEEP',
value: this.lineChartData.dataList.map(item => item.utilizationRate)
},
{
@@ -761,7 +761,7 @@
value: this.lineChartData.dataList.map(item => item.overallEquipmentEfficiency)
}
],
- yAxisName: '鏁村勾搴﹀埄鐢ㄧ巼(%)'
+ yAxisName: '鏁村勾搴EEP(%)'
}
let legendData = []
let seriesData = []
diff --git a/src/views/dashboard/IndexSignage.vue b/src/views/dashboard/IndexSignage.vue
index 98c3cd0..358183e 100644
--- a/src/views/dashboard/IndexSignage.vue
+++ b/src/views/dashboard/IndexSignage.vue
@@ -536,7 +536,7 @@
data: data
}],
series: [{
- name: '鍒╃敤鐜�',
+ name: 'TEEP',
type: 'bar',
zlevel: 1,
itemStyle: {
@@ -598,7 +598,7 @@
}
]
}
- option.title.text = `${moment().subtract(1, 'days').format('M鏈圖鏃�')}鍒╃敤鐜嘸
+ option.title.text = `${moment().subtract(1, 'days').format('M鏈圖鏃�')}TEEP`
this.efficiencyChart.setOption(option, true)
this.efficiencyChart.hideLoading()
this.efficiencyChart.on('click', params => {
@@ -1002,7 +1002,7 @@
}
}
},
- data: ['OEE', '鍒╃敤鐜�']
+ data: ['OEE', 'TEEP']
},
xAxis: {
type: 'category',
@@ -1092,7 +1092,7 @@
type: 'bar',
barWidth: 15,
itemStyle: { barBorderRadius: 100 },
- name: '鍒╃敤鐜�',
+ name: 'TEEP',
data: this.doubleBarChartData.utilizationList,
label: {
show: false,
diff --git a/src/views/dashboard/WorkshopSectionSignage.vue b/src/views/dashboard/WorkshopSectionSignage.vue
index 5d2e786..7523ffb 100644
--- a/src/views/dashboard/WorkshopSectionSignage.vue
+++ b/src/views/dashboard/WorkshopSectionSignage.vue
@@ -660,7 +660,7 @@
xAxis: equipmentIdList,
yAxis: [
{
- name: '鍒╃敤鐜�',
+ name: 'TEEP',
value: this.first7DaysEfficiencyData.dataList.map(item => item.utilizationRate)
},
{
@@ -672,7 +672,7 @@
value: this.first7DaysEfficiencyData.dataList.map(item => item.openRate)
}
],
- yAxisName: '鍓�7澶╁埄鐢ㄧ巼(%)'
+ yAxisName: '鍓�7澶㏕EEP(%)'
}
let legendData = []
let seriesData = []
@@ -953,8 +953,8 @@
}
})
.finally(() => {
- option.title.text = moment().subtract(1, 'days').format('M鏈圖鏃�') + `鍒╃敤鐜嘸
- option.series[0].name = '鍒╃敤鐜�'
+ option.title.text = moment().subtract(1, 'days').format('M鏈圖鏃�') + `TEEP`
+ option.series[0].name = 'TEEP'
option.series[0].data = [this.gaugeChartData.utilizationRate]
this.gaugeChart1.setOption(option, true)
this.gaugeChart1.hideLoading()
diff --git a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
index 52d0796..caa5613 100644
--- a/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
+++ b/src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -49,17 +49,33 @@
/>
</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-form-item label="璁惧绾у埆">
<a-select
- :value="queryParams.deviceCategory"
+ :value="queryParams.deviceLevel"
mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
+ placeholder="璇烽�夋嫨璁惧绾у埆"
allow-clear
:maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
+ @change="selectChange($event,'deviceLevel')"
>
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
+ <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -78,22 +94,7 @@
</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-->
diff --git a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
index 1a46371..6f0de45 100644
--- a/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
+++ b/src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue
@@ -43,17 +43,33 @@
:allowClear="false"/>
</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-form-item label="璁惧绾у埆">
<a-select
- :value="queryParams.deviceCategory"
+ :value="queryParams.deviceLevel"
mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
+ placeholder="璇烽�夋嫨璁惧绾у埆"
allow-clear
:maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
+ @change="selectChange($event,'deviceLevel')"
>
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
+ <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -72,22 +88,7 @@
</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
@@ -155,6 +156,8 @@
</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
</th>
+ <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧鍨嬪彿
+ </th>
<!--<th rowspan="2">缁勫埆</th>-->
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -197,6 +200,7 @@
{{item.equipmentName}}
</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu5 kaitou">{{item.equipmentModel}}</td>
</template>
<template v-else>
diff --git a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
index 2bc960a..b2f0ebf 100644
--- a/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
+++ b/src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -45,16 +45,16 @@
</a-form-item>
</a-col>
<a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧绉嶇被">
+ <a-form-item label="璁惧绾у埆">
<a-select
- :value="queryParams.deviceCategory"
+ :value="queryParams.deviceLevel"
mode="multiple"
- placeholder="璇烽�夋嫨璁惧绉嶇被"
+ placeholder="璇烽�夋嫨璁惧绾у埆"
allow-clear
:maxTagCount="1"
- @change="selectChange($event,'deviceCategory')"
+ @change="selectChange($event,'deviceLevel')"
>
- <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
+ <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
{{item.label}}
</a-select-option>
</a-select>
@@ -73,22 +73,7 @@
</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
@@ -168,7 +153,7 @@
</tr>
<tr class="thead notfixed gudingth">
<template v-for="(tableHead, index) in tableHeads">
- <th v-if="checkedList.indexOf('lyl') > -1">鍒╃敤鐜�(%)</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>
@@ -218,7 +203,7 @@
{{tableHead.utilizationRate | numFilter}}
</td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
- {{tableHead.openRate | n umFilter}}
+ {{tableHead.openRate | numFilter}}
</td>
<td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
{{tableHead.openLong | getFormattedTime}}
@@ -282,7 +267,7 @@
queryParamEquip: {},
queryParamPeople: {},
efficiencyOptions: [
- { label: '鍒╃敤鐜�', value: 'lyl' },
+ { label: 'TEEP', value: 'lyl' },
{ label: '寮�鏈虹巼', value: 'kjl' },
{ label: '寮�鏈烘椂闂�', value: 'kjsj' },
{ label: '鍔犲伐鏃堕棿', value: 'jgsj' },
@@ -519,7 +504,7 @@
$('#Efficiency').table2excel({
exclude: '.noExl',
name: 'Excel Document Name',
- filename: '璁惧鍒╃敤鐜�',
+ filename: '璁惧TEEP',
exclude_img: true,
fileext: '.xls',
exclude_links: true,
diff --git a/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue b/src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue
index 44422dc..3d09bf0 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
@@ -177,6 +177,8 @@
</th>
<th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">璁惧绫诲瀷
</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>
<template v-for="(tableHead, index) in tableHeads">
<th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -219,6 +221,7 @@
{{item.equipmentName}}
</td>
<td class="tdgu5 kaitou">{{item.equipmentType}}</td>
+ <td class="tdgu5 kaitou">{{item.equipmentModel}}</td>
<td class="tdgu6 kaitou">{{item.shiftSubName}}</td>
</template>
--
Gitblit v1.9.3