Merge branch 'uat' into uat_us
commit
6ac94ec1a0
|
@ -112,7 +112,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"
|
||||
|
|
|
@ -86,7 +86,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>
|
||||
|
|
|
@ -89,6 +89,7 @@
|
|||
type="datetimerange"
|
||||
:default-time="['00:00:00', '23:59:59']"
|
||||
@change="changeTimeList"
|
||||
style="width:250px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
|
|
Loading…
Reference in New Issue