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 | 46 ++++++++++++++++++++++------------------------ 1 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 5ec7335..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> - <div class="back-nav" @click="backToLastSignage" v-if="userType===4"> - <dv-decoration-7>涓婁竴绾�</dv-decoration-7> - </div> - </template> + <Component :is="currentSignage" :userType="userType" :productionCode="productionCode" + @switchToNextSignage="switchToNextSignage" @backToLastSignage="backToLastSignage"> </Component> </template> @@ -13,18 +9,22 @@ 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, - WorkshopSectionSignage + WorkshopSectionSignage, + EquipmentSignage }, data() { return { currentSignage: '', productionCode: '', + branchFactoryProductionCode: '', + workshopSectionProductionCode: '', userType: '' } }, @@ -41,7 +41,7 @@ this.userType = res.userType switch (this.userType) { case 1: - this.currentSignage = '' + this.currentSignage = 'EquipmentSignage' break case 2: this.currentSignage = 'WorkshopSectionSignage' @@ -60,28 +60,26 @@ }, - 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> - .back-nav { - width: 100px; - height: 30px; - color: #ccc; - position: absolute; - top: 25px; - left: 25px; - cursor: pointer; - z-index: 9999 - } + </style> \ No newline at end of file -- Gitblit v1.9.3