|
@@ -54,14 +54,18 @@
|
|
|
<div>观察记录</div>
|
|
<div>观察记录</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div style="display: flex;justify-content: flex-end;align-items: center;">
|
|
<div style="display: flex;justify-content: flex-end;align-items: center;">
|
|
|
- <selectStyle
|
|
|
|
|
|
|
+ <!-- <selectStyle
|
|
|
ref="weiSel"
|
|
ref="weiSel"
|
|
|
@shadeIsShow="shadeIsShow"
|
|
@shadeIsShow="shadeIsShow"
|
|
|
@update-search="handleUpdateSearch"
|
|
@update-search="handleUpdateSearch"
|
|
|
:listCont="filtrate"
|
|
:listCont="filtrate"
|
|
|
:tit="'请选择纬度'"
|
|
:tit="'请选择纬度'"
|
|
|
:choose="filtrateData"
|
|
:choose="filtrateData"
|
|
|
- ></selectStyle>
|
|
|
|
|
|
|
+ ></selectStyle> -->
|
|
|
|
|
+ <van-dropdown-menu>
|
|
|
|
|
+ <van-dropdown-item @change="handleUpdateSearch" v-model="filtrateData" :options="filtrate" />
|
|
|
|
|
+ </van-dropdown-menu>
|
|
|
|
|
+
|
|
|
<img class="img" src="../../assets/images/eva/Frame (5).png" alt="" />
|
|
<img class="img" src="../../assets/images/eva/Frame (5).png" alt="" />
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -153,6 +157,12 @@ export default {
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
|
|
+ value1: 0,
|
|
|
|
|
+ option1: [
|
|
|
|
|
+ { text: '全部商品', value: 0 },
|
|
|
|
|
+ { text: '新款商品', value: 1 },
|
|
|
|
|
+ { text: '活动商品', value: 2 }
|
|
|
|
|
+ ],
|
|
|
// 遮罩层
|
|
// 遮罩层
|
|
|
isSelectShow: false,
|
|
isSelectShow: false,
|
|
|
|
|
|
|
@@ -164,7 +174,7 @@ export default {
|
|
|
// 筛选项
|
|
// 筛选项
|
|
|
filtrate: [],
|
|
filtrate: [],
|
|
|
// 纬度筛选项选择数据
|
|
// 纬度筛选项选择数据
|
|
|
- filtrateData: [''],
|
|
|
|
|
|
|
+ filtrateData: '',
|
|
|
// 学生信息
|
|
// 学生信息
|
|
|
studentInfo: {},
|
|
studentInfo: {},
|
|
|
|
|
|
|
@@ -268,8 +278,19 @@ export default {
|
|
|
allsType.push(sctysotypepe[[i]])
|
|
allsType.push(sctysotypepe[[i]])
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- this.filtrate = allsType
|
|
|
|
|
- console.log('allsType', allsType)
|
|
|
|
|
|
|
+ allsType.forEach((e, index) => {
|
|
|
|
|
+ let a = { value: '', text: '' }
|
|
|
|
|
+ a.value = e.id
|
|
|
|
|
+ a.text = e.name
|
|
|
|
|
+ this.filtrate.push(a)
|
|
|
|
|
+ })
|
|
|
|
|
+ this.filtrate.unshift({ value: '', text: '全部' })
|
|
|
|
|
+ // this.filtrate = allsType
|
|
|
|
|
+ // this.filtrate.forEach(e => {
|
|
|
|
|
+ // e.name=text
|
|
|
|
|
+ // e.id=value
|
|
|
|
|
+ // }
|
|
|
|
|
+ console.log('filtrate', this.filtrate)
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
|
|
|
|
@@ -315,7 +336,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
// 上一个
|
|
// 上一个
|
|
|
upStu() {
|
|
upStu() {
|
|
|
- this.filtrateData = ['']
|
|
|
|
|
|
|
+ this.filtrateData = ''
|
|
|
// 判断学生在数组中的位置,获取班学生列表有初始值
|
|
// 判断学生在数组中的位置,获取班学生列表有初始值
|
|
|
this.activeItem = null
|
|
this.activeItem = null
|
|
|
// 刷新学期
|
|
// 刷新学期
|
|
@@ -336,7 +357,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
// 下一个
|
|
// 下一个
|
|
|
nextStu() {
|
|
nextStu() {
|
|
|
- this.filtrateData = ['']
|
|
|
|
|
|
|
+ this.filtrateData = ''
|
|
|
|
|
|
|
|
this.activeItem = null
|
|
this.activeItem = null
|
|
|
// 刷新学期
|
|
// 刷新学期
|
|
@@ -434,7 +455,7 @@ export default {
|
|
|
const data4 = {
|
|
const data4 = {
|
|
|
uid: this.stuId,
|
|
uid: this.stuId,
|
|
|
trm: this.termData[0],
|
|
trm: this.termData[0],
|
|
|
- txt: this.filtrateData[0]
|
|
|
|
|
|
|
+ txt: this.filtrateData
|
|
|
}
|
|
}
|
|
|
// return console.log('getTermRecord', data4)
|
|
// return console.log('getTermRecord', data4)
|
|
|
// console.log(' 获取所有学生记录aaaaaaaaaaaaaaaaaaaaaaa', data4)
|
|
// console.log(' 获取所有学生记录aaaaaaaaaaaaaaaaaaaaaaa', data4)
|
|
@@ -533,6 +554,26 @@ export default {
|
|
|
color: #fff;
|
|
color: #fff;
|
|
|
// left: 0;
|
|
// left: 0;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+/deep/.van-dropdown-menu__bar {
|
|
|
|
|
+ box-shadow: none;
|
|
|
|
|
+ padding-right: 20px;
|
|
|
|
|
+ // margin-left: 30px !important;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/deep/ .van-dropdown-item__content {
|
|
|
|
|
+ border-radius: 0 0 10px 10px;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/deep/ .van-ellipsis {
|
|
|
|
|
+ font-size: 14px;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+/deep/ .van-cell__title,
|
|
|
|
|
+.van-cell__value {
|
|
|
|
|
+ font-weight: normal;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
.goods-card {
|
|
.goods-card {
|
|
|
margin: 0;
|
|
margin: 0;
|
|
|
background-color: #fff;
|
|
background-color: #fff;
|