From 2b3ed371c6aa62214647e60224b4c3d48d662a6c Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 21 Feb 2022 16:15:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=B4=E5=8D=B0=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/App.vue                          |  7 ++++++
 jero-web/src/assets/watermark.js              | 22 +++--------------
 jero-web/src/components/layouts/RouteView.vue | 24 +++++++++----------
 jero-web/src/components/layouts/TabLayout.vue |  8 ++-----
 4 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue
index 46935bbfd..e48a99987 100644
--- a/jero-web/src/App.vue
+++ b/jero-web/src/App.vue
@@ -75,6 +75,13 @@
 
     },
     watch:{
+       $route:function(val) {
+         this.$nextTick(() => {
+           if (document.getElementsByClassName('ant-card-body').length > 0){
+             this.$watermark.set('fanqiangqiang 范强强')
+           }
+         })
+       }
     },
     computed:{
     },
diff --git a/jero-web/src/assets/watermark.js b/jero-web/src/assets/watermark.js
index 38602dd5f..b854882fc 100644
--- a/jero-web/src/assets/watermark.js
+++ b/jero-web/src/assets/watermark.js
@@ -1,34 +1,18 @@
 let watermark = {}
 let setWatermark = (str) => {
   let id = '1.23452384164.123412415'
-
   if (document.getElementById(id) !== null) {
     document.body.removeChild(document.getElementById(id))
   }
-
   let can = document.createElement('canvas')
-  can.width = 190
-  can.height = 120
-
   let cans = can.getContext('2d')
   cans.rotate(-30 * Math.PI / 180)
-  cans.font = '15px Vedana'
+  cans.font = '13px Vedana'
   cans.fillStyle = '#f4f4f4'
   cans.textAlign = 'left'
   cans.textBaseline = 'Middle'
-  cans.fillText(str, can.width / 20, can.height)
-
-  let div = document.createElement('div')
-  div.id = id
-  div.style.pointerEvents = 'none'
-  div.style.top = '-30px'
-  div.style.left = '0px'
-  div.style.position = 'absolute'
-  div.style.zIndex = '1'
-  div.style.width = '100%'
-  div.style.height = '100%'
-  div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
-  document.getElementsByClassName('main')[0].appendChild(div)
+  cans.fillText(str, 10,120)
+  document.getElementsByClassName('ant-card-body')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
   return id
 }
 
diff --git a/jero-web/src/components/layouts/RouteView.vue b/jero-web/src/components/layouts/RouteView.vue
index 73237de16..a1bdc7204 100644
--- a/jero-web/src/components/layouts/RouteView.vue
+++ b/jero-web/src/components/layouts/RouteView.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="main">
-  <keep-alive :include="includedComponents">
-    <router-view v-if="keepAlive" />
-  </keep-alive>
-  <router-view v-if="!keepAlive" />
+    <keep-alive :include="includedComponents">
+      <router-view v-if="keepAlive"/>
+    </keep-alive>
+    <router-view v-if="!keepAlive"/>
   </div>
 </template>
 
 <script>
   import Vue from 'vue'
-  import { CACHE_INCLUDED_ROUTES } from "@/store/mutation-types"
+  import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
 
   export default {
-    name: "RouteView",
+    name: 'RouteView',
     computed: {
       //update-begin--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
       includedComponents() {
@@ -20,24 +20,24 @@
         //如果是缓存路由，则加入到 cache_included_routes
         if (this.$route.meta.keepAlive && this.$route.meta.componentName) {
           let cacheRouterArray = Vue.ls.get(CACHE_INCLUDED_ROUTES) || []
-          if(!cacheRouterArray.includes(this.$route.meta.componentName)){
+          if (!cacheRouterArray.includes(this.$route.meta.componentName)) {
             cacheRouterArray.push(this.$route.meta.componentName)
             // cacheRouterArray.push("OnlCgformHeadList")
             Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
-            return cacheRouterArray;
+            return cacheRouterArray
           }
         }
-        return includedRouters;
+        return includedRouters
       },
       //update-end--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
-      keepAlive () {
+      keepAlive() {
         return this.$route.meta.keepAlive
       }
-    },
+    }
   }
 </script>
 <style>
-  .main{
+  .main {
     height: 100%;
     overflow: auto;
   }
diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index 5f8c5d557..003d2f164 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -100,9 +100,7 @@
       this.activePage = currentRoute.fullPath
     },
     mounted() {
-      this.$nextTick(() => {
-        this.$watermark.set('测试水印')
-      })
+
     },
     watch: {
       '$route': function(newRoute) {
@@ -131,7 +129,6 @@
           let oldPositionRoute = this.pageList[oldIndex]
           this.pageList.splice(oldIndex, 1, Object.assign({}, newRoute, { meta: oldPositionRoute.meta }))
         }
-        this.$watermark.set('测试水印')
       },
       'activePage': function(key) {
         let index = this.linkList.lastIndexOf(key)
@@ -435,12 +432,11 @@
 
   .main {
     position: relative;
-    background: #fff;
   }
 
   .ant-card {
     z-index: 999;
-    background: transparent !important;
+    background: #fff;
   }
   .ant-input{
     background: transparent !important;