UI_2022-02-10
4 years ago
parent 1ce6c7de69
commit 2f10c302c5
  1. 1
      src/assets/css/main.css
  2. 5
      src/components/common/Home.vue
  3. 4
      src/components/page/Dashboard.vue
  4. 48
      src/components/page/PersonalCenter.vue

@ -9,6 +9,7 @@ body,
.wrapper { .wrapper {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto;
} }
body { body {

@ -13,6 +13,7 @@
<el-backtop target=".content"></el-backtop> <el-backtop target=".content"></el-backtop>
</div> </div>
</div> </div>
<v-footer ref="footer"></v-footer>
</div> </div>
</template> </template>
@ -21,6 +22,7 @@ import vHead from './Header.vue';
import vSidebar from './Sidebar.vue'; import vSidebar from './Sidebar.vue';
import vTags from './Tags.vue'; import vTags from './Tags.vue';
import bus from './bus'; import bus from './bus';
import vFooter from './Footer'
export default { export default {
data() { data() {
return { return {
@ -31,7 +33,8 @@ export default {
components: { components: {
vHead, vHead,
vSidebar, vSidebar,
vTags vTags,
vFooter
}, },
created() { created() {
bus.$on('collapse-content', msg => { bus.$on('collapse-content', msg => {

@ -20,7 +20,7 @@
<Backstage v-if="!showProject && activeName == 'second'"></Backstage> <Backstage v-if="!showProject && activeName == 'second'"></Backstage>
<Project v-if="showProject"></Project> <Project v-if="showProject"></Project>
<Record v-if="activeName=='fourth'"></Record> <Record v-if="activeName=='fourth'"></Record>
<v-footer ref="footer"></v-footer> <!-- <v-footer ref="footer"></v-footer> -->
</div> </div>
</div> </div>
@ -368,7 +368,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content-wrap{ .content-wrap{
height: calc(100vh - 119px); min-height: calc(100vh);
overflow: auto; overflow: auto;
} }
/deep/.el-tabs__item:focus{ /deep/.el-tabs__item:focus{

@ -2,7 +2,8 @@
<div class="wrap"> <div class="wrap">
<!-- 头像部分 --> <!-- 头像部分 -->
<div class="header"> <div class="header">
<img :src="this.$store.state.avatar" class="HeadPortrait" /> <!-- <img :src="this.$store.state.avatar" class="HeadPortrait" /> -->
<el-avatar :size="80" :src="this.$store.state.avatar" class="Headtop"></el-avatar>
<div style="color:#9278FF;font-size:14px;font-family:MicrosoftYaHei;margin-top:5px;"> <div style="color:#9278FF;font-size:14px;font-family:MicrosoftYaHei;margin-top:5px;">
<el-upload <el-upload
class="upload-demo" class="upload-demo"
@ -154,7 +155,7 @@
</div> </div>
<div class="information" style="margin-top: 20px;"> <div class="information" style="margin-top: 20px;">
<div class="archives" v-for="(archive,index) in archivesList" :key="index" v-show="index == 0 || showArch || archive.isNew"> <div class="archives" v-for="(archive,index) in archivesList" :key="index" v-show="index == 0 || showArch">
<div class="line"> <div class="line">
<div class="item"> <div class="item">
<span>职业</span> <span>职业</span>
@ -258,7 +259,8 @@
</div> </div>
<div class="fold" v-if="archivesList.length > 1"> <div class="fold" v-if="archivesList.length > 1">
<img style="width: 21px;height: 17px;" src="../../assets/img/open.png" alt="" @click="foldArch"> <!-- <img style="width: 21px;height: 17px;" src="../../assets/img/open.png" alt="" @click="foldArch"> -->
<img :class="{ 'arrowTransform': showArch, 'arrowTransformReturn': !showArch}" style="width: 21px;height: 17px;" src="../../assets/img/open.png" alt="" @click="foldArch">
</div> </div>
</div> </div>
@ -656,12 +658,12 @@ export default {
userId: this.userId, userId: this.userId,
personalFileId: '' personalFileId: ''
}) })
if(!isLoadData){ // if(!isLoadData){
this.$nextTick(() => { // this.$nextTick(() => {
document.body.scrollTop = document.querySelector('.content-box').scrollHeight // document.body.scrollTop = document.querySelector('.content-box').scrollHeight
document.documentElement.scrollTop = document.querySelector('.content-box').scrollHeight // document.documentElement.scrollTop = document.querySelector('.content-box').scrollHeight
}) // })
} // }
}, },
addArch() { addArch() {
let isEmpty = false let isEmpty = false
@ -713,10 +715,10 @@ export default {
}, },
foldArch() { foldArch() {
this.showArch = !this.showArch this.showArch = !this.showArch
this.$nextTick(() => { // this.$nextTick(() => {
document.body.scrollTop = document.querySelector('.content-box').scrollHeight // document.body.scrollTop = document.querySelector('.content-box').scrollHeight
document.documentElement.scrollTop = document.querySelector('.content-box').scrollHeight // document.documentElement.scrollTop = document.querySelector('.content-box').scrollHeight
}) // })
}, },
// //
getSubject(){ getSubject(){
@ -1025,8 +1027,18 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.arrowTransform{
transition: 0.5s;
transform-origin: center;
transform: rotateZ(180deg);
}
.arrowTransformReturn{
transition: 0.5s;
transform-origin: center;
transform: rotateZ(0deg);
}
.wrap{ .wrap{
height: calc(100vh - 60px); // height: calc(100vh - 60px);
padding-top: 170px; padding-top: 170px;
overflow: auto; overflow: auto;
display:flex; display:flex;
@ -1066,12 +1078,12 @@ input:focus {
.openfile { .openfile {
cursor: pointer; cursor: pointer;
} }
.HeadPortrait { .Headtop {
margin-top: 10px; margin-top: 10px;
width: 80px; // width: 80px;
height: 80px; // height: 80px;
// background: url('../../assets/img/img.jpg'); // background: url('../../assets/img/img.jpg');
border-radius: 50%; // border-radius: 50%;
.head { .head {
width: 34px; width: 34px;

Loading…
Cancel
Save