diff --git a/src/main.js b/src/main.js
index 0b9f7f8..24432a7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -108,8 +108,6 @@
 
 // 错误打印
 app.config.errorHandler = (err, instance, info) => {
-    // 处理错误，例如：报告给一个服务
-    console.log('全局异常--', err, instance, info);
 };
 
 directive(app);

diff --git a/src/main.js b/src/main.js
index 0b9f7f8..24432a7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -108,8 +108,6 @@
 
 // 错误打印
 app.config.errorHandler = (err, instance, info) => {
-    // 处理错误，例如：报告给一个服务
-    console.log('全局异常--', err, instance, info);
 };
 
 directive(app);
diff --git a/src/permission.js b/src/permission.js
index fe31b57..3cf19ac 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -60,10 +60,13 @@
             // 在免登录白名单，直接进入
             next();
         } else {
-            location.href = 'http://192.168.1.39:8132/door';
-            // next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
-            next(); // 否则全部重定向到登录页
-            NProgress.done();
+            if (process.env.NODE_ENV == 'development') {
+                router.push('/login')
+              } else {
+                 location.href = 'http://192.168.1.39:8132/door';
+              }
+              next(); // 否则全部重定向到登录页
+              NProgress.done();
         }
     }
 });

diff --git a/src/main.js b/src/main.js
index 0b9f7f8..24432a7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -108,8 +108,6 @@
 
 // 错误打印
 app.config.errorHandler = (err, instance, info) => {
-    // 处理错误，例如：报告给一个服务
-    console.log('全局异常--', err, instance, info);
 };
 
 directive(app);
diff --git a/src/permission.js b/src/permission.js
index fe31b57..3cf19ac 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -60,10 +60,13 @@
             // 在免登录白名单，直接进入
             next();
         } else {
-            location.href = 'http://192.168.1.39:8132/door';
-            // next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
-            next(); // 否则全部重定向到登录页
-            NProgress.done();
+            if (process.env.NODE_ENV == 'development') {
+                router.push('/login')
+              } else {
+                 location.href = 'http://192.168.1.39:8132/door';
+              }
+              next(); // 否则全部重定向到登录页
+              NProgress.done();
         }
     }
 });
diff --git a/src/views/AlertService/components/abilityAnalysis.vue b/src/views/AlertService/components/abilityAnalysis.vue
index a0244e1..5d0658f 100644
--- a/src/views/AlertService/components/abilityAnalysis.vue
+++ b/src/views/AlertService/components/abilityAnalysis.vue
@@ -251,7 +251,7 @@
             form.value.warnFormula += warnFactor?.[i] + ruleId?.[i] + zhiVlue?.[i] + pdinfo?.[i];
           });
         }
-        form.value.warnFormula = data.warnFormula.substring(0, data.warnFormula.length - 2);
+        form.value.warnFormula = data.warnFormula.replace(/undefined/,'')
         form.value.pcParseAssist = { pdinfo: data.pdinfo, ruleId: data.ruleId, zhiVlue: data.zhiVlue };
         delete form.value.pdinfo;
         delete form.value.ruleId;
@@ -335,7 +335,7 @@
     let data = array.split(',');
     filterTableData.value = data;
     data.forEach((i, index) => {
-      form.value.warnFactor[`D${index}`] = i;
+       form.value.warnFactor[`D${index}`] = i;
     });
     let json = infoList.pcParseAssist;
     if (json !== 'null') {

diff --git a/src/main.js b/src/main.js
index 0b9f7f8..24432a7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -108,8 +108,6 @@
 
 // 错误打印
 app.config.errorHandler = (err, instance, info) => {
-    // 处理错误，例如：报告给一个服务
-    console.log('全局异常--', err, instance, info);
 };
 
 directive(app);
diff --git a/src/permission.js b/src/permission.js
index fe31b57..3cf19ac 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -60,10 +60,13 @@
             // 在免登录白名单，直接进入
             next();
         } else {
-            location.href = 'http://192.168.1.39:8132/door';
-            // next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
-            next(); // 否则全部重定向到登录页
-            NProgress.done();
+            if (process.env.NODE_ENV == 'development') {
+                router.push('/login')
+              } else {
+                 location.href = 'http://192.168.1.39:8132/door';
+              }
+              next(); // 否则全部重定向到登录页
+              NProgress.done();
         }
     }
 });
