From d099fdfa0eeaf9c8977d83aaa9d923471044ff0e Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Fri, 26 Dec 2025 11:34:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20[=E8=BF=9B=E5=85=A5=E8=AF=95=E9=AA=8C]=20=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en.js                                     |   6 +-
 src/lang/en/business/study/studyEnter.js           |   8 ++
 src/lang/zh.js                                     |   6 +-
 src/lang/zh/business/study/studyEnter.js           |   8 ++
 src/views/business/resource/gyzj/comps/ffjl/Xq.vue |   2 +-
 src/views/business/resource/gyzj/comps/gyzj/Xq.vue |   2 +-
 src/views/business/resource/mjy/comps/ffjl/Xq.vue  |   2 +-
 src/views/business/resource/mjy/comps/mjy/Xq.vue   |   2 +-
 src/views/business/study/comp/edit.vue             |  22 ++--
 src/views/business/study/comp/enter.vue            |  86 +++++++------
 src/views/business/study/comp/suject.vue           | 134 +++++++++++++++++++++
 src/views/business/study/comp/ytbd.vue             |  61 ++++++++++
 src/views/business/study/list.vue                  |  88 +++++++-------
 src/views/login.vue                                |   6 +-
 14 files changed, 325 insertions(+), 108 deletions(-)
 create mode 100644 src/lang/en/business/study/studyEnter.js
 create mode 100644 src/lang/zh/business/study/studyEnter.js
 create mode 100644 src/views/business/study/comp/suject.vue
 create mode 100644 src/views/business/study/comp/ytbd.vue

diff --git a/src/lang/en.js b/src/lang/en.js
index aa8513f..c235557 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -12,6 +12,7 @@ import template from './en/system/template'
 
 // 试验管理
 import study from './en/business/study/study'
+import studyEnter from './en/business/study/studyEnter'
 
 //资源库管理
 // 仪器管理
@@ -132,7 +133,10 @@ export default {
         sj,
         gyzj
       },
-      study: study
+      study: {
+        study: study,
+        studyEnter: studyEnter
+      }
     }
   }
 }
diff --git a/src/lang/en/business/study/studyEnter.js b/src/lang/en/business/study/studyEnter.js
new file mode 100644
index 0000000..625db0d
--- /dev/null
+++ b/src/lang/en/business/study/studyEnter.js
@@ -0,0 +1,8 @@
+export default {
+  ytbdlb: 'Form',
+  tbbdlb: 'Record',
+  syxx: 'Information',
+  wzlb: 'Resources',
+  syfflb: 'Method',
+  syjsygl: 'Animal Room Usage'
+}
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 15e0fa6..2ff8bef 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -12,6 +12,7 @@ import template from './zh/system/template'
 
 // 试验管理
 import study from './zh/business/study/study'
+import studyEnter from './zh/business/study/studyEnter'
 
 //资源库管理
 // 仪器管理
@@ -129,7 +130,10 @@ export default {
         sj,
         gyzj
       },
-      study: study
+      study: {
+        study: study,
+        studyEnter: studyEnter
+      }
     }
   }
 }
diff --git a/src/lang/zh/business/study/studyEnter.js b/src/lang/zh/business/study/studyEnter.js
new file mode 100644
index 0000000..e65b5aa
--- /dev/null
+++ b/src/lang/zh/business/study/studyEnter.js
@@ -0,0 +1,8 @@
+export default {
+  ytbdlb: '预填表单列表',
+  tbbdlb: '填报表单列表',
+  syxx: '试验信息',
+  wzlb: '物资列表',
+  syfflb: '试验方法列表',
+  syjsygl: '饲养间使用管理'
+}
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
index d5b6844..fcd33c7 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
@@ -7,7 +7,7 @@
         <div class="left-title"></div>
       </div>
       <div class="right-top">
-        <el-button @click="cancel()">{{ $t('page.business.study.cancel') }}</el-button>
+        <el-button @click="cancel()">{{ $t('page.business.study.study.cancel') }}</el-button>
         <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
       </div>
     </div>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
index 42a304c..84b80ca 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
@@ -8,7 +8,7 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="right-top">
-        <el-button @click="cancel()">{{$t('page.business.study.cancel')}}</el-button>
+        <el-button @click="cancel()">{{$t('page.business.study.study.cancel')}}</el-button>
           <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
         </div>
       </div>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
index eb665f2..616593b 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
@@ -7,7 +7,7 @@
         <div class="left-title"></div>
       </div>
       <div class="right-top">
