‘merge

src/components/end/login.vue

@@ -103,6 +103,9 @@ export default {
                   localStorage.setItem("userId", resData.user.id);
                   localStorage.setItem("backToken", resData.token);
                   localStorage.setItem("roleList", resData.user.roleList);
+                  if(!resData.user.permanent){
+                     localStorage.setItem("expireNum", resData.expireNum);
+                  }
                   localStorage.setItem(
                     "menuList",
                     JSON.stringify(resData.menuList)
@@ -111,10 +114,7 @@ export default {
                     this.$alert("登录成功,为了安全，建议修改密码", "", {
                       confirmButtonText: "确定",
                       callback: (action) => {
-                        // this.$message({
-                        //   type: "info",
-                        //   message: `action: ${action}`,
-                        // });
+                       
                       },
                     });
                   }
@@ -152,6 +152,7 @@ export default {
   background: #9b1f23 url("~@/assets/login/login_bg.png") no-repeat center/ 100%
     100%;
   .content {
+    min-width: 350px;
     width: 33.33%;
     height: 100vh;
     background-color: @party-white;

src/components/topbar.vue

@@ -10,6 +10,9 @@
       <div class="line"></div>
       <div class="login-out" @click="logout()"></div>
     </div>
+    <div class="effectiveDate" v-show=" (expireNum || expireNum===0) && expireNum < 30 ">
+      您的账号{{ expireNum }}天到期
+    </div>
   </div>
 </template>
 <script>
@@ -18,6 +21,7 @@ export default {
   data() {
     return {
       userName: localStorage.getItem("user"),
+      expireNum: localStorage.getItem("expireNum"),
     };
   },
   mounted() {},
@@ -115,5 +119,11 @@ export default {
       cursor: pointer;
     }
   }
+  .effectiveDate {
+    position: absolute;
+    right: 93px;
+    top: 25px;
+    color: @party-white
+  }
 }
 </style>

src/config/loginOut.js

 export function loginOut() {
-    const list = ['user', 'userId','roleList', 'backToken', 'menuList']
+    const list = ['user', 'userId','roleList', 'backToken', 'menuList','expireNum']
     list.forEach(v => {
         localStorage.removeItem(v)
     })

src/page/STB/interactive/index.vue

@@ -32,7 +32,8 @@
     </el-card>
     <el-card class="height100 detail-box" ref="rightBox">
       <div class="content-title">
-        <div class="title">"{{selectOrgName}}" 展板互动信息汇总</div>
+        <div class="title" v-if="selectOrgName">"{{selectOrgName}}" 展板互动信息汇总</div>
+        <div class="title" v-if="!selectOrgName">展板互动信息汇总</div>
         <div class="page-tip">
           <span class="page-tip-title">页面说明:</span>
           <span class="page-tips">可查看某个组织机构的互动信息</span>

src/page/accounts/stbDialog/edit.vue

@@ -110,7 +110,6 @@ export default {
     // 根据id获取获取详情内容
     getDetailById() {
       let _this = this;
-      debugger
       this.$https(
         {
           method: "get",
@@ -128,9 +127,12 @@ export default {
                   this.form[key] = resData[key];
                 }
               }
+              _this.form.areaId = resData.areas
               if (!_this.form.permanent) {
                 _this.form.date = [resData.effectiveDate, resData.exiredDate];
               }
+              this.form = {..._this.form}
+              console.log(this.form)
             } else {
               _this.$message.error(res.data.message);
             }