Merge remote-tracking branch 'origin/uat' into main

src/views/login/index.vue

@@ -119,7 +119,7 @@
             {{ $t("login:button:login") }}
           </el-button>
           <div style="text-align: right">
-            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+            <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
             <!-- Forget password? -->
             <el-button
               type="text"
@@ -271,7 +271,7 @@ export default {
       this.setLanguage("en");
       this.$updateDictionary();
     } else {
-      if (this.location === "USA") {
+      if (this.location === "USA" || this.NODE_ENV === "usa") {
         this.$i18n.locale = "en";
         this.setLanguage("en");
         this.$updateDictionary();

src/views/trials/trials-layout/components/trialsNavbar.vue

@@ -89,7 +89,7 @@
           }}</el-menu-item>
         </el-submenu>
       </el-menu>
-      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
+      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'&& NODE_ENV !== 'usa'" />
     </div>
   </div>
 </template>

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -80,14 +80,16 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <!-- 分配时间 -->
+        <!-- 审核通过时间 -->
         <el-form-item :label="$t('trials:qcCheck:table:auditTime')">
           <el-date-picker
             v-model="timeList"
-            value-format="yyyy-MM-dd"
-            format="yyyy-MM-dd"
-            type="daterange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
             @change="changeTimeList"
+            style="width:240px"
           />
         </el-form-item>
         <el-form-item>