From 60bc0411894c39aafab981d235300bf2dca1cd02 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期四, 11 四月 2024 09:17:33 +0800
Subject: [PATCH] 1、设备利用率、设备开动率以及班次利用率页面查询条件多选框删除至少选择第一项条件的限制条件，即可一项条件都不选 2、设备利用率、设备开动率以及班次利用率页面表格高度设置为页面进入时即可拖动水平滚动条的高度
---
src/views/dashboard/Analysis.vue | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 59b71a3..3570efe 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,10 +1,6 @@
<template>
- <Component :is="currentSignage" :productionCode="productionCode" @switchToBranchFactory="switchToBranchFactory">
- <template #back_nav>
- <dv-decoration-11 class="back-nav" v-if="userType===4">
- <div @click="backToLastSignage">杩斿洖涓婁竴绾�</div>
- </dv-decoration-11>
- </template>
+ <Component :is="currentSignage" :userType="userType" :productionCode="productionCode"
+ @switchToNextSignage="switchToNextSignage" @backToLastSignage="backToLastSignage">
</Component>
</template>
@@ -12,17 +8,23 @@
import signageApi from '@/api/signage'
import IndexSignage from './IndexSignage.vue'
import BranchFactorySignage from './BranchFactorySignage.vue'
+ import WorkshopSectionSignage from './WorkshopSectionSignage.vue'
+ import EquipmentSignage from './EquipmentSignage.vue'
export default {
name: 'Analysis',
components: {
IndexSignage,
- BranchFactorySignage
+ BranchFactorySignage,
+ WorkshopSectionSignage,
+ EquipmentSignage
},
data() {
return {
currentSignage: '',
productionCode: '',
+ branchFactoryProductionCode: '',
+ workshopSectionProductionCode: '',
userType: ''
}
},
@@ -37,13 +39,12 @@
signageApi.getUserByIdApi(id)
.then(res => {
this.userType = res.userType
- console.log('瑙﹀彂鍒ゆ柇', this.userType)
switch (this.userType) {
case 1:
- this.currentSignage = ''
+ this.currentSignage = 'EquipmentSignage'
break
case 2:
- this.currentSignage = 'BranchFactorySignage'
+ this.currentSignage = 'WorkshopSectionSignage'
break
case 3:
this.currentSignage = 'BranchFactorySignage'
@@ -59,19 +60,35 @@
},
- backToLastSignage() {
- this.currentSignage = 'IndexSignage'
+ backToLastSignage(signageName) {
+ if (signageName === 'Index') this.productionCode = ''
+ if (signageName === 'WorkshopSection') this.productionCode = this.workshopSectionProductionCode
+ if (signageName === 'BranchFactory') this.productionCode = this.branchFactoryProductionCode
+ this.currentSignage = signageName + 'Signage'
},
- switchToBranchFactory(value) {
- console.log('瀛愮粍浠秜alue', value)
- this.currentSignage = 'BranchFactorySignage'
- this.productionCode = value
+ switchToNextSignage(params) {
+ console.log('瀛愮粍浠秔arams', params)
+ if (params.signageName === 'WorkshopSection') this.branchFactoryProductionCode = this.productionCode
+ if (params.signageName === 'Equipment') this.workshopSectionProductionCode = this.productionCode
+ this.$nextTick(() => {
+ this.productionCode = params.productionCode
+ this.currentSignage = params.signageName + 'Signage'
+ })
}
}
}
</script>
<style lang="less" scoped>
-
+ /deep/ .back-nav {
+ width: 100px;
+ height: 30px;
+ color: #fff;
+ position: absolute;
+ top: 15px;
+ left: 10px;
+ cursor: pointer;
+ z-index: 9999
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3