From d6a8de9744f60c5f09f18ffe349bbc1e4fc1405c Mon Sep 17 00:00:00 2001
From: whyczyk <525500596@qq.com>
Date: 星期三, 02 三月 2022 15:46:05 +0800
Subject: [PATCH] fix bug
---
src/store/index.js | 14 ++++++--------
src/assets/js/axios.js | 6 +++---
src/store/modules/app.js | 23 +++++++++++++++++++++++
src/pages/exhibition.vue | 8 ++++----
4 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/assets/js/axios.js b/src/assets/js/axios.js
index 97c8b82..f351fb7 100644
--- a/src/assets/js/axios.js
+++ b/src/assets/js/axios.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import axios from 'axios';
+import store from '@/store'
// import qs from 'qs';
-let newPlatform = sessionStorage.getItem('newPlatform')
if (process.env.NODE_ENV == 'dev') {
// 璺ㄥ煙璇锋眰
axios.defaults.baseURL = 'http://localhost:8090/screen';
@@ -14,13 +14,13 @@
axios.interceptors.request.use(function (config) {
if (config.asy) {
if (process.env.NODE_ENV == 'dev') {
- if (newPlatform == 1) {
+ if (store.state.app.newPlatform == 1) {
config.baseURL = 'http://localhost:8091/fg';
} else {
config.baseURL = 'http://localhost:8919/fg';
}
} else {
- if (newPlatform == 1) {
+ if (store.state.app.newPlatform == 1) {
config.baseURL = `http://${location.hostname}:8091/fg`;
} else {
config.baseURL = `http://${location.hostname}:8919/fg`;
diff --git a/src/pages/exhibition.vue b/src/pages/exhibition.vue
index 773ebf9..73218f7 100644
--- a/src/pages/exhibition.vue
+++ b/src/pages/exhibition.vue
@@ -3,7 +3,7 @@
<screen-title :title="nowlayOut.appName" :bgImg="screenTitleBg" v-if="isHeader"></screen-title>
<div class="pageWarp" ref="pageWarp">
<vue-draggable-resizable :w="item.w" :h="item.h" :x="item.x" :y="item.y" :parent="true" :debug="false" :snap="true" :snapTolerance="5" :draggable="false" :resizable="false" style="transition: none; will-change: transform;" v-for="(item,i) in nowlayOut.children" :key="i">
- <div @contextmenu.prevent.stop="openMenu(item,$event)" style="width:100%;height:100%;">
+ <div style="width:100%;height:100%;">
<layout-box :title="item.name">
<div style="width:100%;height:100%" :id="'layout-box'+item.id" :ref="'layout-box'+item.id" v-if="isNow"></div>
</layout-box>
@@ -49,14 +49,14 @@
if (this.$route.query.userId) {
localStorage.setItem('userId', this.$route.query.userId);
}
- if (this.$route.query.newPlatform) {
- sessionStorage.setItem('newPlatform', this.$route.query.newPlatform);
- }
this.nowlayOut.appName = this.$route.query.name;
if (this.$route.query.head && this.$route.query.head == 1) {
this.isHeader = false
}
this.$nextTick(() => {
+ if (this.$route.query.newPlatform) {
+ this.$store.dispatch('app/setNewPlatform', this.$route.query.newPlatform)
+ }
clientWidth = this.$refs.pageWarp.clientWidth;
clientHeight = this.$refs.pageWarp.clientHeight;
this.loadLayout();
diff --git a/src/store/index.js b/src/store/index.js
index 332b916..e4e289b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,15 +1,13 @@
import Vue from 'vue'
import Vuex from 'vuex'
+import app from './modules/app'
Vue.use(Vuex)
-export default new Vuex.Store({
- state: {
- },
- mutations: {
- },
- actions: {
- },
+const store = new Vuex.Store({
modules: {
- }
+ app,
+ },
})
+
+export default store
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
new file mode 100644
index 0000000..de60711
--- /dev/null
+++ b/src/store/modules/app.js
@@ -0,0 +1,23 @@
+const state = {
+ newPlatform: sessionStorage.getItem('newPlatform') || 0
+}
+
+const mutations = {
+ setNewPlatform: (state, newPlatform) => {
+ sessionStorage.setItem('newPlatform', newPlatform)
+ state.newPlatform = Number(newPlatform)
+ }
+}
+
+const actions = {
+ setNewPlatform({ commit }, device) {
+ commit('setNewPlatform', device)
+ }
+}
+
+export default {
+ namespaced: true,
+ state,
+ mutations,
+ actions
+}
--
Gitblit v1.9.1