|
|
@@ -1411,13 +1411,31 @@
|
|
|
v-for="(item, index) in worksDetail[sIndex].eList"
|
|
|
:key="index"
|
|
|
>
|
|
|
+ <el-tooltip
|
|
|
+ class="item"
|
|
|
+ effect="dark"
|
|
|
+ v-if="worksDetail[sIndex].state == 5"
|
|
|
+ :content="item.detail"
|
|
|
+ placement="top-start"
|
|
|
+ >
|
|
|
+ <div class="RootImgBlock">
|
|
|
+ <img
|
|
|
+ v-if="item.isai == 1"
|
|
|
+ class="RootImg"
|
|
|
+ src="../../../assets/icon/conSentences/Brootper.svg"
|
|
|
+ alt=""
|
|
|
+ />
|
|
|
+ {{ item.detail }}
|
|
|
+ </div>
|
|
|
+ </el-tooltip>
|
|
|
<el-tooltip
|
|
|
class="item"
|
|
|
effect="dark"
|
|
|
+ v-else
|
|
|
:content="item.value"
|
|
|
placement="top-start"
|
|
|
>
|
|
|
- <div class="RootImgBlock">
|
|
|
+ <div class="RootImgBlock">
|
|
|
<img
|
|
|
v-if="item.isai == 1"
|
|
|
class="RootImg"
|
|
|
@@ -1430,7 +1448,7 @@
|
|
|
<el-rate
|
|
|
class="rate_size"
|
|
|
style="min-width: 120px"
|
|
|
- v-model="worksDetail[sIndex].rateList[item.value]"
|
|
|
+ v-model="worksDetail[sIndex].rateList[item.detail]"
|
|
|
@change="getStar(sIndex)"
|
|
|
></el-rate>
|
|
|
</div>
|
|
|
@@ -1453,7 +1471,8 @@
|
|
|
.eList"
|
|
|
:key="tarIndex"
|
|
|
>
|
|
|
- <span v-if="item.target"> {{ item.target }}</span>
|
|
|
+ <span v-if="worksDetail[sIndex].state == 5"> {{ item.target }}</span>
|
|
|
+ <span v-else> {{ item.target[item.target.length-1] }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1859,13 +1878,16 @@ export default {
|
|
|
return function(val) {
|
|
|
let sco = 0;
|
|
|
let num = 0;
|
|
|
-
|
|
|
+
|
|
|
for (const key in val) {
|
|
|
- if (val[key] || key != 'content') {
|
|
|
+ if (val[key] && key != 'content') {
|
|
|
sco += val[key] * 1;
|
|
|
}
|
|
|
num += 1;
|
|
|
}
|
|
|
+
|
|
|
+ if(sco == 0) return '0.0'
|
|
|
+
|
|
|
return (sco / (num - 1)).toFixed(1);
|
|
|
};
|
|
|
},
|
|
|
@@ -2068,6 +2090,7 @@ export default {
|
|
|
wordInfo: [],
|
|
|
scopeId: res.data[0][k].id,
|
|
|
stagetask: stagetask,
|
|
|
+ state: res.data[0][k].state,
|
|
|
time: "",
|
|
|
};
|
|
|
checkJson[stagetask] = {
|
|
|
@@ -2547,7 +2570,7 @@ export default {
|
|
|
result[l].eList = eList;
|
|
|
for (var i = 0; i < eList.length; i++) {
|
|
|
_ooption.push({ value: 0, name: eList[i].value });
|
|
|
- result[l].rateList[eList[i].value] = 0;
|
|
|
+ result[l].rateList[eList[i].detail] = 0;
|
|
|
}
|
|
|
result[l].rateList.content = "";
|
|
|
this.ooption[l] = _ooption;
|
|
|
@@ -2600,7 +2623,7 @@ export default {
|
|
|
result[l].eList = eList;
|
|
|
for (var i = 0; i < eList.length; i++) {
|
|
|
_ooption.push({ value: 0, name: eList[i].value });
|
|
|
- result[l].rateList[eList[i].value] = 0;
|
|
|
+ result[l].rateList[eList[i].detail] = 0;
|
|
|
}
|
|
|
result[l].rateList.content = "";
|
|
|
this.ooption[l] = _ooption;
|
|
|
@@ -2744,91 +2767,91 @@ export default {
|
|
|
wordInfo: []
|
|
|
};
|
|
|
var eList = [];
|
|
|
- if (workEvaList.length > 0) {
|
|
|
- for (var qi = 0; qi < workEvaList.length; qi++) {
|
|
|
- var eListOld =
|
|
|
- chapters[workEvaList[qi].stage].chapterInfo[0].taskJson[
|
|
|
- workEvaList[qi].task
|
|
|
- ].eList;
|
|
|
- var _ooption = [];
|
|
|
- if (eListOld && eListOld.length) {
|
|
|
- var eListNew = Object.keys(eListOld).map(function(key) {
|
|
|
- return {
|
|
|
- detail: eListOld[key].detail,
|
|
|
- score: eListOld[key].score,
|
|
|
- value: eListOld[key].value
|
|
|
- };
|
|
|
- });
|
|
|
- eList = eListNew;
|
|
|
- if (eList && eList.length) {
|
|
|
- workJson.eList = eList;
|
|
|
- for (var i = 0; i < eList.length; i++) {
|
|
|
- _ooption.push({ value: 0, name: eList[i].value });
|
|
|
- workJson.rateList[eList[i].value] = 0;
|
|
|
- }
|
|
|
- workJson.rateList.content = "";
|
|
|
- this.ooption = _ooption;
|
|
|
- } else {
|
|
|
- workJson.eList = [
|
|
|
- { value: "意识能力", detail: "", score: 5 },
|
|
|
- { value: "科学探究能力", detail: "", score: 5 },
|
|
|
- { value: "实践创新能力", detail: "", score: 5 },
|
|
|
- { value: "学习反思能力", detail: "", score: 5 },
|
|
|
- { value: "工程思维能力", detail: "", score: 5 }
|
|
|
- ];
|
|
|
- for (var i = 0; i < workJson.eList.length; i++) {
|
|
|
- _ooption.push({ value: 0, name: workJson.eList[i].value });
|
|
|
- workJson.rateList[workJson.eList[i].value] = 0;
|
|
|
- }
|
|
|
- workJson.rateList.content = "";
|
|
|
- this.ooption = [
|
|
|
- { value: 0, name: "意识能力" },
|
|
|
- { value: 0, name: "科学探究能力" },
|
|
|
- { value: 0, name: "实践创新能力" },
|
|
|
- { value: 0, name: "学习反思能力" },
|
|
|
- { value: 0, name: "工程思维能力" }
|
|
|
- ];
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- var _rate = [],
|
|
|
- _rateList = [];
|
|
|
- if (workEvaList.length > 0) {
|
|
|
- for (var p = 0; p < workEvaList.length; p++) {
|
|
|
- if (workEvaList[p].rate && eList && eList.length) {
|
|
|
- _rate[p] = JSON.parse(workEvaList[p].rate);
|
|
|
- }
|
|
|
- _rateList[p] = Object.keys(JSON.parse(workEvaList[p].rate));
|
|
|
- for (var i = 0; i < _rateList[p].length; i++) {
|
|
|
- var _c = Object.keys(workJson.rateList);
|
|
|
- if (_c.indexOf(_rateList[p][i]) != -1) {
|
|
|
- workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
|
|
|
- }
|
|
|
- }
|
|
|
- for (var i = 0; i < this.ooption[p].length; i++) {
|
|
|
- if (_rateList[p].indexOf(this.ooption[p][i].name) != -1) {
|
|
|
- this.ooption[p][i].value = _rate[p][this.ooption[p][i].name];
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (this.sInfo.rate) {
|
|
|
- _rate = JSON.parse(this.sInfo.rate);
|
|
|
- _rateList = Object.keys(JSON.parse(this.sInfo.rate));
|
|
|
- for (var i = 0; i < _rateList.length; i++) {
|
|
|
- var _c = Object.keys(workJson.rateList);
|
|
|
- if (_c.indexOf(_rateList[i]) != -1) {
|
|
|
- workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
|
|
|
- }
|
|
|
- }
|
|
|
- for (var i = 0; i < this.ooption.length; i++) {
|
|
|
- if (_rateList.indexOf(this.ooption[i].name) != -1) {
|
|
|
- this.ooption[i].value = _rate[this.ooption[i].name];
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (workEvaList.length > 0) {
|
|
|
+ // for (var qi = 0; qi < workEvaList.length; qi++) {
|
|
|
+ // var eListOld =
|
|
|
+ // chapters[workEvaList[qi].stage].chapterInfo[0].taskJson[
|
|
|
+ // workEvaList[qi].task
|
|
|
+ // ].eList;
|
|
|
+ // var _ooption = [];
|
|
|
+ // if (eListOld && eListOld.length) {
|
|
|
+ // var eListNew = Object.keys(eListOld).map(function(key) {
|
|
|
+ // return {
|
|
|
+ // detail: eListOld[key].detail,
|
|
|
+ // score: eListOld[key].score,
|
|
|
+ // value: eListOld[key].value
|
|
|
+ // };
|
|
|
+ // });
|
|
|
+ // eList = eListNew;
|
|
|
+ // if (eList && eList.length) {
|
|
|
+ // workJson.eList = eList;
|
|
|
+ // for (var i = 0; i < eList.length; i++) {
|
|
|
+ // _ooption.push({ value: 0, name: eList[i].value });
|
|
|
+ // workJson.rateList[eList[i].value] = 0;
|
|
|
+ // }
|
|
|
+ // workJson.rateList.content = "";
|
|
|
+ // this.ooption = _ooption;
|
|
|
+ // } else {
|
|
|
+ // workJson.eList = [
|
|
|
+ // { value: "意识能力", detail: "", score: 5 },
|
|
|
+ // { value: "科学探究能力", detail: "", score: 5 },
|
|
|
+ // { value: "实践创新能力", detail: "", score: 5 },
|
|
|
+ // { value: "学习反思能力", detail: "", score: 5 },
|
|
|
+ // { value: "工程思维能力", detail: "", score: 5 }
|
|
|
+ // ];
|
|
|
+ // for (var i = 0; i < workJson.eList.length; i++) {
|
|
|
+ // _ooption.push({ value: 0, name: workJson.eList[i].value });
|
|
|
+ // workJson.rateList[workJson.eList[i].value] = 0;
|
|
|
+ // }
|
|
|
+ // workJson.rateList.content = "";
|
|
|
+ // this.ooption = [
|
|
|
+ // { value: 0, name: "意识能力" },
|
|
|
+ // { value: 0, name: "科学探究能力" },
|
|
|
+ // { value: 0, name: "实践创新能力" },
|
|
|
+ // { value: 0, name: "学习反思能力" },
|
|
|
+ // { value: 0, name: "工程思维能力" }
|
|
|
+ // ];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // var _rate = [],
|
|
|
+ // _rateList = [];
|
|
|
+ // if (workEvaList.length > 0) {
|
|
|
+ // for (var p = 0; p < workEvaList.length; p++) {
|
|
|
+ // if (workEvaList[p].rate && eList && eList.length) {
|
|
|
+ // _rate[p] = JSON.parse(workEvaList[p].rate);
|
|
|
+ // }
|
|
|
+ // _rateList[p] = Object.keys(JSON.parse(workEvaList[p].rate));
|
|
|
+ // for (var i = 0; i < _rateList[p].length; i++) {
|
|
|
+ // var _c = Object.keys(workJson.rateList);
|
|
|
+ // if (_c.indexOf(_rateList[p][i]) != -1) {
|
|
|
+ // workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // for (var i = 0; i < this.ooption[p].length; i++) {
|
|
|
+ // if (_rateList[p].indexOf(this.ooption[p][i].name) != -1) {
|
|
|
+ // this.ooption[p][i].value = _rate[p][this.ooption[p][i].name];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+ // if (this.sInfo.rate) {
|
|
|
+ // _rate = JSON.parse(this.sInfo.rate);
|
|
|
+ // _rateList = Object.keys(JSON.parse(this.sInfo.rate));
|
|
|
+ // for (var i = 0; i < _rateList.length; i++) {
|
|
|
+ // var _c = Object.keys(workJson.rateList);
|
|
|
+ // if (_c.indexOf(_rateList[i]) != -1) {
|
|
|
+ // workJson.rateList[_rateList[i]] = _rate[_rateList[i]];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // for (var i = 0; i < this.ooption.length; i++) {
|
|
|
+ // if (_rateList.indexOf(this.ooption[i].name) != -1) {
|
|
|
+ // this.ooption[i].value = _rate[this.ooption[i].name];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
for (var i = 0; i < worksDetail.length; i++) {
|
|
|
workJson.img.push({
|
|
|
@@ -3568,7 +3591,14 @@ export default {
|
|
|
if (element) {
|
|
|
element.scrollIntoView({
|
|
|
behavior: 'smooth'
|
|
|
+ },()=>{
|
|
|
+ let scrollBody = document.querySelector(".zyBoxC").parentElement
|
|
|
+ scrollBody.scrollTop = scrollBody.scrollTop - 30
|
|
|
});
|
|
|
+ setTimeout(() => {
|
|
|
+ let scrollBody = document.querySelector(".zyBoxC").parentElement
|
|
|
+ scrollBody.scrollTop = scrollBody.scrollTop - 70
|
|
|
+ }, 500);
|
|
|
}
|
|
|
var a = s + "-" + i;
|
|
|
// var b = document.getElementById(a);
|
11wqe1