diff --git a/element-vue/src/components/supManager/labManage.vue b/element-vue/src/components/supManager/labManage.vue
index 620bdfd..43ab4d4 100644
--- a/element-vue/src/components/supManager/labManage.vue
+++ b/element-vue/src/components/supManager/labManage.vue
@@ -1,59 +1,156 @@
 <template>
-    <div>
+    <div style="width: 100%" >
         <el-form :model="form" :inline="true">
-            <el-form-item label="类型">
-                <el-input v-model="form.type" placeholder="安卓实验室" ></el-input>
+            <el-form-item label="类型" style="width: 20% ">
+
+                <el-select v-model="form.type" style="border-style: outset;" >
+                    <el-option  label="安卓实验室" value="0"></el-option>
+                    <el-option  label="window实验室" value="1"></el-option>
+                    <el-option  label="ios实验室" value="2"></el-option>
+
+                </el-select>
             </el-form-item>
-            <el-form-item label="位置">
-                <el-input v-model="form.position" placeholder="位置"></el-input>
+            <el-form-item label="位置" style="width: 20% ;">
+                <el-select v-model="form.position" style="border-style: outset;" >
+                    <el-option  label="旭日楼" value="0"></el-option>
+                    <el-option  label="电子楼" value="1"></el-option>
+                    <el-option  label="实训楼" value="2"></el-option>
+
+                </el-select>
             </el-form-item>
-            <el-form-item label="状态">
-                <el-input v-model="form.status" placeholder="状态"></el-input>
+            <el-form-item label="状态"  style="width: 20%">
+                <el-select v-model="form.status" style="border-style: outset;" >
+                    <el-option  label="可预约" value="0"></el-option>
+                    <el-option  label="不可预约" value="1"></el-option>
+                    <el-option  label="故障" value="2"></el-option>
+
+                </el-select>
+            </el-form-item >
+            <el-input v-model="search" placeholder="输入关键字搜索" suffix-icon="el-icon-search" style="width: 20%;border-style: outset;"/>
+            <el-button type="success" style="width: 6%;text-align: left" icon="el-icon-circle-plus-outline"
+                       @click="showAddLab" >新增
+            </el-button>
+            <el-button type="success" style="width: 8%;text-align: left" icon="el-icon-circle-plus-outline"
+                       @click="showAddLab" >批量操作
+            </el-button>
+
+        </el-form>
+
+
+        <el-form :model="time" :inline="true" style="width: 100%">
+            <span  style="width: 10% ;:-20px">可预约时间段:
+             </span>
+            <el-form-item label="学年" style="width: 20% ;">
+
+                <el-select v-model="time.year" style="border-style: outset;" >
+
+                    <el-option  label="2017-2018" value="0"></el-option>
+                    <el-option  label="2018-2019" value="1"></el-option>
+                    <el-option  label="2019-2020" value="2"></el-option>
+
+                </el-select>
             </el-form-item>
-            <el-input v-model="search" placeholder="输入关键字搜索" suffix-icon="el-icon-search"/>
-            <el-button type="success" style="width: 120px;text-align: left" icon="el-icon-circle-plus-outline"
-                       @click="showAddLab">新增
+            <el-form-item label="学期"  style="width: 20%">
+                <el-select v-model="time.semester" style="border-style: outset;" >
+
+                    <el-option  label="第一学期" value="0"></el-option>
+                    <el-option  label="第二学期" value="1"></el-option>
+
+
+                </el-select>
+            </el-form-item >
+            <el-form-item label="周次"  style="width: 5%">
+
+            </el-form-item >
+            <el-select v-model="time.day1" style="border-style: outset;;width:5%" >
+
+                <el-option  label="1" value="0"></el-option>
+                <el-option  label="2" value="1"></el-option>
+                <el-option  label="3" value="0"></el-option>
+                <el-option  label="4" value="1"></el-option>
+                <el-option  label="5" value="0"></el-option>
+                <el-option  label="6" value="1"></el-option>
+                <el-option  label="7" value="0"></el-option>
+
+            </el-select>
+
+            <span>至</span>
+            <el-select v-model="time.day2" style="border-style: outset;;width: 5%" >
+
+                <el-option  label="1" value="0"></el-option>
+                <el-option  label="2" value="1"></el-option>
+                <el-option  label="3" value="0"></el-option>
+                <el-option  label="4" value="1"></el-option>
+                <el-option  label="5" value="0"></el-option>
+                <el-option  label="6" value="1"></el-option>
+                <el-option  label="7" value="0"></el-option>
+
+            </el-select>
+            <el-form-item label="星期几"  style="width: 5%">
+
+            </el-form-item >
+
+            <el-select v-model="time.day1" style="border-style: outset;;width: 10%" >
+
+                <el-option  label="星期一" value="0"></el-option>
+                <el-option  label="星期二" value="1"></el-option>
+                <el-option  label="星期三" value="0"></el-option>
+                <el-option  label="星期四" value="1"></el-option>
+                <el-option  label="星期五" value="0"></el-option>
+                <el-option  label="星期六" value="1"></el-option>
+                <el-option  label="星期七" value="0"></el-option>
+
+            </el-select>
+
+
+
+            <el-button type="success" style="width: 6%;text-align: left" icon="el-icon-circle-plus-outline"
+                       @click="showAddLab" >检索
             </el-button>
+
+
         </el-form>
+
         <el-table
                 :data="tableData"
                 border
-                style="width: 100%">
+                >
             <el-table-column
-                    fixed
                     prop="name"
                     label="实验室名称"
-                    width="150">
+
+                  >
             </el-table-column>
             <el-table-column
                     prop="address"
                     label="地点"
-                    width="120">
+                   >
             </el-table-column>
             <el-table-column
                     prop="status"
                     label="状态"
-                    width="120">
+                    >
             </el-table-column>
             <el-table-column
                     prop="week"
                     label="可申请周次"
-                    width="120">
+                   >
             </el-table-column>
             <el-table-column
                     prop="manage"
                     label="管理员"
-                    width="300">
+                 >
             </el-table-column>
 
             <el-table-column
-                    fixed="right"
                     label="操作"
-                    width="100">
+
+                    width="300px"
+                    >
                 <template slot-scope="scope">
-                    <el-button @click="" type="text" size="small">查看申请详情</el-button>
-                    <el-button @click="" type="text" size="small">详细信息</el-button>
-                    <el-button @click="" type="text" size="small">查看</el-button>
+                    <el-button  @click="" style="border: lightpink solid 1px " size="small">查看申请详情</el-button>
+                    <el-button  @click=""  size="small">详细信息</el-button>
+                    <el-button  @click=""  size="small">查看</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -62,6 +159,7 @@
 </template>
 
 <script>
+
     import addLab from "~/components/supManager/addLab" ;
     import {get, post} from "~/utils";
     import {showDialog, showFail, showSuccess} from "~/utils/dialog";
@@ -71,12 +169,21 @@
             return{
                 edit:"",
                 form:{
-                    type:'',
-                    position:'',
-                    status:'',
+                    type:'0',
+                    position:'0',
+                    status:'0',
                 },
+                time:{
+                    year:'0',
+                    week:'0',
+                    day1:"0",
+                    day2:"16",
+                    semester:'0'
+                },
+
                 search:'',
                 tableData:[
+                    { name:"aaaa" , address:"509"}
                 ],
             }
         },
@@ -117,7 +224,7 @@
         },
 
         mounted() {
-            // this.tableData=get('/lb/getall')
+            // this.tableData=get('/url')
         }
     }
 </script>