From ff085919d436c198b0810ce8c1befddf219aba89 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 22 八月 2023 16:09:34 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
screen_standard/src/components/AppLayout.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index ad01b2c..46790b5 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -16,7 +16,7 @@
</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="router.replace('/')">
</div>
<div class="title">DM浜戝伐鍘傝溅闂村ぇ灞�</div>
@@ -46,14 +46,16 @@
</div>
</div>
</div>
- <RouterView />
+ <KeepAlive>
+ <RouterView />
+ </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'
@@ -139,7 +141,6 @@
}
onMounted(() => {
- console.log(route.name);
getDepartmentList(enterprise.companyId)
.then(res => {
data.comList = res
@@ -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