Merge branch 'uat_us'

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"

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) {