From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/dashboard/Analysis.vue | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 59b71a3..17ea563 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,14 +60,21 @@
},
- 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'
+ })
}
}
}
--
Gitblit v1.9.3