From dcc5ba7b4e03d9b1f6f32aa32924a385f2e94891 Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Sun, 11 Jan 2026 21:25:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E9=A5=B2=E5=85=BB=E9=97=B4=E7=AE=A1=E7=90=86]=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/study/studyMethod.js      |  2 +-
 src/lang/en/business/study/studyMethod.js  | 34 +++++++++++++++---------------
 src/lang/en/business/study/studyRoom.js    | 26 +++++++++++------------
 src/views/business/study/comp/syff/Xq.vue  |  5 +++--
 src/views/business/study/comp/syffList.vue |  6 +++---
 src/views/business/study/comp/syjList.vue  |  8 +++----
 6 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/src/api/business/study/studyMethod.js b/src/api/business/study/studyMethod.js
index 20a9892..772a58f 100644
--- a/src/api/business/study/studyMethod.js
+++ b/src/api/business/study/studyMethod.js
@@ -42,7 +42,7 @@ export function studyMethod_readList(query) {
 // 方法阅读导出
 export function studyMethod_export(query) {
   return request({
-    url: '/system/business/studyMethod/test',
+    url: '/system/business/studyMethod/download',
     method: 'get',
     params: query
   })
diff --git a/src/lang/en/business/study/studyMethod.js b/src/lang/en/business/study/studyMethod.js
index 2bfa44d..33e5bb7 100644
--- a/src/lang/en/business/study/studyMethod.js
+++ b/src/lang/en/business/study/studyMethod.js
@@ -1,20 +1,20 @@
 export default {
-    ffmc: '方法名称',
-    cjr: '创建人',
-    cjsj: '创建时间',
-    scff: '上传方法',
-    scwj: '上传文件',
-    wjm:'支持扩展名：pdf',
-    zt: '状态',
-    yuedu: '阅读',
-    daochu: '导出',
-    mc: '名称',
-    ff: '方法',
+    ffmc: 'Name',
+    cjr: 'Creator',
+    cjsj: 'Creation Date',
+    scff: 'Upload',
+    scwj: 'Upload File',
+    wjm:'Allowed Format: .pdf',
+    zt: 'Status',
+    yuedu: 'Read',
+    daochu: 'Download',
+    mc: 'Name',
+    ff: 'Method',
     qmhz: '签名汇总',
-    yidu: '已读',
-    weidu: '未读',
-    qmr: '签名人',
-    qmsj: '签名时间',
-    qmyy: '签名意义',
-    remark: '备注',
+    yidu: 'Read',
+    weidu: 'Unread',
+    qmr: 'Signed By',
+    qmsj: 'Date',
+    qmyy: 'Purpose',
+    remark: 'Comment',
 }
\ No newline at end of file
diff --git a/src/lang/en/business/study/studyRoom.js b/src/lang/en/business/study/studyRoom.js
index 52db2b8..71b433b 100644
--- a/src/lang/en/business/study/studyRoom.js
+++ b/src/lang/en/business/study/studyRoom.js
@@ -1,18 +1,18 @@
 export default {
-    qysyj: '启用饲养间',
-    xzqy: '新增启用',
+    qysyj: 'Start Usage',
+    xzqy: 'Start Usage',
 
-    syqy: '试验区域',
-    syjh: '饲养间号',
-    dwzs: '动物种属',
-    longju: '笼具',
-    kssyyl: '开始使用原因',
-    qyr: '启用人',
-    kssj: '开始时间',
-    jssyyl: '结束使用原因',
-    jsr: '结束人',
-    jssj: '结束时间',
-    zt: '状态',
+    syqy: 'Area',
+    syjh: 'Room ID',
+    dwzs: 'Species',
+    longju: 'Cage',
+    kssyyl: 'Start Reason',
+    qyr: 'Start by',
+    kssj: 'Start Date',
+    jssyyl: 'End Reason',
+    jsr: 'End by',
+    jssj: 'End Date',
+    zt: 'Status',
     syz: '使用中',
     yjs: '已结束',
     ghlj: '更换笼具',
diff --git a/src/views/business/study/comp/syff/Xq.vue b/src/views/business/study/comp/syff/Xq.vue
index b5b1b2d..6b24e49 100644
--- a/src/views/business/study/comp/syff/Xq.vue
+++ b/src/views/business/study/comp/syff/Xq.vue
@@ -151,8 +151,9 @@ export default {
     },
 
     handleExport() {
-      studyMethod_export({studyMethodId:6}).then(response => {
-
+      studyMethod_export({studyMethodId: this.form.id}).then(response => {
+        let fileUrl = response.data.fileUrl
+        this.$download.saveAs(process.env.VUE_APP_FILE_DOMAIN + fileUrl, this.form.ffmc + ".pdf");
       })
     }
 
diff --git a/src/views/business/study/comp/syffList.vue b/src/views/business/study/comp/syffList.vue
index 9fc80eb..463f1d5 100644
--- a/src/views/business/study/comp/syffList.vue
+++ b/src/views/business/study/comp/syffList.vue
@@ -42,7 +42,7 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()">{{
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyMethod:upload']">{{
               $t('page.business.study.studyMethod.scff') }}</el-button>
           </el-col>
         </el-row>
@@ -60,10 +60,10 @@
           <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
               <!-- 阅读 -->
-              <el-button type="text" @click="detail(scope.row)">{{
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyMethod:read']">{{
                 $t('page.business.study.studyMethod.yuedu') }}</el-button>
               <!-- 导出 -->
-              <el-button type="text" @click="showExport(scope.row)">{{
+              <el-button type="text" @click="showExport(scope.row)" v-hasPermi="['business:studyMethod:download']">{{
                 $t('page.business.study.studyMethod.daochu') }}</el-button>
             </template>
           </el-table-column>
diff --git a/src/views/business/study/comp/syjList.vue b/src/views/business/study/comp/syjList.vue
index 277c524..c85bb9b 100644
--- a/src/views/business/study/comp/syjList.vue
+++ b/src/views/business/study/comp/syjList.vue
@@ -44,7 +44,7 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()">{{
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyRoom:add']">{{
               $t('page.business.study.studyRoom.xzqy') }}</el-button>
           </el-col>
         </el-row>
@@ -69,13 +69,13 @@
           <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
               <!-- 笼具记录 -->
-              <el-button type="text" @click="detail(scope.row)">{{
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyRoom:ljjl']">{{
                 $t('page.business.study.studyRoom.ljjl') }}</el-button>
               <!-- 更换笼具 -->
-              <el-button type="text" v-if="scope.row.zt === 1" @click="edit(scope.row)">{{
+              <el-button type="text" v-if="scope.row.zt === 1" @click="edit(scope.row)" v-hasPermi="['business:studyRoom:update']">{{
                 $t('page.business.study.studyRoom.ghlj') }}</el-button>
               <!-- 结束 -->
-              <el-button type="text" v-if="scope.row.zt === 1" @click="end(scope.row)">{{
+              <el-button type="text" v-if="scope.row.zt === 1" @click="end(scope.row)" v-hasPermi="['business:studyRoom:js']">{{
                 $t('page.business.study.studyRoom.js') }}</el-button>
             </template>
           </el-table-column>