|
@@ -158,13 +158,13 @@
|
|
|
class="orgData"
|
|
|
>
|
|
|
<div @click="lookPrize(item2.courseId)">
|
|
|
- {{ item2.title }}:{{ item2.num }}份
|
|
|
+ <!-- {{ item2.title }} -->
|
|
|
+ 查看:{{ item2.num }}份
|
|
|
</div>
|
|
|
<div
|
|
|
- style="color: black;"
|
|
|
@click="goFillIn(item2.courseId)"
|
|
|
>
|
|
|
- 去填写
|
|
|
+ 填写
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -248,35 +248,32 @@ export default {
|
|
|
timeA:"",
|
|
|
timeB:"",
|
|
|
testExamineBaseList:[],
|
|
|
+ brief:"",
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
- // pType(newVal, oldVal) {
|
|
|
- // this.getPageBase();
|
|
|
- // console.log('333');
|
|
|
-
|
|
|
- // },
|
|
|
- // timeA(){
|
|
|
- // this.getPageBase();
|
|
|
- // console.log('444');
|
|
|
-
|
|
|
- // },
|
|
|
+ pType(newVal, oldVal) {
|
|
|
+ this.getPageBase();
|
|
|
+ },
|
|
|
+ timeA(){
|
|
|
+ this.getPageBase();
|
|
|
+ },
|
|
|
timeB(){
|
|
|
this.getPageBase();
|
|
|
}
|
|
|
},
|
|
|
computed: {},
|
|
|
- activated() {
|
|
|
- // 当组件被激活时调用
|
|
|
+ // activated() {
|
|
|
+ // // 当组件被激活时调用
|
|
|
+ // this.getPageBase();
|
|
|
+ // this.getPageBase2(1)
|
|
|
+ // this.getPageBase2(2)
|
|
|
+ // },
|
|
|
+ mounted() {
|
|
|
this.getPageBase();
|
|
|
this.getPageBase2(1)
|
|
|
this.getPageBase2(2)
|
|
|
- },
|
|
|
- mounted() {
|
|
|
- // this.getPageBase();
|
|
|
- // this.getPageBase2(1)
|
|
|
- // this.getPageBase2(2)
|
|
|
- // console.log('2222');
|
|
|
+ console.log('2222');
|
|
|
|
|
|
// console.log(JSON.stringify(this.TeaTabJson));
|
|
|
},
|
|
@@ -449,13 +446,14 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
-
|
|
|
+ // console.log('this.PageBaseData2222222',this.PageBaseData);
|
|
|
this.handleData();
|
|
|
return (this.tabLoad = false);
|
|
|
} else {
|
|
|
this.allData.type = 1;
|
|
|
this.allData.rjson = "";
|
|
|
this.handleData();
|
|
|
+ // console.log('this.PageBaseData3333',this.PageBaseData);
|
|
|
this.tabLoad = false;
|
|
|
}
|
|
|
// this.$forceUpdate();
|
|
@@ -483,9 +481,11 @@ export default {
|
|
|
// console.log("resresresres", res.data[0]);
|
|
|
// this.allData = res.data[0][0];
|
|
|
let testExamineBaseList = res.data[0];
|
|
|
+ // console.log("res.data[0][0]", res.data[0][0]);
|
|
|
this.testExamineBaseList = testExamineBaseList;
|
|
|
- console.log("selectTestExamineBase", res.data[0][0]);
|
|
|
+ // console.log("selectTestExamineBase", res.data[0][0]);
|
|
|
this.PageBaseData = JSON.parse(res.data[0][0].json);
|
|
|
+ // console.log('this.PageBaseData1111111111111111',this.PageBaseData);
|
|
|
// 先获取基础模板,然后再获取用户又没有填写过,填写过就开始循环赋值给基础模板,最后提交基础模板
|
|
|
this.getData();
|
|
|
|
|
@@ -495,7 +495,7 @@ export default {
|
|
|
console.log(error);
|
|
|
});
|
|
|
},
|
|
|
- // 获取页面基础ui信息
|
|
|
+ // 获取页面基础ui信息,年度筛选框数据和展示哪个页面
|
|
|
getPageBase2(type) {
|
|
|
let params = {
|
|
|
typ: type,
|
|
@@ -512,10 +512,10 @@ export default {
|
|
|
if(this.timeListA.length>0)this.timeA = this.timeListA[0].value;
|
|
|
}else {
|
|
|
this.bArray = res.data[0];
|
|
|
- this.timeListB = this.bArray.map(i=>{return {value:i.time,label:i.timeLabel}})
|
|
|
- if(this.timeListB.length>0)this.timeB = this.timeListB[0].value;
|
|
|
- if(!this.bArray.length){
|
|
|
- this.pType = 1
|
|
|
+ this.timeListB = this.bArray.map(i=>{return {value:i.time,label:i.timeLabel}}) //获取年度筛选框数据
|
|
|
+ if(this.timeListB.length>0)this.timeB = this.timeListB[0].value; //默认选择最新年度
|
|
|
+ if(!this.bArray.length){
|
|
|
+ this.pType = 1 //显示专任教室页面
|
|
|
}
|
|
|
}
|
|
|
})
|
|
@@ -523,7 +523,7 @@ export default {
|
|
|
console.log(error);
|
|
|
});
|
|
|
},
|
|
|
- async handleData() {
|
|
|
+ async handleData() { //获取数据来源数据
|
|
|
for (const e of this.PageBaseData) {
|
|
|
for (const k of e.children) {
|
|
|
if (k.testid.test.length > 0) {
|
|
@@ -533,6 +533,8 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computedTest(val) {
|
|
|
+ // console.log('val',val);
|
|
|
+
|
|
|
let params = [
|
|
|
{
|
|
|
uid: this.userid,
|