zc

pages/views/teacherPage/laboratoryList.vue

@@ -2,8 +2,8 @@
 <template>
 	<view id="laboratoryList">
 		<view class='top-search-value-max-box'>
-			<view class='top-search-value-box' @click="searchValueClick()">
-				<img :src="imagesUrl('commonality/icon_sys_ss@1x.png')">
+			<view class='top-search-value-box'>
+				<img :src="imagesUrl('commonality/icon_sys_ss@1x.png')" @click="searchValueClick()">
 				<input class="input-box" v-model="queryParams.searchValue" 
 							 maxlength="10" placeholder="搜索实验室/房间号"
 							 type="text" @confirm="searchValueClick()">
@@ -14,7 +14,7 @@
 			<view class="top-picker-box">
 				<picker @change="facultyChange" :value="facultyIndex" :range="facultyArray">
 					<view class="picker-view">
-						<view>{{!facultyIndex?'二级单位':facultyArray[facultyIndex]}}</view>
+						<view>{{!facultyIndex&&facultyIndex!=0?'二级单位':facultyArray[facultyIndex]}}</view>
 						<img class="picker-img" :src="imagesUrl('commonality/icon_06.png')" alt="">
 					</view>
 				</picker>
@@ -22,7 +22,7 @@
 			<view class="top-picker-box">
 				<picker @change="subjectChange" :value="subjectIndex" :range="subjectArray">
 					<view class="picker-view">
-						<view>{{!subjectIndex?'分类':subjectArray[subjectIndex]}}</view>
+						<view>{{!subjectIndex&&subjectIndex!=0?'分类':subjectArray[subjectIndex]}}</view>
 						<img class="picker-img" :src="imagesUrl('commonality/icon_06.png')" alt="">
 					</view>
 				</picker>
@@ -30,7 +30,7 @@
 			<view class="top-picker-box">
 				<picker @change="levelChange" :value="levelIndex" :range="levelArray">
 					<view class="picker-view">
-						<view>{{!levelIndex?'分级':levelArray[levelIndex]}}</view>
+						<view>{{!levelIndex&&levelIndex!=0?'分级':levelArray[levelIndex]}}</view>
 						<img class="picker-img" :src="imagesUrl('commonality/icon_06.png')" alt="">
 					</view>
 				</picker>
@@ -64,9 +64,7 @@
 </template>
 
 <script>
-	import {
-		tabBar
-	} from '@/pages/component/tabBar.vue'
+	import tabBar from '@/pages/component/tabBar.vue'
 	import $mqtt from '@/utils/mqtt.min.js';
 	import {
 		config
@@ -94,16 +92,19 @@
 				//分类选择器数据
 				subjectList: [],
 				subjectArray: [],
-				subjectIndex: "",
+				subjectIndex: 0,
 				//级别选择器数据
 				levelList: [],
 				levelArray: [],
-				levelIndex: "",
+				levelIndex: 0,
 				// 查询参数
 				queryParams: {
 					page: 1,
 					pageSize: 10,
 					searchValue:"",
+					deptId:"",
+					typeId:"",
+					levelId:"",
 				},
 			}
 		},
@@ -220,10 +221,10 @@
 						list.push(data.data[i].titleName)
 					}
 					this.levelArray = list;
-					list.unshift('全部分类');
+					list.unshift('全部分级');
 					this.levelList = data.data;
 					this.levelList.unshift({
-						titleName: "全部分类",
+						titleName: "全部分级",
 						levelId: ""
 					})
 				}
@@ -248,18 +249,23 @@
 				})
 			},
 			searchValueClick(){
-				this.$set(this.queryParams,'page',1);
-				this.$nextTick(() => {
-					this.getList();
-				})
+				if(this.facultyList[0]){
+					this.$set(this.queryParams,'page',1);
+					this.$nextTick(() => {
+						this.getList();
+					})
+				}
 			},
 			//获取实验室列表
 			async getList() {
+				if(!this.facultyList[0]||uni.getStorageSync('userType')==2){
+					return
+				}
 				let self = this;
 				let obj = JSON.parse(JSON.stringify(this.queryParams));
-				obj.deptId = this.facultyIndex ? this.facultyList[this.facultyIndex].deptId : '';
-				obj.typeId = this.subjectIndex ? this.subjectList[this.subjectIndex].typeId : '';
-				obj.levelId = this.levelIndex ? this.levelList[this.levelIndex].levelId : '';
+				obj.deptId = this.facultyIndex||this.facultyIndex==0 ? this.facultyList[this.facultyIndex].deptId : '';
+				obj.typeId = this.subjectIndex||this.subjectIndex==0 ? this.subjectList[this.subjectIndex].typeId : '';
+				obj.levelId = this.levelIndex||this.levelIndex==0 ? this.levelList[this.levelIndex].levelId : '';
 				const {
 					data
 				} = await laboratoryAppletSubList(obj);