master
许宏杰 1 year ago
parent 3c93ebade2
commit 228d70232e

@ -6,3 +6,7 @@ ENV = 'production'
# 扫码连网/生产环境 # 扫码连网/生产环境
VUE_APP_BASE_API = 'https://www.jichuanglanhai.com:9038' VUE_APP_BASE_API = 'https://www.jichuanglanhai.com:9038'
#服务器环境退出登录问题
VUE_APP_LOGIN_OUT="/demo/netEwm"

@ -96,8 +96,16 @@ export default {
this.$modal.msgError("视频大小不能超过50MB"); this.$modal.msgError("视频大小不能超过50MB");
return false; return false;
} }
if (this.isContainChinese(file.name)) {
this.$modal.msgError("视频文件名不能包含中文字符");
return false;
}
this.isShowUploadVideo = false; this.isShowUploadVideo = false;
}, },
isContainChinese(str) {
const reg = /[^\x00-\xff]/;
return reg.test(str);
},
// //
uploadVideoProcess(event, file, fileList) { uploadVideoProcess(event, file, fileList) {
//data //data

@ -98,6 +98,7 @@ export default {
}, },
}, },
}, },
methods: { methods: {
toggleSideBar() { toggleSideBar() {
this.$store.dispatch("app/toggleSideBar"); this.$store.dispatch("app/toggleSideBar");
@ -110,8 +111,11 @@ export default {
}) })
.then(() => { .then(() => {
this.$store.dispatch("LogOut").then(() => { this.$store.dispatch("LogOut").then(() => {
// location.href = "/index"; if (process.env.NODE_ENV == "production") {
this.$router.replace("/login"); location.href = process.env.VUE_APP_LOGIN_OUT + "/login";
} else {
location.href = "/login";
}
}); });
}) })
.catch(() => {}); .catch(() => {});

@ -5,6 +5,9 @@ const state = {
}; };
const mutations = { const mutations = {
CLOSE_LIST: (state, list) => {
state.visitedViews = list;
},
ADD_IFRAME_VIEW: (state, view) => { ADD_IFRAME_VIEW: (state, view) => {
if (state.iframeViews.some((v) => v.path === view.path)) return; if (state.iframeViews.some((v) => v.path === view.path)) return;
state.iframeViews.push( state.iframeViews.push(

@ -120,8 +120,11 @@ service.interceptors.response.use(
.then(() => { .then(() => {
isRelogin.show = false; isRelogin.show = false;
store.dispatch("LogOut").then(() => { store.dispatch("LogOut").then(() => {
// location.href = "/index"; if (process.env.NODE_ENV == "production") {
router.replace("/login"); location.href = process.env.VUE_APP_LOGIN_OUT + "/login";
} else {
location.href = "/login";
}
}); });
}) })
.catch(() => { .catch(() => {

@ -161,6 +161,7 @@
> >
<div ref="downloadElement" style="padding: 20px 10px"> <div ref="downloadElement" style="padding: 20px 10px">
<img :src="code.imgs" alt="" class="codeImg" /> <img :src="code.imgs" alt="" class="codeImg" />
<div class="netName">店铺名称{{ code.posName }}</div>
<div class="netName">WI-FI名称{{ code.wifiName }}</div> <div class="netName">WI-FI名称{{ code.wifiName }}</div>
</div> </div>
@ -248,7 +249,9 @@ export default {
}; };
getCode(data).then((res) => { getCode(data).then((res) => {
this.code.imgs = "data:image/png;base64," + res.data; this.code.imgs = "data:image/png;base64," + res.data;
this.code.wifiName = row.wifiName; this.code.wifiName = row.wifiName;
this.code.posName = row.posName;
this.wifiopen = true; this.wifiopen = true;
}); });
}, },
@ -372,7 +375,7 @@ export default {
height: 350px; height: 350px;
} }
.netName { .netName {
margin-top: 6px; margin-top: 10px;
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;

Loading…
Cancel
Save