From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
screen_standard/src/components/AppLayout.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 5141f04..22f0e80 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">DM浜戝伐鍘傝溅闂村ぇ灞�</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">
@@ -47,7 +47,7 @@
</div>
</div>
<KeepAlive>
- <RouterView />
+ <router-view></router-view>
</KeepAlive>
</div>
</template>
@@ -58,7 +58,7 @@
import { getDepartmentList } from '@/utils/api.js'
import { reactive, toRefs, onMounted, computed } from 'vue';
import { useCounterStore } from '@/stores/counter.js'
-import { RouterView, useRoute, useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
const enterprise = useCounterStore()
const route = useRoute()
const router = useRouter()
@@ -84,7 +84,9 @@
const unqualifiedRate = computed(() => {
return enterprise.unqualifiedRate
})
-
+const title = computed(() => {
+ return enterprise.procedureName ? `${enterprise.procedureName}宸ュ簭鏁版嵁鐪嬫澘` : 'DM浜戝伐鍘傝溅闂村ぇ灞�'
+})
const data = reactive({
tempCom: { name: '璞嗙背绉戞妧' },
isFull: false,
@@ -148,7 +150,7 @@
enterprise.setDepartId(data.tempCom.id)
})
.catch(err => {})
- const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�',]
+ const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�']
setInterval(() => {
let date = new Date()
data.tempDate = {
@@ -158,18 +160,24 @@
}
}, 1000)
// console.log(date.getDay());
-
+
})
+const back = () => {
+ enterprise.setProcedureName('')
+ router.go(-1)
+}
</script>
<style lang="scss" scoped>
.content {
- background-image: url('@/assets/img/bg@2x.png');
+ background-image: url('@/assets/img/bg.png');
background-position: center;
background-size: 100% 100%;
background-repeat: no-repeat;
- // width: 100%;
- // height: 100%;
+ // width: 1920px;
+ // height: 1080px;
+ width: 100%;
+ height: 100%;
padding: 30px;
// overflow-y: scroll;
box-sizing: border-box;
--
Gitblit v1.9.3