Merge remote-tracking branch 'origin/gzb' into wzl

src/api/school.js

 /**
  * 3.2.0.2用户--校验登录状态
  */
-export const ulogin_check_login = (data) =>
-  setRequest("ulogin/check_login", data);
+export const login_check_login = (data) =>
+  setRequest("login/check_login", data);
 /**
  * 3.2.0.3用户--退出登录
  */
-export const ulogin_login_out = (data) => setRequest("ulogin/login_out", data);
+export const login_login_out = (data) => setRequest("login/login_out", data);
 /**
  * 3.2.1用户--管理列表
  */

src/views/layout.vue

 <script>
 import { admin_detail, admin_edit_phone, admin_edit_pwd } from "@/api/admin";
 import { login_msg_code } from "@/api/login";
+import { login_check_login, login_login_out } from "@/api/school";
 import { logdoperatemsg_get_nrn } from "@/api/log";
 import { pwdCheck, reg } from "@/utils";
 export default {
           }
         ]
       },
+      time1: null,
       userInfo: {}
     };
   },
     this.userInfo = JSON.parse(
       localStorage.getItem("xh_control_userInfo")
     ).content;
+    this.get_check_user();
   },
   computed: {
     // 所属名称
     this.$EventBus.$on("nreadChange", () => {
       this.nreadNum = this.nreadNum > 0 ? this.nreadNum - 1 : 0;
     });
+    this.time1 = setInterval(() => {
+      this.get_check_user();
+    }, 1000 * 60);
+  },
+  beforeDestroy() {
+    if (this.time1) {
+      clearInterval(this.time1);
+    }
   },
   methods: {
+    //判断用户是否需要重新登录
+    get_check_user() {
+      let adminid = this.userInfo.adminid;
+      let loginpwd = this.userInfo.loginpwd;
+      login_check_login({ adminid, loginpwd }).then((res) => {
+        if (res.code === 0) {
+          if (res.obj) {
+            let needLogin = res.obj.needLogin;
+            if (needLogin) {
+              this.toLoginOut();
+            }
+          }
+        } else {
+          this.toLoginOut();
+        }
+      });
+    },
     init() {
       logdoperatemsg_get_nrn({
         rtype: this.powerParams.rtype,
                 phone: "",
                 msgcode: ""
               };
-
             }
           } else {
             this.$Message.error(res.msg);
     },
     // 退出
     toLoginOut() {
-      this.$router.push("/login");
+      login_login_out({ adminid: this.userInfo.adminid }).then((res) => {
+        this.$router.replace({
+          path: "/login"
+        });
+      });
     }
   }
 };

src/views/regionSection/applicationManage/applicationManage.vue

               placeholder="请输入更新内容"
             ></Input>
             <div class="appcomm">
-              更新描述不能超过1000个字符<span class="red">{{
+              更新内容不能超过1000个字符<span class="red">{{
                 wallpaperInfo.appRenew.length
               }}</span
               >/1000

src/views/schoolSection/applicationManage/applicationList.vue

               placeholder="请输入更新内容"
             ></Input>
             <div class="appcomm">
-              更新描述不能超过1000个字符<span class="red">{{
+              更新内容不能超过1000个字符<span class="red">{{
                 wallpaperInfo.appRenew.length
               }}</span
               >/1000

src/views/schoolSection/deviceManage/deviceManage.vue

                 class="app_list"
                 v-for="item in strategyInfo.padApps"
                 :key="item.appid"
+                :title="item.appName"
               >
                 <img :src="$api.baseImageUrl + item.appIcon" />
-                <div>{{ item.appName }}</div>
+                <div class="appName">{{ item.appName }}</div>
               </div>
             </div>
           </div>
             height: 40px;
             object-fit: cover;
           }
+          .appName {
+            width: 100px;
+            padding: 0 8px;
+            cursor: pointer;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            line-height: 14px;
+          }
           .checked {
             position: absolute;
             right: 2px;