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 @@