Merge remote-tracking branch 'aly/master'

This commit is contained in:
于继存
2022-09-19 11:12:12 +08:00
2 changed files with 17 additions and 7 deletions

View File

@@ -79,7 +79,7 @@
</el-input>
</el-form-item>
<el-form-item label="场景" v-show="!weike.onlyRequired">
<el-select v-model="courseInfo.forScene" style="width: 100%;">
<el-select v-model="courseInfo.forScene" style="width: 100%;" clearable>
<el-option v-for="item in sceneList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -217,7 +217,7 @@
</el-form-item>
<el-form-item label="场景">
<el-select v-model="courseInfo.forScene" style="width: 100%;">
<el-select v-model="courseInfo.forScene" style="width: 100%;" clearable>
<el-option v-for="item in sceneList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>

View File

@@ -58,7 +58,7 @@
</el-radio-group>
</div>
<div class="search-item-sub" v-if="types.towSubList.length != 0">
<el-radio-group v-model="types.subTow" size="mini" @change="searchData">
<el-radio-group v-model="types.subTow" size="mini" @change="changeTypeTow">
<el-radio-button label="0">全部</el-radio-button>
<el-radio-button v-for="item in types.towSubList" :key="item.id" :label="item.id">{{item.name}}</el-radio-button>
</el-radio-group>
@@ -447,19 +447,21 @@ export default {
this.course[i] = "";
if (i === "sysType1") {
this.types.sysTypes = "";
// this.types.oneSubList = [];
// this.types.towSubList = [];
}
if (i === "sysType2") {
this.types.subOne = "";
this.types.oneSubList = [];
}
if (i === "sysType3") {
this.types.subTow = "";
this.types.towSubList = [];
}
if (i === "type") {
this.category = "";
this.categorySub = "";
}
this.searchTags.splice(index, 1);
if(i === 'type') {
this.category = null;
@@ -500,12 +502,21 @@ export default {
changeTypeSub(num) {
this.types.subTow = "0";
let list = {};
if (num !== 0) {
if (num != 0) {
apiType.list(1, num).then(res => {
if (res.status === 200) {
this.types.towSubList = res.result;
}
});
} else {
this.types.oneSubList = [];
}
this.searchData();
},
changeTypeTow(num) {
if(num == 0) {
this.types.towSubList=[]
}
this.searchData();
},
@@ -605,7 +616,6 @@ export default {
});
this.courseList.push(...res.result.list);
console.log(this.courseList,'this.courseList');
this.moreState = 1;
} else {
this.moreState = 3;