提交merge1.3

openhis-ui-vue3/vite.config.js

@@ -1,7 +1,7 @@
 /*
  * @Author: sjjh
  * @Date: 2025-04-09 09:33:35
- * @Description: 
+ * @Description:
  */
 import { defineConfig, loadEnv } from 'vite';
 import path from 'path';
@@ -19,7 +19,11 @@ export default defineConfig(({ mode, command }) => {
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
     // 例如 https://www.openHIS.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.openhis.vip/admin/，则设置 baseUrl 为 /admin/。
+<<<<<<< HEAD
     base: VITE_APP_ENV === 'prod' ? '/' : '/',
+=======
+    base: VITE_APP_ENV === 'production' ? '/' : '/',
+>>>>>>> v1.3
     plugins: createVitePlugins(env, command === 'build'),
     resolve: {
       // https://cn.vitejs.dev/config/#resolve-alias
@@ -40,13 +44,20 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
+<<<<<<< HEAD
          target: 'http://localhost:18080/openhis',
           changeOrigin: true,
           rewrite: p => p.replace(/^\/dev-api/, ''),
+=======
+          target: 'http://localhost:18080/openhis',
+          changeOrigin: true,
+          rewrite: (p) => p.replace(/^\/dev-api/, ''),
+>>>>>>> v1.3
         },
         '/ybplugin': {
           target: 'http://localhost:5000',
           changeOrigin: true,
+<<<<<<< HEAD
           rewrite: p => p.replace(/^\/ybplugin/, ''),
         },
         '/prd-api': {
@@ -59,6 +70,10 @@ export default defineConfig(({ mode, command }) => {
           changeOrigin: true,
           rewrite: p => p.replace(/^\/test-api/, ''),
         }
+=======
+          rewrite: (p) => p.replace(/^\/ybplugin/, ''),
+        },
+>>>>>>> v1.3
       },
     },
     //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
@@ -68,7 +83,7 @@ export default defineConfig(({ mode, command }) => {
           {
             postcssPlugin: 'internal:charset-removal',
             AtRule: {
-              charset: atRule => {
+              charset: (atRule) => {
                 if (atRule.name === 'charset') {
                   atRule.remove();
                 }