From 29194b5f6962594884b7218756dc37db54ba0748 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 22 八月 2023 19:30:12 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
screen_standard/src/components/AppLayout.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 06bde5d..d1df556 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -16,10 +16,10 @@
</template>
</el-dropdown>
- <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="router.go(-1)">
+ <img v-else src="@/assets/img/btn_back@2x.png" style="width: 108px;height: 34px; margin-top: 14px;" @click="back">
</div>
- <div class="title">{{ route.name=='home' ? 'DM浜戝伐鍘傝溅闂村ぇ灞�' : `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` }}</div>
+ <div class="title">{{ title }}</div>
<div class="header-item right">
<img v-if="!isFull" src="@/assets/img/ic_fullscreen@2x.png" class="full-ic" @click="fullChange">
@@ -84,7 +84,9 @@
const unqualifiedRate = computed(() => {
return enterprise.unqualifiedRate
})
-
+const title = computed(() => {
+ return enterprise.procedureName ? 'DM浜戝伐鍘傝溅闂村ぇ灞�' : `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘`
+})
const data = reactive({
tempCom: { name: '璞嗙背绉戞妧' },
isFull: false,
@@ -160,6 +162,10 @@
// console.log(date.getDay());
})
+const back = () => {
+ enterprise.setProcedureName('')
+ router.go(-1)
+}
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3