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/BranchFactorySignage.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/views/dashboard/BranchFactorySignage.vue b/src/views/dashboard/BranchFactorySignage.vue
index 5c2e663..4de1dc3 100644
--- a/src/views/dashboard/BranchFactorySignage.vue
+++ b/src/views/dashboard/BranchFactorySignage.vue
@@ -8,7 +8,9 @@
<!--</div>-->
<div class="content-container">
<div style="width: 25%" class="left-col">
- <slot name="back_nav"></slot>
+ <div class="back-nav" @click="$emit('backToLastSignage','Index')" v-if="userType===4">
+ <dv-decoration-7>涓婁竴绾�</dv-decoration-7>
+ </div>
<dv-border-box-9 style="padding: 40px 20px 0">
<!--<div class="first-title">M D C 鍏� 缃� 鎬� 鏁� : 6 0 3 鍙�</div>-->
<div id="running_state_chart" style="width:100%;height: 400px;"></div>
@@ -79,6 +81,9 @@
productionCode: {
type: String,
default: ''
+ },
+ userType: {
+ type: Number
}
},
data() {
@@ -551,7 +556,7 @@
} else {
console.log('yAxisParams===========', params)
- this.$emit('switchToBranchFactory', params.value)
+ this.$emit('switchToNextSignage', { signageName: 'WorkshopSection', productionCode: params.value })
}
})
},
@@ -1018,6 +1023,17 @@
justify-content: space-between;
.left-col {
+ .back-nav {
+ width: 100px;
+ height: 30px;
+ color: #eee;
+ position: absolute;
+ top: 25px;
+ left: 25px;
+ cursor: pointer;
+ z-index: 9999
+ }
+
.first-title {
color: #00A8AC;
font-size: 20px;
--
Gitblit v1.9.3