Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
This commit is contained in:
commit
7fdedec00f
@ -32,8 +32,16 @@ export default {
|
|||||||
this.centerDialogVisible = false;
|
this.centerDialogVisible = false;
|
||||||
},
|
},
|
||||||
async comit() {
|
async comit() {
|
||||||
await getPermissionJoint(`${this.input}`);
|
if (this.input) {
|
||||||
this.centerDialogVisible = false;
|
try {
|
||||||
|
await getPermissionJoint(`${this.input}`);
|
||||||
|
this.centerDialogVisible = false;
|
||||||
|
} catch (error) {
|
||||||
|
this.$messageBox('扫码错误:' + error.message);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.$messageBox('请输入房间号');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<el-card v-loading="loading" class="map-list-main">
|
<el-card v-loading="loading" class="map-list-main">
|
||||||
<div slot="header" class="clearfix">
|
<div slot="header" class="clearfix">
|
||||||
<span>地图列表</span>
|
<span>地图列表</span>
|
||||||
<div v-if="role" class="back-home" @click="backHome">返回首页</div>
|
<!-- <div v-if="role" class="back-home" @click="backHome">返回首页</div> -->
|
||||||
</div>
|
</div>
|
||||||
<filter-city ref="filerCity" filter-empty :query-function="queryFunction" @filterSelectChange="refresh" @changeFilter="clearMapSelect" />
|
<filter-city ref="filerCity" filter-empty :query-function="queryFunction" @filterSelectChange="refresh" @changeFilter="clearMapSelect" />
|
||||||
<el-input v-model="filterText" placeholder="输入关键字进行过滤" clearable />
|
<el-input v-model="filterText" placeholder="输入关键字进行过滤" clearable />
|
||||||
@ -80,9 +80,9 @@ export default {
|
|||||||
this.clearMapSelect();
|
this.clearMapSelect();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
backHome() {
|
// backHome() {
|
||||||
this.$router.push({ path: `/` });
|
// this.$router.push({ path: `/` });
|
||||||
},
|
// },
|
||||||
filterNode(value, data) {
|
filterNode(value, data) {
|
||||||
if (!value) return true;
|
if (!value) return true;
|
||||||
return data.name.indexOf(value) !== -1;
|
return data.name.indexOf(value) !== -1;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<el-card v-loading="loading" class="map-list-main">
|
<el-card v-loading="loading" class="map-list-main">
|
||||||
<div slot="header" class="clearfix">
|
<div slot="header" class="clearfix">
|
||||||
<span>试题列表</span>
|
<span>试题列表</span>
|
||||||
<div v-if="role" class="back-home" @click="backHome">返回首页</div>
|
<!-- <div v-if="role" class="back-home" @click="backHome">返回首页</div> -->
|
||||||
</div>
|
</div>
|
||||||
<filter-city
|
<filter-city
|
||||||
ref="filerCity"
|
ref="filerCity"
|
||||||
@ -97,9 +97,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
backHome() {
|
// backHome() {
|
||||||
this.$router.push({ path: `/` });
|
// this.$router.push({ path: `/` });
|
||||||
},
|
// },
|
||||||
filterNode(value, data) {
|
filterNode(value, data) {
|
||||||
if (!value) return true;
|
if (!value) return true;
|
||||||
return data.name.indexOf(value) !== -1;
|
return data.name.indexOf(value) !== -1;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<el-card v-loading="loading" class="map-list-main">
|
<el-card v-loading="loading" class="map-list-main">
|
||||||
<div slot="header" class="clearfix">
|
<div slot="header" class="clearfix">
|
||||||
<span>课程列表</span>
|
<span>课程列表</span>
|
||||||
<div v-if="role" class="back-home" @click="backHome">返回首页</div>
|
<!-- <div v-if="role" class="back-home" @click="backHome">返回首页</div> -->
|
||||||
</div>
|
</div>
|
||||||
<filter-city
|
<filter-city
|
||||||
ref="filerCity"
|
ref="filerCity"
|
||||||
@ -108,9 +108,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
backHome() {
|
// backHome() {
|
||||||
this.$router.push({ path: `/` });
|
// this.$router.push({ path: `/` });
|
||||||
},
|
// },
|
||||||
filterNode(value, data) {
|
filterNode(value, data) {
|
||||||
if (!value) return true;
|
if (!value) return true;
|
||||||
return data.name.indexOf(value) !== -1;
|
return data.name.indexOf(value) !== -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user