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