From 575eb544d311904dd4cf6b3476f6f244df99ea06 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Thu, 16 Feb 2023 14:56:42 +0800
Subject: [PATCH] 账号异常提示，放开长水学校管理员设备导入以及添加设备

---
 src/assets/images/EasyQuiz.png   | Bin 0 -> 37499 bytes
 src/views/device/index.vue       |  6 +++---
 src/views/down/client.vue        |  4 ++--
 src/views/layout/aside/aside.vue |  2 +-
 src/views/login/index.vue        | 18 +++++++++++++++---
 5 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 src/assets/images/EasyQuiz.png

diff --git a/src/assets/images/EasyQuiz.png b/src/assets/images/EasyQuiz.png
new file mode 100644
index 0000000..a1606f8
Binary files /dev/null and b/src/assets/images/EasyQuiz.png differ
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 7718b2a..3520469 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -4,7 +4,7 @@
       <template slot="title">
         <span>设备管理</span>
       </template>
-      <template slot="btns" v-if="role != 'ROLE_JITUAN' && type == 1 && !code">
+      <template slot="btns" v-if="role == 'ROLE_XUEXIAO' && type == 1">
         <el-tooltip effect="dark" content="设备导入" placement="bottom">
           <el-button
             type="primary"
@@ -16,7 +16,6 @@
           ></el-button>
         </el-tooltip>
         <el-tooltip
-          v-if="role == 'ROLE_XUEXIAO'"
           effect="dark"
           content="添加基站"
           placement="bottom"
@@ -659,7 +658,8 @@ export default {
       this.page = 1;
       this._QueryData();
     },
-    edit(obj) {//修改设备
+    edit(obj) {
+      //修改设备
       this.isAdd = false;
       for (let key in this.form) {
         if (key == "classIds") {
diff --git a/src/views/down/client.vue b/src/views/down/client.vue
index 14a572f..60c0590 100644
--- a/src/views/down/client.vue
+++ b/src/views/down/client.vue
@@ -27,7 +27,7 @@
           >
         </div>
       </div>
-      <ul class="down-ul">
+      <!-- <ul class="down-ul">
         <li class="down-li" v-for="item in tableData" :key="item.id">
           <span class="p1 ellipsis" @click="setConfigForm(item)">{{
             item.configName
@@ -46,7 +46,7 @@
             >参数设置</el-button
           >
         </li>
-      </ul>
+      </ul> -->
     </div>
     <div class="edit-dia" ref="editDia" v-show="dialogVis" height="100%">
       <div class="back">
diff --git a/src/views/layout/aside/aside.vue b/src/views/layout/aside/aside.vue
index 7a9c48a..926ae4e 100644
--- a/src/views/layout/aside/aside.vue
+++ b/src/views/layout/aside/aside.vue
@@ -62,7 +62,7 @@
 import menuTree from "./menuTree";
 import { getURLParams } from "@/utils";
 import BusEvent from "@/utils/busEvent";
-const logo = require("../../../assets/images/logo.png");
+const logo = require("../../../assets/images/EasyQuiz.png");
 const csLogo = require("../../../assets/images/331logo.png");
 export default {
   name: "asideNav",
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3dd6fa8..a060f9c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,5 +1,9 @@
 // <template>
-  <div class="login-container" v-loading="loading" element-loading-text="努力加载中...">
+  <div
+    class="login-container"
+    v-loading="loading"
+    element-loading-text="努力加载中..."
+  >
     <el-form
       v-if="!code && !dockkey"
       ref="loginForm"
@@ -89,7 +93,7 @@ import { getURLParams } from "@/utils";
 export default {
   data() {
     return {
-      loading:false,
+      loading: false,
       disableClick: true,
       passwordType: "password",
       loginForm: {
@@ -114,7 +118,15 @@ export default {
     this.code = getURLParams("code") || localStorage.getItem("csCode") || "";
     this.dockkey = getURLParams("dockkey") || "";
     if (this.code || this.dockkey) {
-      this.loading = true
+      this.loading = true;
+      if (this.code == -1) {
+        this.$message({
+          showClose: true,
+          message: "账号异常请联系管理员！",
+          type: "error",
+        });
+        return;
+      }
       this._LoginCheck();
     }
   },
--
libgit2 0.21.4