From 4c30e63bfd14bdcb087fee26acc9324302c0b455 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Tue, 14 Jan 2025 13:21:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/archives-manage.scss | 9 ++-- src/main.js | 3 ++ src/views/home.vue | 2 +- .../checkManage/dataScreening/girdList.vue | 52 ++++++++++--------- .../dataScreening/module/export.vue | 39 +++++++++----- .../visualCheck/venueDevice/area/index.vue | 6 ++- .../venueDevice/bookshelf/index.vue | 6 ++- .../visualCheck/venueDevice/floor/index.vue | 8 ++- 8 files changed, 79 insertions(+), 46 deletions(-) diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index a251bdc..a1ede63 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -890,13 +890,14 @@ position: relative; } .double-click-btn{ - position: absolute; - right: 0; - top: 0; + // position: absolute; + // right: 0; + // top: 0; display: flex; - justify-content: flex-start; + justify-content: flex-end; align-items: center; line-height: 26px; + margin: -6px 0 4px 0; span{ display: inline-block; font-size: 12px; diff --git a/src/main.js b/src/main.js index 1125686..49e3fce 100644 --- a/src/main.js +++ b/src/main.js @@ -70,6 +70,9 @@ Vue.prototype.$x2js = new X2js() // 创建x2js对象，挂到vue原型上 Vue.config.productionTip = false +// 江夏图书馆馆代码 +Vue.prototype.libcode = '1501' + new Vue({ el: '#app', router, diff --git a/src/views/home.vue b/src/views/home.vue index ad03f3d..329c635 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -91,7 +91,7 @@

流通统计

-
2024-11-28 09:46
+
diff --git a/src/views/visualCheck/checkManage/dataScreening/girdList.vue b/src/views/visualCheck/checkManage/dataScreening/girdList.vue index b0e8add..c2e3e60 100644 --- a/src/views/visualCheck/checkManage/dataScreening/girdList.vue +++ b/src/views/visualCheck/checkManage/dataScreening/girdList.vue @@ -65,7 +65,7 @@ @@ -228,12 +228,12 @@ import CRUD, { presenter, header, crud } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import { mapGetters } from 'vuex' import eForm from './module/form' +import exportForm from './module/export' import { parseTime, saveAs, getBlob } from '@/utils/index' -// import qs from 'qs' export default { name: 'DataScreening', - components: { crudOperation, eForm }, + components: { crudOperation, eForm, exportForm }, cruds() { return CRUD({ title: '架位盘点', url: 'api/libraryRegion/initLibraryRegionList', crudMethod: { ...crudRegion }, sort: [], optShow: { add: false, @@ -468,23 +468,27 @@ export default { }) }, toAdd(type, item) { - if (item.isCheck) { + if (type === 5) { this.$refs.eform.formVisible = true - if (type === 5) { - this.$refs.eform.form.shelfId = this.bookShelfDetails.id - this.$refs.eform.form.gridShelf = this.gridShelf - this.$refs.eform.form.stockRegion = this.floorName + this.regionName + this.bookShelfDetails.shelfName + this.gridShelf + '架' - } else { + this.$refs.eform.form.shelfId = this.bookShelfDetails.id + this.$refs.eform.form.gridShelf = this.gridShelf + this.$refs.eform.form.stockRegion = this.floorName + this.regionName + this.bookShelfDetails.shelfName + this.gridShelf + '架' + } else { + if (item.isCheck) { + this.$refs.eform.formVisible = true this.$refs.eform.form.shelfId = null this.$refs.eform.form.gridShelf = null this.$refs.eform.form.gridId = item.id this.$refs.eform.form.stockRegion = item.gridName + } else { + this.$message({ message: '当前层位不可盘点', type: 'error', offset: 8 }) } - - this.$refs.eform.setData(type) - } else { - this.$message({ message: '当前层位不可盘点', type: 'error', offset: 8 }) } + this.$refs.eform.setData(type) + }, + doExport(type) { + this.$refs.exportform.formExportVisible = true + this.$refs.exportform.type = 3 }, handleCellCurrent(item, index) { this.cellIndex = index @@ -504,7 +508,11 @@ export default { this.detailVisible = true this.detailTable = item.books this.detailCurrent = item - this.handleViewImg() + if (this.detailCurrent.onShelfNum) { + this.bigImg = `${this.baseApi}/api/fileRelevant/getImg?imgId=/${this.libcode}/${this.billNoImg}/${this.detailCurrent.gridCode}/img_result/result_LSD_compressed.jpg` + } else { + this.bigImg = '' + } }, setActiveItem(index) { this.$refs.carousel.setActiveItem(index) @@ -518,20 +526,20 @@ export default { // http://192.168.99.67:12010/api/fileRelevant/getImg?imgId=/1501/PD20250108013/010011015/img_result/result_LSD.jpg // http://192.168.99.67:12010/api/fileRelevant/getImg?imgId=/1501/PD20250108013/010011015/img_result/result_cut_1_compressed.jpg this.bookImgData = [] - // this.detailImgVisible = true + this.detailImgVisible = true const params = { 'billNo': this.billNoImg, 'gridId': this.detailCurrent.id } FetchIsGoodcutByBillNoAndGridId(params) .then(res => { - const baseUrl = `${this.baseApi}/api/fileRelevant/getImg?imgId=/${this.billNoImg}/${this.detailCurrent.gridCode}/img_result/` + const baseUrl = `${this.baseApi}/api/fileRelevant/getImg?imgId=/${this.libcode}/${this.billNoImg}/${this.detailCurrent.gridCode}/img_result/` const commonImgs = [ `${baseUrl}result_LSD_compressed.jpg`, `${baseUrl}result_cut_1_compressed.jpg`, `${baseUrl}result_cut_2_compressed.jpg` ] - this.bigImg = commonImgs[0] + this.$refs.carousel.setActiveItem(0) if (res) { this.bookImgData = commonImgs } else { @@ -542,10 +550,6 @@ export default { console.error(error) }) }, - showAllImg() { - this.detailImgVisible = true - this.$refs.carousel.setActiveItem(0) - }, handleDownloadImg() { this.downImgLoading = true const idsArray = [] @@ -635,7 +639,7 @@ export default { } .tab-content{ width: 100%; - min-height: calc(100vh - 196px) !important; + min-height: calc(100vh - 232px) !important; .tab-nav{ flex: 1; } diff --git a/src/views/visualCheck/checkManage/dataScreening/module/export.vue b/src/views/visualCheck/checkManage/dataScreening/module/export.vue index a4d9f62..4da68e5 100644 --- a/src/views/visualCheck/checkManage/dataScreening/module/export.vue +++ b/src/views/visualCheck/checkManage/dataScreening/module/export.vue @@ -1,5 +1,5 @@ -
+
+
双击列表数据查看对应区域