diff --git a/src/views/AlertService/components/abilityAnalysis.vue b/src/views/AlertService/components/abilityAnalysis.vue
index a0244e1..5d0658f 100644
--- a/src/views/AlertService/components/abilityAnalysis.vue
+++ b/src/views/AlertService/components/abilityAnalysis.vue
@@ -251,7 +251,7 @@
             form.value.warnFormula += warnFactor?.[i] + ruleId?.[i] + zhiVlue?.[i] + pdinfo?.[i];
           });
         }
-        form.value.warnFormula = data.warnFormula.substring(0, data.warnFormula.length - 2);
+        form.value.warnFormula = data.warnFormula.replace(/undefined/,'')
         form.value.pcParseAssist = { pdinfo: data.pdinfo, ruleId: data.ruleId, zhiVlue: data.zhiVlue };
         delete form.value.pdinfo;
         delete form.value.ruleId;
@@ -335,7 +335,7 @@
     let data = array.split(',');
     filterTableData.value = data;
     data.forEach((i, index) => {
-      form.value.warnFactor[`D${index}`] = i;
+       form.value.warnFactor[`D${index}`] = i;
     });
     let json = infoList.pcParseAssist;
     if (json !== 'null') {
diff --git a/src/views/dataAnalysis/syntheticData/index.vue b/src/views/dataAnalysis/syntheticData/index.vue
index 5b9ce68..16b4e44 100644
--- a/src/views/dataAnalysis/syntheticData/index.vue
+++ b/src/views/dataAnalysis/syntheticData/index.vue
@@ -81,7 +81,7 @@
     name: '典型项目',
     value: '(4水质、4水位自建 市局20处共享)',
     imgUrl: 'river_icon.png',
-    key: 'monitorTargetType',
+    key: 'river',
   },
   {
     name: '典型片区',

diff --git a/src/main.js b/src/main.js
index 0b9f7f8..24432a7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -108,8 +108,6 @@
 
 // 错误打印
 app.config.errorHandler = (err, instance, info) => {
-    // 处理错误，例如：报告给一个服务
-    console.log('全局异常--', err, instance, info);
 };
 
 directive(app);
diff --git a/src/permission.js b/src/permission.js
index fe31b57..3cf19ac 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -60,10 +60,13 @@
             // 在免登录白名单，直接进入
             next();
         } else {
-            location.href = 'http://192.168.1.39:8132/door';
-            // next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
-            next(); // 否则全部重定向到登录页
-            NProgress.done();
+            if (process.env.NODE_ENV == 'development') {
+                router.push('/login')
+              } else {
+                 location.href = 'http://192.168.1.39:8132/door';
+              }
+              next(); // 否则全部重定向到登录页
+              NProgress.done();
         }
     }
 });
diff --git a/src/views/AlertService/components/abilityAnalysis.vue b/src/views/AlertService/components/abilityAnalysis.vue
index a0244e1..5d0658f 100644
--- a/src/views/AlertService/components/abilityAnalysis.vue
+++ b/src/views/AlertService/components/abilityAnalysis.vue
@@ -251,7 +251,7 @@
             form.value.warnFormula += warnFactor?.[i] + ruleId?.[i] + zhiVlue?.[i] + pdinfo?.[i];
           });
         }
-        form.value.warnFormula = data.warnFormula.substring(0, data.warnFormula.length - 2);
+        form.value.warnFormula = data.warnFormula.replace(/undefined/,'')
         form.value.pcParseAssist = { pdinfo: data.pdinfo, ruleId: data.ruleId, zhiVlue: data.zhiVlue };
         delete form.value.pdinfo;
         delete form.value.ruleId;
