XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/uat' into main
continuous-integration/drone/push Build is running Details

uat_us
caiyiling 2024-08-02 15:18:54 +08:00
parent d0641cdfc9 f8837d8cef
commit f96f8bca91
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/login/index.vue
View File

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

2
src/views/trials/trials-layout/components/trialsNavbar.vue
View File

@ -89,7 +89,7 @@
}}</el-menu-item> }}</el-menu-item>
</el-submenu> </el-submenu>
</el-menu> </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>
</div> </div>
</template> </template>

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

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