|
|
@@ -18,28 +18,59 @@
|
|
|
<div class="page-form-title-box">
|
|
|
<el-form :model="queryParams" class="form-box" ref="queryForm"
|
|
|
:inline="true" style="width:100%;">
|
|
|
- <el-form-item label="" prop="queryParamsData1" label-width="50px">
|
|
|
+ <el-form-item label="" prop="searchValue" label-width="50px">
|
|
|
<el-input
|
|
|
maxLength="30"
|
|
|
- v-model="queryParams.queryParamsData1"
|
|
|
+ v-model="queryParams.searchValue"
|
|
|
placeholder="请输入名称"
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
+
|
|
|
+ style="width: 140px"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="" prop="queryParamsData2">
|
|
|
- <el-select v-model="queryParams.queryParamsData2" clearable placeholder="请选择状态" style="width: 200px">
|
|
|
- <el-option
|
|
|
- v-for="dict in optionList"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
+ <el-form-item label="" prop="schoolId">
|
|
|
+ <el-select v-model="queryParams.schoolId" @change="changeSchool"
|
|
|
+ placeholder="请选择校区" style="width: 150px">
|
|
|
+ <el-option v-for="(item,index) in schoolOption"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"/>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="" prop="buildId">
|
|
|
+ <el-select v-model="queryParams.buildId" @change="buildSchool"
|
|
|
+ placeholder="请选择楼栋" style="width: 150px">
|
|
|
+ <el-option v-for="(item,index) in buildOption"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"/>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="" prop="subjectId">
|
|
|
+ <el-select v-model="queryParams.subjectId"
|
|
|
+ placeholder="请选择实验室" style="width: 150px">
|
|
|
+ <el-option v-for="(item,index) in subjectOption"
|
|
|
+ :key="item.subId"
|
|
|
+ :label="item.subName"
|
|
|
+ :value="item.subId"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="" prop="state">
|
|
|
+ <el-select v-model="queryParams.state"
|
|
|
+ placeholder="请选择状态" style="width: 140px">
|
|
|
+ <el-option label="启用" :value="true"/>
|
|
|
+ <el-option label="停用" :value="false"/>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="" prop="online">
|
|
|
+ <el-select v-model="queryParams.online"
|
|
|
+ placeholder="是否在线" style="width: 140px">
|
|
|
+ <el-option label="在线" :value="true"/>
|
|
|
+ <el-option label="离线" :value="false"/>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="">
|
|
|
<el-date-picker
|
|
|
- :clearable="false"
|
|
|
+ :="false"
|
|
|
v-model="dateRange"
|
|
|
size="small"
|
|
|
style="width: 240px"
|
|
|
@@ -121,6 +152,7 @@
|
|
|
</template>
|
|
|
<script>
|
|
|
import { iotDeviceList,iotDeviceDetail,iotDeviceDeviceCount,iotDeviceDelete } from "@/api/iotDevice/index";
|
|
|
+ import { systemBuildingGetTreeList,laboratorySubRelInfoGetListByFloor } from "@/api/commonality/permission";
|
|
|
import addPage from "./addPage.vue";
|
|
|
import infoPage from "./infoPage.vue";
|
|
|
import batchAddPage from "./batchAddPage.vue";
|
|
|
@@ -138,14 +170,16 @@
|
|
|
pageType:1,
|
|
|
//页面遮罩
|
|
|
loading:false,
|
|
|
- //下拉列表数据
|
|
|
- optionList:[{value:true,label:'启用'},{value:false,label:'停用'}],
|
|
|
//查询条件
|
|
|
queryParams:{
|
|
|
page:1,
|
|
|
pageSize:20,
|
|
|
- queryParamsData1:"",
|
|
|
- queryParamsData2 :null,
|
|
|
+ searchValue:"",
|
|
|
+ schoolId:null,
|
|
|
+ buildId:null,
|
|
|
+ subjectId:null,
|
|
|
+ state :null,
|
|
|
+ online :null,
|
|
|
},
|
|
|
//时间数据
|
|
|
dateRange:[],
|
|
|
@@ -158,12 +192,21 @@
|
|
|
//设备类型列表
|
|
|
classList:[],
|
|
|
classTypeId:null,
|
|
|
+ //校区楼栋原始数据
|
|
|
+ addressList:[],
|
|
|
+ //校区下拉列表
|
|
|
+ schoolOption:[],
|
|
|
+ //楼栋下拉列表
|
|
|
+ buildOption:[],
|
|
|
+ //实验室下拉列表
|
|
|
+ subjectOption:[],
|
|
|
}
|
|
|
},
|
|
|
created () {
|
|
|
|
|
|
},
|
|
|
mounted () {
|
|
|
+ this.systemBuildingGetTreeList();
|
|
|
this.iotDeviceDeviceCount();
|
|
|
this.getList();
|
|
|
},
|
|
|
@@ -180,12 +223,18 @@
|
|
|
},
|
|
|
//重置按钮
|
|
|
resetQuery(){
|
|
|
- this.$set(this,'dateRange',[])
|
|
|
+ this.$set(this,'dateRange',[]);
|
|
|
+ this.$set(this,'buildOption',[]);
|
|
|
+ this.$set(this,'subjectOption',[]);
|
|
|
this.$set(this,'queryParams',{
|
|
|
page:1,
|
|
|
pageSize:20,
|
|
|
- queryParamsData1:"",
|
|
|
- queryParamsData2 :null,
|
|
|
+ searchValue:"",
|
|
|
+ schoolId:null,
|
|
|
+ buildId:null,
|
|
|
+ subjectId:null,
|
|
|
+ state :null,
|
|
|
+ online :null,
|
|
|
});
|
|
|
this.getList();
|
|
|
},
|
|
|
@@ -271,6 +320,46 @@
|
|
|
this.$set(this,'propsData',{});
|
|
|
}
|
|
|
},
|
|
|
+ //获取校区
|
|
|
+ systemBuildingGetTreeList(){
|
|
|
+ systemBuildingGetTreeList({}).then(response => {
|
|
|
+ let list = [];
|
|
|
+ for(let i=0;i<response.data.length;i++){
|
|
|
+ list.push({
|
|
|
+ id:response.data[i].id,
|
|
|
+ name:response.data[i].name,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.$set(this,'schoolOption',list);
|
|
|
+ this.$set(this,'addressList',response.data);
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //校区选中
|
|
|
+ changeSchool(val){
|
|
|
+ let self = this;
|
|
|
+ let list = [];
|
|
|
+ for(let i=0;i<self.addressList.length;i++){
|
|
|
+ if(val == self.addressList[i].id && self.addressList[i].buildFloorVoList[0]){
|
|
|
+ for(let o=0;o<self.addressList[i].buildFloorVoList.length;o++){
|
|
|
+ list.push({
|
|
|
+ id:self.addressList[i].buildFloorVoList[o].id,
|
|
|
+ name:self.addressList[i].buildFloorVoList[o].name,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.$set(this.queryParams,'buildId',null);
|
|
|
+ this.$set(this.queryParams,'subjectId',null);
|
|
|
+ this.$set(this,'buildOption',list);
|
|
|
+ this.$set(this,'subjectOption',[]);
|
|
|
+ },
|
|
|
+ //楼栋选中
|
|
|
+ buildSchool(val){
|
|
|
+ laboratorySubRelInfoGetListByFloor({buildId:val}).then(response => {
|
|
|
+ this.$set(this.queryParams,'subjectId',null);
|
|
|
+ this.$set(this,'subjectOption',response.data);
|
|
|
+ })
|
|
|
+ },
|
|
|
},
|
|
|
}
|
|
|
</script>
|
dedsudiyu