diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index e3b9c255..3fa4aa2f 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/src/permission.js b/src/permission.js
index 7fd32ff6..1a279d80 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -16,6 +16,7 @@ const indexArr = ["/index", "/"]
router.beforeEach((to, from, next) => {
NProgress.start()
if (getToken()) {
+
to.meta.title && useSettingsStore().setTitle(to.meta.title)
/* has token*/
if (to.path === '/login') {
diff --git a/src/views/constructionScheduling/progress-monitoring/index.vue b/src/views/constructionScheduling/progress-monitoring/index.vue
index 417e8ab6..5a6eaef4 100644
--- a/src/views/constructionScheduling/progress-monitoring/index.vue
+++ b/src/views/constructionScheduling/progress-monitoring/index.vue
@@ -131,6 +131,7 @@ function getList(params) {
// max-height: calc(100% - 150px);
overflow: auto;
/* 子元素超出宽度时换行 */
+
}
.app-container {
diff --git a/src/views/large-screen/index.vue b/src/views/large-screen/index.vue
index fb551af7..ba736209 100644
--- a/src/views/large-screen/index.vue
+++ b/src/views/large-screen/index.vue
@@ -33,7 +33,7 @@
总工期
- {{ parseFloat(state.gk.gcjd).toFixed(0)
+ {{ state.gk.gcjd=='NaN'?0:parseFloat(state.gk.gcjd).toFixed(0)
}}%
工程进度
diff --git a/vite.config.js b/vite.config.js
index 40e0d179..78f926c3 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -43,9 +43,9 @@ export default defineConfig(({ mode, command }) => {
},
proxy: {
'/dev-api': {
- target: 'http://192.168.2.39:8581',
+ // target: 'http://192.168.2.39:8581',
// target: 'http://192.168.2.223:8080',
- // target: 'http://39.100.74.100:8581',
+ target: 'http://39.100.74.100:8581',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
}