|
@@ -684,6 +684,7 @@ export default {
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
stype: 1,
|
|
stype: 1,
|
|
|
|
|
+ gotype: window.topU && window.topU.gotype ? window.topU.gotype : '',
|
|
|
typeArray: [],
|
|
typeArray: [],
|
|
|
array: [],
|
|
array: [],
|
|
|
jArray: [],
|
|
jArray: [],
|
|
@@ -1162,7 +1163,6 @@ ${fileText}
|
|
|
"d87b62d3-1b6d-11f0-a66a-005056924926",
|
|
"d87b62d3-1b6d-11f0-a66a-005056924926",
|
|
|
"c25ea59b-1b6d-11f0-a66a-005056924926",
|
|
"c25ea59b-1b6d-11f0-a66a-005056924926",
|
|
|
]
|
|
]
|
|
|
-
|
|
|
|
|
let jk = 'selectTestType'
|
|
let jk = 'selectTestType'
|
|
|
if (list.includes(this.org)) {
|
|
if (list.includes(this.org)) {
|
|
|
jk = 'selectTestType_liYuan'
|
|
jk = 'selectTestType_liYuan'
|
|
@@ -1171,7 +1171,7 @@ ${fileText}
|
|
|
.get(this.$store.state.api + jk, params)
|
|
.get(this.$store.state.api + jk, params)
|
|
|
.then(res => {
|
|
.then(res => {
|
|
|
try {
|
|
try {
|
|
|
- if (window.topU.gotype == 'bjspersonTop') {
|
|
|
|
|
|
|
+ if (this.gotype == 'bjspersonTop') {
|
|
|
this.typeArray = res.data[0].filter(e => e.pid == "ce4f1224-37a5-11f1-bcd9-005056924926");
|
|
this.typeArray = res.data[0].filter(e => e.pid == "ce4f1224-37a5-11f1-bcd9-005056924926");
|
|
|
this.getData();
|
|
this.getData();
|
|
|
} else {
|
|
} else {
|
|
@@ -1269,24 +1269,54 @@ ${fileText}
|
|
|
},
|
|
},
|
|
|
getCourse() {
|
|
getCourse() {
|
|
|
this.isLoading = true;
|
|
this.isLoading = true;
|
|
|
- let params = {
|
|
|
|
|
- type: this.groupA,
|
|
|
|
|
- uid: this.userid,
|
|
|
|
|
- oid: this.oid,
|
|
|
|
|
- org: this.org,
|
|
|
|
|
- typea: "",
|
|
|
|
|
- typeb: "",
|
|
|
|
|
- typec: "",
|
|
|
|
|
- typed: "",
|
|
|
|
|
- typef: this.typeCheck,
|
|
|
|
|
- typeE: "",
|
|
|
|
|
- cu: "",
|
|
|
|
|
- cn: this.courseName,
|
|
|
|
|
- page: this.page,
|
|
|
|
|
- pageSize: this.pageSize
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ // let params = {
|
|
|
|
|
+ // type: this.groupA,
|
|
|
|
|
+ // uid: this.userid,
|
|
|
|
|
+ // oid: this.oid,
|
|
|
|
|
+ // org: this.org,
|
|
|
|
|
+ // typea: "",
|
|
|
|
|
+ // typeb: "",
|
|
|
|
|
+ // typec: "",
|
|
|
|
|
+ // typed: "",
|
|
|
|
|
+ // typef: this.typeCheck,
|
|
|
|
|
+ // typeE: "",
|
|
|
|
|
+ // cu: "",
|
|
|
|
|
+ // cn: this.courseName,
|
|
|
|
|
+ // page: this.page,
|
|
|
|
|
+ // pageSize: this.pageSize
|
|
|
|
|
+ // };
|
|
|
|
|
+
|
|
|
|
|
+ let params = {}
|
|
|
|
|
+
|
|
|
|
|
+ if (this.gotype == 'bjspersonTop') {
|
|
|
|
|
+ params = {
|
|
|
|
|
+ uid: this.userid,
|
|
|
|
|
+ type: 0,
|
|
|
|
|
+ oid: this.oid,
|
|
|
|
|
+ org: this.org,
|
|
|
|
|
+ typeId: this.typeCheck ? this.typeCheck : 'ce4f1224-37a5-11f1-bcd9-005056924926',
|
|
|
|
|
+ textValue: this.courseName || ''
|
|
|
|
|
+ }
|
|
|
|
|
+ }else{
|
|
|
|
|
+ params = {
|
|
|
|
|
+ type: this.groupA,
|
|
|
|
|
+ uid: this.userid,
|
|
|
|
|
+ oid: this.oid,
|
|
|
|
|
+ org: this.org,
|
|
|
|
|
+ typea: "",
|
|
|
|
|
+ typeb: "",
|
|
|
|
|
+ typec: "",
|
|
|
|
|
+ typed: "",
|
|
|
|
|
+ typef: this.typeCheck,
|
|
|
|
|
+ typeE: "",
|
|
|
|
|
+ cu: "",
|
|
|
|
|
+ cn: this.courseName,
|
|
|
|
|
+ page: this.page,
|
|
|
|
|
+ pageSize: this.pageSize
|
|
|
|
|
+ };
|
|
|
|
|
+ }
|
|
|
this.ajax
|
|
this.ajax
|
|
|
- .get(this.$store.state.api + "selectTesttCourse", params)
|
|
|
|
|
|
|
+ .get(this.$store.state.api + (this.gotype == 'bjspersonTop' ? 'selectTesttCourse_sass' : "selectTesttCourse"), params)
|
|
|
.then(res => {
|
|
.then(res => {
|
|
|
console.log("API返回的数据", res.data);
|
|
console.log("API返回的数据", res.data);
|
|
|
this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
|
|
this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
|