From 3ea790ec7b0280a55cc406d2c3dc9fa5411a7471 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 20 Jan 2022 17:32:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/map/components/campusBuildingSearch.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index ee1ebdf..6c2dc17 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -233,8 +233,6 @@
var result = param.list
var imgArr = result.tpurl.split(',')
- var tabOne = param.jx.split(',')
- var tabTwo = param.sh.split(',')
this.$store.commit('SET_POPUPBGURL', imgArr[0])
this.$store.commit('SET_POPUPQRURL', result.codeurl)
@@ -250,13 +248,15 @@
this.$store.commit('SET_MONITORURL', result.videourl)
}
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
- if (param.jx != '') {
+ if (param.jx != undefined && param.jx != '') {
+ var tabOne = param.jx.split(',')
this.$store.commit('SET_TEACHLIST', tabOne)
} else {
this.$store.commit('SET_TEACHLIST', [])
}
- if (param.sh != '') {
+ if (param.sh != undefined && param.sh != '') {
+ var tabTwo = param.sh.split(',')
this.$store.commit('SET_LIVELIST', tabTwo)
} else {
this.$store.commit('SET_LIVELIST', [])
@@ -393,7 +393,7 @@
display: flex;
width: 100%;
height: 120px;
- justify-content: start;
+ justify-content: flex-start;
flex-wrap: wrap;
li {
--
Gitblit v1.9.3