提交 2f6d234a authored 作者: lidongxu's avatar lidongxu

fix(scm): 修复:水印只在系统内页面显示以及修复勤策发货单表格数量超出范围无法垂直滚动问题

上级 374e77d5
<template>
<template v-if="!isInWhiteList">
<el-watermark :font="font"
:content="content"
class="wm-class">
<router-view />
</el-watermark>
</template>
<template v-else>
<router-view />
</template>
<back-to-up />
</template>
......@@ -11,6 +16,10 @@
import useSettingsStore from '@/store/modules/settings'
import { handleThemeStyle } from '@/utils/theme'
import useUserStore from '@/store/modules/user'
import { isWhiteList } from '@/permission'
const route = useRoute()
const isInWhiteList = computed(() => isWhiteList(route.path))
const content = computed(() => {
return useUserStore().userInfo.nickName + ' ' + useUserStore().userInfo.phone
......@@ -19,14 +28,14 @@ const isDark = computed(() => {
return useSettingsStore().isDark
})
const font = reactive({
color: 'rgba(0, 0, 0, .15)',
color: 'rgba(0, 0, 0, .05)',
})
watch(
isDark,
() => {
font.color = isDark.value
? 'rgba(255, 255, 255, 0.15)'
: 'rgba(0, 0, 0, .15)'
? 'rgba(255, 255, 255, 0.05)'
: 'rgba(0, 0, 0, .05)'
},
{
immediate: true,
......
......@@ -14,9 +14,9 @@ import useVersionStore from '@/store/modules/version'
NProgress.configure({ showSpinner: false })
// 登录页,物流查询页
export const whiteList = ['/login', '/logistics']
const whiteList = ['/login', '/logistics']
const isWhiteList = (path) => {
export const isWhiteList = (path) => {
return whiteList.some(pattern => isPathMatch(pattern, path))
}
......
<template>
<div class="app-container">
<div class="container">
<el-row class="client-fix-height container">
<el-col>
<!-- 查询表单 -->
<el-form :model="queryParams"
inline
......@@ -142,7 +143,8 @@
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getLogisticsReceiptList" />
</div>
</el-col>
</el-row>
</div>
</template>
......@@ -402,6 +404,13 @@ const handleSentStatusChange = async (row) => {
<style scoped
lang="scss">
.app-container {
>.el-row {
.el-col {
display: flex;
flex-direction: column;
height: 100%;
.table-container {
margin-top: 20px;
......@@ -463,4 +472,10 @@ const handleSentStatusChange = async (row) => {
}
}
}
}
}
}
</style>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论