-        <el-button @click="cancel()">{{ $t('page.business.study.cancel') }}</el-button>
+        <el-button @click="cancel()">{{ $t('page.business.study.study.cancel') }}</el-button>
         <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
       </div>
     </div>
diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue
index 43541e7..3a5ed8e 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue
@@ -8,7 +8,7 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="right-top">
-        <el-button @click="cancel()">{{$t('page.business.study.cancel')}}</el-button>
+        <el-button @click="cancel()">{{$t('page.business.study.study.cancel')}}</el-button>
           <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
         </div>
       </div>
diff --git a/src/views/business/study/comp/edit.vue b/src/views/business/study/comp/edit.vue
index dcccb7b..db32e91 100644
--- a/src/views/business/study/comp/edit.vue
+++ b/src/views/business/study/comp/edit.vue
@@ -3,34 +3,34 @@
     <div class="edit-top">
       <div class="left-top">
         <img src="@/assets/images/back.png" @click="cancel()" />
-        <div class="left-title">{{$t('page.business.study.create')}}</div>
+        <div class="left-title">{{$t('page.business.study.study.create')}}</div>
       </div>
       <div class="right-top">
-        <el-button @click="cancel()">{{$t('page.business.study.cancel')}}</el-button>
-        <el-button type="primary" @click="save(1)" plain>{{$t('page.business.study.save')}}</el-button>
-        <el-button type="primary" @click="save(3)">{{$t('page.business.study.submit')}}</el-button>
+        <el-button @click="cancel()">{{$t('page.business.study.study.cancel')}}</el-button>
+        <el-button type="primary" @click="save(1)" plain>{{$t('page.business.study.study.save')}}</el-button>
+        <el-button type="primary" @click="save(3)">{{$t('page.business.study.study.submit')}}</el-button>
       </div>
     </div>
     <div class="edit-content">
       <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="150px" class="edit-form">
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.name')+'：'" prop="name">
+            <el-form-item :label="$t('page.business.study.study.name')+'：'" prop="name">
               <el-input v-model="infoDialog.formData.name" :placeholder="$t('form.placeholderInput')" maxlength="100" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.sn')+'：'" prop="sn">
+            <el-form-item :label="$t('page.business.study.study.sn')+'：'" prop="sn">
               <el-input v-model="infoDialog.formData.sn" :placeholder="$t('form.placeholderInput')" maxlength="100" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.leader')+'：'" prop="leader">
+            <el-form-item :label="$t('page.business.study.study.leader')+'：'" prop="leader">
               <SelectDeptUser @change="changeLeader" v-model="infoDialog.formData.leader" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.remark')+'：'" prop="remark">
+            <el-form-item :label="$t('page.business.study.study.remark')+'：'" prop="remark">
               <el-input type="textarea" :rows="5" :placeholder="$t('form.placeholderInput')" v-model="infoDialog.formData.remark" maxlength="500" show-word-limit> </el-input>
             </el-form-item>
           </el-col>
@@ -68,13 +68,13 @@ export default {
         formData:{},
         rules:{
           name: [
-            { required: true, message: this.$t('page.business.study.inputName'), trigger: "blur" }
+            { required: true, message: this.$t('page.business.study.study.inputName'), trigger: "blur" }
           ],
           sn: [
-            { required: true, message: this.$t('page.business.study.inputSn'), trigger: "blur" }
+            { required: true, message: this.$t('page.business.study.study.inputSn'), trigger: "blur" }
           ],
           leader: [
-            { required: true, message: this.$t('page.business.study.inputLeader'), trigger: "change" }
+            { required: true, message: this.$t('page.business.study.study.inputLeader'), trigger: "change" }
           ],
         }
       },
diff --git a/src/views/business/study/comp/enter.vue b/src/views/business/study/comp/enter.vue
index 31d1a69..070ab2b 100644
--- a/src/views/business/study/comp/enter.vue
+++ b/src/views/business/study/comp/enter.vue
@@ -2,60 +2,63 @@
   <div class="study-enter">
     <div class="content-list">
       <div class="search-box">
-        <div class="search-item" :class="active===item.key?'active':''" v-for="(item,index) in tabList" :key="index" @click="changeTab(item)">{{item.name}}</div>
+        <div
+          class="search-item"
+          :class="active === item.key ? 'active' : ''"
+          v-for="(item, index) in tabList"
+          :key="index"
+          @click="changeTab(item)"
+        >
+          {{ item.name }}
+        </div>
       </div>
 
       <div class="content-box">
