Merge branch 'master' of http://114.55.171.231:3000/lxd/ECG
This commit is contained in:
commit
dfc3c161d7
@ -29,14 +29,24 @@
|
|||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
|
|
||||||
<div class="my-container">
|
<div class="my-container">
|
||||||
|
<<<<<<< HEAD
|
||||||
<div class="my-top">
|
<div class="my-top">
|
||||||
<img class="top-image" src="@/assets/imgs/FLY.png" />
|
<img class="top-image" src="@/assets/imgs/FLY.png" />
|
||||||
<div class="text-container">
|
<div class="text-container">
|
||||||
<span style="font-size: 4.32vh">{{headTitle}}</span>
|
<span style="font-size: 4.32vh">{{headTitle}}</span>
|
||||||
<span style="font-size: 1.64vh">Regional Cloud-based Electrocardiogram (ECG) System</span>
|
<span style="font-size: 1.64vh">Regional Cloud-based Electrocardiogram (ECG) System</span>
|
||||||
|
=======
|
||||||
|
<div class="my-top" :style="!(showLogo == 'true') ? { height: '7%' } : {}">
|
||||||
|
<img class="top-image" src="@/assets/imgs/FLY.png" v-if="showLogo == 'true'" />
|
||||||
|
<div class="text-container" :style="!(showLogo == 'true') ? { marginLeft: '8.9vw' } : {}">
|
||||||
|
<span style="font-size: 4.32vh">{{ headTitle }}</span>
|
||||||
|
<span style="font-size: 1.64vh" v-if="showLogo == 'true'">
|
||||||
|
The Medical Community Medical Imaging Systems
|
||||||
|
</span>
|
||||||
|
>>>>>>> ba061bfb9b242894492edcfff8b13d52060c671c
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="my-middle">
|
<div class="my-middle" :style="!(showLogo == 'true') ? { height: '92.98%' } : {}">
|
||||||
<div
|
<div
|
||||||
style="
|
style="
|
||||||
width: 20.8vw;
|
width: 20.8vw;
|
||||||
@ -79,7 +89,7 @@
|
|||||||
<!-- </Transition> -->
|
<!-- </Transition> -->
|
||||||
<!-- </div> -->
|
<!-- </div> -->
|
||||||
</div>
|
</div>
|
||||||
<div class="my-bottom">
|
<div class="my-bottom" v-if="showLogo == 'true'">
|
||||||
<img class="bottom-image" src="@/assets/imgs/客服.png" />
|
<img class="bottom-image" src="@/assets/imgs/客服.png" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -93,7 +103,7 @@ import { useDesign } from '@/hooks/web/useDesign'
|
|||||||
import { useAppStore } from '@/store/modules/app'
|
import { useAppStore } from '@/store/modules/app'
|
||||||
import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
|
import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
|
||||||
import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
|
import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
|
||||||
import * as ConfigApi from '@/api/infra/config'//李晓东
|
import * as ConfigApi from '@/api/infra/config' //李晓东
|
||||||
import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components'
|
import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components'
|
||||||
|
|
||||||
defineOptions({ name: 'Login' })
|
defineOptions({ name: 'Login' })
|
||||||
@ -103,11 +113,11 @@ const appStore = useAppStore()
|
|||||||
const { getPrefixCls } = useDesign()
|
const { getPrefixCls } = useDesign()
|
||||||
const prefixCls = getPrefixCls('login')
|
const prefixCls = getPrefixCls('login')
|
||||||
|
|
||||||
|
const showLogo = ref<any>('')
|
||||||
const headTitle = ref('医共体医学影像系统')
|
const headTitle = ref('医共体医学影像系统')
|
||||||
onMounted(async() => {
|
onMounted(async () => {
|
||||||
|
headTitle.value = await ConfigApi.getConfigKey('headTitle') //李晓东 通过配置项取退出后重定向页面 原先定向首页= await ConfigApi.getConfigKey('url.loginOut')//李晓东 通过配置项取退出后重定向页面 原先定向首页
|
||||||
headTitle.value= await ConfigApi.getConfigKey('headTitle')//李晓东 通过配置项取退出后重定向页面 原先定向首页= await ConfigApi.getConfigKey('url.loginOut')//李晓东 通过配置项取退出后重定向页面 原先定向首页
|
showLogo.value = await ConfigApi.getConfigKey('login.showLogo')
|
||||||
console.log('系统名称'+headTitle.value)
|
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user