Compare commits

..

No commits in common. "f96f8bca91cd36a793fe389a2e4a0ce362f38bb4" and "d0641cdfc93fd66776e3dc423842a94d1f03be25" have entirely different histories.

3 changed files with 7 additions and 9 deletions

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'&& NODE_ENV !== 'usa'" /> <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
<!-- 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" || this.NODE_ENV === "usa") { if (this.location === "USA") {
this.$i18n.locale = "en"; this.$i18n.locale = "en";
this.setLanguage("en"); this.setLanguage("en");
this.$updateDictionary(); this.$updateDictionary();

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'&& NODE_ENV !== 'usa'" /> <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'" />
</div> </div>
</div> </div>
</template> </template>

View File

@ -80,16 +80,14 @@
</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 HH:mm:ss" value-format="yyyy-MM-dd"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"
type="datetimerange" type="daterange"
: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>