-        456
+        <ytbd v-if="active==='ytbd'" :study="study" />
       </div>
     </div>
   </div>
-
 </template>
 
 <script>
-import { study_list,study_info,study_save,study_delete} from "@/api/business/study/study";
+import ytbd from './ytbd.vue'
 export default {
-  name: "StudyEnter",
-  props:{
-  },
-  components:{
-  },
-  computed: {
-  },
-  filters:{
-  },
+  name: 'StudyEnter',
+  props: {},
+  components: {ytbd},
+  computed: {},
+  filters: {},
   data() {
     return {
-      tabList:[
-        {key:'ytbd',name:'预填表单列表'},
-        {key:'tbbd',name:'填报表单列表'},
-        {key:'syxx',name:'试验信息'},
-        {key:'wzlb',name:'物资列表'},
-        {key:'syff',name:'试验方法列表'},
-        {key:'syj',name:'饲养间使用管理'}
+      tabList: [
+        { key: 'ytbd', name: this.$t('page.business.study.studyEnter.ytbdlb')},
+        { key: 'tbbd', name: this.$t('page.business.study.studyEnter.tbbdlb') },
+        { key: 'syxx', name: this.$t('page.business.study.studyEnter.syxx') },
+        { key: 'wzlb', name: this.$t('page.business.study.studyEnter.wzlb') },
+        { key: 'syff', name: this.$t('page.business.study.studyEnter.syfflb') },
+        { key: 'syj', name: this.$t('page.business.study.studyEnter.syjsygl')}
       ],
-      active:'ytbd'
-    };
-  },
-  created() {
+      active: 'ytbd',
+
+      study:{},
+    }
   },
+  created() {},
   methods: {
     show(row){
-
+      this.study = row
     },
-    changeTab(item){
-      if(this.active!==item.key){
+    changeTab(item) {
+      if (this.active !== item.key) {
         this.active = item.key
       }
     }
-    
   }
-};
+}
 </script>
 <style lang="scss" scoped>
-.study-enter{
-  .search-box{
+.study-enter {
+  .search-box {
     background: #fff;
     padding: 0;
     border-radius: 3px;
@@ -64,34 +67,29 @@ export default {
     display: flex;
     flex-direction: row;
     align-items: center;
-    .search-item{
+    .search-item {
       padding: 10px 20px;
+      font-size: 14px;
       cursor: pointer;
-      &.active{
+      &.active {
         background: #1890ff;
         color: #fff;
-        
       }
-      &:hover{
+      &:hover {
         background: #46a6ff;
         color: #fff;
       }
-      &:first-child{
+      &:first-child {
         border-top-left-radius: 3px;
         border-bottom-left-radius: 3px;
       }
-      &:last-child{
+      &:last-child {
         border-top-right-radius: 3px;
         border-bottom-right-radius: 3px;
       }
     }
   }
-  .content-box{
-    background: #fff;
-    padding: 20px;
-    .add-box{
-      margin-bottom: 10px;
-    }
+  .content-box {
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue
new file mode 100644
index 0000000..33e3730
--- /dev/null
+++ b/src/views/business/study/comp/suject.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="study-subject">
+    <div class="subject-top">{{study.name}}</div>
+    <div class="subject-study">
+      <div class="study-info">{{$t('page.business.study.study.sn')}}：<span>{{study.sn}}</span></div>
+      <div class="study-info">{{$t('page.business.study.study.name')}}：<span>{{study.name}}</span></div>
+      <div class="study-info">{{$t('page.business.study.study.createDate')}}：<span>{{study.createTime}}</span></div>
+    </div>
+    <div class="subject-operate">
+      <div class="operate-img"></div>
+      <div class="operate-left">试验学科信息</div>
+      <div class="operate-right">
+        <i class="el-icon-edit operate-icon"></i>
+      </div>
+    </div>
+    <div class="subject-content">
+      <div class="subject-item" v-for="(item,index) in  subjectList" :key="index">
+        <div class="subject-item-name">{{item.name}}({{item.leader}})</div>
+        <div class="subject-item-add">
+          <el-button type="primary" plain>邀请</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  study_list,
+  study_info,
+  study_save,
+  study_delete
+} from '@/api/business/study/study'
+export default {
+  name: 'StudyYtbd',
+  props: {
+    study:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
+    }
+  },
+  components: {},
+  computed: {},
+  filters: {},
+  data() {
+    return {
+      subjectList:[
+        {name:'色谱',leader:'谭飞'},
+        {name:'供试品',leader:'韩龙'},
+        {name:'细胞',leader:'何栋'}
+      ]
+    }
+  },
+  created() {},
+  methods: {
+  }
+}
+</script>
+<style lang="scss" scoped>
+.study-subject {
+  .subject-top {
+    background: #f0f7ff;
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+    border-top: 3px solid #409eff;
+    padding: 20px 0;
+    text-align: center;
+    color: #409eff;
+    font-weight: bold;
+  }
+  .subject-study{
+    background: #fafcff;
+    padding: 20px;
+    color: #666666;
+    position: relative;
+    .study-info{
+      margin-bottom: 20px;
+      span{
+        color: #777;
+      }
+      &:last-child{
+        margin-bottom: 0;
+      }
+    }
+  }
+  .subject-operate{
+    margin: 20px 0;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    .operate-img{
+      flex-shrink: 0;
+      height: 15px;
+      background: #3178ff;
+      width: 3px;
+    }
+    .operate-left{
+      flex-shrink: 0;
+      font-weight: bold;
+      padding-left: 10px;
+    }
+    .operate-right{
+      flex-grow: 1;
+      text-align: right;
+      .operate-icon{
+        cursor: pointer;
+      }
+    }
+  }
+  .subject-content{
+    .subject-item{
+      margin-bottom: 10px;
+      padding: 10px;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+      background: #f9fafc;
+      border-radius: 5px;
+      &:hover{
+        border: 1px solid #47a1ff;
+      }
+      .subject-item-name{
+        color: #777;
+      }
+      .subject-item-add{
+
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/business/study/comp/ytbd.vue b/src/views/business/study/comp/ytbd.vue
new file mode 100644
index 0000000..df5683a
--- /dev/null
+++ b/src/views/business/study/comp/ytbd.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="study-ytbd">
+    <div class="ytbd-left">
+      <sbject :study="study" />
+    </div>
+    <div class="ytbd-right">
+      <div class="right-top">456</div>
+      <div class="right-content">789</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import sbject from './suject.vue'
+export default {
+  name: 'StudyYtbd',
+  props: {
+    study:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
+    }
+  },
+  components: {sbject},
+  computed: {},
+  filters: {},
+  data() {
+    return {
+    }
+  },
+  created() {},
+  methods: {
+  }
+}
+</script>
+<style lang="scss" scoped>
+.study-ytbd {
+  display: flex;
+  flex-direction: row;
+  .ytbd-left {
+    background: #fff;
+    padding: 20px;
+    margin-right: 10px;
+    flex-shrink: 0;
+    width: 350px;
+  }
+  .ytbd-right{
+    flex-grow: 1;
+    .right-top{
+      background: #fff;
+      padding: 20px;
+      margin-bottom: 10px;
+    }
+    .right-content{
+      padding: 20px;
+      background: #fff;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/study/list.vue b/src/views/business/study/list.vue
index 0972dd1..150e626 100644
--- a/src/views/business/study/list.vue
+++ b/src/views/business/study/list.vue
@@ -2,19 +2,19 @@
   <div class="app-container study-page">
     <div class="content-list" v-show="showType==='list'">
       <el-form :model="searchForm" ref="searchForm" :inline="true" class="search-box">
-        <el-form-item :label="$t('page.business.study.name')" prop="name">
+        <el-form-item :label="$t('page.business.study.study.name')" prop="name">
           <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
         </el-form-item>
-        <el-form-item :label="$t('page.business.study.sn')" prop="sn">
+        <el-form-item :label="$t('page.business.study.study.sn')" prop="sn">
           <el-input v-model="searchForm.sn" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
         </el-form-item>
 
-        <el-form-item :label="$t('page.business.study.dateRange')">
-          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.study.startDate')"
-            :end-placeholder="$t('page.business.study.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
+        <el-form-item :label="$t('page.business.study.study.dateRange')">
+          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.study.study.startDate')"
+            :end-placeholder="$t('page.business.study.study.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
         </el-form-item>
 
-        <el-form-item prop="status" :label="$t('page.business.study.status')">
+        <el-form-item prop="status" :label="$t('page.business.study.study.status')">
           <el-select
             v-model="searchForm.status"
             :placeholder="$t('form.placeholderSelect')"
@@ -22,16 +22,16 @@
             style="width: 100px"
             @change="search"
           >
-            <el-option :label="$t('page.business.study.statusCg')" :value="1" />
-            <el-option :label="$t('page.business.study.statusSyz')" :value="3" />
-            <el-option :label="$t('page.business.study.statusYsd')" :value="5" />
-            <el-option :label="$t('page.business.study.statusDgd')" :value="7" />
-            <el-option :label="$t('page.business.study.statusGd')" :value="9" />
-            <el-option :label="$t('page.business.study.statusDjd')" :value="10" />
+            <el-option :label="$t('page.business.study.study.statusCg')" :value="1" />
+            <el-option :label="$t('page.business.study.study.statusSyz')" :value="3" />
+            <el-option :label="$t('page.business.study.study.statusYsd')" :value="5" />
+            <el-option :label="$t('page.business.study.study.statusDgd')" :value="7" />
+            <el-option :label="$t('page.business.study.study.statusGd')" :value="9" />
+            <el-option :label="$t('page.business.study.study.statusDjd')" :value="10" />
           </el-select>
         </el-form-item>
 
-        <el-form-item prop="leaderName" :label="$t('page.business.study.leader')">
+        <el-form-item prop="leaderName" :label="$t('page.business.study.study.leader')">
           <el-input v-model="searchForm.leaderName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
         </el-form-item>
         <div class="right-btn">
@@ -45,56 +45,56 @@
       <div class="content-box">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:study:add']">{{ $t('page.business.study.add') }}</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:study:add']">{{ $t('page.business.study.study.add') }}</el-button>
           </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list">
-          <el-table-column :label="$t('page.business.study.sort')" type="index" width="50" />
-          <el-table-column :label="$t('page.business.study.name')" prop="name" />
-          <el-table-column :label="$t('page.business.study.sn')" prop="sn" />
-          <el-table-column :label="$t('page.business.study.status')" prop="status" width="100">
+          <el-table-column :label="$t('page.business.study.study.sort')" type="index" width="50" />
+          <el-table-column :label="$t('page.business.study.study.name')" prop="name" />
+          <el-table-column :label="$t('page.business.study.study.sn')" prop="sn" />
+          <el-table-column :label="$t('page.business.study.study.status')" prop="status" width="100">
             <template slot-scope="scope">
-              <span v-if="scope.row.status===1">{{$t('page.business.study.statusCg')}}</span>
-              <span v-if="scope.row.status===3">{{$t('page.business.study.statusSyz')}}</span>
-              <span v-if="scope.row.status===5">{{$t('page.business.study.statusYsd')}}</span>
-              <span v-if="scope.row.status===7">{{$t('page.business.study.statusDgd')}}</span>
-              <span v-if="scope.row.status===9">{{$t('page.business.study.statusGd')}}</span>
-              <span v-if="scope.row.status===10">{{$t('page.business.study.statusDjd')}}</span>
+              <span v-if="scope.row.status===1">{{$t('page.business.study.study.statusCg')}}</span>
+              <span v-if="scope.row.status===3">{{$t('page.business.study.study.statusSyz')}}</span>
+              <span v-if="scope.row.status===5">{{$t('page.business.study.study.statusYsd')}}</span>
+              <span v-if="scope.row.status===7">{{$t('page.business.study.study.statusDgd')}}</span>
+              <span v-if="scope.row.status===9">{{$t('page.business.study.study.statusGd')}}</span>
+              <span v-if="scope.row.status===10">{{$t('page.business.study.study.statusDjd')}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column :label="$t('page.business.study.borrowStatus')" prop="borrowStatus" width="100">
+          <el-table-column :label="$t('page.business.study.study.borrowStatus')" prop="borrowStatus" width="100">
             <template slot-scope="scope">
-              <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.borrowStatusWjy')}}</span>
-              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.borrowStatusJyz')}}</span>
-              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.study.borrowStatusWjy')}}</span>
+              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.study.borrowStatusJyz')}}</span>
+              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.study.borrowStatusDjy')}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column :label="$t('page.business.study.formCount')" align="center" prop="formCount" width="100" />
-          <el-table-column :label="$t('page.business.study.formFinishCount')" align="center" prop="formFinishCount" width="120" />
-          <el-table-column :label="$t('page.business.study.leader')" align="center" prop="leaderName" width="100" />
-          <el-table-column :label="$t('page.business.study.createDate')" align="center" prop="createTime" width="140" />
+          <el-table-column :label="$t('page.business.study.study.formCount')" align="center" prop="formCount" width="100" />
+          <el-table-column :label="$t('page.business.study.study.formFinishCount')" align="center" prop="formFinishCount" width="120" />
+          <el-table-column :label="$t('page.business.study.study.leader')" align="center" prop="leaderName" width="100" />
+          <el-table-column :label="$t('page.business.study.study.createDate')" align="center" prop="createTime" width="140" />
           
           <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">
             <template slot-scope="scope">
               <!-- 编辑 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:study:edit']" v-if="scope.row.status===1 || scope.row.status===3">{{$t('page.business.study.edit')}}</el-button>
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:study:edit']" v-if="scope.row.status===1 || scope.row.status===3">{{$t('page.business.study.study.edit')}}</el-button>
               <!-- 删除 -->
-              <el-button type="text" @click="del(scope.row)" v-hasPermi="['business:study:remove']" v-if="scope.row.status===1">{{$t('page.business.study.delete')}}</el-button>
+              <el-button type="text" @click="del(scope.row)" v-hasPermi="['business:study:remove']" v-if="scope.row.status===1">{{$t('page.business.study.study.delete')}}</el-button>
               <!-- 详情 -->
-              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study:detail']" v-if="scope.row.status===1 || scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.detail')}}</el-button>
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study:detail']" v-if="scope.row.status===1 || scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.study.detail')}}</el-button>
               <!-- 进入试验 -->
-              <el-button type="text" @click="enter(scope.row)" v-hasPermi="['business:study:enter']" v-if="scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.enter')}}</el-button>
+              <el-button type="text" @click="enter(scope.row)" v-hasPermi="['business:study:enter']" v-if="scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.study.enter')}}</el-button>
               <!-- 归档 -->
-              <el-button type="text" @click="gd(scope.row)" v-hasPermi="['business:study:gd']" v-if="scope.row.status===5">{{$t('page.business.study.gd')}}</el-button>
+              <el-button type="text" @click="gd(scope.row)" v-hasPermi="['business:study:gd']" v-if="scope.row.status===5">{{$t('page.business.study.study.gd')}}</el-button>
               <!-- 解锁 -->
-              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:js']" v-if="scope.row.status===5">{{$t('page.business.study.js')}}</el-button>
+              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:js']" v-if="scope.row.status===5">{{$t('page.business.study.study.js')}}</el-button>
               <!-- 解档 -->
-              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jd']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.jd')}}</el-button>
+              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jd']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.study.jd')}}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jy']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.jy')}}</el-button>
+              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jy']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.study.jy')}}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -111,22 +111,22 @@
         <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="100px">
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.name')+'：'" prop="name">
+              <el-form-item :label="$t('page.business.study.study.name')+'：'" prop="name">
                 <el-input v-model="infoDialog.formData.name" :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.sn')+'：'" prop="sn">
