Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/sy_mapcopy.vue

@@ -1737,15 +1737,21 @@ const open_detail = () => {
   let age = "";
   if (choose.value.person == "9999") {
     age = "";
+    person_detail(age);
+    dialogShow.value = true;
   } else if (choose.value.person == "6666") {
     age = "";
   } else if (choose.value.person == 1) {
     age = "0";
-  } else {
-    age = choose.value.person - 1;
-  }
     person_detail(age);
     dialogShow.value = true;
+  } else {
+    age = choose.value.person - 1;
+    person_detail(age);
+    dialogShow.value = true;
+  }
+  
+  
 };
 const close = () => {
   dialogShow.value = false;

vite.config.js

@@ -15,8 +15,8 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        target: "http://10.0.0.65:8095/", //刘进
-        // target: "http://220.191.238.50:996/", //线上
+        // target: "http://10.0.0.65:8095/", //刘进
+        target: "http://220.191.238.50:996/", //线上
         changeOrigin: true, //是否支持跨域
         //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
       },