diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue index e509d5f..d37821a 100644 --- a/src/layout/newyjLayout.vue +++ b/src/layout/newyjLayout.vue @@ -101,11 +101,12 @@ export default { let isGovernmentAffairsNetwork = localStorage.getItem( "isGovernmentAffairsNetwork" ); - const G_USER_INFO = JSON.parse(localStorage.getItem("G_USER_INFO")); + // const G_USER_INFO = JSON.parse(localStorage.getItem("G_USER_INFO")); + let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO")); if (isGovernmentAffairsNetwork == "1") { - this.userName = G_USER_INFO.data.username; + this.userName = userInfo.lawLevel + " " + userInfo.nickName; } else { - this.userName = this.dept.deptName + " " + this.username; + this.userName = userInfo.lawLevel + " " + userInfo.nickName; } }, watch: { @@ -146,7 +147,6 @@ export default { localStorage.removeItem("isGovernmentAffairsNetwork"); location.href = "/login?redirect=%2Findex"; } - }); }) .catch(() => {}); diff --git a/src/views/components/AddDialog/tab1.vue b/src/views/components/AddDialog/tab1.vue index 3838205..f5d8c6a 100644 --- a/src/views/components/AddDialog/tab1.vue +++ b/src/views/components/AddDialog/tab1.vue @@ -82,7 +82,7 @@
- +
- +
- + diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue index d51f4a8..dda7567 100644 --- a/src/views/yingji/enforcing.vue +++ b/src/views/yingji/enforcing.vue @@ -106,6 +106,11 @@ > + {{ componendDistrict(scope.row.district) }} - - +
- {{ scope.row.checkStatus == 2 ? "未检查" : "已检查" }} + {{ scope.row.checkStatus == 1 ? "已检查" : "未检查" }}
- + @@ -289,6 +299,7 @@ export default { //检测状态 checkStatus: "", enterpriseName: "", + status: 1, }, plannedMonth: "", checkList: [""], diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue index 96efd55..a415b79 100644 --- a/src/views/yingji/planManage.vue +++ b/src/views/yingji/planManage.vue @@ -57,11 +57,15 @@ ref="executive" /> - +