@@ -335,7 +335,7 @@
     let data = array.split(',');
     filterTableData.value = data;
     data.forEach((i, index) => {
-      form.value.warnFactor[`D${index}`] = i;
+       form.value.warnFactor[`D${index}`] = i;
     });
     let json = infoList.pcParseAssist;
     if (json !== 'null') {
diff --git a/src/views/dataAnalysis/syntheticData/index.vue b/src/views/dataAnalysis/syntheticData/index.vue
index 5b9ce68..16b4e44 100644
--- a/src/views/dataAnalysis/syntheticData/index.vue
+++ b/src/views/dataAnalysis/syntheticData/index.vue
@@ -81,7 +81,7 @@
     name: '典型项目',
     value: '(4水质、4水位自建 市局20处共享)',
     imgUrl: 'river_icon.png',
-    key: 'monitorTargetType',
+    key: 'river',
   },
   {
     name: '典型片区',
diff --git a/vite.config.js b/vite.config.js
index 6b4d502..53e79a1 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -37,34 +37,34 @@
       open: true,
       proxy: {
         '/dev-api': {
-          target: 'http://192.168.30.94:8100', //研发服务器网关
-          //target: 'https://server1.wh-nf.cn:8132/prod-api', //研发服务器网关
+          // target: 'http://192.168.30.94:8100', //研发服务器网关
+          target: 'https://server1.wh-nf.cn:8132/prod-api', //研发服务器网关
           changeOrigin: true,
           rewrite: p => p.replace(/^\/dev-api/, ''),
         },
         '/schedule': {
-          target: 'http://192.168.30.94:8100', //研发服务器网关
-          //target: 'https://server1.wh-nf.cn:8132/prod-api', //研发服务器网关
+          // target: 'http://192.168.30.94:8100', //研发服务器网关
+          target: 'https://server1.wh-nf.cn:8132/prod-api', //研发服务器网关
           changeOrigin: true,
           rewrite: p => p.replace(/^\/schedule/, '/schedule'),
         },
         '/system': {
-          target: 'http://192.168.30.94:8100', //研发服务器网关
+          // target: 'http://192.168.30.94:8100', //研发服务器网关
           //target: "http://192.168.16.136:8101", //卢凡
           //target: "http://192.168.20.157:8101", //倪文峰
-          //target: 'https://server1.wh-nf.cn:8132/prod-api', //测试环境
+          target: 'https://server1.wh-nf.cn:8132/prod-api', //测试环境
           changeOrigin: true,
           rewrite: p => p.replace(/^\/system/, '/system'),
         },
         '/code': {
-          target: 'http://192.168.30.94:8100', //研发服务器网关
-          //target: 'https://server1.wh-nf.cn:8132/prod-api', //测试环境
+          // target: 'http://192.168.30.94:8100', //研发服务器网关
+          target: 'https://server1.wh-nf.cn:8132/prod-api', //测试环境
           changeOrigin: true,
           rewrite: p => p.replace(/^\/code/, '/code'),
         },
         '/auth': {
-          target: 'http://192.168.30.94:8100', //研发服务器网关
-          //target: 'https://server1.wh-nf.cn:8132/prod-api', //测试环境
+          // target: 'http://192.168.30.94:8100', //研发服务器网关
+          target: 'https://server1.wh-nf.cn:8132/prod-api', //测试环境
           changeOrigin: true,
           rewrite: p => p.replace(/^\/auth/, '/auth'),
         },
@@ -75,16 +75,16 @@
         },
 
         '/business': {
-          target: 'http://192.168.30.94:8100', //研发服务器网关
+          // target: 'http://192.168.30.94:8100', //研发服务器网关
           //target: 'http://192.168.16.136:8102', //卢凡
           //target: 'http://192.168.20.138:8102', //魏鹏
-          // target: 'https://server1.wh-nf.cn:8132/prod-api', //测试服务
+          target: 'https://server1.wh-nf.cn:8132/prod-api', //测试服务
           changeOrigin: true,
           rewrite: p => p.replace(/^\/business/, '/business'),
         },
         '/datafilter-api': {
-          target: 'http://192.168.30.94:8080', //研发服务器网关
-          //target: 'https://server1.wh-nf.cn:8132/prod-api', //测试服务
+          // target: 'http://192.168.30.94:8080', //研发服务器网关
+          target: 'https://server1.wh-nf.cn:8132/prod-api', //测试服务
           changeOrigin: true,
           rewrite: p => p.replace(/^\/datafilter-api/, '/datafilter-api'),
         },
@@ -95,9 +95,10 @@
           rewrite: path => path.replace(/^\/RongYunsAPI/, ''),
         },
         "/prod-api": {
-          target: "http://192.168.16.94:8100", //熊凯---走网关
+          // target: "http://192.168.16.94:8100", //熊凯---走网关
           // target: "http://192.168.16.180:8102", //熊凯---走网关
           // target: "http://192.168.16.124:8081",
+          target: 'https://server1.wh-nf.cn:8132/prod-api', //测试服务
 
           changeOrigin: true,
           logLevel: "debug",