From 67ceadcc9c780808ec804fbd2a9e9ebf658820e8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 15 Jul 2024 13:48:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AEip=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/login-log/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index 9d96ecb7..4ce9fb43 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -85,13 +85,13 @@
           sortable="custom"
           show-overflow-tooltip
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('trials:loginLog:table:IPRegion')"
           prop="IPRegion"
           min-width="120"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"

From 978aacf0859f168fead340590b3cb334289cea7f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 17 Jul 2024 11:16:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9D=9Edicom=E9=98=85=E7=89=87=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa                                                   | 2 +-
 .env.usa_prod                                              | 2 +-
 .../trials/trials-panel/reading/none-dicoms/index.vue      | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.env.usa b/.env.usa
index 06df05fe..99a61943 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-12/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-17/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
diff --git a/.env.usa_prod b/.env.usa_prod
index 5a6ac5da..47554665 100644
--- a/.env.usa_prod
+++ b/.env.usa_prod
@@ -2,7 +2,7 @@
 ENV = 'usa'
 NODE_ENV = 'usa'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-11/'
+VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-17/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/index.vue b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
index e3844b6a..442dc086 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
@@ -59,7 +59,7 @@
       :show-close="false"
     >
       <span slot="title" class="dialog-footer">
-        当前阅片任务存在临床数据，请查看。若已查看，请点击“确认”
+        {{ $t('trials:reading:noneDicom:tip:hasCllinicalData') }}
       </span>
       <div :style="{'height':dialogH,'margin':0}">
         <ClinicalData
@@ -70,7 +70,7 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handleConfirmCD">确认</el-button>
+        <el-button type="primary" @click="handleConfirmCD">{{$t("common:button:confirm")}}</el-button>
       </span>
     </el-dialog>
 
@@ -136,7 +136,8 @@ export default {
     this.readingTool = this.$router.currentRoute.query.readingTool
     this.isNewSubject = this.$router.currentRoute.query.isNewSubject
     if (this.isNewSubject && this.isReadingTaskViewInOrder) {
-      this.$message.success(`已开始受试者${this.subjectCode}阅片任务`)
+      let message = this.$t('trials:reading:noneDicom:message:startRead').replace("xxx",this.subjectCode);
+      this.$message.success(message)
       changeURLStatic('isNewSubject', '')
     }
     if (this.$router.currentRoute.query.TokenKey) {