+              <el-form-item :label="$t('page.business.study.study.sn')+'：'" prop="sn">
                 <el-input v-model="infoDialog.formData.sn" :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.leader')+'：'" prop="leader">
+              <el-form-item :label="$t('page.business.study.study.leader')+'：'" prop="leader">
                 <el-input v-model="infoDialog.formData.leader" :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.remark')+'：'" prop="remark">
+              <el-form-item :label="$t('page.business.study.study.remark')+'：'" prop="remark">
                 <el-input type="textarea" :rows="5" :placeholder="$t('form.placeholderInput')" v-model="infoDialog.formData.remark"> </el-input>
               </el-form-item>
             </el-col>
diff --git a/src/views/login.vue b/src/views/login.vue
index bea2974..cd34b9e 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -4,7 +4,7 @@
       <img class="system-logo" src="@/assets/images/logo-white.png" />
       <div>{{ $t('system.name')}} </div>
     </div>
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" size="middle">
       <div class="login-lang"><lang-select class="set-language" /></div>
       <div class="login-title">
         <img class="login-logo" src="@/assets/images/logomini.png" />
@@ -45,8 +45,8 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item> -->
-      <el-checkbox v-model="loginForm.rememberMe" style="float: right;margin-bottom:30px">{{ $t('login.rememberMe') }}</el-checkbox>
-      <el-form-item style="width:100%;">
+      <!-- <el-checkbox v-model="loginForm.rememberMe" style="float: right;margin-bottom:30px">{{ $t('login.rememberMe') }}</el-checkbox> -->
+      <el-form-item style="width:100%;margin-top:50px">
         <el-button
           :loading="loading"