huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

fix

Browse Source
dev_202412
yujialong 3 months ago
parent f6bcb729c2
commit 09b0734d2f
3 changed files with 991 additions and 936 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      src/pages/setting/person/info.vue
  2. 4
      src/pages/station/preview/index.vue
  3. 4
      src/pages/station/product/index.vue

103
src/pages/setting/person/info.vue
Unescape View File

@ -13,7 +13,8 @@
<li>
<label>所在国家：</label>
<el-select size="small" v-model="form.countries">
<el-option v-for="item in countryList" :key="item.value" :label="item.label" :value="item.label"></el-option>
<el-option v-for="item in countryList" :key="item.value" :label="item.label"
:value="item.label"></el-option>
</el-select>
</li>
</div>
@ -21,7 +22,8 @@
<li>
<label>性别：</label>
<el-select size="small" v-model="form.sex">
<el-option v-for="item in sexList" :key="item.value" :label="item.name" :value="item.value"></el-option>
<el-option v-for="item in sexList" :key="item.value" :label="item.name"
:value="item.value"></el-option>
</el-select>
</li>
<li class="selects">
@ -29,17 +31,21 @@
<div class="mul">
<div class="child">
<el-select size="small" v-model="form.countries" placeholder>
<el-option v-for="item in countryList" :key="item.value" :label="item.label" :value="item.label"></el-option>
<el-option v-for="item in countryList" :key="item.value" :label="item.label"
:value="item.label"></el-option>
</el-select>
</div>
<div class="child">
<el-select size="small" v-model="form.provinceId" placeholder @change="id => getCity(id, 1)">
<el-option v-for="item in provinceList" :key="item.provinceId" :label="item.provinceName" :value="item.provinceId"></el-option>
<el-option v-for="item in provinceList" :key="item.provinceId" :label="item.provinceName"
:value="item.provinceId"></el-option>
</el-select>
</div>
<div class="child">
<el-select size="small" v-model="form.cityId" placeholder :disabled="form.provinceId ? false : true">
<el-option v-for="item in cityList" :key="item.cityId" :label="item.cityName" :value="item.cityId"></el-option>
<el-select size="small" v-model="form.cityId" placeholder
:disabled="form.provinceId ? false : true">
<el-option v-for="item in cityList" :key="item.cityId" :label="item.cityName"
:value="item.cityId"></el-option>
</el-select>
</div>
</div>
@ -48,7 +54,8 @@
<div class="line info">
<li>
<label>出生年月：</label>
<el-date-picker size="small" placeholder="请选择时间" v-model="form.dateBirth" :clearable="false" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
<el-date-picker size="small" placeholder="请选择时间" v-model="form.dateBirth" :clearable="false" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
</li>
<li>
<label>身份证：</label>
@ -59,7 +66,8 @@
<li>
<label>教育程度：</label>
<el-select size="small" v-model="form.educationDegree" placeholder="请选择教育程度">
<el-option v-for="(item,index) in educationDegreeList" :key="index" :label="item.name" :value="item.value"></el-option>
<el-option v-for="(item, index) in educationDegreeList" :key="index" :label="item.name"
:value="item.value"></el-option>
</el-select>
</li>
<li>
@ -80,41 +88,52 @@
<li>
<label>职业：</label>
<el-select size="small" v-model="archive.personalCareerId" placeholder="选择职业">
<el-option v-for="item in occupationList" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-option v-for="item in occupationList" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</li>
<li>
<label>所在国家：</label>
<el-select size="small" v-model="form.countries" placeholder>
<el-option v-for="item in countryList" :key="item.value" :label="item.label" :value="item.label" ></el-option>
<el-option v-for="item in countryList" :key="item.value" :label="item.label"
:value="item.label"></el-option>
</el-select>
</li>
</div>
<div class="line">
<li>
<label>学校名称：</label>
<el-select size="small" v-model="archive.schoolId" filterable placeholder="选择学校" @change="id => getSchoolName(id,index)">
<el-option v-for="item in schoolList" :key="item.value" :label="item.schoolName" :value="item.schoolId"></el-option>
<el-select size="small" v-model="archive.schoolId" filterable placeholder="选择学校"
@change="id => getSchoolName(id, index)">
<el-option v-for="item in schoolList" :key="item.value" :label="item.schoolName"
:value="item.schoolId"></el-option>
</el-select>
</li>
<li>
<label>专业学科：</label>
<el-select size="small" v-model="archive.disciplineId" placeholder="选择专业学科" @change="id => getItemProfessionalClass(id,index)" @clear="() => clearItemClass(index)">
<el-option v-for="item in subjectList" :key="item.value" :label="item.disciplineName" :value="item.disciplineId"></el-option>
<el-select size="small" v-model="archive.disciplineId" placeholder="选择专业学科"
@change="id => getItemProfessionalClass(id, index)" @clear="() => clearItemClass(index)">
<el-option v-for="item in subjectList" :key="item.value" :label="item.disciplineName"
:value="item.disciplineId"></el-option>
</el-select>
</li>
</div>
<div class="line" style="margin-bottom: 0">
<li>
<label>专业类：</label>
<el-select size="small" v-model="archive.professionalClassId" placeholder="选择专业类" :disabled="archive.disciplineId ? false : true" @change="id => getItemProfessional(id,index)" @clear="() => clearItemProfess(index)">
<el-option v-for="item in archive.ProfessionalClassList" :key="item.professionalClassId" :label="item.professionalClassName" :value="item.professionalClassId"></el-option>
<el-select size="small" v-model="archive.professionalClassId" placeholder="选择专业类"
:disabled="archive.disciplineId ? false : true" @change="id => getItemProfessional(id, index)"
@clear="() => clearItemProfess(index)">
<el-option v-for="item in archive.ProfessionalClassList" :key="item.professionalClassId"
:label="item.professionalClassName" :value="item.professionalClassId"></el-option>
</el-select>
</li>
<li>
<label>专业：</label>
<el-select size="small" v-model="archive.professionalId" placeholder="选择专业" :disabled="archive.professionalClassId ? false : true" @change="getItemStuGrade">
<el-option v-for="item in archive.ProfessionalList" :key="item.professionalId" :label="item.professionalName" :value="item.professionalId"></el-option>
<el-select size="small" v-model="archive.professionalId" placeholder="选择专业"
:disabled="archive.professionalClassId ? false : true" @change="getItemStuGrade">
<el-option v-for="item in archive.ProfessionalList" :key="item.professionalId"
:label="item.professionalName" :value="item.professionalId"></el-option>
</el-select>
</li>
</div>
@ -167,7 +186,8 @@
<el-button type="primary" size="small" v-throttle @click="save(0)">更新</el-button>
</div>
<el-dialog :title="form.email ? '更换邮箱' : '绑定邮箱'" :visible.sync="emailVisible" :close-on-click-modal="false" @close="closeEmail" width="30%">
<el-dialog :title="form.email ? '更换邮箱' : '绑定邮箱'" :visible.sync="emailVisible" :close-on-click-modal="false"
@close="closeEmail" width="30%">
<el-form ref="form" :model="form" label-width="60px">
<el-form-item label="邮箱">
<el-input style="width: 394px;" placeholder="请输入邮箱" v-model="email"></el-input>
@ -175,7 +195,8 @@
<el-form-item label="验证码">
<div class="flex">
<el-input v-model="emailCode" placeholder="请输入验证码" maxlength="6"></el-input>
<el-button style="margin-left: 10px" type="text" @click="sendEmailCode" :disabled="emailDisabled">{{emailBtnText}}</el-button>
<el-button style="margin-left: 10px" type="text" @click="sendEmailCode"
:disabled="emailDisabled">{{ emailBtnText }}</el-button>
</div>
</el-form-item>
</el-form>
@ -185,7 +206,8 @@
</span>
</el-dialog>
<el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'" :visible.sync="phoneVisible" :close-on-click-modal="false" @close="closePhone" width="30%">
<el-dialog :title="form.phone ? '更换手机号' : '绑定手机号'" :visible.sync="phoneVisible" :close-on-click-modal="false"
@close="closePhone" width="30%">
<el-form ref="form" :model="form" label-width="60px">
<el-form-item label="手机号">
<el-input style="width: 404px;" placeholder="请输入手机号" v-model="phone" maxlength="11"></el-input>
@ -193,7 +215,8 @@
<el-form-item label="验证码">
<div class="flex">
<el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
<el-button style="margin-left: 10px" type="text" @click="sendPhoneCode" :disabled="phoneDisabled">{{phoneBtnText}}</el-button>
<el-button style="margin-left: 10px" type="text" @click="sendPhoneCode"
:disabled="phoneDisabled">{{ phoneBtnText }}</el-button>
</div>
</el-form-item>
</el-form>
@ -203,16 +226,19 @@
</span>
</el-dialog>
<el-dialog title="更换密码" :visible.sync="passwordVisible" :close-on-click-modal="false" @close="closePassword" width="30%">
<el-dialog title="更换密码" :visible.sync="passwordVisible" :close-on-click-modal="false" @close="closePassword"
width="30%">
<el-form ref="passwordForm" :model="form" label-width="82px">
<el-form-item label="原密码">
<el-input type="password" v-model="passwordForm.password" placeholder="请输入原密码"></el-input>
</el-form-item>
<el-form-item label="新密码">
<el-input type="password" v-model="passwordForm.newPassword" placeholder="请输入新密码" @keyup.enter.native="editPassword"></el-input>
<el-input type="password" v-model="passwordForm.newPassword" placeholder="请输入新密码"
@keyup.enter.native="editPassword"></el-input>
</el-form-item>
<el-form-item label="确认新密码">
<el-input type="password" v-model="passwordForm.reNewPassword" placeholder="请确认新密码" @keyup.enter.native="editPassword"></el-input>
<el-input type="password" v-model="passwordForm.reNewPassword" placeholder="请确认新密码"
@keyup.enter.native="editPassword"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@ -867,20 +893,25 @@ export default {
max-height: calc(100vh - 125px);
overflow: auto;
}
.page {
margin-bottom: 12px;
/deep/.el-input__inner {
border-color: #CACFDB;
}
.list {
.line {
display: flex;
margin-bottom: 24px;
&.info li:not(.selects) {
.el-input {
flex: 1;
}
}
&.imp li {
&:nth-child(odd) {
width: 360px;
@ -888,15 +919,20 @@ export default {
}
}
}
.el-input, .el-select{
.el-input,
.el-select {
width: 220px;
.el-input__inner {
border-color: #CACFDB;
}
}
li {
display: inline-flex;
align-items: center;
&>label {
width: 100px;
margin-right: 5px;
@ -904,23 +940,29 @@ export default {
font-size: 14px;
color: #4c4c4c;
}
.el-select {
flex: 1;
}
.el-select .el-input.is-disabled .el-input__inner {
border-color: #ddd;
}
.val {
margin-right: 15px;
color: #606266;
font-size: 14px;
}
.mul {
display: inline-flex;
.child {
display: inline-flex;
width: 132px;
margin-right: 10px;
&>span {
margin-bottom: 5px;
font-size: 14px;
@ -928,12 +970,14 @@ export default {
}
}
}
&:nth-child(odd) {
width: 325px;
margin-right: 100px;
}
}
}
.archives {
position: relative;
width: 862px;
@ -941,6 +985,7 @@ export default {
margin-bottom: 6px;
border-radius: 4px;
background-color: #FAFAFA;
.del {
position: absolute;
top: 80px;
@ -948,28 +993,34 @@ export default {
cursor: pointer;
}
}
.fold {
margin-top: 20px;
text-align: center;
font-size: 12px;
color: #006EFF;
span {
cursor: pointer;
i {
transition: .5s;
}
&.active i {
transform: rotate(180deg);
}
}
}
}
.btns {
width: 100%;
padding: 12px 0;
text-align: center;
background-color: #fff;
box-shadow: 0px 0px 10px 0px rgba(188, 201, 218, 0.4);
.el-button {
width: 80px;
}

4
src/pages/station/preview/index.vue
Unescape View File

@ -487,7 +487,9 @@ export default {
// 获取章节小节
async getChapter () {
if (this.courseId) {
let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`);
let res = await this.$get(this.api.curriculumChapter, {
courseId: this.courseId
})
this.chapterList = res.chapterList;
if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length && !this.commentId) {
this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);

4
src/pages/station/product/index.vue
Unescape View File

@ -232,7 +232,9 @@ export default {
// 获取章节小节
async getChapter () {
if (this.isCourse) {
let res = await this.$get(this.api.curriculumChapter + '/' + this.form.mall.associatedProduct)
let res = await this.$get(this.api.curriculumChapter, {
courseId: this.form.mall.associatedProduct
})
this.chapterList = res.chapterList
}
},

Write Preview
Loading…
Cancel
Save