Commit c90a1be5 by lishengfu

udpate

parent cbd14f8d
...@@ -6,25 +6,38 @@ ...@@ -6,25 +6,38 @@
<van-icon size="14px" color="#E1E4EB" name="arrow" /> <van-icon size="14px" color="#E1E4EB" name="arrow" />
</div> </div>
<div class="box"> <div class="box">
<div class="item"> <div class="editItem">
<span>派遣公司</span> <van-cell title="北京大学" is-link value="2019-2019" />
<label></label> <van-cell title="北京大学" is-link value="2019-2019" />
<div class="addEdu">添加教育经历</div>
</div> </div>
<div class="item">
<span>用工单位</span>
<label></label>
</div> </div>
<div class="item"> <div class="box" v-show="false">
<span>工作地点</span> <div class="unEiteItem">
<label>福国际大厦A座88层市场推广专员2019-11-22</label> <div class="line">
<div class="lineTitle">
<i></i>
</div> </div>
<div class="item"> <div class="lineBox"></div>
<span>工作职位</span> </div>
<label></label> <div class="unEiteItemBox">
<div class="timeLine">2010-2008</div>
<div class="schoolName">北京大学</div>
<div class="eduInfo">北京|计算机科学与技术</div>
</div>
</div>
<div class="unEiteItem">
<div class="line">
<div class="lineTitle">
<i></i>
</div>
<div class="lineBox"></div>
</div>
<div class="unEiteItemBox">
<div class="timeLine">2010-2008</div>
<div class="schoolName">北京大学</div>
<div class="eduInfo">北京|计算机科学与技术</div>
</div> </div>
<div class="item">
<span>入职时间</span>
<label></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -32,12 +45,13 @@ ...@@ -32,12 +45,13 @@
<script lang="ts"> <script lang="ts">
import Vue from "vue"; import Vue from "vue";
import { Icon } from "vant"; import { Icon, Cell } from "vant";
import { Component } from "vue-property-decorator"; import { Component } from "vue-property-decorator";
@Component({ @Component({
components: { components: {
[Icon.name]: Icon [Icon.name]: Icon,
[Cell.name]: Cell
} }
}) })
export default class eduExperience extends Vue { export default class eduExperience extends Vue {
...@@ -48,7 +62,7 @@ export default class eduExperience extends Vue { ...@@ -48,7 +62,7 @@ export default class eduExperience extends Vue {
}; };
this.$server.EmployeeService.getEduExperience(params) this.$server.EmployeeService.getEduExperience(params)
.then(res => { .then(res => {
console.log("edu-res=" + JSON.stringify(res)); // console.log("edu-res=" + JSON.stringify(res));
this.obj = res; this.obj = res;
}) })
.catch(error => {}); .catch(error => {});
...@@ -83,23 +97,69 @@ export default class eduExperience extends Vue { ...@@ -83,23 +97,69 @@ export default class eduExperience extends Vue {
margin: 0 20px; margin: 0 20px;
padding: 12px 0; padding: 12px 0;
border-top: 1px solid #eaeef5; border-top: 1px solid #eaeef5;
.item { .editItem {
.van-cell {
padding: 8px 0;
}
.addEdu {
height: 15px;
font-size: 15px;
font-weight: 500;
color: rgba(34, 189, 122, 1);
line-height: 15px;
text-align: center;
margin: 25px auto 12px;
}
}
.unEiteItem {
display: flex;
.line {
.lineTitle {
width: 10px;
height: 10px;
background: #c8eede;
border-radius: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
span { justify-content: center;
min-width: 98px; i {
height: 6px;
width: 6px;
background: #22bd7a;
display: block; display: block;
border-radius: 50%;
}
}
.lineBox {
width: 1px;
height: 100px;
background: rgba(225, 228, 235, 1);
margin: 0 auto;
}
}
.unEiteItemBox {
margin-left: 10px;
.timeLine {
height: 16px;
font-size: 16px;
color: rgba(34, 189, 122, 1);
line-height: 16px;
}
.schoolName {
margin-top: 16px;
height: 16px;
font-size: 16px;
font-weight: 500;
color: rgba(61, 64, 71, 1);
line-height: 16px;
}
.eduInfo {
height: 14px;
font-size: 14px; font-size: 14px;
color: rgba(149, 152, 158, 1); color: rgba(149, 152, 158, 1);
line-height: 30px; line-height: 14px;
text-align: right; margin-top: 12px;
margin-bottom: auto;
} }
label {
font-size: 14px;
color: rgba(61, 64, 71, 1);
line-height: 30px;
margin-left: 20px;
} }
} }
} }
......
...@@ -5,26 +5,41 @@ ...@@ -5,26 +5,41 @@
<div class="title">工作经历</div> <div class="title">工作经历</div>
<van-icon size="14px" color="#E1E4EB" name="arrow" /> <van-icon size="14px" color="#E1E4EB" name="arrow" />
</div> </div>
<div class="box"> <div class="box" v-show="false">
<div class="item"> <div class="editItem">
<span>派遣公司</span> <van-cell title="亲亲小保" is-link value="2019-2019" />
<label></label> <van-cell title="亲亲小保" is-link value="2019-2019" />
<div class="addEdu">添加工作经历</div>
</div> </div>
<div class="item">
<span>用工单位</span>
<label></label>
</div> </div>
<div class="item"> <div class="box" v-show="true">
<span>工作地点</span> <div class="unEiteItem">
<label>福国际大厦A座88层市场推广专员2019-11-22</label> <div class="line">
<div class="lineTitle">
<i></i>
</div> </div>
<div class="item"> <div class="lineBox"></div>
<span>工作职位</span> </div>
<label></label> <div class="unEiteItemBox">
<div class="timeLine">2010-2008</div>
<div class="schoolName">北京大学</div>
<div class="eduInfo">北京|计算机科学与技术</div>
<div class="ditale">审核日常员工报销,办理公司收、付款;录入现金、银行有关收付款凭证,做到日清月结,每日用友软件中的现 缴纳税款、办理投标用。</div>
</div>
</div>
<div class="unEiteItem">
<div class="line">
<div class="lineTitle">
<i></i>
</div>
<div class="lineBox"></div>
</div>
<div class="unEiteItemBox">
<div class="timeLine">2010-2008</div>
<div class="schoolName">北京大学</div>
<div class="eduInfo">北京|计算机科学与技术</div>
<div class="ditale">审核日常员工报销,办理公司收、付款;录入现金、银行有关收付款凭证,做到日清月结,每日用友软件中的现 缴纳税款、办理投标用。</div>
</div> </div>
<div class="item">
<span>入职时间</span>
<label></label>
</div> </div>
</div> </div>
</div> </div>
...@@ -32,28 +47,17 @@ ...@@ -32,28 +47,17 @@
<script lang="ts"> <script lang="ts">
import Vue from "vue"; import Vue from "vue";
import { Icon } from 'vant'; import { Icon, Cell } from "vant";
import { Component } from "vue-property-decorator"; import { Component } from "vue-property-decorator";
@Component({ @Component({
components:{ components: {
[Icon.name]: Icon [Icon.name]: Icon,
[Cell.name]: Cell
} }
}) })
export default class workExperience extends Vue { export default class workExperience extends Vue {
obj: object = {}; obj: object = {};
created() {
let params = {
edId: this.$route.query.ed_id
};
// this.$server.EmployeeService.(params)
// .then(res => {
// console.log("res=" + JSON.stringify(res));
// this.obj = res;
// })
// .catch(error => {});
}
} }
</script> </script>
...@@ -84,23 +88,76 @@ export default class workExperience extends Vue { ...@@ -84,23 +88,76 @@ export default class workExperience extends Vue {
margin: 0 20px; margin: 0 20px;
padding: 12px 0; padding: 12px 0;
border-top: 1px solid #eaeef5; border-top: 1px solid #eaeef5;
.item { .editItem {
.van-cell {
padding: 8px 0;
}
.addEdu {
height: 15px;
font-size: 15px;
font-weight: 500;
color: rgba(34, 189, 122, 1);
line-height: 15px;
text-align: center;
margin: 25px auto 12px;
}
}
.unEiteItem {
display: flex;
.line {
.lineTitle {
width: 10px;
height: 10px;
background: #c8eede;
border-radius: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
span { justify-content: center;
min-width: 98px; i {
height: 6px;
width: 6px;
background: #22bd7a;
display: block; display: block;
border-radius: 50%;
}
}
.lineBox {
width: 1px;
height: 100px;
background: rgba(225, 228, 235, 1);
margin: 0 auto;
}
}
.unEiteItemBox {
margin-left: 10px;
.timeLine {
height: 16px;
font-size: 16px;
color: rgba(34, 189, 122, 1);
line-height: 16px;
}
.schoolName {
margin-top: 16px;
height: 16px;
font-size: 16px;
font-weight: 500;
color: rgba(61, 64, 71, 1);
line-height: 16px;
}
.eduInfo {
height: 14px;
font-size: 14px; font-size: 14px;
color: rgba(149, 152, 158, 1); color: rgba(149, 152, 158, 1);
line-height: 30px; line-height: 14px;
text-align: right; margin-top: 12px;
margin-bottom: auto;
} }
label { .ditale {
margin-top: 17px;
height: 72px;
font-size: 14px; font-size: 14px;
color: rgba(61, 64, 71, 1); color: rgba(94, 96, 102, 1);
line-height: 30px; line-height: 24px;
margin-left: 20px; }
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment