From 133c3ad5450976bb161a9c713f2a6cf075165c55 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 03 三月 2025 16:50:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dashboard/Analysis.vue | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 5ec7335..6dd7c52 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,10 +1,7 @@
<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"
+ :workshopSectionProductionCode="workshopSectionProductionCode"
+ @switchToNextSignage="switchToNextSignage" @backToLastSignage="backToLastSignage">
</Component>
</template>
@@ -13,18 +10,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 +42,7 @@
this.userType = res.userType
switch (this.userType) {
case 1:
- this.currentSignage = ''
+ this.currentSignage = 'EquipmentSignage'
break
case 2:
this.currentSignage = 'WorkshopSectionSignage'
@@ -60,27 +61,34 @@
},
- 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 {
+ /deep/ .back-nav {
width: 100px;
height: 30px;
- color: #ccc;
+ color: #fff;
position: absolute;
- top: 25px;
- left: 25px;
+ top: 15px;
+ left: 10px;
cursor: pointer;
z-index: 9999
}
--
Gitblit v1.9.3