|
@@ -217,7 +217,7 @@
|
|
|
</el-tooltip>
|
|
|
<div class="ml">目录</div>
|
|
|
<div class="cru_selectBox">
|
|
|
- <div v-for="(dy, dyIndex) in dyList" :key="dyIndex">
|
|
|
+ <div v-for="(dy, dyIndex) in dyList2" :key="dyIndex">
|
|
|
<div class="blue_box_one" @click="isOpen(dyIndex)">
|
|
|
<div>第{{ dyIndex + 1 }}阶段</div>
|
|
|
<div>{{ dy.name }}</div>
|
|
@@ -225,7 +225,7 @@
|
|
|
<div
|
|
|
class="twoChild"
|
|
|
:class="{
|
|
|
- navActive: dyIndex == stageIndex,
|
|
|
+ navActive: dy.id == stageIndex,
|
|
|
}"
|
|
|
>
|
|
|
<div
|
|
@@ -235,21 +235,21 @@
|
|
|
>
|
|
|
<div
|
|
|
class="navTask"
|
|
|
- @click="openTask(dyIndex, navIndex, nav.id)"
|
|
|
+ @click="openTask(dy.id, nav.id)"
|
|
|
:class="{
|
|
|
openTaskActive:
|
|
|
- navIndex == taskCount &&
|
|
|
- nav.id == navId &&
|
|
|
- dyIndex == stageIndex,
|
|
|
+ nav.id == taskCount &&
|
|
|
+ dy.id + '-' + nav.id == navId &&
|
|
|
+ dy.id == stageIndex,
|
|
|
}"
|
|
|
>
|
|
|
<div
|
|
|
class="vedioNav"
|
|
|
:class="{
|
|
|
isClick:
|
|
|
- navIndex == taskCount &&
|
|
|
- nav.id == navId &&
|
|
|
- dyIndex == stageIndex,
|
|
|
+ nav.id == taskCount &&
|
|
|
+ dy.id + '-' + nav.id == navId &&
|
|
|
+ dy.id == stageIndex,
|
|
|
}"
|
|
|
style="margin: 0"
|
|
|
>
|
|
@@ -269,7 +269,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="shuBox">
|
|
|
+ <div class="shuBox" v-if="worksDetail.length">
|
|
|
<div
|
|
|
class="allBox"
|
|
|
v-for="(sin, sIndex) in sInfo"
|
|
@@ -883,6 +883,7 @@ export default {
|
|
|
},
|
|
|
askJson: {},
|
|
|
dyList: [],
|
|
|
+ dyList2: [],
|
|
|
userAarray: [],
|
|
|
};
|
|
|
},
|
|
@@ -963,7 +964,7 @@ export default {
|
|
|
_rateList = [];
|
|
|
var worksDetail = res.data[1];
|
|
|
// this.scopeId = res.data[2][0].id;
|
|
|
- var scopeId = res.data[2][0].id;
|
|
|
+ // var scopeId = res.data[2][0].id;
|
|
|
var askInfo = res.data[3];
|
|
|
var answerInfo = res.data[4];
|
|
|
var pptInfo = res.data[5];
|
|
@@ -978,6 +979,7 @@ export default {
|
|
|
answerInfo: [],
|
|
|
wpptInfo: [],
|
|
|
scopeId: res.data[0][k].id,
|
|
|
+ stagetask: "",
|
|
|
});
|
|
|
this.allWorks = res.data[0][k];
|
|
|
this.chapInfo.push(JSON.parse(res.data[0][k].chapters));
|
|
@@ -986,15 +988,19 @@ export default {
|
|
|
chapters[0][res.data[0][k].stage].chapterInfo[0].taskJson[
|
|
|
res.data[0][k].task
|
|
|
].eList;
|
|
|
+ workJson[k].stagetask =
|
|
|
+ res.data[0][k].stage + "-" + res.data[0][k].task;
|
|
|
if (eList) {
|
|
|
+ _ooption = [];
|
|
|
workJson[k].eList = eList;
|
|
|
for (var i = 0; i < eList.length; i++) {
|
|
|
_ooption.push({ value: 0, name: eList[i].value });
|
|
|
- workJson[k].rateList[eList[j].value] = 0;
|
|
|
+ workJson[k].rateList[eList[i].value] = 0;
|
|
|
}
|
|
|
workJson[k].rateList.content = "";
|
|
|
this.ooption[k] = _ooption;
|
|
|
} else {
|
|
|
+ _ooption = [];
|
|
|
workJson[k].eList = [
|
|
|
{ value: "意识能力", detail: "", score: 5 },
|
|
|
{ value: "科学探究能力", detail: "", score: 5 },
|
|
@@ -1129,6 +1135,30 @@ export default {
|
|
|
}
|
|
|
}, 0);
|
|
|
|
|
|
+ let _dyList = JSON.parse(JSON.stringify(this.dyList));
|
|
|
+ let _dyList2 = [];
|
|
|
+ let _dyList3 = [];
|
|
|
+ for (var c = 0; c < _dyList.length; c++) {
|
|
|
+ _dyList[c].taskList = [];
|
|
|
+ _dyList2.push(_dyList[c]);
|
|
|
+ }
|
|
|
+ _dyList = JSON.parse(JSON.stringify(this.dyList));
|
|
|
+ for (var c = 0; c < workJson.length; c++) {
|
|
|
+ let _stage = workJson[c].stagetask.split("-")[0];
|
|
|
+ let _task = workJson[c].stagetask.split("-")[1];
|
|
|
+ _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
|
|
|
+ _dyList2[_stage].taskList;
|
|
|
+ }
|
|
|
+ for (var c = 0; c < _dyList2.length; c++) {
|
|
|
+ if (_dyList2[c].taskList.length) {
|
|
|
+ _dyList3.push(_dyList2[c]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.dyList2 = _dyList3;
|
|
|
+ this.stageIndex = this.dyList2[0].id;
|
|
|
+ this.taskCount = this.dyList2[0].taskList[0].id;
|
|
|
+ this.navId =
|
|
|
+ this.dyList2[0].id + "-" + this.dyList2[0].taskList[0].id;
|
|
|
// this.sInfo = res.data[0][0];
|
|
|
// this.chapInfo = JSON.parse(res.data[0][0].chapters);
|
|
|
// var chapters = JSON.parse(res.data[0][0].chapters);
|
|
@@ -1486,6 +1516,7 @@ export default {
|
|
|
imgIndex: 0,
|
|
|
eList: [],
|
|
|
rateList: {},
|
|
|
+ wpptInfo: [],
|
|
|
askInfo: [],
|
|
|
answerInfo: [],
|
|
|
};
|
|
@@ -1662,15 +1693,15 @@ export default {
|
|
|
isOpen(s) {
|
|
|
this.stageIndex = s;
|
|
|
},
|
|
|
- openTask(s, t, i) {
|
|
|
- var a = s + "-" + t;
|
|
|
+ openTask(s, i) {
|
|
|
+ var a = s + "-" + i;
|
|
|
var b = document.getElementById(a);
|
|
|
var d = b.getAttribute("scrollindex");
|
|
|
var c = document.getElementsByClassName("shuBox")[0];
|
|
|
c.scrollTop = parseInt(d) * 375;
|
|
|
this.stageIndex = s;
|
|
|
- this.taskCount = t;
|
|
|
- this.navId = i;
|
|
|
+ this.taskCount = i;
|
|
|
+ this.navId = a;
|
|
|
},
|
|
|
async generate(a) {
|
|
|
// 将html文件中需要用到的数据挂载到store上
|
|
@@ -2188,6 +2219,7 @@ export default {
|
|
|
.zyBox {
|
|
|
display: flex;
|
|
|
min-width: 600px;
|
|
|
+ width: 600px;
|
|
|
position: relative;
|
|
|
background: #fff;
|
|
|
flex-direction: column;
|
|
@@ -2262,7 +2294,8 @@ export default {
|
|
|
}
|
|
|
|
|
|
.max_diy >>> .el-dialog {
|
|
|
- max-width: 1200px;
|
|
|
+ /* max-width: 1200px; */
|
|
|
+ max-width: 1300px;
|
|
|
}
|
|
|
|
|
|
.dialog_diy2 >>> .el-dialog__header {
|
|
@@ -2296,7 +2329,8 @@ export default {
|
|
|
margin: 10px 0;
|
|
|
background: #fff;
|
|
|
padding: 15px;
|
|
|
- max-height: 400px;
|
|
|
+ /* max-height: 400px; */
|
|
|
+ max-height: 170px;
|
|
|
overflow: auto;
|
|
|
}
|
|
|
.a_add_box {
|
|
@@ -2496,7 +2530,7 @@ export default {
|
|
|
width: 20%;
|
|
|
margin-right: 10px;
|
|
|
background: rgb(255, 255, 255);
|
|
|
- padding-right: 10px;
|
|
|
+ /* padding-right: 10px; */
|
|
|
height: 500px;
|
|
|
}
|
|
|
.cTitle {
|
|
@@ -2524,7 +2558,7 @@ export default {
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
.cru_selectBox {
|
|
|
- width: 105%;
|
|
|
+ width: 100%;
|
|
|
margin: 0 auto;
|
|
|
overflow: auto;
|
|
|
height: 400px;
|
|
@@ -2554,7 +2588,7 @@ export default {
|
|
|
color: #fff;
|
|
|
background-image: linear-gradient(90deg, #477cd7, #65b9fc);
|
|
|
border-radius: 7px;
|
|
|
- margin: 10px;
|
|
|
+ margin: 10px auto;
|
|
|
cursor: pointer;
|
|
|
width: 95%;
|
|
|
height: 45px;
|
|
@@ -2588,7 +2622,7 @@ export default {
|
|
|
}
|
|
|
.twoChild {
|
|
|
width: 95%;
|
|
|
- margin: 10px;
|
|
|
+ margin: 10px auto;
|
|
|
border-radius: 5px;
|
|
|
background: #f2f2f2;
|
|
|
display: flex;
|