diff --git a/ah-jjzhgd-web/src/App.vue b/ah-jjzhgd-web/src/App.vue
index a738a88..ad98c26 100644
--- a/ah-jjzhgd-web/src/App.vue
+++ b/ah-jjzhgd-web/src/App.vue
@@ -6,25 +6,34 @@
 
 <script>
 import { removeWatermark, setWaterMark } from "@/utils/waterMark";
+import {decryptData} from '@/utils/test';
 export default {
   name: 'App',
   created() {
     this.loadWaterMark();
   },
+  updated(){
+    removeWatermark();
+    this.loadWaterMark();
+  },
   mounted() {
     window.onresize = () => {
       removeWatermark();
       this.loadWaterMark();
     }
+    
   },
   methods: {
     loadWaterMark() {
-      //设置水印内容，这段代码实现的是两行文本内容的水印。
-     const nickName = sessionStorage.getItem('nickName');
-     const deptName = sessionStorage.getItem('deptName');
-      let str1 = nickName ? nickName : '';
-      let str2 = deptName ? deptName : '';
-      setWaterMark(str1, str2);
+    //设置水印内容，这段代码实现的是两行文本内容的水印。
+    const nickName = sessionStorage.getItem('nickName');
+    const roleName = sessionStorage.getItem('roleName');
+    let str1 = nickName ? decryptData(nickName) : '';
+    let str2 = roleName ? decryptData(roleName) : '';
+    let str3 = '国网安徽电力';
+    if(nickName || roleName){
+      setWaterMark(str1, str2,str3);
+    }
     },
   },
   destroyed() {
diff --git a/ah-jjzhgd-web/src/store/modules/user.js b/ah-jjzhgd-web/src/store/modules/user.js
index d9a90d9..e0a3e85 100644
--- a/ah-jjzhgd-web/src/store/modules/user.js
+++ b/ah-jjzhgd-web/src/store/modules/user.js
@@ -1,6 +1,7 @@
 import { login, logout, getInfo } from '@/api/user'
 import {getToken, setToken, removeToken, setUs, setIscId, getIscId} from '@/utils/auth'
 import router, { resetRouter } from '@/router'
+import {encryptData,decryptData} from '@/utils/test';
 
 const state = {
   token: getToken(),
@@ -43,8 +44,13 @@ const actions = {
         setIscId(data.iscUserId)// 存储用户信息到缓存
         commit('SET_ROLES', data.us.role)
         commit('SET_NAME', data.us.userName)
-        sessionStorage.setItem('nickName',JSON.parse(data.us).nickName)
-        sessionStorage.setItem('deptName',JSON.parse(data.us).deptName)
+        if(JSON.parse(data.us).nickName){
+          sessionStorage.setItem('nickName',encryptData(JSON.parse(data.us).nickName))
+        }
+        
+        if(JSON.parse(data.us).roleName){
+          sessionStorage.setItem('roleName',encryptData(JSON.parse(data.us).roleName))
+        }
         resolve()
       }).catch(error => {
         reject(error)
diff --git a/ah-jjzhgd-web/src/utils/auth.js b/ah-jjzhgd-web/src/utils/auth.js
index 9d88c27..9038681 100644
--- a/ah-jjzhgd-web/src/utils/auth.js
+++ b/ah-jjzhgd-web/src/utils/auth.js
@@ -20,6 +20,8 @@ export function removeToken() {
   Cookies.remove(usKey)
   sessionStorage.removeItem(usKey)
   sessionStorage.removeItem(TokenKey)
+  sessionStorage.removeItem('nickName')
+  sessionStorage.removeItem('roleName')
   return Cookies.remove(TokenKey)
 }
 /**
diff --git a/ah-jjzhgd-web/src/utils/test.js b/ah-jjzhgd-web/src/utils/test.js
index 9354e2e..505d4cc 100644
--- a/ah-jjzhgd-web/src/utils/test.js
+++ b/ah-jjzhgd-web/src/utils/test.js
@@ -4,3 +4,9 @@ export const decryptData = function (word) {
 	const val = sm4.decryptDefault_CBC(word);
 	return val;
 };
+
+export const encryptData = function (word) {
+	var sm4 = new SM4Util();
+	const val = sm4.encryptDefault_CBC(word);
+	return val;
+};
diff --git a/ah-jjzhgd-web/src/utils/waterMark.js b/ah-jjzhgd-web/src/utils/waterMark.js
index 5af8965..42e1e23 100644
--- a/ah-jjzhgd-web/src/utils/waterMark.js
+++ b/ah-jjzhgd-web/src/utils/waterMark.js
@@ -1,5 +1,5 @@
 /**  水印添加方法  */
-let setWatermark = (str1, str2) => {
+let setWatermark = (str1, str2,str3) => {
     let id = '1.23452384164.123412415'
    
     if (document.getElementById(id) !== null) {
@@ -16,7 +16,8 @@ let setWatermark = (str1, str2) => {
     cans.textAlign = 'center'
     cans.textBaseline = 'Middle'
     cans.fillText(str1, can.width / 2, can.height) // 水印在画布的位置x，y轴
-    cans.fillText(str2, can.width / 2, can.height + 30)
+    cans.fillText(str2, can.width / 2, can.height + 20)
+    cans.fillText(str3, can.width / 2, can.height + 40)
    
     let div = document.createElement('div')
     div.id = id
@@ -34,10 +35,10 @@ let setWatermark = (str1, str2) => {
   }
    
   // 添加水印方法
-  export const setWaterMark = (str1, str2) => {
-    let id = setWatermark(str1, str2)
+  export const setWaterMark = (str1, str2,str3) => {
+    let id = setWatermark(str1, str2,str3)
     if (document.getElementById(id) === null) {
-      id = setWatermark(str1, str2)
+      id = setWatermark(str1, str2,str3)
     }
   }