From 4b56571172e87bda7cbdfa223293092584ce2b71 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 15 Jan 2026 15:34:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=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]=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/study/studyRoom.js | 20 ++++ src/lang/en/business/study/studyRoom.js | 2 +- src/lang/zh/business/study/studyRoom.js | 2 +- src/views/business/comps/common/JcgjList.vue | 14 ++- src/views/business/study/comp/syff/Xz.vue | 2 +- src/views/business/study/comp/syj/Detail.vue | 153 +++++++++++++++++++++++++++ src/views/business/study/comp/syj/Xz.vue | 1 + src/views/business/study/comp/syjList.vue | 45 ++++++-- 8 files changed, 224 insertions(+), 15 deletions(-) create mode 100644 src/views/business/study/comp/syj/Detail.vue diff --git a/src/api/business/study/studyRoom.js b/src/api/business/study/studyRoom.js index b0de015..5a4c5e7 100644 --- a/src/api/business/study/studyRoom.js +++ b/src/api/business/study/studyRoom.js @@ -27,6 +27,26 @@ export function studyRoom_list(query) { }) } +// 饲养间详情 +export function studyRoom_info(query) { + return request({ + url: '/system/business/studyRoom/info', + method: 'get', + params: query + }) +} + +// 饲养间稽查轨迹列表 +export function studyRoom_jcgjList(query) { + return request({ + url: '/system/business/studyRoom/jcgjList', + method: 'get', + params: query + }) +} + + + // 笼具更换记录列表 export function studyRoom_historyList(query) { return request({ diff --git a/src/lang/en/business/study/studyRoom.js b/src/lang/en/business/study/studyRoom.js index 71b433b..4c39538 100644 --- a/src/lang/en/business/study/studyRoom.js +++ b/src/lang/en/business/study/studyRoom.js @@ -1,7 +1,7 @@ export default { qysyj: 'Start Usage', xzqy: 'Start Usage', - + xq: 'Detail', syqy: 'Area', syjh: 'Room ID', dwzs: 'Species', diff --git a/src/lang/zh/business/study/studyRoom.js b/src/lang/zh/business/study/studyRoom.js index 52db2b8..b6649c9 100644 --- a/src/lang/zh/business/study/studyRoom.js +++ b/src/lang/zh/business/study/studyRoom.js @@ -1,7 +1,7 @@ export default { qysyj: '启用饲养间', xzqy: '新增启用', - + xq: '详情', syqy: '试验区域', syjh: '饲养间号', dwzs: '动物种属', diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue index c2ae879..28c79ab 100644 --- a/src/views/business/comps/common/JcgjList.vue +++ b/src/views/business/comps/common/JcgjList.vue @@ -8,8 +8,9 @@
{{ $t('page.business.study.study.qb') }} - {{ $t('page.business.study.study.lc') }} + {{ $t('page.business.study.study.lc') }} {{ $t('page.business.study.study.bj') }} + {{ $t('page.business.study.studyRoom.ghlj') }} {{ $t('page.business.study.study.ry') }} {{ $t('page.business.study.study.xg') }} @@ -62,10 +63,19 @@ export default { type:Boolean, default:false }, + showLc:{ + type:Boolean, + default:true + }, showBj:{ type:Boolean, default:true }, + // 更换笼具 + showLj: { + type:Boolean, + default:false + }, }, data() { return { @@ -103,7 +113,7 @@ export default { item.jcnrList = [] item.jcnrListEn = [] } - // 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + // 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 if (item.jcmcys == 1) { item.color = '#409EFF' } diff --git a/src/views/business/study/comp/syff/Xz.vue b/src/views/business/study/comp/syff/Xz.vue index 67c84b5..4fc3a1f 100644 --- a/src/views/business/study/comp/syff/Xz.vue +++ b/src/views/business/study/comp/syff/Xz.vue @@ -135,7 +135,7 @@ export default { }, show(study) { this.reset() - this.form.studyId = study.studyId + this.form.studyId = study.id this.form.studySubjectId = study.studySubjectId this.open = true }, diff --git a/src/views/business/study/comp/syj/Detail.vue b/src/views/business/study/comp/syj/Detail.vue new file mode 100644 index 0000000..963fb37 --- /dev/null +++ b/src/views/business/study/comp/syj/Detail.vue @@ -0,0 +1,153 @@ + + + diff --git a/src/views/business/study/comp/syj/Xz.vue b/src/views/business/study/comp/syj/Xz.vue index 70161a0..d1c3082 100644 --- a/src/views/business/study/comp/syj/Xz.vue +++ b/src/views/business/study/comp/syj/Xz.vue @@ -141,6 +141,7 @@ export default { syjh: null, dwzs: null, lj: null, + studyId: null, qmrmm: null, kssyyl:'', qmyy: '启用饲养间', diff --git a/src/views/business/study/comp/syjList.vue b/src/views/business/study/comp/syjList.vue index c85bb9b..977e514 100644 --- a/src/views/business/study/comp/syjList.vue +++ b/src/views/business/study/comp/syjList.vue @@ -1,7 +1,7 @@ @@ -103,6 +111,7 @@ import Xz from "./syj/Xz"; import Bj from "./syj/Bj"; import Js from "./syj/Js"; import Jl from "./syj/Jl"; +import Detail from "./syj/Detail"; import { mapGetters } from 'vuex' import moment from "moment"; export default { @@ -134,11 +143,11 @@ export default { deep: true } }, - components: { Xz, Bj, Js, Jl }, + components: { Xz, Bj, Js, Jl, Detail }, data() { return { + showDetail: false, daterange: [], - showFh: false, daterange: [], searchForm: { pageNum: 1, @@ -184,7 +193,7 @@ export default { }) }, add() { - this.$refs.Xz.show(this.study.studyId); + this.$refs.Xz.show(this.study.id); }, edit(row) { this.$refs.Bj.show(row) @@ -192,12 +201,28 @@ export default { end(row) { this.$refs.Js.show(row) }, - detail(row) { + ljHistory(row) { this.$refs.Jl.show(row) // this.showDetail = true // this.$emit('showDetail', this.showDetail) // this.$refs.Xq.show(row) }, + detail(row) { + this.showDetail = true + this.$emit('showDetail', this.showDetail) + this.$refs.Detail.show(row) + // this.showDetail = true + // this.$emit('showDetail', this.showDetail) + // this.$refs.Xq.show(row) + }, + handleExport() { + + }, + xqClose() { + this.showDetail = false + this.$emit('showDetail', this.showDetail) + this.search() + }, } }