Commit 575eb544d311904dd4cf6b3476f6f244df99ea06

Authored by 梁保满
1 parent c4eb9615

账号异常提示,放开长水学校管理员设备导入以及添加设备

src/assets/images/EasyQuiz.png 0 → 100644

36.6 KB

src/views/device/index.vue
... ... @@ -4,7 +4,7 @@
4 4 <template slot="title">
5 5 <span>设备管理</span>
6 6 </template>
7   - <template slot="btns" v-if="role != 'ROLE_JITUAN' && type == 1 && !code">
  7 + <template slot="btns" v-if="role == 'ROLE_XUEXIAO' && type == 1">
8 8 <el-tooltip effect="dark" content="设备导入" placement="bottom">
9 9 <el-button
10 10 type="primary"
... ... @@ -16,7 +16,6 @@
16 16 ></el-button>
17 17 </el-tooltip>
18 18 <el-tooltip
19   - v-if="role == 'ROLE_XUEXIAO'"
20 19 effect="dark"
21 20 content="添加基站"
22 21 placement="bottom"
... ... @@ -659,7 +658,8 @@ export default {
659 658 this.page = 1;
660 659 this._QueryData();
661 660 },
662   - edit(obj) {//修改设备
  661 + edit(obj) {
  662 + //修改设备
663 663 this.isAdd = false;
664 664 for (let key in this.form) {
665 665 if (key == "classIds") {
... ...
src/views/down/client.vue
... ... @@ -27,7 +27,7 @@
27 27 >
28 28 </div>
29 29 </div>
30   - <ul class="down-ul">
  30 + <!-- <ul class="down-ul">
31 31 <li class="down-li" v-for="item in tableData" :key="item.id">
32 32 <span class="p1 ellipsis" @click="setConfigForm(item)">{{
33 33 item.configName
... ... @@ -46,7 +46,7 @@
46 46 >参数设置</el-button
47 47 >
48 48 </li>
49   - </ul>
  49 + </ul> -->
50 50 </div>
51 51 <div class="edit-dia" ref="editDia" v-show="dialogVis" height="100%">
52 52 <div class="back">
... ...
src/views/layout/aside/aside.vue
... ... @@ -62,7 +62,7 @@
62 62 import menuTree from "./menuTree";
63 63 import { getURLParams } from "@/utils";
64 64 import BusEvent from "@/utils/busEvent";
65   -const logo = require("../../../assets/images/logo.png");
  65 +const logo = require("../../../assets/images/EasyQuiz.png");
66 66 const csLogo = require("../../../assets/images/331logo.png");
67 67 export default {
68 68 name: "asideNav",
... ...
src/views/login/index.vue
1 1 // <template>
2   - <div class="login-container" v-loading="loading" element-loading-text="努力加载中...">
  2 + <div
  3 + class="login-container"
  4 + v-loading="loading"
  5 + element-loading-text="努力加载中..."
  6 + >
3 7 <el-form
4 8 v-if="!code && !dockkey"
5 9 ref="loginForm"
... ... @@ -89,7 +93,7 @@ import { getURLParams } from &quot;@/utils&quot;;
89 93 export default {
90 94 data() {
91 95 return {
92   - loading:false,
  96 + loading: false,
93 97 disableClick: true,
94 98 passwordType: "password",
95 99 loginForm: {
... ... @@ -114,7 +118,15 @@ export default {
114 118 this.code = getURLParams("code") || localStorage.getItem("csCode") || "";
115 119 this.dockkey = getURLParams("dockkey") || "";
116 120 if (this.code || this.dockkey) {
117   - this.loading = true
  121 + this.loading = true;
  122 + if (this.code == -1) {
  123 + this.$message({
  124 + showClose: true,
  125 + message: "账号异常请联系管理员!",
  126 + type: "error",
  127 + });
  128 + return;
  129 + }
118 130 this._LoginCheck();
119 131 }
120 132 },
... ...