diff --git a/.env.development b/.env.development
index d1c8a3e7c..d38c11f03 100644
--- a/.env.development
+++ b/.env.development
@@ -1,12 +1,13 @@
NODE_ENV=development
-VUE_APP_API_SERVER = http://192.168.1.140/api
+# VUE_APP_API_SERVER = http://192.168.1.140/api
# VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn:41080/api
# VUE_APP_API_SERVER = https://epmet-dev.elinkservice.cn/api
+VUE_APP_API_SERVER = https://epmet-panshi.elinkservice.cn/api
# VUE_APP_NODE_ENV=dev_sdtdt
VUE_APP_NODE_ENV=dev
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 7ebb31e94..eb25c128e 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -45,6 +45,8 @@ export default new Vuex.Store({
fixed1920: {
height: document.documentElement.clientHeight,
},
+
+ fullscreen: false, //是否全屏状态
},
modules: {
user,
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 12346a8a6..aa2c272a3 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -1,86 +1,100 @@
-
diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index e1026e6fd..06839ba0e 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -1,30 +1,33 @@
-
-
+