|
@ -64,6 +64,7 @@ |
|
|
<transition mode="out-in" name="el-fade-in-linear"> |
|
|
<transition mode="out-in" name="el-fade-in-linear"> |
|
|
<router-view class="admin-box" v-if="!$route.meta.keepAlive"></router-view> |
|
|
<router-view class="admin-box" v-if="!$route.meta.keepAlive"></router-view> |
|
|
</transition> |
|
|
</transition> |
|
|
|
|
|
<BottomInfo /> |
|
|
</el-main> |
|
|
</el-main> |
|
|
</el-container> |
|
|
</el-container> |
|
|
<el-dialog :visible.sync="showPassword" @close="clearPassword" title="修改密码" width="360px"> |
|
|
<el-dialog :visible.sync="showPassword" @close="clearPassword" title="修改密码" width="360px"> |
|
@ -91,6 +92,7 @@ import Aside from '@/view/layout/aside' |
|
|
import HistoryComponent from '@/view/layout/aside/historyComponent/history' |
|
|
import HistoryComponent from '@/view/layout/aside/historyComponent/history' |
|
|
import Screenfull from '@/view/layout/screenfull' |
|
|
import Screenfull from '@/view/layout/screenfull' |
|
|
import Search from '@/view/layout/search/search' |
|
|
import Search from '@/view/layout/search/search' |
|
|
|
|
|
import BottomInfo from '@/view/layout/bottomInfo/bottomInfo' |
|
|
import { mapGetters, mapActions } from 'vuex' |
|
|
import { mapGetters, mapActions } from 'vuex' |
|
|
import { changePassword } from '@/api/user' |
|
|
import { changePassword } from '@/api/user' |
|
|
export default { |
|
|
export default { |
|
@ -135,7 +137,8 @@ export default { |
|
|
Aside, |
|
|
Aside, |
|
|
HistoryComponent, |
|
|
HistoryComponent, |
|
|
Screenfull, |
|
|
Screenfull, |
|
|
Search |
|
|
|
|
|
|
|
|
Search, |
|
|
|
|
|
BottomInfo |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
...mapActions('user', ['LoginOut']), |
|
|
...mapActions('user', ['LoginOut']), |
|
@ -241,6 +244,7 @@ $mainHight: 100vh; |
|
|
z-index: 999; |
|
|
z-index: 999; |
|
|
} |
|
|
} |
|
|
.admin-box { |
|
|
.admin-box { |
|
|
|
|
|
min-height: calc(100vh - 240px); |
|
|
background-color: rgb(255, 255, 255); |
|
|
background-color: rgb(255, 255, 255); |
|
|
margin-top: 100px; |
|
|
margin-top: 100px; |
|
|
} |
|
|
} |
|
@ -366,6 +370,7 @@ $mainHight: 100vh; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
.screenfull { |
|
|
.screenfull { |
|
|
display: inline-block; |
|
|
display: inline-block; |
|
|
} |
|
|
} |
|
|