From ec9be3ceae55f72c680d3f733b8bea66428a79a8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Apr 2025 16:04:31 +0800
Subject: [PATCH] =?UTF-8?q?usa=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 package.json                                  |  2 +-
 .../components/noticeMarquee.vue              | 62 +++++++++----------
 .../trials-layout/components/trialsNavbar.vue |  9 ++-
 vue.config.js                                 |  6 +-
 5 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/.env.development b/.env.development
index 15ae6a5..0c20f27 100644
--- a/.env.development
+++ b/.env.development
@@ -46,4 +46,4 @@ VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai'
 
 VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs'
 
-VUE_APP_OSS_PATH = '/test/dist'
+VUE_APP_OSS_PATH = /hir_test/dist
diff --git a/package.json b/package.json
index 37e03b9..951dd8d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "HICS",
   "version": "1.0.0",
   "scripts": {
-    "dev": "vue-cli-service serve --open",
+    "dev": "vue-cli-service serve --open --mode development",
     "build": "vue-cli-service build",
     "build:prod": "vue-cli-service  build --mode prod",
     "build:uat": "vue-cli-service  build --mode uat",
diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue
index 6ddc026..7ca5949 100644
--- a/src/views/trials/trials-layout/components/noticeMarquee.vue
+++ b/src/views/trials/trials-layout/components/noticeMarquee.vue
@@ -1,21 +1,9 @@
 <template>
   <div class="notice-marquee_wrapper">
-    <marquee
-      ref="mar"
-      hspace="0"
-      direction="left"
-      width="500"
-      @mouseout="start()"
-      @mouseover="stop()"
-    >
+    <marquee ref="mar" hspace="0" direction="left" :width="isEN ? '400' : '500'" @mouseout="start()" @mouseover="stop()">
       <!-- <i class="el-icon-message-solid" /> -->
       <svg-icon v-if="noticeList.length > 0" icon-class="speaker" />
-      <span
-        v-for="item in noticeList"
-        :key="item.Id"
-        style="cursor: pointer"
-        @click="showDetail(item)"
-      >
+      <span v-for="item in noticeList" :key="item.Id" style="cursor: pointer" @click="showDetail(item)">
         {{ item.Content }}
       </span>
     </marquee>
@@ -35,6 +23,9 @@ export default {
     noticeList() {
       return this.$store.state.global.noticeList || [];
     },
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    }
   },
   mounted() {
     this.getDicData();
@@ -62,29 +53,29 @@ export default {
           h("span", null, item.Content),
           item.Path
             ? h(
-                "div",
-                {
-                  style: {
-                    marginTop: "10px",
-                  },
+              "div",
+              {
+                style: {
+                  marginTop: "10px",
                 },
-                _this.$t("trials:notice:message:tipTitle")
-              )
+              },
+              _this.$t("trials:notice:message:tipTitle")
+            )
             : "",
           item.Path
             ? h(
-                "a",
-                {
-                  attrs: {
-                    href: _this.OSSclientConfig.basePath + item.Path,
-                    target: "_blank",
-                  },
-                  style: {
-                    color: "#428bca",
-                  },
+              "a",
+              {
+                attrs: {
+                  href: _this.OSSclientConfig.basePath + item.Path,
+                  target: "_blank",
                 },
-                item.FileName
-              )
+                style: {
+                  color: "#428bca",
+                },
+              },
+              item.FileName
+            )
             : "",
         ]),
         beforeClose: (action, instance, done) => {
@@ -119,13 +110,16 @@ export default {
 .notice-marquee_wrapper {
   display: flex;
   align-items: center;
+
   span {
     font-size: 20px;
   }
-  >>> .el-dialog__header {
+
+  >>>.el-dialog__header {
     padding: 10px;
   }
-  >>> .el-dialog__body {
+
+  >>>.el-dialog__body {
     padding: 10px 20px;
     line-height: 25px;
   }
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index df3d263..afd1baa 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -3,7 +3,7 @@
     <div class="leftMenu">
       <!-- <img v-if="language === 'zh' && hospital.HospitalLogoPath" -->
       <img v-if="hospital.HospitalLogoPath" :src="OSSclientConfig.basePath + hospital.HospitalLogoPath"
-        crossOrigin="anonymous" alt="" style="min-width: 170px;" />
+        crossOrigin="anonymous" alt="" style="min-width: 170px;" :class="{ img_en: isEN }" />
       <div v-else style="width: 170px;"></div>
       <!-- <img v-else src="@/assets/zzlogo3.png" alt="" /> -->
       <span style="white-space: nowrap">
@@ -126,6 +126,9 @@ export default {
     },
     isDev() {
       return process.env.VUE_APP_OSS_PATH === "/hir_test/dist"
+    },
+    isEN() {
+      return this.$i18n.locale !== 'zh'
     }
   },
   watch: {
@@ -309,6 +312,10 @@ export default {
       margin-right: 10px;
     }
 
+    .img_en {
+      height: 60px;
+    }
+
     span {
       font-size: 20px;
       position: relative;
diff --git a/vue.config.js b/vue.config.js
index ae75698..9b06683 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,7 @@ const name = defaultSettings.title || 'HIRS' // page title
 // eslint-disable-next-line no-undef
 module.exports = {
   transpileDependencies: ['minio'],
-  publicPath: process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`,
+  publicPath: process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'usa' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-uat' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`,
   outputDir: 'dist',
   assetsDir: 'static',
   productionSourceMap: false,
@@ -94,7 +94,7 @@ module.exports = {
           ignore: ['.*']
         }
       ]),
-      process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() {}
+      process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'usa' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-uat' ? function () { }
         : new WebpackAliyunOss({
           from: ['./dist/**'],
           dist: process.env.VUE_APP_OSS_PATH + distDate,
@@ -123,7 +123,7 @@ module.exports = {
       // 生成文件的最大体积
       maxAssetSize: 3000000000,
       // 只给出js的性能提示
-      assetFilter: function(assetFileName) {
+      assetFilter: function (assetFileName) {
         return assetFileName.endsWith('.js')
       }
     },