From 074f334d060ec7d33d39cdeaae5ed84a2a2dd3a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 八月 2023 18:20:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
screen_standard/src/components/AppLayout.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index ad01b2c..c5715f1 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -46,17 +46,19 @@
</div>
</div>
</div>
- <RouterView />
+ <KeepAlive>
+ <router-view></router-view>
+ </KeepAlive>
</div>
</template>
<script setup>
import { getAssets } from '@/utils'
-import { getDepartmentList } from '@/utils/apis.js'
+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()
@@ -139,7 +141,6 @@
}
onMounted(() => {
- console.log(route.name);
getDepartmentList(enterprise.companyId)
.then(res => {
data.comList = res
@@ -147,7 +148,7 @@
enterprise.setDepartId(data.tempCom.id)
})
.catch(err => {})
- const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�',]
+ const week = ['鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�', '鏄熸湡鏃�']
setInterval(() => {
let date = new Date()
data.tempDate = {
@@ -167,10 +168,10 @@
background-position: center;
background-size: 100% 100%;
background-repeat: no-repeat;
- width: 100%;
- height: 100%;
+ // width: 100%;
+ // height: 100%;
padding: 30px;
- overflow-y: scroll;
+ // overflow-y: scroll;
box-sizing: border-box;
.header {
background-image: url('@/assets/img/bg_maintitle@2x.png');
--
Gitblit v1.9.3