From 5d5370de888be338ed128bf44d42b6860d93c002 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 31 Mar 2025 11:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/views/login/index.vue                     | 35 ++++++++++---------
 .../components/add-trials-list.vue            |  5 ++-
 .../components/confirm-visit-list.vue         |  6 ++--
 .../components/trials-select.vue              |  2 +-
 src/views/trials/trials-inspection/index.vue  |  4 +--
 .../trials-layout/components/trialsNavbar.vue |  3 +-
 src/views/trials/trials-list/index.vue        | 14 ++++----
 .../hirVisit/components/edit-study-list.vue   |  6 ++--
 .../trial-summary/download-record/index.vue   |  6 ++--
 .../trial-summary/trial-information/index.vue |  2 +-
 11 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index 504621a..37e03b9 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "moment": "^2.27.0",
     "node-polyfill-webpack-plugin": "^2.0.1",
     "node-sass": "^4.14.1",
-    "normalize.css": "7.0.0",
+    "normalize.css": "^8.0.1",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
     "pdfobject": "^2.2.8",
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7c3abda..7770a50 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -6,8 +6,9 @@
     <div class="login-body">
       <div class="login-l">
         <div class="login-logo">
-          <img v-if="language === 'zh' && hospital.HospitalLogoPath"
-            :src="OSSclientConfig.basePath + hospital.HospitalLogoPath" crossOrigin="anonymous" alt="" />
+          <!-- <img v-if="language === 'zh' && hospital.HospitalLogoPath"  -->
+          <img v-if="hospital.HospitalLogoPath" :src="OSSclientConfig.basePath + hospital.HospitalLogoPath"
+            crossOrigin="anonymous" alt="" />
           <!-- <img v-else src="@/assets/zzlogo3.png" alt="" /> -->
         </div>
         <div class="login-image">
@@ -88,7 +89,7 @@
       <span> | </span>
       <span>{{ $t('login:copyright:title:support') }}{{ config.company }}</span>
     </div>
-    <div v-else>
+    <div v-else class="login-footer">
       <span>{{ $t('login:copyright:title:construct')
       }}{{ hospital.HospitalName }}</span>
       <span> | </span>
