Commit 575eb544d311904dd4cf6b3476f6f244df99ea06
1 parent
c4eb9615
账号异常提示,放开长水学校管理员设备导入以及添加设备
Showing
5 changed files
with
21 additions
and
9 deletions
src/assets/images/EasyQuiz.png
0 → 100644
36.6 KB
src/views/device/index.vue
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <template slot="title"> | 4 | <template slot="title"> |
5 | <span>设备管理</span> | 5 | <span>设备管理</span> |
6 | </template> | 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 | <el-tooltip effect="dark" content="设备导入" placement="bottom"> | 8 | <el-tooltip effect="dark" content="设备导入" placement="bottom"> |
9 | <el-button | 9 | <el-button |
10 | type="primary" | 10 | type="primary" |
@@ -16,7 +16,6 @@ | @@ -16,7 +16,6 @@ | ||
16 | ></el-button> | 16 | ></el-button> |
17 | </el-tooltip> | 17 | </el-tooltip> |
18 | <el-tooltip | 18 | <el-tooltip |
19 | - v-if="role == 'ROLE_XUEXIAO'" | ||
20 | effect="dark" | 19 | effect="dark" |
21 | content="添加基站" | 20 | content="添加基站" |
22 | placement="bottom" | 21 | placement="bottom" |
@@ -659,7 +658,8 @@ export default { | @@ -659,7 +658,8 @@ export default { | ||
659 | this.page = 1; | 658 | this.page = 1; |
660 | this._QueryData(); | 659 | this._QueryData(); |
661 | }, | 660 | }, |
662 | - edit(obj) {//修改设备 | 661 | + edit(obj) { |
662 | + //修改设备 | ||
663 | this.isAdd = false; | 663 | this.isAdd = false; |
664 | for (let key in this.form) { | 664 | for (let key in this.form) { |
665 | if (key == "classIds") { | 665 | if (key == "classIds") { |
src/views/down/client.vue
@@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
27 | > | 27 | > |
28 | </div> | 28 | </div> |
29 | </div> | 29 | </div> |
30 | - <ul class="down-ul"> | 30 | + <!-- <ul class="down-ul"> |
31 | <li class="down-li" v-for="item in tableData" :key="item.id"> | 31 | <li class="down-li" v-for="item in tableData" :key="item.id"> |
32 | <span class="p1 ellipsis" @click="setConfigForm(item)">{{ | 32 | <span class="p1 ellipsis" @click="setConfigForm(item)">{{ |
33 | item.configName | 33 | item.configName |
@@ -46,7 +46,7 @@ | @@ -46,7 +46,7 @@ | ||
46 | >参数设置</el-button | 46 | >参数设置</el-button |
47 | > | 47 | > |
48 | </li> | 48 | </li> |
49 | - </ul> | 49 | + </ul> --> |
50 | </div> | 50 | </div> |
51 | <div class="edit-dia" ref="editDia" v-show="dialogVis" height="100%"> | 51 | <div class="edit-dia" ref="editDia" v-show="dialogVis" height="100%"> |
52 | <div class="back"> | 52 | <div class="back"> |
src/views/layout/aside/aside.vue
@@ -62,7 +62,7 @@ | @@ -62,7 +62,7 @@ | ||
62 | import menuTree from "./menuTree"; | 62 | import menuTree from "./menuTree"; |
63 | import { getURLParams } from "@/utils"; | 63 | import { getURLParams } from "@/utils"; |
64 | import BusEvent from "@/utils/busEvent"; | 64 | import BusEvent from "@/utils/busEvent"; |
65 | -const logo = require("../../../assets/images/logo.png"); | 65 | +const logo = require("../../../assets/images/EasyQuiz.png"); |
66 | const csLogo = require("../../../assets/images/331logo.png"); | 66 | const csLogo = require("../../../assets/images/331logo.png"); |
67 | export default { | 67 | export default { |
68 | name: "asideNav", | 68 | name: "asideNav", |
src/views/login/index.vue
1 | // <template> | 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 | <el-form | 7 | <el-form |
4 | v-if="!code && !dockkey" | 8 | v-if="!code && !dockkey" |
5 | ref="loginForm" | 9 | ref="loginForm" |
@@ -89,7 +93,7 @@ import { getURLParams } from "@/utils"; | @@ -89,7 +93,7 @@ import { getURLParams } from "@/utils"; | ||
89 | export default { | 93 | export default { |
90 | data() { | 94 | data() { |
91 | return { | 95 | return { |
92 | - loading:false, | 96 | + loading: false, |
93 | disableClick: true, | 97 | disableClick: true, |
94 | passwordType: "password", | 98 | passwordType: "password", |
95 | loginForm: { | 99 | loginForm: { |
@@ -114,7 +118,15 @@ export default { | @@ -114,7 +118,15 @@ export default { | ||
114 | this.code = getURLParams("code") || localStorage.getItem("csCode") || ""; | 118 | this.code = getURLParams("code") || localStorage.getItem("csCode") || ""; |
115 | this.dockkey = getURLParams("dockkey") || ""; | 119 | this.dockkey = getURLParams("dockkey") || ""; |
116 | if (this.code || this.dockkey) { | 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 | this._LoginCheck(); | 130 | this._LoginCheck(); |
119 | } | 131 | } |
120 | }, | 132 | }, |