diff --git a/jero-web/public/color.less b/jero-web/public/color.less
index 0f799c1d9..f206ced63 100644
--- a/jero-web/public/color.less
+++ b/jero-web/public/color.less
@@ -3570,7 +3570,7 @@ mark {
}
.ant-card {
color: rgba(0, 0, 0, 0.65);
- background: #fff;
+ //background: #fff;
border-radius: 2px;
}
.ant-card-hoverable:hover {
@@ -5092,7 +5092,7 @@ form .ant-upload {
border-bottom-left-radius: 0;
}
.ant-layout {
- background: #f0f2f5;
+ //background: #f0f2f5;
}
.ant-layout-header {
background: #001529;
diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue
index 852101243..80defc7d6 100644
--- a/jero-web/src/App.vue
+++ b/jero-web/src/App.vue
@@ -1,7 +1,7 @@
-
+
@@ -11,19 +11,20 @@
import enquireScreen from '@/utils/device'
import moment from 'moment'
import 'moment/locale/zh-cn'
+
moment.locale('zh-cn')
const EN = 'en-us'
const ZH = 'zh-cn'
export default {
- data () {
+ data() {
return {
locale: zhCN,
- isRouterAlive:true
+ isRouterAlive: true
}
},
- created () {
+ created() {
let that = this
enquireScreen(deviceType => {
// tablet
@@ -35,67 +36,66 @@
else if (deviceType === 1) {
that.$store.commit('TOGGLE_DEVICE', 'mobile')
that.$store.dispatch('setSidebar', false)
- }
- else {
+ } else {
that.$store.commit('TOGGLE_DEVICE', 'desktop')
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 => {
- let router_path = this.$route.path;
+ this.$root.Bus.$on('switchLanguage', value => {
+ let router_path = this.$route.path
switch (value) {
- case "zh-cn":
- localStorage.setItem("language", "zh-cn");
- break;
- case "en-us":
- localStorage.setItem("language", "en-us");
- break;
+ case 'zh-cn':
+ localStorage.setItem('language', 'zh-cn')
+ break
+ case 'en-us':
+ localStorage.setItem('language', 'en-us')
+ break
}
// 刷新页面
- this.isRouterAlive = false; //先关闭,
+ this.isRouterAlive = false //先关闭,
this.$nextTick(function() {
- this.isRouterAlive = true; //再打开
- });
+ this.isRouterAlive = true //再打开
+ })
// 系统组件适配
- let lang = localStorage.language;
- if (lang == "zh-cn") {
- this.locale = zhCN;
- moment.locale("zh-cn");
- } else if (lang == "en-us") {
- this.locale = enUS;
- moment.locale("en-us");
+ let lang = localStorage.language
+ if (lang == 'zh-cn') {
+ this.locale = zhCN
+ moment.locale('zh-cn')
+ } else if (lang == 'en-us') {
+ this.locale = enUS
+ moment.locale('en-us')
}
- });
+ })
},
mounted() {
},
- watch:{
- $route:function(val) {
- this.$nextTick(() => {
- if (document.getElementsByClassName('ant-card-body').length > 0){
- this.$watermark.set('fanqiangqiang 范强强')
- }
- })
- }
- },
- computed:{
+ watch: {
+ $route: function(val) {
+ this.$nextTick(() => {
+ this.$watermark.set('fanqiangqiang 范强强')
+ })
+ }
},
+ computed: {},
- methods:{
-
- }
+ methods: {}
}
\ No newline at end of file
diff --git a/jero-web/src/assets/watermark.js b/jero-web/src/assets/watermark.js
index b854882fc..65874022f 100644
--- a/jero-web/src/assets/watermark.js
+++ b/jero-web/src/assets/watermark.js
@@ -12,7 +12,7 @@ let setWatermark = (str) => {
cans.textAlign = 'left'
cans.textBaseline = 'Middle'
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
}
diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index 8008b40b3..4e3b55d5c 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -20,7 +20,7 @@
-
+
@@ -83,7 +83,14 @@
} else {
return this.$store.state.app.multipage
}
- }
+ },
+ isTrue(){
+ if (this.$route.path == '/docManage/library/detail'){
+ return false
+ }else{
+ return true
+ }
+ },
},
created() {
if (this.$route.path != indexKey) {
@@ -440,7 +447,7 @@
.ant-card {
z-index: 999;
- background: #fff;
+ background: transparent!important;
}
.ant-input{
background: transparent !important;
diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue
index f0841f6b9..5fb50c7f0 100644
--- a/jero-web/src/components/layouts/Tabcrumbs.vue
+++ b/jero-web/src/components/layouts/Tabcrumbs.vue
@@ -1,7 +1,7 @@
-
- 文档管理
+
+ {{Navigation}}
@@ -17,17 +17,28 @@
name: 'Tabcrumbs',
data() {
return {
- Navigation: '',
- subNavigation: ''
+ Navigation: '文档管理',
+ subNavigation: null
}
},
watch: {
'$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() {
- 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: {}
}
@@ -38,7 +49,6 @@
width: 100%;
height: 72px;
line-height: 92px;
- background: #fff;
padding: 0 24px;
box-sizing: border-box;
}
diff --git a/jero-web/src/components/page/GlobalLayout.vue b/jero-web/src/components/page/GlobalLayout.vue
index cf70b6d7f..d0cb3f786 100644
--- a/jero-web/src/components/page/GlobalLayout.vue
+++ b/jero-web/src/components/page/GlobalLayout.vue
@@ -65,14 +65,14 @@
/>
-
+
-
-
-
+
+
+
@@ -99,7 +99,7 @@
components: {
SideMenu,
GlobalHeader,
- GlobalFooter,
+ GlobalFooter
// update-start---- author:os_chengtgen -- date:20190830 -- for:issues/463 -编译主题颜色已生效,但还一直转圈,显示主题 正在编译 ------
// // SettingDrawer
// 注释这个因为在个人设置模块已经加载了SettingDrawer页面
@@ -110,7 +110,7 @@
data() {
return {
collapsed: false,
- activeMenu:{},
+ activeMenu: {},
menus: []
}
},
@@ -133,7 +133,7 @@
this.menus = this.permissionMenuList
//--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
- this.collapsed=!this.sidebarOpened;
+ this.collapsed = !this.sidebarOpened
//--update-begin----author:liusq---date:20210223------for:关于测边菜单遮挡内容问题详细说明 #2255
// 根据后台配置菜单,重新排序加载路由信息
@@ -156,21 +156,21 @@
}
},
//update-begin-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
- myMenuSelect(value){
+ myMenuSelect(value) {
//此处触发动态路由被点击事件
- this.findMenuBykey(this.menus,value.key)
- this.$emit("dynamicRouterShow",value.key,this.activeMenu.meta.title)
+ this.findMenuBykey(this.menus, value.key)
+ this.$emit('dynamicRouterShow', value.key, this.activeMenu.meta.title)
// update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
let storeKey = 'route:title:' + this.activeMenu.path
this.$ls.set(storeKey, this.activeMenu.meta.title)
// update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
},
- findMenuBykey(menus,key){
- for(let i of menus){
- if(i.path==key){
- this.activeMenu = {...i}
- }else if(i.children && i.children.length>0){
- this.findMenuBykey(i.children,key)
+ findMenuBykey(menus, key) {
+ for (let i of menus) {
+ if (i.path == key) {
+ this.activeMenu = { ...i }
+ } else if (i.children && i.children.length > 0) {
+ this.findMenuBykey(i.children, key)
}
}
}
@@ -207,14 +207,17 @@
* ant-table-wrapper
* 覆盖的表格手机模式样式,如果想修改在手机上表格最低宽度,可以在这里改动
*/
+
.ant-table-wrapper {
.ant-table-content {
overflow-y: auto;
}
+
.ant-table-body {
min-width: 800px;
}
}
+
.sidemenu {
.ant-header-fixedHeader {
@@ -226,12 +229,14 @@
.topmenu {
/* 必须为 topmenu 才能启用流式布局 */
+
&.content-width-Fluid {
.header-index-wide {
margin-left: 0;
}
}
}
+
.header, .top-nav-header-index {
.user-wrapper .action {
padding: 0 12px;
@@ -272,7 +277,9 @@
width: 100%;
}
}
+
/* 必须为 topmenu 才能启用流式布局 */
+
&.content-width-Fluid {
.header-index-wide {
max-width: unset;
@@ -405,6 +412,7 @@
}
}
}
+
//
}
}
@@ -479,6 +487,7 @@
float: right;
height: 59px;
overflow: hidden;
+
.action:hover {
background-color: rgba(0, 0, 0, 0.05);
}
@@ -511,6 +520,7 @@
}
}
}
+
.header-index-wide .header-index-left .trigger:hover {
background: rgba(255, 255, 255, 0.3);
}
@@ -545,8 +555,10 @@
background-color: rgb(0, 21, 41);
}
}
+
&.light {
box-shadow: none;
+
.ant-drawer-content {
background-color: #fff;
}
@@ -659,6 +671,7 @@
padding-right: 8px;
width: auto;
}
+
.ant-form-item-control {
height: 32px;
line-height: 32px;
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index 4ed82bfba..dbf92a17e 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -177,7 +177,7 @@
let query = {
pageNo: this.pageNo,
pageSize: this.pageSize,
- documentId:this.$route.query.id
+ documentId: this.$route.query.id
}
this.loading = true
getAction(this.url.list, query).then((res) => {
@@ -185,7 +185,7 @@
this.dataSource = res.result.records
this.total = res.result.total
this.loading = false
- }else{
+ } else {
this.loading = false
}
})
@@ -198,14 +198,14 @@
this.pageSize = pageSize
this.bussLogList()
},
- DocumentSplitting(){
- this.$router.push({
- path:'/docManage/splite',
- query:{
- serial_number:this.$route.query.serial_number
- }
- })
- },
+ DocumentSplitting() {
+ this.$router.push({
+ path: '/docManage/splite',
+ query: {
+ serial_number: this.$route.query.serial_number
+ }
+ })
+ }
}
}
@@ -213,15 +213,16 @@
@import '~@assets/less/common.less';
.doc-detail {
- padding: 20px;
+ padding: 0 8px;
+ box-sizing: border-box;
.doc-detail-wrap {
.doc-detail-header {
- height: 50px;
+ width: 100%;
+ height: 44px;
display: flex;
justify-content: space-between;
border-bottom: 2px #eff1f3 solid;
-
.doc-detail-title {
display: inline-block;
text-overflow: ellipsis;
@@ -335,6 +336,7 @@
}
}
}
+
.page {
text-align: right;
margin-top: 20px;
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index 28dbe33c5..a6ec552bb 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -272,4 +272,7 @@
\ No newline at end of file