@@ -189,20 +190,20 @@ export default {
     this.location = this.$route.query.location
     zzSessionStorage.setItem('loginType', this.loginType)
     localStorage.setItem('location', this.location)
-    // if (process.env.VUE_APP_OSS_CONFIG_REGION === "oss-us-west-1") {
-    //   this.$i18n.locale = "en";
-    //   this.setLanguage("en");
-    //   this.$updateDictionary();
-    // } else {
-    //   if (this.location === "USA") {
-    //     this.$i18n.locale = "en";
-    //     this.setLanguage("en");
-    //     this.$updateDictionary();
-    //   } else {
-    this.$i18n.locale = 'zh'
-    this.setLanguage('zh')
-    this.$updateDictionary()
-    // }
+    if (process.env.NODE_ENV === "usa") {
+      this.$i18n.locale = "en";
+      this.setLanguage("en");
+      this.$updateDictionary();
+    } else {
+      //   if (this.location === "USA") {
+      //     this.$i18n.locale = "en";
+      //     this.setLanguage("en");
+      //     this.$updateDictionary();
+      //   } else {
+      this.$i18n.locale = 'zh'
+      this.setLanguage('zh')
+      this.$updateDictionary()
+    }
     // }
     if (this.$route.query.token) {
       this.TJUserLoginInfo(this.$route.query.token)
diff --git a/src/views/trials/trials-inspection/components/add-trials-list.vue b/src/views/trials/trials-inspection/components/add-trials-list.vue
index a923cec..f974941 100644
--- a/src/views/trials/trials-inspection/components/add-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/add-trials-list.vue
@@ -19,7 +19,7 @@
         :model="submitMessage"
         class="demo-form-inline"
         :rules="rules"
-        label-width="130px"
+        :label-width="isEN?'200px':'130px'"
       >
         <div>
           <!--项目-->
@@ -264,6 +264,9 @@ export default {
       if (PatientList.length <= 0) return false;
       return PatientList;
     },
+    isEN(){
+      return this.$i18n.locale !== 'zh'
+    }
   },
   created() {
     this.getTrialList();
diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
index ee1f7b4..39f98e1 100644
--- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue
+++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
@@ -9,9 +9,9 @@
             <el-date-picker
               v-model="dateValue"
               type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              range-separator="-" 
+              :start-placeholder="$t('trials:uploadClinicalData:table:beginDate')"
+              :end-placeholder="$t('trials:uploadClinicalData:table:endDate')"
               :default-time="['00:00:00', '23:59:59']"
             >
             </el-date-picker>
diff --git a/src/views/trials/trials-inspection/components/trials-select.vue b/src/views/trials/trials-inspection/components/trials-select.vue
index 3576a78..6f4c60c 100644
--- a/src/views/trials/trials-inspection/components/trials-select.vue
+++ b/src/views/trials/trials-inspection/components/trials-select.vue
@@ -49,7 +49,7 @@
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              width: 80px;
+              width: 130px;
             "
           >
             {{ $t("trials:trials-list:table:sponsor") }}
diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue
index ed726fd..5ad431e 100644
--- a/src/views/trials/trials-inspection/index.vue
+++ b/src/views/trials/trials-inspection/index.vue
@@ -30,8 +30,8 @@
         </el-form-item>
         <!-- 最新接收时间 -->
         <el-form-item :label="$t('trials:inspection:table:latestReceiveTime')">
-          <el-date-picker v-model="dateValue" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-            end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" clearable>
+          <el-date-picker v-model="dateValue" type="datetimerange" range-separator="-" :start-placeholder="$t('trials:uploadClinicalData:table:beginDate')"
+            :end-placeholder="$t('trials:uploadClinicalData:table:endDate')" :default-time="['00:00:00', '23:59:59']" clearable>
           </el-date-picker>
         </el-form-item>
         <el-form-item>
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index e75ec81..4ad79fa 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="trials-navbar" style="position: relative">
     <div class="leftMenu">
-      <img v-if="language === 'zh' && hospital.HospitalLogoPath"
+      <!-- <img v-if="language === 'zh' && hospital.HospitalLogoPath" -->
+        <img v-if="hospital.HospitalLogoPath"
         :src="OSSclientConfig.basePath + hospital.HospitalLogoPath" crossOrigin="anonymous" alt=""
         style="min-width: 170px;" />
       <div v-else style="width: 170px;"></div>
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 0398101..09d4461 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -66,18 +66,18 @@
           <template slot-scope="scope">
             <i v-if="!scope.row.AuthorizationEncrypt" class="el-icon-warning-outline"
               :title="$t('trials:trials-list:tipMessage:tipOne')" style="color: red; font-size: 20px"></i>
-            <i v-if="
-              scope.row.AuthorizationEncrypt &&
-              scope.row.AuthorizationDate &&
-              !trialExpired(scope.row.AuthorizationDate, 15)
-            " class="el-icon-warning-outline" :title="$t('trials:trials-list:tipMessage:tipTwo')"
-              style="color: #e6a23c; font-size: 20px"></i>
-            <i v-if="
+            <i v-else-if="
               scope.row.AuthorizationEncrypt &&
               scope.row.AuthorizationDate &&
               !trialExpired(scope.row.AuthorizationDate)
             " class="el-icon-warning-outline" :title="$t('trials:trials-list:tipMessage:tipThree')"
               style="color: red; font-size: 20px"></i>
+            <i v-else-if="
+              scope.row.AuthorizationEncrypt &&
+              scope.row.AuthorizationDate &&
+              !trialExpired(scope.row.AuthorizationDate, 15)
+            " class="el-icon-warning-outline" :title="$t('trials:trials-list:tipMessage:tipTwo')"
+              style="color: #e6a23c; font-size: 20px"></i>
           </template>
         </el-table-column>
         <el-table-column prop="trialType" :label="$t('trials:trials-list:form:trialType')" show-overflow-tooltip>
diff --git a/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue b/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue
index 85db723..dc24f12 100644
--- a/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue
+++ b/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue
@@ -124,9 +124,9 @@
             <el-date-picker
               v-model="dateValue"
               type="datetimerange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
+              range-separator="-" 
+              :start-placeholder="$t('trials:uploadClinicalData:table:beginDate')"
+              :end-placeholder="$t('trials:uploadClinicalData:table:endDate')"
               :default-time="['00:00:00', '23:59:59']"
               clearable
             >
diff --git a/src/views/trials/trials-panel/trial-summary/download-record/index.vue b/src/views/trials/trials-panel/trial-summary/download-record/index.vue
index 0eb77e0..2fece3a 100644
--- a/src/views/trials/trials-panel/trial-summary/download-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/download-record/index.vue
@@ -65,9 +65,9 @@
           <el-date-picker
             v-model="dateValue"
             type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
+            range-separator="-"
+            :start-placeholder="$t('trials:uploadClinicalData:table:beginDate')"
+            :end-placeholder="$t('trials:uploadClinicalData:table:endDate')"
             :default-time="['00:00:00', '23:59:59']"
           >
           </el-date-picker>
diff --git a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
index 7614cda..9670b2a 100644
--- a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
@@ -88,7 +88,7 @@
       v-hasPermi="['trials:trials-list:activate']"
     >
       <el-descriptions :column="2" border style="width: 1200px">
-        <p slot="title">项目授权信息</p>
+        <p slot="title">{{$t('trials:trials-list:activate:title')}}</p>
         <!--单位名称-->
         <el-descriptions-item
           :label="$t('trials:trials-list:activate:organizationName')"