|
|
@@ -25,9 +25,11 @@
|
|
|
</div>
|
|
|
<div class="step_box" :style="{ width: steps == 2 && '100%' }">
|
|
|
<setInfo v-if="steps == 1 && !loading" :oid="oid" :org="org" :steps.sync="steps" :title.sync="title"
|
|
|
- :testType.sync="testType" :see.sync="see" :cJson.sync="cJson" :typeid.sync="typeid" :brief.sync="brief" :juri.sync="juri" :overDate.sync="overDate" :juriList.sync="juriList"></setInfo>
|
|
|
- <editInfo v-if="steps == 2 && !loading" :oid="oid" :org="org" :steps.sync="steps" :title.sync="title"
|
|
|
- :cJson.sync="cJson" @save="save" @publish="publish"></editInfo>
|
|
|
+ :testType.sync="testType" :see.sync="see" :cJson.sync="cJson" :typeid.sync="typeid"
|
|
|
+ :brief.sync="brief" :juri.sync="juri" :overDate.sync="overDate" :juriList.sync="juriList" :typeInfo.sync="typeInfo">
|
|
|
+ </setInfo>
|
|
|
+ <editInfo v-if="steps == 2 && !loading" :oid="oid" :org="org" :steps.sync="steps"
|
|
|
+ :title.sync="title" :cJson.sync="cJson" @save="save" @publish="publish"></editInfo>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -53,13 +55,14 @@ export default {
|
|
|
testType: [],
|
|
|
see: false,
|
|
|
cJson: [],
|
|
|
- loading:false,
|
|
|
- look:"",
|
|
|
- typeid:"",
|
|
|
- brief:"",
|
|
|
- juri:'0',
|
|
|
- overDate:"",
|
|
|
- juriList:"",
|
|
|
+ loading: false,
|
|
|
+ look: "",
|
|
|
+ typeid: "",
|
|
|
+ brief: "",
|
|
|
+ juri: '0',
|
|
|
+ overDate: "",
|
|
|
+ juriList: "",
|
|
|
+ typeInfo: [],
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -95,7 +98,7 @@ export default {
|
|
|
if (this.title == "") {
|
|
|
this.$message.error("请补充填写课程名称");
|
|
|
return;
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
this.addWork(5);
|
|
|
}
|
|
|
// else if(!this.juriList.length){
|
|
|
@@ -106,7 +109,7 @@ export default {
|
|
|
if (this.title == "") {
|
|
|
this.$message.error("请补充填写课程名称");
|
|
|
return;
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
this.updateWork(5);
|
|
|
}
|
|
|
// else if(!this.juriList.length){
|
|
|
@@ -135,6 +138,12 @@ export default {
|
|
|
this.$router.push(path);
|
|
|
},
|
|
|
addWork(look) {
|
|
|
+ let j3 = []
|
|
|
+ if(this.typeInfo.length){
|
|
|
+ this.typeInfo.forEach(e => {
|
|
|
+ j3.push(e.value)
|
|
|
+ })
|
|
|
+ }
|
|
|
let params = [
|
|
|
{
|
|
|
uid: this.userid,
|
|
|
@@ -151,14 +160,15 @@ export default {
|
|
|
inviteCode: "",
|
|
|
typeid: this.typeid ? this.typeid : '',
|
|
|
overtime: this.overDate ? this.formatTime(this.overDate) : '',
|
|
|
- j2: this.juriList.length ? this.juriList.join(",") : ''
|
|
|
+ j2: this.juriList.length ? this.juriList.join(",") : '',
|
|
|
+ j3: j3.length ? j3.join(",") : '',
|
|
|
},
|
|
|
];
|
|
|
this.ajax
|
|
|
- .post(this.$store.state.api + "addTestCourse", params)
|
|
|
+ .post(this.$store.state.api + "addTestCourse3", params)
|
|
|
.then((res) => {
|
|
|
this.cid = res.data.courseId;
|
|
|
- if(look == 5){
|
|
|
+ if (look == 5) {
|
|
|
this.$message.success("保存成功")
|
|
|
this.goTo(
|
|
|
"/test?userid=" +
|
|
|
@@ -185,10 +195,16 @@ export default {
|
|
|
const year = date.getFullYear();
|
|
|
const month = String(date.getMonth() + 1).padStart(2, '0');
|
|
|
const day = String(date.getDate()).padStart(2, '0');
|
|
|
-
|
|
|
+
|
|
|
return `${year}-${month}-${day}`;
|
|
|
},
|
|
|
updateWork(look) {
|
|
|
+ let j3 = []
|
|
|
+ if(this.typeInfo.length){
|
|
|
+ this.typeInfo.forEach(e => {
|
|
|
+ j3.push(e.value)
|
|
|
+ })
|
|
|
+ }
|
|
|
let params = [
|
|
|
{
|
|
|
cid: this.cid,
|
|
|
@@ -206,13 +222,14 @@ export default {
|
|
|
look: look == 3 ? 2 : look == 4 ? this.look : look == 5 ? this.look : look,
|
|
|
typeid: this.typeid ? this.typeid : '',
|
|
|
overtime: this.overDate ? this.formatTime(this.overDate) : '',
|
|
|
- j2: this.juriList.length ? this.juriList.join(",") : ''
|
|
|
+ j2: this.juriList.length ? this.juriList.join(",") : '',
|
|
|
+ j3: j3.length ? j3.join(",") : '',
|
|
|
},
|
|
|
];
|
|
|
this.ajax
|
|
|
- .post(this.$store.state.api + "updateTestCourse", params)
|
|
|
+ .post(this.$store.state.api + "updateTestCourse3", params)
|
|
|
.then((res) => {
|
|
|
- if(look == 3){
|
|
|
+ if (look == 3) {
|
|
|
this.$message.success("发布成功")
|
|
|
this.goTo(
|
|
|
"/test?userid=" +
|
|
|
@@ -224,11 +241,11 @@ export default {
|
|
|
"&role=" +
|
|
|
this.role
|
|
|
);
|
|
|
- }else if(look == 4){
|
|
|
+ } else if (look == 4) {
|
|
|
this.$message.success("保存成功")
|
|
|
- }else if( look == 1 || look == 2){
|
|
|
+ } else if (look == 1 || look == 2) {
|
|
|
// this.$message.success("保存成功")
|
|
|
- }else if(look == 5){
|
|
|
+ } else if (look == 5) {
|
|
|
this.$message.success("保存成功")
|
|
|
this.goTo(
|
|
|
"/test?userid=" +
|
|
|
@@ -254,7 +271,7 @@ export default {
|
|
|
if (this.cid == "" || this.cid == undefined) {
|
|
|
console.log("这是新增课程");
|
|
|
} else {
|
|
|
- if(type != 2){
|
|
|
+ if (type != 2) {
|
|
|
this.loading = true
|
|
|
}
|
|
|
let params = {
|
|
|
@@ -268,6 +285,16 @@ export default {
|
|
|
this.juri = res.data[0][0].juri ? res.data[0][0].juri : '0';
|
|
|
this.overDate = res.data[0][0].overTime ? res.data[0][0].overTime : '';
|
|
|
this.juriList = res.data[0][0].juri2 ? res.data[0][0].juri2.split(',') : [];
|
|
|
+ let juri3 = res.data[0][0].juri3 ? res.data[0][0].juri3.split(',') : [];
|
|
|
+ if(juri3.length > 0){
|
|
|
+ this.typeInfo.forEach(e =>{
|
|
|
+ let array2 = []
|
|
|
+ for (var i = 0; i < e.child.length; i++) {
|
|
|
+ array2.push(e.child[i].id)
|
|
|
+ }
|
|
|
+ e.value = this.arrayToArray(juri3, array2)[0]
|
|
|
+ })
|
|
|
+ }
|
|
|
this.see = res.data[0][0].open == 1 ? true : false;
|
|
|
|
|
|
this.typeid = res.data[0][0].typeid;
|
|
|
@@ -279,7 +306,7 @@ export default {
|
|
|
console.log(this.testType);
|
|
|
this.look = res.data[0][0].look
|
|
|
this.$forceUpdate()
|
|
|
- if(type != 2){
|
|
|
+ if (type != 2) {
|
|
|
this.loading = false
|
|
|
}
|
|
|
})
|
|
|
@@ -294,9 +321,50 @@ export default {
|
|
|
publish() {
|
|
|
this.updateWork(3)
|
|
|
},
|
|
|
+ //获取分类类名
|
|
|
+ getTypeInfo() {
|
|
|
+ let params = {
|
|
|
+ oid: this.oid
|
|
|
+ };
|
|
|
+ this.ajax
|
|
|
+ .get(this.$store.state.api + "selectPerInfoAllTea", params)
|
|
|
+ .then((res) => {
|
|
|
+ this.typeInfo = res.data[0];
|
|
|
+ let typeInfo = res.data[1];
|
|
|
+ this.typeInfo.forEach((e) => {
|
|
|
+ e.child = [];
|
|
|
+ e.value = '';
|
|
|
+ typeInfo.forEach((i) => {
|
|
|
+ if (e.id == i.parentid) {
|
|
|
+ e.child.push({ id: i.id, name: i.name })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ console.log(this.typeInfo, "typeInfo");
|
|
|
+ this.getData();
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ console.error(err);
|
|
|
+ });
|
|
|
+ },
|
|
|
+ arrayToArray(arrayo, arrayt) {
|
|
|
+ let array1 = arrayo;
|
|
|
+ let array2 = arrayt;
|
|
|
+
|
|
|
+ let commonElements = [];
|
|
|
+
|
|
|
+ for (let i = 0; i < array1.length; i++) {
|
|
|
+ for (let j = 0; j < array2.length; j++) {
|
|
|
+ if (array1[i] === array2[j]) {
|
|
|
+ commonElements.push(array1[i]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return commonElements;
|
|
|
+ },
|
|
|
},
|
|
|
- mounted () {
|
|
|
- this.getData();
|
|
|
+ mounted() {
|
|
|
+ this.getTypeInfo();
|
|
|
},
|
|
|
}
|
|
|
</script>
|
