WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改整体布局

Browse Source
This commit is contained in:
qq787203167
2022-02-25 19:14:37 +08:00
parent e91eba2511
commit 027246fb4f
8 changed files with 118 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/public/color.less
Vendored
+2 -2
View File
@@ -3570,7 +3570,7 @@ mark {
} }
.ant-card { .ant-card {
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
background: #fff; //background: #fff;
border-radius: 2px; border-radius: 2px;
} }
.ant-card-hoverable:hover { .ant-card-hoverable:hover {
@@ -5092,7 +5092,7 @@ form .ant-upload {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.ant-layout { .ant-layout {
background: #f0f2f5; //background: #f0f2f5;
} }
.ant-layout-header { .ant-layout-header {
background: #001529; background: #001529;
jero-web/src/App.vue
+41 -41
View File
@@ -1,7 +1,7 @@
<template> <template>
<a-config-provider :locale="locale"> <a-config-provider :locale="locale">
<div id="app"> <div id="app">
<router-view v-if="isRouterAlive" /> <router-view v-if="isRouterAlive"/>
</div> </div>
</a-config-provider> </a-config-provider>
</template> </template>
@@ -11,19 +11,20 @@
import enquireScreen from '@/utils/device' import enquireScreen from '@/utils/device'
import moment from 'moment' import moment from 'moment'
import 'moment/locale/zh-cn' import 'moment/locale/zh-cn'
moment.locale('zh-cn') moment.locale('zh-cn')
const EN = 'en-us' const EN = 'en-us'
const ZH = 'zh-cn' const ZH = 'zh-cn'
export default { export default {
data () { data() {
return { return {
locale: zhCN, locale: zhCN,
isRouterAlive:true isRouterAlive: true
} }
}, },
created () { created() {
let that = this let that = this
enquireScreen(deviceType => { enquireScreen(deviceType => {
// tablet // tablet
@@ -35,67 +36,66 @@
else if (deviceType === 1) { else if (deviceType === 1) {
that.$store.commit('TOGGLE_DEVICE', 'mobile') that.$store.commit('TOGGLE_DEVICE', 'mobile')
that.$store.dispatch('setSidebar', false) that.$store.dispatch('setSidebar', false)
} } else {
else {
that.$store.commit('TOGGLE_DEVICE', 'desktop') that.$store.commit('TOGGLE_DEVICE', 'desktop')
that.$store.dispatch('setSidebar', true) that.$store.dispatch('setSidebar', true)
} }
}) })
// 默认中文 // 默认中文
localStorage.lang == undefined ? localStorage.setItem("language", "zh-cn") : ""; localStorage.lang == undefined ? localStorage.setItem('language', 'zh-cn') : ''
// 自己配置多语言适配 // 自己配置多语言适配
this.$root.Bus.$on("switchLanguage", value => { this.$root.Bus.$on('switchLanguage', value => {
let router_path = this.$route.path; let router_path = this.$route.path
switch (value) { switch (value) {
case "zh-cn": case 'zh-cn':
localStorage.setItem("language", "zh-cn"); localStorage.setItem('language', 'zh-cn')
break; break
case "en-us": case 'en-us':
localStorage.setItem("language", "en-us"); localStorage.setItem('language', 'en-us')
break; break
} }
// 刷新页面 // 刷新页面
this.isRouterAlive = false; //先关闭， this.isRouterAlive = false //先关闭，
this.$nextTick(function() { this.$nextTick(function() {
this.isRouterAlive = true; //再打开 this.isRouterAlive = true //再打开
}); })
// 系统组件适配 // 系统组件适配
let lang = localStorage.language; let lang = localStorage.language
if (lang == "zh-cn") { if (lang == 'zh-cn') {
this.locale = zhCN; this.locale = zhCN
moment.locale("zh-cn"); moment.locale('zh-cn')
} else if (lang == "en-us") { } else if (lang == 'en-us') {
this.locale = enUS; this.locale = enUS
moment.locale("en-us"); moment.locale('en-us')
} }
}); })
}, },
mounted() { mounted() {
}, },
watch:{ watch: {
$route:function(val) { $route: function(val) {
this.$nextTick(() => { this.$nextTick(() => {
if (document.getElementsByClassName('ant-card-body').length > 0){ this.$watermark.set('fanqiangqiang 范强强')
this.$watermark.set('fanqiangqiang 范强强') })
} }
})
}
},
computed:{
}, },
computed: {},
methods:{ methods: {}
}
} }
</script> </script>
<style> <style>
body{ body {
font-family: "Blue Sky Noto"!important; font-family: "Blue Sky Noto" !important;
} }
#app { #app {
height: 100%; height: 100%;
} }
.ant-layout {
background: transparent !important;
}
</style> </style>
jero-web/src/assets/watermark.js
+1 -1
View File
@@ -12,7 +12,7 @@ let setWatermark = (str) => {
cans.textAlign = 'left' cans.textAlign = 'left'
cans.textBaseline = 'Middle' cans.textBaseline = 'Middle'
cans.fillText(str, 10,120) cans.fillText(str, 10,120)
document.getElementsByClassName('ant-card-body')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' document.getElementsByClassName('ant-layout-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
return id return id
} }
jero-web/src/components/layouts/TabLayout.vue
+10 -3
View File
@@ -20,7 +20,7 @@
<!-- </a-tab-pane>--> <!-- </a-tab-pane>-->
<!-- </a-tabs>--> <!-- </a-tabs>-->
<!-- style="margin: 12px 12px 0;"--> <!-- style="margin: 12px 12px 0;"-->
<Tabcrumbs /> <Tabcrumbs v-if="isTrue"/>
<div> <div>
<!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 --> <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
<keep-alive v-if="multipage"> <keep-alive v-if="multipage">
@@ -83,7 +83,14 @@
} else { } else {
return this.$store.state.app.multipage return this.$store.state.app.multipage
} }
} },
isTrue(){
if (this.$route.path == '/docManage/library/detail'){
return false
}else{
return true
}
},
}, },
created() { created() {
if (this.$route.path != indexKey) { if (this.$route.path != indexKey) {
@@ -440,7 +447,7 @@
.ant-card { .ant-card {
z-index: 999; z-index: 999;
background: #fff; background: transparent!important;
} }
.ant-input{ .ant-input{
background: transparent !important; background: transparent !important;
jero-web/src/components/layouts/Tabcrumbs.vue
+17 -7
View File
@@ -1,7 +1,7 @@
<template> <template>
<div class="box"> <div class="box">
<span class="box-text"> <span class="box-text">
文档管理 {{Navigation}}
</span> </span>
<span class="box-text-content" v-if="subNavigation"> <span class="box-text-content" v-if="subNavigation">
<img src="~@/assets/dayu.png" alt=""> <img src="~@/assets/dayu.png" alt="">
@@ -17,17 +17,28 @@
name: 'Tabcrumbs', name: 'Tabcrumbs',
data() { data() {
return { return {
Navigation: '', Navigation: '文档管理',
subNavigation: '' subNavigation: null
} }
}, },
watch: { watch: {
'$route': function(val) { '$route': function(val) {
this.subNavigation = val.meta.title if (val.meta.title == '首页') {
this.Navigation = val.meta.title
this.subNavigation = null
} else {
this.subNavigation = val.meta.title
}
} }
}, },
mounted() { mounted() {
this.subNavigation = this.$route.meta.title if (this.$route.meta.title == '首页') {
this.Navigation = this.$route.meta.title
this.subNavigation = null
} else {
this.subNavigation = this.$route.meta.title
}
}, },
methods: {} methods: {}
} }
@@ -38,7 +49,6 @@
width: 100%; width: 100%;
height: 72px; height: 72px;
line-height: 92px; line-height: 92px;
background: #fff;
padding: 0 24px; padding: 0 24px;
box-sizing: border-box; box-sizing: border-box;
} }
jero-web/src/components/page/GlobalLayout.vue
+29 -16
View File
@@ -65,14 +65,14 @@
/> />
<!-- layout content --> <!-- layout content -->
<a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' }"> <a-layout-content :style="{ height: '100%', paddingTop: fixedHeader ? '59px' : '0' , 'background': '#fff'}">
<slot></slot> <slot></slot>
</a-layout-content> </a-layout-content>
<!-- layout footer --> <!-- layout footer -->
<!-- <a-layout-footer style="padding: 0px">--> <!-- <a-layout-footer style="padding: 0px">-->
<!-- <global-footer/>--> <!-- <global-footer/>-->
<!-- </a-layout-footer>--> <!-- </a-layout-footer>-->
</a-layout> </a-layout>
<!-- update-start---- author:os_chengtgen -- date:20190830 -- for:issues/463 -编译主题颜色已生效，但还一直转圈，显示主题 正在编译 ---- --> <!-- update-start---- author:os_chengtgen -- date:20190830 -- for:issues/463 -编译主题颜色已生效，但还一直转圈，显示主题 正在编译 ---- -->
@@ -99,7 +99,7 @@
components: { components: {
SideMenu, SideMenu,
GlobalHeader, GlobalHeader,
GlobalFooter, GlobalFooter
// update-start---- author:os_chengtgen -- date:20190830 -- for:issues/463 -编译主题颜色已生效，但还一直转圈，显示主题 正在编译 ------ // update-start---- author:os_chengtgen -- date:20190830 -- for:issues/463 -编译主题颜色已生效，但还一直转圈，显示主题 正在编译 ------
// // SettingDrawer // // SettingDrawer
// 注释这个因为在个人设置模块已经加载了SettingDrawer页面 // 注释这个因为在个人设置模块已经加载了SettingDrawer页面
@@ -110,7 +110,7 @@
data() { data() {
return { return {
collapsed: false, collapsed: false,
activeMenu:{}, activeMenu: {},
menus: [] menus: []
} }
}, },
@@ -133,7 +133,7 @@
this.menus = this.permissionMenuList this.menus = this.permissionMenuList
//--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255 //--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
this.collapsed=!this.sidebarOpened; this.collapsed = !this.sidebarOpened
//--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255 //--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
// 根据后台配置菜单，重新排序加载路由信息 // 根据后台配置菜单，重新排序加载路由信息
@@ -156,21 +156,21 @@
} }
}, },
//update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title //update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
myMenuSelect(value){ myMenuSelect(value) {
//此处触发动态路由被点击事件 //此处触发动态路由被点击事件
this.findMenuBykey(this.menus,value.key) this.findMenuBykey(this.menus, value.key)
this.$emit("dynamicRouterShow",value.key,this.activeMenu.meta.title) this.$emit('dynamicRouterShow', value.key, this.activeMenu.meta.title)
// update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常 // update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
let storeKey = 'route:title:' + this.activeMenu.path let storeKey = 'route:title:' + this.activeMenu.path
this.$ls.set(storeKey, this.activeMenu.meta.title) this.$ls.set(storeKey, this.activeMenu.meta.title)
// update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常 // update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
}, },
findMenuBykey(menus,key){ findMenuBykey(menus, key) {
for(let i of menus){ for (let i of menus) {
if(i.path==key){ if (i.path == key) {
this.activeMenu = {...i} this.activeMenu = { ...i }
}else if(i.children && i.children.length>0){ } else if (i.children && i.children.length > 0) {
this.findMenuBykey(i.children,key) this.findMenuBykey(i.children, key)
} }
} }
} }
@@ -207,14 +207,17 @@
* ant-table-wrapper * ant-table-wrapper
* 覆盖的表格手机模式样式，如果想修改在手机上表格最低宽度，可以在这里改动 * 覆盖的表格手机模式样式，如果想修改在手机上表格最低宽度，可以在这里改动
*/ */
.ant-table-wrapper { .ant-table-wrapper {
.ant-table-content { .ant-table-content {
overflow-y: auto; overflow-y: auto;
} }
.ant-table-body { .ant-table-body {
min-width: 800px; min-width: 800px;
} }
} }
.sidemenu { .sidemenu {
.ant-header-fixedHeader { .ant-header-fixedHeader {
@@ -226,12 +229,14 @@
.topmenu { .topmenu {
/* 必须为 topmenu 才能启用流式布局 */ /* 必须为 topmenu 才能启用流式布局 */
&.content-width-Fluid { &.content-width-Fluid {
.header-index-wide { .header-index-wide {
margin-left: 0; margin-left: 0;
} }
} }
} }
.header, .top-nav-header-index { .header, .top-nav-header-index {
.user-wrapper .action { .user-wrapper .action {
padding: 0 12px; padding: 0 12px;
@@ -272,7 +277,9 @@
width: 100%; width: 100%;
} }
} }
/* 必须为 topmenu 才能启用流式布局 */ /* 必须为 topmenu 才能启用流式布局 */
&.content-width-Fluid { &.content-width-Fluid {
.header-index-wide { .header-index-wide {
max-width: unset; max-width: unset;
@@ -405,6 +412,7 @@
} }
} }
} }
// //
} }
} }
@@ -479,6 +487,7 @@
float: right; float: right;
height: 59px; height: 59px;
overflow: hidden; overflow: hidden;
.action:hover { .action:hover {
background-color: rgba(0, 0, 0, 0.05); background-color: rgba(0, 0, 0, 0.05);
} }
@@ -511,6 +520,7 @@
} }
} }
} }
.header-index-wide .header-index-left .trigger:hover { .header-index-wide .header-index-left .trigger:hover {
background: rgba(255, 255, 255, 0.3); background: rgba(255, 255, 255, 0.3);
} }
@@ -545,8 +555,10 @@
background-color: rgb(0, 21, 41); background-color: rgb(0, 21, 41);
} }
} }
&.light { &.light {
box-shadow: none; box-shadow: none;
.ant-drawer-content { .ant-drawer-content {
background-color: #fff; background-color: #fff;
} }
@@ -659,6 +671,7 @@
padding-right: 8px; padding-right: 8px;
width: auto; width: auto;
} }
.ant-form-item-control { .ant-form-item-control {
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
jero-web/src/views/documentManage/library/docDetail/index.vue
+15 -13
View File
@@ -177,7 +177,7 @@
let query = { let query = {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
documentId:this.$route.query.id documentId: this.$route.query.id
} }
this.loading = true this.loading = true
getAction(this.url.list, query).then((res) => { getAction(this.url.list, query).then((res) => {
@@ -185,7 +185,7 @@
this.dataSource = res.result.records this.dataSource = res.result.records
this.total = res.result.total this.total = res.result.total
this.loading = false this.loading = false
}else{ } else {
this.loading = false this.loading = false
} }
}) })
@@ -198,14 +198,14 @@
this.pageSize = pageSize this.pageSize = pageSize
this.bussLogList() this.bussLogList()
}, },
DocumentSplitting(){ DocumentSplitting() {
this.$router.push({ this.$router.push({
path:'/docManage/splite', path: '/docManage/splite',
query:{ query: {
serial_number:this.$route.query.serial_number serial_number: this.$route.query.serial_number
} }
}) })
}, }
} }
} }
</script> </script>
@@ -213,15 +213,16 @@
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.doc-detail { .doc-detail {
padding: 20px; padding: 0 8px;
box-sizing: border-box;
.doc-detail-wrap { .doc-detail-wrap {
.doc-detail-header { .doc-detail-header {
height: 50px; width: 100%;
height: 44px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 2px #eff1f3 solid; border-bottom: 2px #eff1f3 solid;
.doc-detail-title { .doc-detail-title {
display: inline-block; display: inline-block;
text-overflow: ellipsis; text-overflow: ellipsis;
@@ -335,6 +336,7 @@
} }
} }
} }
.page { .page {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
jero-web/src/views/documentManage/library/index.vue
+3
View File
@@ -272,4 +272,7 @@
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
ddd{
background: #fff;
}
</style> </style>