test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.5' into master 

# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
This commit is contained in:
Captain.B 2020-11-25 16:49:52 +08:00
parent 0ffe1cc414 245da1d1ca
commit 4f93da8907
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6

2
frontend/src/business/App.vue
View File

@ -7,7 +7,7 @@
</el-row> </el-row>
<el-row id="header-top" type="flex" justify="space-between" align="middle"> <el-row id="header-top" type="flex" justify="space-between" align="middle">
<el-col :span="12"> <el-col :span="12">
<img :src="'/display/file/svg/logo'" style="width: 156px;height: 37px;" alt=""> <img :src="'/display/file/logo'" style="width: 156px;height: 37px;" alt="">
<ms-top-menus/> <ms-top-menus/>
</el-col> </el-col>

4
frontend/src/login/Login.vue
View File

@ -4,7 +4,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form :model="form" :rules="rules" ref="form"> <el-form :model="form" :rules="rules" ref="form">
<div class="logo"> <div class="logo">
<img :src="'/display/file/svg/loginLogo'" style="width: 224px;height: 45px;" alt=""> <img :src="'/display/file/loginLogo'" style="width: 224px;height: 45px;" alt="">
</div> </div>
<div class="title"> <div class="title">
<span id="s1">{{ loginTitle }}</span> <span id="s1">{{ loginTitle }}</span>
@ -40,7 +40,7 @@
</el-form> </el-form>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<img :src="'/display/file/png/loginImage'" style="height: 560px; width: 100%"> <img :src="'/display/file/loginImage'" style="height: 560px; width: 100%">
</el-col> </el-col>
</el-row> </el-row>
</div> </div>