diff --git a/src/App.vue b/src/App.vue
index 69a7a68..0d6ecac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
index d37821a..22407d7 100644
--- a/src/layout/newyjLayout.vue
+++ b/src/layout/newyjLayout.vue
@@ -56,19 +56,15 @@
+
+ 进入后台管理
+
修改密码
退出登录
-
@@ -86,6 +82,7 @@ export default {
routerIndex: 0,
avatarFlag: false,
userName: null,
+ userInfo: JSON.parse(sessionStorage.getItem("USER_INFO")),
};
},
computed: {
@@ -102,11 +99,12 @@ export default {
"isGovernmentAffairsNetwork"
);
// const G_USER_INFO = JSON.parse(localStorage.getItem("G_USER_INFO"));
- let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
- if (isGovernmentAffairsNetwork == "1") {
- this.userName = userInfo.lawLevel + " " + userInfo.nickName;
+ // let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
+ // if (isGovernmentAffairsNetwork == "1") {
+ if (this.userInfo.userName == "admin") {
+ this.userName = this.userInfo.userName;
} else {
- this.userName = userInfo.lawLevel + " " + userInfo.nickName;
+ this.userName = this.userInfo.lawLevel + " " + this.userInfo.nickName;
}
},
watch: {
@@ -139,6 +137,8 @@ export default {
let isGovernmentAffairsNetwork = localStorage.getItem(
"isGovernmentAffairsNetwork"
);
+ sessionStorage.removeItem("SET_IS_ORG_PWD");
+
// console.log("进入跳转政务网的登录页");
if (isGovernmentAffairsNetwork == "1") {
localStorage.removeItem("isGovernmentAffairsNetwork");
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 70c6c5e..c13ad39 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -70,7 +70,8 @@ const user = {
commit("SET_TOKEN", res.token);
// 判断是否是初始密码
if (password == "Yingji@123") {
- commit("SET_IS_ORG_PWD", true);
+ // commit("SET_IS_ORG_PWD", true);
+ sessionStorage.setItem("SET_IS_ORG_PWD", JSON.stringify(true));
}
resolve();
})
@@ -119,7 +120,7 @@ const user = {
getInfo()
.then((res) => {
const user = res.user;
- sessionStorage.setItem("USER_INFO", JSON.stringify(user))
+ sessionStorage.setItem("USER_INFO", JSON.stringify(user));
commit("get_dept", user.dept);
const avatar =
user.avatar == "" || user.avatar == null
diff --git a/src/views/components/AddDialog/index.vue b/src/views/components/AddDialog/index.vue
index f7b7f9c..4ac9d88 100644
--- a/src/views/components/AddDialog/index.vue
+++ b/src/views/components/AddDialog/index.vue
@@ -20,36 +20,38 @@
-->
- Ⅱ
- 选择非省重点
+
+ Ⅰ
+ 选择企业
- Ⅲ
+
+ Ⅱ
草稿箱
-