提交代码

.env

@@ -1,5 +1,5 @@
 # 标题
-VITE_APP_TITLE=医学影像系统
+VITE_APP_TITLE=区域云心电系统
 
 # 项目本地运行端口号
 VITE_PORT=8080

.env.dev

@@ -3,8 +3,8 @@ NODE_ENV=production
 
 VITE_DEV=false
 
-# 请求路径
+# 请求路径 http://10.55.253.199:8073
-VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='/adminecg'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
@@ -24,7 +24,7 @@ VITE_DROP_CONSOLE=false
 VITE_SOURCEMAP=true
 
 # 打包路径
-VITE_BASE_PATH=/
+VITE_BASE_PATH=/ecg
 
 # 输出路径
 VITE_OUT_DIR=dist
@@ -33,4 +33,4 @@ VITE_OUT_DIR=dist
 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
 
 # 验证码的开关
-VITE_APP_CAPTCHA_ENABLE=false
+VITE_APP_CAPTCHA_ENABLE=true

src/views/Login/Login.vue

@@ -29,21 +29,11 @@
       <!--   </div> -->
 
       <div class="my-container">
-<<<<<<< HEAD
         <div class="my-top">
           <img class="top-image" src="@/assets/imgs/FLY.png" />
           <div class="text-container">
             <span style="font-size: 4.32vh">{{headTitle}}</span>
             <span style="font-size: 1.64vh">Regional Cloud-based Electrocardiogram (ECG) System</span>
-=======
-        <div class="my-top" :style="!(showLogo == 'true') ? { height: '7%' } : {}">
-          <img class="top-image" src="@/assets/imgs/FLY.png" v-if="showLogo == 'true'" />
-          <div class="text-container" :style="!(showLogo == 'true') ? { marginLeft: '8.9vw' } : {}">
-            <span style="font-size: 4.32vh">{{ headTitle }}</span>
-            <span style="font-size: 1.64vh" v-if="showLogo == 'true'">
-              The Medical Community Medical Imaging Systems
-            </span>
->>>>>>> ba061bfb9b242894492edcfff8b13d52060c671c
           </div>
         </div>
         <div class="my-middle" :style="!(showLogo == 'true') ? { height: '92.98%' } : {}">