diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js
index 41188ab..cd6c810 100644
--- a/src/api/business/public/public.js
+++ b/src/api/business/public/public.js
@@ -37,3 +37,24 @@ export function public_studyFormPreList(query) {
     params: query
   })
 }
+<<<<<<< HEAD
+=======
+
+// 试验区域-饲养间列表
+export function public_roomList(query) {
+  return request({
+    url: '/system/business/public/roomList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 动物种属-笼具列表
+export function public_animalSpeciesList(query) {
+  return request({
+    url: '/system/business/public/animalSpeciesList',
+    method: 'get',
+    params: query
+  })
+}
+>>>>>>> 980f3ba (feat:[试验管理][饲养间管理])
diff --git a/src/api/business/study/studyRoom.js b/src/api/business/study/studyRoom.js
new file mode 100644
index 0000000..b0de015
--- /dev/null
+++ b/src/api/business/study/studyRoom.js
@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+// 启用饲养间
+export function studyRoom_save(data) {
+  return request({
+    url: '/system/business/studyRoom/save',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更换笼具
+export function studyRoom_update(data) {
+  return request({
+    url: '/system/business/studyRoom/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 饲养间列表
+export function studyRoom_list(query) {
+  return request({
+    url: '/system/business/studyRoom/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 笼具更换记录列表
+export function studyRoom_historyList(query) {
+  return request({
+    url: '/system/business/studyRoom/historyList',
+    method: 'get',
+    params: query
+  })
+}
+// 饲养间结束使用
+export function studyRoom_js(data) {
+  return request({
+    url: '/system/business/studyRoom/js',
+    method: 'post',
+    data: data
+  })
+}
+
+
diff --git a/src/lang/en/business/study/studyRoom.js b/src/lang/en/business/study/studyRoom.js
index 6e93ae1..52db2b8 100644
--- a/src/lang/en/business/study/studyRoom.js
+++ b/src/lang/en/business/study/studyRoom.js
@@ -1,4 +1,25 @@
 export default {
     qysyj: '启用饲养间',
     xzqy: '新增启用',
+
+    syqy: '试验区域',
+    syjh: '饲养间号',
+    dwzs: '动物种属',
+    longju: '笼具',
+    kssyyl: '开始使用原因',
+    qyr: '启用人',
+    kssj: '开始时间',
+    jssyyl: '结束使用原因',
+    jsr: '结束人',
+    jssj: '结束时间',
+    zt: '状态',
+    syz: '使用中',
+    yjs: '已结束',
+    ghlj: '更换笼具',
+    js: '结束',
+    ljjl: '笼具记录',
+    ghr: '更换人',
+    ghsj: '更换时间',
+    ghqlj: '更换前笼具',
+    ghhlj: '更换后笼具',
 }
\ No newline at end of file
diff --git a/src/lang/zh/business/study/studyRoom.js b/src/lang/zh/business/study/studyRoom.js
index 6e93ae1..52db2b8 100644
--- a/src/lang/zh/business/study/studyRoom.js
+++ b/src/lang/zh/business/study/studyRoom.js
@@ -1,4 +1,25 @@
 export default {
     qysyj: '启用饲养间',
     xzqy: '新增启用',
+
+    syqy: '试验区域',
+    syjh: '饲养间号',
+    dwzs: '动物种属',
+    longju: '笼具',
+    kssyyl: '开始使用原因',
+    qyr: '启用人',
+    kssj: '开始时间',
+    jssyyl: '结束使用原因',
+    jsr: '结束人',
+    jssj: '结束时间',
+    zt: '状态',
+    syz: '使用中',
+    yjs: '已结束',
+    ghlj: '更换笼具',
+    js: '结束',
+    ljjl: '笼具记录',
+    ghr: '更换人',
+    ghsj: '更换时间',
+    ghqlj: '更换前笼具',
+    ghhlj: '更换后笼具',
 }
\ No newline at end of file
diff --git a/src/views/business/comps/select/SelectAnimalSpecies.vue b/src/views/business/comps/select/SelectAnimalSpecies.vue
new file mode 100644
index 0000000..507509f
--- /dev/null
+++ b/src/views/business/comps/select/SelectAnimalSpecies.vue
@@ -0,0 +1,92 @@
+<!-- 试验区域 -->
+<template>
+  <div>
+    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
+      <el-option v-for="item in list"  :key="item" :label="item" :value="item" />
+    </el-select>
+  </div>
+</template>
+
+<script>
+import { public_animalSpeciesList } from "@/api/business/public/public";
+export default {
+  name: "SelectAnimalSpecies",
+  components: {},
+  props: {
+    value: {
+      type: [Number, String , Array],
+      default: '',
+    },
+    // 试验区域
+    syqy: {
+      type: String,
+      default: ''
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    filterable: {
+      type: Boolean,
+      default: true
+    },
+    placeholder: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(v) {
+        if(!this.multiple){
+          this.selected = v ? v : ''
+        }else{
+          if(v){
+            //默认传的,分割的字符串，有传数组再改造
+            let arr = v.split(',')
+            let s = []
+            _.forEach(arr,a=>{
+              s.push(a)
+            })
+            this.selected = s
+          }else{
+            this.selected = []
+          }
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      list: [],
+      queryParam:{
+      }
+    };
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.list = []
+      public_animalSpeciesList(this.queryParam).then(response => {
+        response.data.forEach(item => {
+          if(this.list.indexOf(item.animalSpecies) < 0) {
+            this.list.push(item.animalSpecies)
+          }
+        })
+      })
+    },
+    handleChange(val) {
+      this.$emit('input', val)
+      this.$emit('change', val)
+    },
+  }
+};
+</script>
diff --git a/src/views/business/comps/select/SelectCage.vue b/src/views/business/comps/select/SelectCage.vue
new file mode 100644
index 0000000..a6662eb
--- /dev/null
+++ b/src/views/business/comps/select/SelectCage.vue
@@ -0,0 +1,104 @@
+<!-- 试验区域-饲养间号 -->
+<template>
+  <div>
+    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')" :disabled="readonly"
+      :multiple="multiple" @change="handleChange" :filterable="filterable">
+      <el-option v-for="item in list" :key="item" :label="item" :value="item" />
+    </el-select>
+  </div>
+</template>
+
+<script>
+import { public_animalSpeciesList } from "@/api/business/public/public";
+export default {
+  name: "SelectCage",
+  components: {},
+  props: {
+    value: {
+      type: [Number, String, Array],
+      default: '',
+    },
+    // 动物种属
+    animalSpecies: {
+      type: String,
+      default: ''
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    filterable: {
+      type: Boolean,
+      default: true
+    },
+    placeholder: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    animalSpecies: {
+      immediate: true,
+      handler(v) {
+        this.getList();
+      }
+    },
+    value: {
+      immediate: true,
+      handler(v) {
+        if (!this.multiple) {
+          this.selected = v ? v : ''
+        } else {
+          if (v) {
+            //默认传的,分割的字符串，有传数组再改造
+            let arr = v.split(',')
+            let s = []
+            _.forEach(arr, a => {
+              s.push(a)
+            })
+            this.selected = s
+          } else {
+            this.selected = []
+          }
+        }
+        this.getList();
+      }
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      list: [],
+      queryParam: {
+      }
+    };
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.list = []
+      if (this.animalSpecies) {
+        public_animalSpeciesList({ animalSpecies: this.animalSpecies }).then(response => {
+          response.data.forEach(item => {
+            if (this.list.indexOf(item.cage) < 0) {
+              this.list.push(item.cage)
+            }
+          })
+        })
+
+      }
+
+    },
+    handleChange(val) {
+      this.$emit('input', val)
+      this.$emit('change', val)
+    },
+  }
+};
+</script>
diff --git a/src/views/business/comps/select/SelectRoom.vue b/src/views/business/comps/select/SelectRoom.vue
index db6cd82..2c36d48 100644
--- a/src/views/business/comps/select/SelectRoom.vue
+++ b/src/views/business/comps/select/SelectRoom.vue
@@ -1,8 +1,9 @@
 <!-- 试验区域-饲养间号 -->
 <template>
   <div>
-    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
-      <el-option v-for="item in list"  :key="item" :label="item" :value="item" />
+    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')" :disabled="readonly"
+      :multiple="multiple" @change="handleChange" :filterable="filterable">
+      <el-option v-for="item in list" :key="item" :label="item" :value="item" />
     </el-select>
   </div>
 </template>
@@ -14,7 +15,7 @@ export default {
   components: {},
   props: {
     value: {
-      type: [Number, String , Array],
+      type: [Number, String, Array],
       default: '',
     },
     // 试验区域
@@ -28,7 +29,7 @@ export default {
     },
     multiple: {
       type: Boolean,
-      default: true
+      default: false
     },
     filterable: {
       type: Boolean,
@@ -40,24 +41,31 @@ export default {
     }
   },
   watch: {
+    testArea: {
+      immediate: true,
+      handler(v) {
+        this.getList();
+      }
+    },
     value: {
       immediate: true,
       handler(v) {
-        if(!this.multiple){
+        if (!this.multiple) {
           this.selected = v ? v : ''
-        }else{
-          if(v){
+        } else {
+          if (v) {
             //默认传的,分割的字符串，有传数组再改造
             let arr = v.split(',')
             let s = []
-            _.forEach(arr,a=>{
+            _.forEach(arr, a => {
               s.push(a)
             })
             this.selected = s
-          }else{
+          } else {
             this.selected = []
           }
         }
+        this.getList();
       }
     }
   },
@@ -65,7 +73,7 @@ export default {
     return {
       selected: '',
       list: [],
-      queryParam:{
+      queryParam: {
       }
     };
   },
@@ -75,9 +83,17 @@ export default {
   methods: {
     getList() {
       this.list = []
-      public_roomList({syqy: this.testArea}).then(response => {
-        this.list = response.data || []
-      })
+      if (this.testArea) {
+        public_roomList({ syqy: this.testArea }).then(response => {
+          response.data.forEach(item => {
+            if (this.list.indexOf(item.syjh) < 0) {
+              this.list.push(item.syjh)
+            }
+          })
+        })
+
+      }
+
     },
     handleChange(val) {
       this.$emit('input', val)
diff --git a/src/views/business/comps/select/SelectTestArea.vue b/src/views/business/comps/select/SelectTestArea.vue
index 455a7bc..3912ce2 100644
--- a/src/views/business/comps/select/SelectTestArea.vue
+++ b/src/views/business/comps/select/SelectTestArea.vue
@@ -28,7 +28,7 @@ export default {
     },
     multiple: {
       type: Boolean,
-      default: true
+      default: false
     },
     filterable: {
       type: Boolean,
diff --git a/src/views/business/study/comp/syj/Bj.vue b/src/views/business/study/comp/syj/Bj.vue
new file mode 100644
index 0000000..859dd05
--- /dev/null
+++ b/src/views/business/study/comp/syj/Bj.vue
@@ -0,0 +1,159 @@
+G<template>
+  <div>
+    <!-- 试验间-更换笼具弹窗 -->
+    <el-dialog :title="$t('page.business.study.studyRoom.ghlj')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <!-- 试验区域 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.syqy')" prop="syqy">
+              <SelectTestArea v-model="form.syqy" :readonly="true"/>
+            </el-form-item>
+          </el-col>
+          <!-- 饲养间号 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.syjh')" prop="syjh">
+              <SelectRoom v-model="form.syjh" :testArea="form.syqy" :readonly="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 动物种属 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.dwzs')" prop="dwzs">
+              <SelectAnimalSpecies v-model="form.dwzs" :readonly="true"/>
+            </el-form-item>
+          </el-col>
+          <!-- 笼具 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.longju')" prop="lj">
+              <SelectCage v-model="form.lj" :animalSpecies="form.dwzs"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyRoom_update } from "@/api/business/study/studyRoom"
+import { mapGetters } from 'vuex'
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+import SelectTestArea from '@/views/business/comps/select/SelectTestArea';
+import SelectRoom from '@/views/business/comps/select/SelectRoom';
+import SelectAnimalSpecies from '@/views/business/comps/select/SelectAnimalSpecies';
+import SelectCage from '@/views/business/comps/select/SelectCage';
+export default {
+  name: "BjSyj",
+  components: { BusinessSelect, SelectTestArea, SelectRoom, SelectCage, SelectAnimalSpecies },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        syqy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        syjh: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        dwzs: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        syqy: null,
+        syjh: null,
+        dwzs: null,
+        lj: null,
+        qmrmm: '',
+        qmyy: '更换笼具',
+        bjbz: ''
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.form.syqy = row.syqy
+      this.form.syjh = row.syjh
+      this.form.dwzs = row.dwzs
+      this.form.lj = row.lj
+      this.form.qmyy = '更换笼具'
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          studyRoom_update(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/syj/Jl.vue b/src/views/business/study/comp/syj/Jl.vue
new file mode 100644
index 0000000..4987550
--- /dev/null
+++ b/src/views/business/study/comp/syj/Jl.vue
@@ -0,0 +1,113 @@
+G<template>
+  <div>
+    <!-- 试验间-笼具更换记录弹窗 -->
+    <el-dialog :title="$t('page.business.study.studyRoom.ljjl')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form :model="searchForm" ref="searchForm" class="search-area" :inline="true" label-width="88px">
+        <el-row>
+          <el-col :span="24">
+            <!-- 更换人 -->
+            <el-form-item :label="$t('page.business.study.studyRoom.ghr')" prop="ghr">
+              <el-input v-model="searchForm.ghr" :placeholder="$t('form.placeholderInput')" clearable
+                @keyup.enter.native="search" />
+            </el-form-item>
+
+            <!-- 更换时间 -->
+            <el-form-item :label="$t('page.business.study.studyRoom.ghsj') + '：'">
+              <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
+                :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
+                value-format="yyyy-MM-dd" @change="search" style="width: 250px;" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+              <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table v-loading="loading" :data="list">
+        <el-table-column :label="$t('page.business.study.studyRoom.ghsj')" prop="createTime" />
+        <el-table-column :label="$t('page.business.study.studyRoom.ghqlj')" prop="ljOld" />
+        <el-table-column :label="$t('page.business.study.studyRoom.ghhlj')" prop="lj" />
+        <el-table-column :label="$t('page.business.study.studyRoom.ghr')" align="center" prop="qyrMc" />
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+        @pagination="getList" />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyRoom_historyList } from "@/api/business/study/studyRoom"
+import { mapGetters } from 'vuex'
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+import SelectTestArea from '@/views/business/comps/select/SelectTestArea';
+import SelectRoom from '@/views/business/comps/select/SelectRoom';
+import SelectAnimalSpecies from '@/views/business/comps/select/SelectAnimalSpecies';
+import SelectCage from '@/views/business/comps/select/SelectCage';
+export default {
+  name: "JlSyj",
+  components: { BusinessSelect, SelectTestArea, SelectRoom, SelectCage, SelectAnimalSpecies },
+  data() {
+    return {
+      open: false,
+      daterange: [],
+      loading: false,
+      list: [],
+      searchForm: {
+        pageNum: 1,
+        pageSize: 10,
+        ghr: '',
+        startDate: '',
+        endDate: '',
+        studyRoomId: '',
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    search() {
+      this.searchForm.pageNum = 1
+      this.getList()
+    },
+    reset() {
+      this.resetForm("searchForm")
+      this.search()
+    },
+    getList() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.searchForm.startDate = this.daterange[0] + " 00:00:00"
+        this.searchForm.endDate = this.daterange[1] + " 23:59:59"
+      } else {
+        this.searchForm.startDate = ''
+        this.searchForm.endDate = ''
+      }
+      this.loading = true
+      studyRoom_historyList(this.searchForm).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    show(row) {
+      this.searchForm.studyRoomId = row.id
+      this.getList()
+      this.open = true
+    },
+
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/syj/Js.vue b/src/views/business/study/comp/syj/Js.vue
new file mode 100644
index 0000000..a5d2426
--- /dev/null
+++ b/src/views/business/study/comp/syj/Js.vue
@@ -0,0 +1,173 @@
+G<template>
+  <div>
+    <!-- 试验间-结束弹窗 -->
+    <el-dialog :title="$t('page.business.study.studyRoom.js')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <!-- 试验区域 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.syqy')" prop="syqy">
+              <SelectTestArea v-model="form.syqy" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <!-- 饲养间号 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.syjh')" prop="syjh">
+              <SelectRoom v-model="form.syjh" :testArea="form.syqy" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 动物种属 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.dwzs')" prop="dwzs">
+              <SelectAnimalSpecies v-model="form.dwzs" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <!-- 笼具 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.longju')" prop="lj">
+              <SelectCage v-model="form.lj" :animalSpecies="form.dwzs" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- 结束使用原因 -->
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.study.studyRoom.jssyyl')" prop="jssyyl">
+              <el-input type="text" v-model="form.jssyyl" maxlength="500" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyRoom_js } from "@/api/business/study/studyRoom"
+import { mapGetters } from 'vuex'
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+import SelectTestArea from '@/views/business/comps/select/SelectTestArea';
+import SelectRoom from '@/views/business/comps/select/SelectRoom';
+import SelectAnimalSpecies from '@/views/business/comps/select/SelectAnimalSpecies';
+import SelectCage from '@/views/business/comps/select/SelectCage';
+export default {
+  name: "JsSyj",
+  components: { BusinessSelect, SelectTestArea, SelectRoom, SelectCage, SelectAnimalSpecies },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        syqy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        syjh: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        dwzs: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jssyyl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        syqy: null,
+        syjh: null,
+        dwzs: null,
+        lj: null,
+        jssyyl: '',
+        qmrmm: '',
+        qmyy: '饲养间使用结束',
+        bjbz: ''
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.form.syqy = row.syqy
+      this.form.syjh = row.syjh
+      this.form.dwzs = row.dwzs
+      this.form.lj = row.lj
+      this.form.qmyy = '饲养间使用结束'
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          studyRoom_js(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/syj/Xz.vue b/src/views/business/study/comp/syj/Xz.vue
index acac398..1bbba17 100644
--- a/src/views/business/study/comp/syj/Xz.vue
+++ b/src/views/business/study/comp/syj/Xz.vue
@@ -1,82 +1,41 @@
 G<template>
   <div>
     <!-- 新增试验间弹窗 -->
-    <el-dialog :title="$t('page.business.study.studyRoom.xzsyj')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyRoom.qysyj')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <!-- 名称 -->
+          <!-- 试验区域 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gsp.mc')" prop="mc">
-              <el-input type="text" v-model="form.mc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.study.studyRoom.syqy')" prop="syqy">
+              <SelectTestArea v-model="form.syqy" />
             </el-form-item>
           </el-col>
-          <!-- 编号 -->
+          <!-- 饲养间号 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gsp.bh')" prop="bh">
-              <el-input type="text" v-model="form.bh" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.study.studyRoom.syjh')" prop="syjh">
+              <SelectRoom v-model="form.syjh" :testArea="form.syqy"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <!-- 批号 -->
+          <!-- 动物种属 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gsp.ph')" prop="ph">
-              <el-input type="text" v-model="form.ph" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.study.studyRoom.dwzs')" prop="dwzs">
+              <SelectAnimalSpecies v-model="form.dwzs" />
             </el-form-item>
           </el-col>
-          <!-- 规格 -->
-          <el-col :span="8">
-            <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
-              <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <!-- 规格单位 -->
-          <el-col :span="4">
-            <BusinessSelect v-model="form.ggdw"
-              dictType="system_business_nddw,system_business_zldw,system_business_tjdw"></BusinessSelect>
-          </el-col>
-        </el-row>
-        <el-row>
-          <!-- 库存量 -->
-          <el-col :span="8">
-            <el-form-item :label="$t('page.business.resource.gsp.kcl')" prop="kc">
-              <el-input type="number" v-model="form.kc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <!-- 库存量单位 -->
-          <el-col :span="4">
-            <BusinessSelect v-model="form.kcdw"
-              dictType="system_business_nddw,system_business_zldw,system_business_tjdw"></BusinessSelect>
-          </el-col>
+          <!-- 笼具 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
-              <el-date-picker v-model="form.yxq" type="datetime" format="yyyy-MM-dd HH:mm"
-                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
-              </el-date-picker>
+            <el-form-item :label="$t('page.business.study.studyRoom.longju')" prop="lj">
+              <SelectCage v-model="form.lj" :animalSpecies="form.dwzs"/>
             </el-form-item>
           </el-col>
         </el-row>
+        <!-- 开始使用原因 -->
         <el-row>
-          <!-- 存储条件 -->
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
-              <BusinessSelect v-model="form.cctj" dictType="system_business_cctj"></BusinessSelect>
-            </el-form-item>
-          </el-col>
-          <!-- 接收日期 -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gsp.jsrq')" prop="jsrq">
-              <el-date-picker v-model="form.jsrq" type="datetime" format="yyyy-MM-dd HH:mm"
-                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <!-- 注意事项 -->
-          <el-col :span="24">
-            <el-form-item :label="$t('page.business.resource.gsp.zysx')" prop="zysx">
-              <el-input type="textarea" :rows="2" v-model="form.zysx" maxlength="500"
+            <el-form-item :label="$t('page.business.study.studyRoom.kssyyl')" prop="kssyyl">
+              <el-input type="text" v-model="form.kssyyl" maxlength="50"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -88,6 +47,8 @@ G<template>
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
@@ -96,22 +57,14 @@ G<template>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
               <el-input type="password" v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmbz')" prop="qmbz">
-              <el-input type="textarea" v-model="form.qmbz" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
@@ -122,59 +75,42 @@ G<template>
 </template>
 
 <script>
-import { save } from "@/api/business/gsp/gsp"
+import { studyRoom_save } from "@/api/business/study/studyRoom"
 import { mapGetters } from 'vuex'
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
-
+import SelectTestArea from '@/views/business/comps/select/SelectTestArea';
+import SelectRoom from '@/views/business/comps/select/SelectRoom';
+import SelectAnimalSpecies from '@/views/business/comps/select/SelectAnimalSpecies';
+import SelectCage from '@/views/business/comps/select/SelectCage';
 export default {
   name: "XzSyj",
-  components: { BusinessSelect },
+  components: { BusinessSelect, SelectTestArea, SelectRoom, SelectCage, SelectAnimalSpecies },
   data() {
     return {
       open: false,
       form: {},
       rules: {
-        mc: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        bh: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        ph: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        gg: [{
+        syqy: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        kc: [{
+        syjh: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        yxq: [{
+        dwzs: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        jsrq: [{
+        lj: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        cctj: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        zysx: [{
+        kssyyl: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -201,28 +137,26 @@ export default {
     reset() {
       this.form = {
         id: null,
-        mc: null,
-        bh: null,
-        nd: null,
-        nddw: null,
-        sxrq: null,
-        cctj: null,
-        ccwz: null,
+        syqy: null,
+        syjh: null,
+        dwzs: null,
+        lj: null,
         qmrmm: null,
-        qmyy: '新增供试品',
+        kssyyl:'',
+        qmyy: '启用饲养间',
         bjbz: ''
       }
       this.resetForm("form")
     },
-    show() {
+    show(studyId) {
       this.reset()
-
+      this.form.studyId = studyId
       this.open = true
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          save(this.form).then(response => {
+          studyRoom_save(this.form).then(response => {
             this.open = false
             this.$emit('callback')
           })
diff --git a/src/views/business/study/comp/syjList.vue b/src/views/business/study/comp/syjList.vue
index 71bb937..16e0482 100644
--- a/src/views/business/study/comp/syjList.vue
+++ b/src/views/business/study/comp/syjList.vue
@@ -1,22 +1,36 @@
 <!-- 饲养间列表 -->
 <template>
   <div>
-    <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
+    <div class="tbbd-list">
       <div class="tbbd-search">
         <el-form :model="searchForm" ref="searchForm" class="search-area" :inline="true" label-width="88px">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
-                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                   @keyup.enter.native="search" />
+              <!-- 饲养间号 -->
+              <el-form-item :label="$t('page.business.study.studyRoom.syjh')" prop="syjh">
+                <el-input v-model="searchForm.syjh" :placeholder="$t('form.placeholderInput')" clearable
+                  @keyup.enter.native="search" />
               </el-form-item>
-              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                   @keyup.enter.native="search" />
+              <!-- 试验区域 -->
+              <el-form-item :label="$t('page.business.study.studyRoom.syqy')" prop="syqy">
+                <el-input v-model="searchForm.syqy" :placeholder="$t('form.placeholderInput')" clearable
+                  @keyup.enter.native="search" />
               </el-form-item>
-              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-                <SelectDeptUser v-model="searchForm.userId"  :name="searchForm.userMc" key="userId"
-                  @change="userChange" />
+              <!-- 启用人 -->
+              <el-form-item :label="$t('page.business.study.studyRoom.qyr')" prop="qyr">
+                <el-input v-model="searchForm.qyr" :placeholder="$t('form.placeholderInput')" clearable
+                  @keyup.enter.native="search" />
+              </el-form-item>
+              <!-- 结束人 -->
+              <el-form-item :label="$t('page.business.study.studyRoom.jsr')" prop="jsr">
+                <el-input v-model="searchForm.jsr" :placeholder="$t('form.placeholderInput')" clearable
+                  @keyup.enter.native="search" />
+              </el-form-item>
+              <!-- 开始时间 -->
+              <el-form-item :label="$t('page.business.study.studyRoom.kssj') + '：'">
+                <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange"
+                  range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
+                  value-format="yyyy-MM-dd" @change="search" style="width: 250px;" />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
@@ -30,74 +44,39 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyFormFill:xz']">{{
+            <el-button type="primary" icon="el-icon-plus" @click="add()">{{
               $t('page.business.study.studyRoom.xzqy') }}</el-button>
           </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list">
-          <el-table-column :label="$t('page.business.form.bh')" prop="bdbh" />
-          <el-table-column :label="$t('page.business.form.bdmc')" prop="bdmc" />
-          <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateMc" />
-          <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
-          <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
-          <el-table-column :label="$t('page.business.form.status')" prop="status" align="center" width="100">
+          <el-table-column :label="$t('page.business.study.studyRoom.syjh')" prop="syjh" />
+          <el-table-column :label="$t('page.business.study.studyRoom.syqy')" prop="syqy" />
+          <el-table-column :label="$t('page.business.study.studyRoom.dwzs')" prop="dwzs" />
+          <el-table-column :label="$t('page.business.study.studyRoom.longju')" align="center" prop="lj" />
+          <el-table-column :label="$t('page.business.study.studyRoom.kssyyl')" align="center" prop="kssyyl" />
+          <el-table-column :label="$t('page.business.study.studyRoom.qyr')" align="center" prop="qyrMc" />
+          <el-table-column :label="$t('page.business.study.studyRoom.kssj')" align="center" prop="createTime" />
+          <el-table-column :label="$t('page.business.study.studyRoom.jssyyl')" align="center" prop="jssyyl" />
+          <el-table-column :label="$t('page.business.study.studyRoom.jsr')" align="center" prop="jsrMc" />
+          <el-table-column :label="$t('page.business.study.studyRoom.jssj')" align="center" prop="jssj" />
+          <el-table-column :label="$t('page.business.study.studyRoom.zt')" prop="status" align="center" width="100">
             <template slot-scope="scope">
-              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormFill.tbz') }}</span>
-              <span v-if="scope.row.bdzt === 3">{{ $t('page.business.study.studyFormFill.ytj') }}</span>
-              <span v-if="scope.row.bdzt === 5">{{ $t('page.business.study.studyFormFill.ywc') }}</span>
-              <span v-if="scope.row.bdzt === 7">{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
-              <span v-if="scope.row.bdzt === 9">{{ $t('page.business.study.studyFormFill.dfz') }}</span>
-              <span v-if="scope.row.bdzt === 11">{{ $t('page.business.study.studyFormFill.yfz') }}</span>
+              <span v-if="scope.row.zt === 1">{{ $t('page.business.study.studyRoom.syz') }}</span>
+              <span v-if="scope.row.zt === 3">{{ $t('page.business.study.studyRoom.yjs') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.study.studyFormFill.sfbl')" align="center" prop="status"
-            width="100">
-            <template slot-scope="scope">
-              <span v-if="scope.row.sfbl === 10">{{ $t('page.business.study.studyFormFill.yes') }}</span>
-              <span v-if="scope.row.sfbl === 1">{{ $t('page.business.study.studyFormFill.no') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" />
           <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
-              <!-- 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 -->
-              <!-- 详情 -->
-              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyFormFill:xq']">{{
-                $t('form.detail') }}</el-button>
-              <!-- 编辑 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
-                @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
-                  $t('form.edit') }}</el-button>
-              <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3" @click="fh(scope.row)"
-                v-hasPermi="['business:studyFormFill:fh']">{{
-                  $t('page.business.study.studyFormFill.fh') }}</el-button>
-              <!-- 加签 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="jq(scope.row)"
-                v-hasPermi="['business:studyFormFill:jq']">{{
-                  $t('page.business.study.studyFormFill.jq') }}</el-button>
-              <!-- 更换归属人 -->
-              <el-button type="text"
-                v-if="scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
-                @click="ghgsr(scope.row)" v-hasPermi="['business:studyFormFill:ghgsr']">{{
-                  $t('page.business.study.studyFormFill.ghgsr') }}</el-button>
-              <!-- 审阅 -->
-              <el-button type="text" v-if="scope.row.bdzt === 5 || scope.row.bdzt === 7" @click="sy(scope.row)"
-                v-hasPermi="['business:studyFormFill:sy']">{{
-                  $t('page.business.study.studyFormFill.sy') }}</el-button>
-              <!-- 废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="fz(scope.row)"
-                v-hasPermi="['business:studyFormFill:fz']">{{
-                  $t('page.business.study.studyFormFill.fz') }}</el-button>
-              <!-- 确认废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 9" @click="qrfz(scope.row)"
-                v-hasPermi="['business:studyFormFill:qrfz']">{{
-                  $t('page.business.study.studyFormFill.qrfz') }}</el-button>
-              <!-- 观察 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="gc(scope.row)"
-                v-hasPermi="['business:studyFormFill:gc']">{{
-                  $t('page.business.study.studyFormFill.gc') }}</el-button>
+              <!-- 笼具记录 -->
+              <el-button type="text" @click="detail(scope.row)">{{
+                $t('page.business.study.studyRoom.ljjl') }}</el-button>
+              <!-- 更换笼具 -->
+              <el-button type="text" v-if="scope.row.zt === 1" @click="edit(scope.row)">{{
+                $t('page.business.study.studyRoom.ghlj') }}</el-button>
+              <!-- 结束 -->
+              <el-button type="text" v-if="scope.row.zt === 1" @click="end(scope.row)">{{
+                $t('page.business.study.studyRoom.js') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -106,42 +85,24 @@
           @pagination="getList" />
       </div>
     </div>
-    <!-- 编辑 -->
-    <Bj v-show="showEdit" key="Bj" ref="Bj" @close="bjClose" />
-    <!-- 详情 -->
-    <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
-    <!-- 审阅 -->
-    <Sy v-show="showAudit" key="Sy" ref="Sy" @close="syClose" />
-    <!-- 复核 -->
-    <Fh v-show="showFh" key="Fh" ref="Fh" @close="fhClose" />
-    <!-- 废止 -->
-    <Fz key="Fz" ref="Fz" @callback="search" />
-    <!-- 确认废止 -->
-    <Qrfz key="Qrfz" ref="Qrfz" @callback="search" />
-    <!-- 加签 -->
-    <Jq key="Jq" ref="Jq" @callback="search" />
-    <!-- 观察 -->
-    <Gc key="Gc" ref="Gc" @callback="search" />
-    <!-- 更换归属人 -->
-    <Ghgsr key="Ghgsr" ref="Ghgsr" @callback="search" />
-    <SelectDeptUserDialog ref="selectDeptUserDialog" @change="ghgsrChange" />
+    <!-- 新增 -->
+    <Xz key="Xz" ref="Xz" @callback="search" />
+    <!-- 更换笼具 -->
+    <Bj key="Bj" ref="Bj" @callback="search" />
+    <!-- 结束使用 -->
+    <Js key="Js" ref="Js" @callback="search" />
+    <!-- 笼具更换记录 -->
+    <Jl key="Jl" ref="Jl" @callback="search" />
   </div>
 
 </template>
 
 <script>
-import { studyFormFill_list } from '@/api/business/study/studyFormFill'
-import Bj from "./tbbd/Bj";
-import Xq from "./tbbd/Xq";
-import Sy from "./tbbd/Sy";
-import Fz from "./tbbd/Fz";
-import Fh from "./tbbd/Fh";
-import Qrfz from "./tbbd/Qrfz";
-import Jq from "./tbbd/Jq";
-import Ghgsr from "./tbbd/Ghgsr";
-import Gc from "./tbbd/Gc";
-import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
-import SelectDeptUserDialog from '@/views/business/comps/select/SelectDeptUserDialog';
+import { studyRoom_list } from '@/api/business/study/studyRoom'
+import Xz from "./syj/Xz";
+import Bj from "./syj/Bj";
+import Js from "./syj/Js";
+import Jl from "./syj/Jl";
 import { mapGetters } from 'vuex'
 import moment from "moment";
 export default {
@@ -173,32 +134,22 @@ export default {
       deep: true
     }
   },
-  components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog },
+  components: { Xz, Bj, Js, Jl },
   data() {
     return {
-      leader: null,
+      daterange: [],
       showFh: false,
-      showAudit: false,
-      showEdit: false,
-      showDetail: false,
-      daterangetj: [],
       daterange: [],
       searchForm: {
         pageNum: 1,
         pageSize: 10,
         studyId: '',
-        studySn: '',
-        studyMc: '',
-        studySubjectId: '',
-        bdbh: '',
-        bdmc: '',
-        userId: '',
-        userMc: '',
-        templateMc: '',
-        cjsjjs: '',
-        cjsjks: '',
-        tjsjjs: '',
-        tjsjks: '',
+        syjh: '',
+        syqy: '',
+        qyr: '',
+        jsr: '',
+        startDate: '',
+        endDate: ''
       },
       loading: false,
       total: 0,
@@ -208,104 +159,44 @@ export default {
   },
   created() { },
   methods: {
-    ghgsr(row) {
-      this.currentRow = row
-      this.$refs.selectDeptUserDialog.show(null, null)
-    },
-    ghgsrChange(val) {
-      this.$refs.Ghgsr.show({ id: this.currentRow.id, userId: val.id, userMc: val.name })
-    },
-    jq(row) {
-      this.$refs.Jq.show(row)
-    },
-    qrfz(row) {
-      this.$refs.Qrfz.show(row)
-    },
-    gc(row) {
-      this.$refs.Gc.show(row)
-    },
-    fz(row) {
-      this.$refs.Fz.show(row)
-    },
-    userChange(val) {
-      this.searchForm.userId = val.id
-      this.searchForm.userMc = val.name
-      this.search()
-    },
+
     search() {
       this.searchForm.pageNum = 1
       this.getList()
     },
     reset() {
       this.resetForm("searchForm")
-      this.handleQuery()
+      this.search()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
-        this.searchForm.cjsjks = this.daterange[0]
-        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
-      } else {
-        this.searchForm.cjsjks = ''
-        this.searchForm.cjsjjs = ''
-      }
-      if (this.daterangetj != null && this.daterangetj.length > 0) {
-        this.searchForm.tjsjks = this.daterangetj[0]
-        this.searchForm.tjsjjs = moment().add(this.daterangetj[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.startDate = this.daterange[0] + " 00:00:00"
+        this.searchForm.endDate = this.daterange[1] + " 23:59:59"
       } else {
-        this.searchForm.tjsjks = ''
-        this.searchForm.tjsjjs = ''
+        this.searchForm.startDate = ''
+        this.searchForm.endDate = ''
       }
       this.loading = true
-      studyFormFill_list(this.searchForm).then(response => {
+      studyRoom_list(this.searchForm).then(response => {
         this.list = response.rows
         this.total = response.total
         this.loading = false
       })
     },
     add() {
-      this.showEdit = true
-      this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
+      this.$refs.Xz.show(this.study.studyId);
     },
     edit(row) {
-      this.showEdit = true
-      this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit(row)
+      this.$refs.Bj.show(row)
     },
-    bjClose() {
-      this.showEdit = false
-      this.$emit('showDetail', this.showEdit)
-      this.search()
-    },
-    xqClose() {
-      this.showDetail = false
-      this.$emit('showDetail', this.showDetail)
-      this.search()
-    },
-    syClose() {
-      this.showAudit = false
-      this.$emit('showDetail', this.showAudit)
-      this.search()
-    },
-    fhClose() {
-      this.showFh = false
-      this.$emit('showDetail', this.showFh)
-      this.search()
+    end(row) {
+      this.$refs.Js.show(row)
     },
     detail(row) {
-      this.showDetail = true
-      this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row)
-    },
-    sy(row) {
-      this.showAudit = true
-      this.$emit('showDetail', this.showAudit)
-      this.$refs.Sy.show(row)
-    },
-    fh(row) {
-      this.showFh = true
-      this.$emit('showDetail', this.showFh)
-      this.$refs.Fh.show(row)
+      this.$refs.Jl.show(row)
+      // this.showDetail = true
+      // this.$emit('showDetail', this.showDetail)
+      // this.$refs.Xq.show(row)
     },
   }
 }
diff --git a/vue.config.js b/vue.config.js
index d474f56..e176b9f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
-         target: `http://39.99.251.173:8080`,
+        target: `http://localhost:8080`,
+        //  target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''