Skip to content

P
pica-professional-exam
提交 14dc5073 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

数据层级问题

上级 a84d7aa2
隐藏空白字符变更
内嵌 并排
正在显示 包含 61 行增加 和 31 行删除
src/utils/env-config.js
浏览文件 @ 14dc5073
...@@ -8,25 +8,25 @@ export const envConfig = { ...@@ -8,25 +8,25 @@ export const envConfig = {
// baseUrl: 'http://10.177.15.180:10202/', // baseUrl: 'http://10.177.15.180:10202/',
// baseUrl: 'http://192.168.140.14:10201/', // baseUrl: 'http://192.168.140.14:10201/',
baseUrl: 'https://dev-sc.yunqueyi.com/', // baseUrl: 'https://dev-sc.yunqueyi.com/',
apiUrl: 'https://dev-api.yunqueyi.com/', // apiUrl: 'https://dev-api.yunqueyi.com/',
webPageUrl: 'https://dev-phome.yunqueyi.com/', // webPageUrl: 'https://dev-phome.yunqueyi.com/',
hactiveUrl: 'https://dev-hactive.yunqueyi.com', // hactiveUrl: 'https://dev-hactive.yunqueyi.com',
fileUrl: 'https://dev-www.yunqueyi.com', // fileUrl: 'https://dev-www.yunqueyi.com',
// appId: 'wx2c577552a2d28550', // 用于微信授权登录
// wxType: 15, // 分享、用户信息对应的appid
// tradeType: 4,
baseUrl: 'https://test1-sc.yunqueyi.com/',
apiUrl: 'https://test1-api.yunqueyi.com/',
webPageUrl: 'https://test1-phome.yunqueyi.com/',
hactiveUrl: 'https://test1-hactive.yunqueyi.com',
fileUrl: 'https://test1-www.yunqueyi.com',
// appId: 'wxcaad75b7fff5659c', // 用于微信授权登录
appId: 'wx2c577552a2d28550', // 用于微信授权登录 appId: 'wx2c577552a2d28550', // 用于微信授权登录
wxType: 15, // 分享、用户信息对应的appid wxType: 15, // 分享、用户信息对应的appid
tradeType: 4, tradeType: 4,
// appId: 'wxf4e66242d31c81c2', // 用于微信授权登录
// baseUrl: 'https://test1-sc.yunqueyi.com/',
// apiUrl: 'https://test1-api.yunqueyi.com/',
// webPageUrl: 'https://test1-phome.yunqueyi.com/',
// hactiveUrl: 'https://test1-hactive.yunqueyi.com',
// fileUrl: 'https://test1-www.yunqueyi.com',
// appId: 'wxcaad75b7fff5659c', // 用于微信授权登录
// baseUrl: 'https://uat-sc.yunqueyi.com/', // baseUrl: 'https://uat-sc.yunqueyi.com/',
// apiUrl: 'https://uat-api.yunqueyi.com/', // apiUrl: 'https://uat-api.yunqueyi.com/',
// webPageUrl: 'https://uat-phome.yunqueyi.com/', // webPageUrl: 'https://uat-phome.yunqueyi.com/',
......
src/views/index.vue
浏览文件 @ 14dc5073
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
</table> </table>
<article class="page-content-list" style="margin-top: 55px;"> <article class="page-content-list" style="margin-top: 55px;">
<CommonImgTitle></CommonImgTitle> <CommonImgTitle></CommonImgTitle>
<div :id="'subject_' + index" class="subject" v-for="(item, index) in gjFirstSubjectModelList" :key="index"> <div :id="'subject_0_' + index" class="subject" v-for="(item, index) in gjFirstSubjectModelList" :key="index">
<p>{{item.name}}<span v-show="item.titleCode">（{{item.titleCode}}）</span></p> <p>{{item.name}}<span v-show="item.titleCode">（{{item.titleCode}}）</span></p>
<ul class="item-wrapper"> <ul class="item-wrapper">
<li @click="coopDetails(item.secondSubjectModelList[0], 1)" v-if="item.secondSubjectModelList[0].projectId && item.secondSubjectModelList[0].openFlag" class="item"> <li @click="coopDetails(item, 1)" v-if="item.projectId && item.openFlag" class="item">
<img src="../images/course/icon-kc-1.png" alt=""> <img src="../images/course/icon-kc-1.png" alt="">
<span>课程</span> <span>课程</span>
<img v-if="item.secondSubjectModelList[0].bindCardStatus" class="buy" src="../images/course/icon-buy.png" alt=""> <img v-if="item.bindCardStatus" class="buy" src="../images/course/icon-buy.png" alt="">
</li> </li>
<li v-else class="item-pre"> <li v-if="item.projectId && !item.openFlag" class="item-pre">
<div class="pre"> <div class="pre">
<img src="../images/course/icon-kc-2.png" alt=""> <img src="../images/course/icon-kc-2.png" alt="">
<span class="pre">课程</span> <span class="pre">课程</span>
...@@ -44,25 +44,25 @@ ...@@ -44,25 +44,25 @@
<p>2020年10月上线</p> <p>2020年10月上线</p>
</li> </li>
<li @click="coopDetails(item.secondSubjectModelList[0], 2)" v-if="item.secondSubjectModelList[0].directoryList.length" class="item tk"> <li @click="coopDetails(item, 2)" v-if="item.directoryList.length" class="item tk">
<img src="../images/course/icon-tk-1.png" alt=""> <img src="../images/course/icon-tk-1.png" alt="">
<span>题库</span> <span>题库</span>
<img v-if="item.secondSubjectModelList[0].bindDirectoryCardStatus" class="buy" src="../images/course/icon-buy.png" alt=""> <img v-if="item.bindDirectoryCardStatus" class="buy" src="../images/course/icon-buy.png" alt="">
</li> </li>
</ul> </ul>
</div> </div>
</article> </article>
<article ref="zjListRef" class="page-content-list"> <article ref="zjListRef" class="page-content-list">
<CommonImgTitle imgType=2 title="中级职称"></CommonImgTitle> <CommonImgTitle imgType=2 title="中级职称"></CommonImgTitle>
<div class="subject" v-for="(item, index) in zjFirstSubjectModelList" :key="index"> <div :id="'subject_1_' + index" class="subject" v-for="(item, index) in zjFirstSubjectModelList" :key="index">
<p>{{item.name}}<span v-show="item.titleCode">（{{item.titleCode}}）</span></p> <p>{{item.name}}<span v-show="item.titleCode">（{{item.titleCode}}）</span></p>
<ul class="item-wrapper"> <ul class="item-wrapper">
<li @click="coopDetails(item.secondSubjectModelList[0], 1)" v-if="item.secondSubjectModelList[0].projectId && item.secondSubjectModelList[0].openFlag" class="item"> <li @click="coopDetails(item, 1)" v-if="item.projectId && item.openFlag" class="item">
<img src="../images/course/icon-kc-1.png" alt=""> <img src="../images/course/icon-kc-1.png" alt="">
<span>课程</span> <span>课程</span>
<img v-if="item.secondSubjectModelList[0].bindCardStatus" class="buy" src="../images/course/icon-buy.png" alt=""> <img v-if="item.bindCardStatus" class="buy" src="../images/course/icon-buy.png" alt="">
</li> </li>
<li v-else class="item-pre"> <li v-if="item.projectId && !item.openFlag" class="item-pre">
<div class="pre"> <div class="pre">
<img src="../images/course/icon-kc-2.png" alt=""> <img src="../images/course/icon-kc-2.png" alt="">
<span class="pre">课程</span> <span class="pre">课程</span>
...@@ -70,10 +70,10 @@ ...@@ -70,10 +70,10 @@
<p>2020年10月上线</p> <p>2020年10月上线</p>
</li> </li>
<li @click="coopDetails(item.secondSubjectModelList[0], 2)" v-if="item.secondSubjectModelList[0].directoryList.length" class="item tk"> <li @click="coopDetails(item, 2)" v-if="item.directoryList.length" class="item tk">
<img src="../images/course/icon-tk-1.png" alt=""> <img src="../images/course/icon-tk-1.png" alt="">
<span>题库</span> <span>题库</span>
<img v-if="item.secondSubjectModelList[0].bindDirectoryCardStatus" class="buy" src="../images/course/icon-buy.png" alt=""> <img v-if="item.bindDirectoryCardStatus" class="buy" src="../images/course/icon-buy.png" alt="">
</li> </li>
</ul> </ul>
</div> </div>
...@@ -252,8 +252,8 @@ export default { ...@@ -252,8 +252,8 @@ export default {
this.showLoading = false; this.showLoading = false;
if (res.code == "000000") { if (res.code == "000000") {
this.existBind = res.data.existBind || 0; this.existBind = res.data.existBind || 0;
this.zjFirstSubjectModelList = res.data.titleTestModelList[0].firstSubjectModelList || []; this.zjFirstSubjectModelList = res.data.titleTestModelList[0].firstSubjectModelList[0] && res.data.titleTestModelList[0].firstSubjectModelList[0].secondSubjectModelList || [];
this.gjFirstSubjectModelList = res.data.titleTestModelList[2].firstSubjectModelList || []; this.gjFirstSubjectModelList = res.data.titleTestModelList[2].firstSubjectModelList[0] && res.data.titleTestModelList[2].firstSubjectModelList[0].secondSubjectModelList || [];
// 如果有绑定的卡，并且之前没有做定位，则进行定位 // 如果有绑定的卡，并且之前没有做定位，则进行定位
if (this.existBind && !this.hasResetPosition) { if (this.existBind && !this.hasResetPosition) {
...@@ -270,9 +270,36 @@ export default { ...@@ -270,9 +270,36 @@ export default {
// 查找对应的职称与专业 // 查找对应的职称与专业
resetPosition(list) { resetPosition(list) {
if (!list.length) return;
let parentIndex = 0,
// fIndex = 0,
subIndex = 0,
firstSub = [],
secondSub = [];
outloop: for (let i = 0; i < list.length; i++) {
firstSub = list[i].firstSubjectModelList;
for (let j = 0; j < firstSub.length; j++) {
secondSub = firstSub[j].secondSubjectModelList;
for (let k = 0; k < secondSub.length; k++) {
if (secondSub[k].bindCardStatus || secondSub[k].bindDirectoryCardStatus) {
parentIndex = i;
// fIndex = j;
subIndex = k;
break outloop;
}
}
}
}
this.$forceUpdate();
this.resetProjectPosition(parentIndex, subIndex);
},
// 查找对应的职称与专业
resetPositionNew(list) {
console.log('in resetPosition', list); console.log('in resetPosition', list);
if (!list.length) return; if (!list.length) return;
let fIndex = 0, let fIndex = 0,
level = 1,
firstSub = [], firstSub = [],
secondSub = []; secondSub = [];
outloop: for (let i = 0; i < list.length; i++) { outloop: for (let i = 0; i < list.length; i++) {
...@@ -280,6 +307,9 @@ export default { ...@@ -280,6 +307,9 @@ export default {
for (let j = 0; j < firstSub.length; j++) { for (let j = 0; j < firstSub.length; j++) {
secondSub = firstSub[j].secondSubjectModelList; secondSub = firstSub[j].secondSubjectModelList;
if(secondSub.length) { if(secondSub.length) {
if(secondSub[0].bindCardStatus) {
level = 1;
}
if(secondSub[0].bindCardStatus || secondSub[0].bindDirectoryCardStatus) { if(secondSub[0].bindCardStatus || secondSub[0].bindDirectoryCardStatus) {
fIndex = j; fIndex = j;
break outloop; break outloop;
...@@ -292,11 +322,11 @@ export default { ...@@ -292,11 +322,11 @@ export default {
}, },
// 将定位到的元素，滚动到最上面 // 将定位到的元素，滚动到最上面
resetProjectPosition(fIndex) { resetProjectPosition(parentIndex, subIndex) {
this.$nextTick(() => { this.$nextTick(() => {
setTimeout(() => { setTimeout(() => {
let scrollTop = document.getElementById( let scrollTop = document.getElementById(
`subject_${fIndex}` `subject_${parentIndex}_${fIndex}`
).offsetTop; ).offsetTop;
window.scrollTo(0, scrollTop - 120); window.scrollTo(0, scrollTop - 120);
}, 100); }, 100);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或