From 60c0c37c985082fdfe6900d46aa4e4ae5369c0c4 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Tue, 14 Jul 2026 08:19:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E9=9B=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/api/storeManage/deviceManage/device.js | 99 ++++++++++++++- src/utils/request.js | 5 +- .../module/archivesInfo/index.vue | 43 +++++-- .../archivesManage/archivesSearch/index.vue | 30 +++-- .../caseManage/caseList/index.vue | 14 ++- .../lendManage/components/archiveDetail.vue | 26 ++-- .../components/lendArchivesList.vue | 26 ++-- .../warehouse3D/deseCabinet/index.vue | 115 +++++++++++++----- vue.config.js | 7 ++ 10 files changed, 285 insertions(+), 84 deletions(-) diff --git a/.env.development b/.env.development index cca0477..8b84f4c 100644 --- a/.env.development +++ b/.env.development @@ -10,8 +10,8 @@ VUE_APP_CAMERA_API = '192.168.99.107:3000' #VUE_APP_WS_API = 'ws://192.168.99.107:7070' # 许镇-本地服地址 -VUE_APP_BASE_API = 'http://192.168.99.72:7070' -VUE_APP_WS_API = 'ws://192.168.99.72:7070' +VUE_APP_BASE_API = 'http://192.168.99.63:7080' +VUE_APP_WS_API = 'ws://192.168.99.63:7080' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/src/api/storeManage/deviceManage/device.js b/src/api/storeManage/deviceManage/device.js index 9d4a718..c2c6d51 100644 --- a/src/api/storeManage/deviceManage/device.js +++ b/src/api/storeManage/deviceManage/device.js @@ -155,4 +155,101 @@ export function FetchCallExternalStopMove(params) { }) } -export default { add, edit, del, getSupplier, getDeviceType, getDeviceById, getDesecabinetById, getRotarycabinetById, getDeviceList, FetchIsOnline, FetchInBorrowByQuCol, unbind, FetchCallExternalOpenCol, FetchCallExternalResetCol, FetchCallExternalVent, FetchCallExternalStopMove } +// 2026 ---------------------------------------------- +// 1.密集架区及列数获取接口 +export function FetchDenseshelfZoneinfo(params) { + return request({ + url: 'denseshelf/zoneinfo', + method: 'get', + params + }) +} + +// 2.密集架状态信 +export function FetchDenseshelfStatus(params) { + return request({ + url: 'denseshelf/status', + method: 'get', + params + }) +} + +// 3.密集架的通风接口 +export function FetchDenseshelfVentilate(params) { + return request({ + url: 'denseshelf/ventilate', + method: 'post', + params + }) +} + +// 4.密集架的停止接口 +export function FetchDenseshelfStop(params) { + return request({ + url: 'denseshelf/stop', + method: 'post', + params + }) +} + +// 5.密集架的关闭接口 +export function FetchDenseshelfClose(params) { + return request({ + url: 'denseshelf/close', + method: 'post', + params + }) +} + +// 6.密集架的打开接口 +export function FetchDenseshelfMannualunfold(params) { + return request({ + url: 'denseshelf/mannualunfold', + method: 'post', + params + }) +} + +// 7.查询档案后打开接口 +export function FetchDenseshelfUnfold(params) { + return request({ + url: 'denseshelf/unfold', + method: 'post', + params + }) +} + +// 8.批量下发档案接口 +export function FetchDenseshelfUnfoldBatch(params) { + return request({ + url: 'denseshelf/unfold_batch', + method: 'post', + params + }) +} + +export default { + add, + edit, + del, + getSupplier, + getDeviceType, + getDeviceById, + getDesecabinetById, + getRotarycabinetById, + getDeviceList, + FetchIsOnline, + FetchInBorrowByQuCol, + unbind, + FetchCallExternalOpenCol, + FetchCallExternalResetCol, + FetchCallExternalStopMove, + FetchDenseshelfZoneinfo, + FetchDenseshelfStatus, + FetchDenseshelfVentilate, + FetchDenseshelfStop, + FetchDenseshelfClose, + FetchDenseshelfMannualunfold, + FetchDenseshelfUnfold, + FetchDenseshelfUnfoldBatch +} diff --git a/src/utils/request.js b/src/utils/request.js index 0dcb226..3d7d4c7 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,7 +6,6 @@ import store from '../store' import { getToken } from '@/utils/auth' import Config from '@/settings' import Cookies from 'js-cookie' -import { reject } from 'core-js/fn/promise' // 创建axios实例 const service = axios.create({ @@ -27,7 +26,7 @@ service.interceptors.request.use( return config }, error => { - Promise.reject(error) + return Promise.reject(error) } ) @@ -48,7 +47,7 @@ service.interceptors.response.use( message: errorMsg, duration: 5000 }) - reject(errorMsg) + return Promise.reject(errorMsg) } } else if (response.data) { return response.data diff --git a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue index ea0d33f..406bc45 100644 --- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue +++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue @@ -191,19 +191,42 @@ export default { } else { zyNumber = '1' } + console.log('leNumber:', leNumber) + console.log('divNumber:', divNumber) + console.log('zyNumber:', zyNumber) + // const params = { + // deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + // quNo: areaNumber, // 区 + // colNo: colNumber, // 列 + // leNo: leNumber, // 节 + // divNo: divNumber, // 层 + // zyNo: zyNumber // 左右 1左 2右 + // } + // CallExternal.FetchCallExternalOpenCol(params).then(res => { + // if (res.success && res.success === '0') { + // this.$message.success('开架执行成功') + // } else { + // this.$message.error(res.msg) + // } + // }).catch((error) => { + // console.log(error) + // this.$message.error('连接失败') + // }) const params = { - deviceId: this.deviceData.id, - quNo: areaNumber, // 区 - colNo: colNumber, // 列 - leNo: leNumber, // 节 - divNo: divNumber, // 层 - zyNo: zyNumber // 左右 1左 2右 + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + zone: areaNumber, + col: colNumber } - CallExternal.FetchCallExternalOpenCol(params).then(res => { - if (res.success && res.success === '0') { - this.$message.success('开架执行成功') + CallExternal.FetchDenseshelfMannualunfold(params).then(res => { + if (res) { + const result = JSON.parse(res) + if (result.resultcode === 0 || result.resultcode === '0') { + this.$message.success('密集架开架执行成功') + } else { + this.$message.error(result.resultdata) + } } else { - this.$message.error(res.msg) + this.$message.error('密集架开架执行失败') } }).catch((error) => { console.log(error) diff --git a/src/views/archivesManage/archivesSearch/index.vue b/src/views/archivesManage/archivesSearch/index.vue index 16b5351..39cca33 100644 --- a/src/views/archivesManage/archivesSearch/index.vue +++ b/src/views/archivesManage/archivesSearch/index.vue @@ -515,20 +515,24 @@ export default { } else { zyNumber = '1' } + console.log('leNumber:', leNumber) + console.log('divNumber:', divNumber) + console.log('zyNumber:', zyNumber) const params = { - deviceId: this.deviceData.id, - quNo: areaNumber, // 区 - colNo: colNumber, // 列 - leNo: leNumber, // 节 - divNo: divNumber, // 层 - zyNo: zyNumber // 左右 1左 2右 + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + zone: areaNumber, + col: colNumber } - console.log(params) - CallExternal.FetchCallExternalOpenCol(params).then(res => { - if (res.success && res.success === '0') { - this.$message.success('开架执行成功') + CallExternal.FetchDenseshelfMannualunfold(params).then(res => { + if (res) { + const result = JSON.parse(res) + if (result.resultcode === 0 || result.resultcode === '0') { + this.$message.success('密集架开架执行成功') + } else { + this.$message.error(result.resultdata) + } } else { - this.$message.error(res.msg) + this.$message.error('密集架开架执行失败') } }).catch((error) => { console.log(error) @@ -727,4 +731,8 @@ export default { background-color: #7A2831; } } +::v-deep .el-table__fixed-right-patch{ + background-color: transparent; + border: none; +} diff --git a/src/views/archivesManage/caseManage/caseList/index.vue b/src/views/archivesManage/caseManage/caseList/index.vue index a186b7f..06e5dfb 100644 --- a/src/views/archivesManage/caseManage/caseList/index.vue +++ b/src/views/archivesManage/caseManage/caseList/index.vue @@ -27,8 +27,8 @@ - - + + + + - - @@ -290,6 +291,9 @@ export default { }) this.crud.refresh() this.codeLoading = false + }).catch(err => { + console.log(err) + this.codeLoading = false }) }, // 打印目录 diff --git a/src/views/archivesManage/lendManage/components/archiveDetail.vue b/src/views/archivesManage/lendManage/components/archiveDetail.vue index ea6c70b..45bbf14 100644 --- a/src/views/archivesManage/lendManage/components/archiveDetail.vue +++ b/src/views/archivesManage/lendManage/components/archiveDetail.vue @@ -162,20 +162,24 @@ export default { } else { zyNumber = '1' } + console.log('leNumber:', leNumber) + console.log('divNumber:', divNumber) + console.log('zyNumber:', zyNumber) const params = { - deviceId: this.deviceData.id, - quNo: areaNumber, // 区 - colNo: colNumber, // 列 - leNo: leNumber, // 节 - divNo: divNumber, // 层 - zyNo: zyNumber // 左右 1左 2右 + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + zone: areaNumber, + col: colNumber } - CallExternal.FetchCallExternalOpenCol(params).then(res => { - if (res.success && res.success === '0') { - this.$message.success('开架执行成功') - this.videoTipVisible = true + CallExternal.FetchDenseshelfMannualunfold(params).then(res => { + if (res) { + const result = JSON.parse(res) + if (result.resultcode === 0 || result.resultcode === '0') { + this.$message.success('密集架开架执行成功') + } else { + this.$message.error(result.resultdata) + } } else { - this.$message.error(res.msg) + this.$message.error('密集架开架执行失败') } }).catch((error) => { console.log(error) diff --git a/src/views/archivesManage/lendManage/components/lendArchivesList.vue b/src/views/archivesManage/lendManage/components/lendArchivesList.vue index f3862d2..1735d34 100644 --- a/src/views/archivesManage/lendManage/components/lendArchivesList.vue +++ b/src/views/archivesManage/lendManage/components/lendArchivesList.vue @@ -219,20 +219,24 @@ export default { } else { zyNumber = '1' } + console.log('leNumber:', leNumber) + console.log('divNumber:', divNumber) + console.log('zyNumber:', zyNumber) const params = { - deviceId: this.deviceData.id, - quNo: areaNumber, // 区 - colNo: colNumber, // 列 - leNo: leNumber, // 节 - divNo: divNumber, // 层 - zyNo: zyNumber // 左右 1左 2右 + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + zone: areaNumber, + col: colNumber } - CallExternal.FetchCallExternalOpenCol(params).then(res => { - if (res.success && res.success === '0') { - this.$message.success('开架执行成功') - this.videoTipVisible = true + CallExternal.FetchDenseshelfMannualunfold(params).then(res => { + if (res) { + const result = JSON.parse(res) + if (result.resultcode === 0 || result.resultcode === '0') { + this.$message.success('密集架开架执行成功') + } else { + this.$message.error(result.resultdata) + } } else { - this.$message.error(res.msg) + this.$message.error('密集架开架执行失败') } }).catch((error) => { console.log(error) diff --git a/src/views/storeManage/warehouse3D/deseCabinet/index.vue b/src/views/storeManage/warehouse3D/deseCabinet/index.vue index ef039db..0b6f94c 100644 --- a/src/views/storeManage/warehouse3D/deseCabinet/index.vue +++ b/src/views/storeManage/warehouse3D/deseCabinet/index.vue @@ -206,13 +206,16 @@ export default { this.getInBorrowByQuCol() } }) + }).catch(err => { + this.loading = false + console.error(err) }) }, // 获取密集架左右节/层档案情况 async getInBorrowByQuCol() { const params = { - deviceId: this.deviceData.id, - quNo: this.deviceData.areaNo, + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + quNo: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '', colNo: this.cabinetNum } CallExternal.FetchInBorrowByQuCol(params).then(data => { @@ -226,6 +229,8 @@ export default { }) this.setReorderData(this.left, this.sortLeft, false) this.setReorderData(this.right, this.sortRight, true) + }).catch(err => { + console.error(err) }) }, // 分出左右后重新排序，根据节和层从下往上，left-从右往左， right-从左往右 @@ -281,19 +286,31 @@ export default { }, // 开架 openCol() { + // zone Y int 区域号 + // col Y string 列号 + // const params = { + // deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + // quNo: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '', + // colNo: this.cabinetNum, + // leNo: '', + // divNo: '', + // zyNo: '' + // } const params = { - deviceId: this.deviceData.id, - quNo: this.deviceData.areaNo, - colNo: this.cabinetNum, - leNo: '', - divNo: '', - zyNo: '' + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + zone: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '', + col: this.cabinetNum } - CallExternal.FetchCallExternalOpenCol(params).then(res => { - if (res.success && res.success === '0') { - this.$message.success('开架执行成功') + CallExternal.FetchDenseshelfMannualunfold(params).then(res => { + if (res) { + const result = JSON.parse(res) + if (result.resultcode === 0 || result.resultcode === '0') { + this.$message.success('密集架开架执行成功') + } else { + this.$message.error(result.resultdata) + } } else { - this.$message.error(res.msg) + this.$message.error('密集架开架执行失败') } }).catch((error) => { console.log(error) @@ -302,15 +319,27 @@ export default { }, // 合架 resetCol() { + // zone Y int 区域号 + // workmode Y string whole 全闭，left 左闭，right 右闭 + // const params = { + // deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + // quNo: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '' + // } const params = { - deviceId: this.deviceData.id, - quNo: this.deviceData.areaNo + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + zone: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '', + workmode: 'left' } - CallExternal.FetchCallExternalResetCol(params).then(res => { - if (res.success && res.success === '0') { - this.$message.success('合架执行成功') + CallExternal.FetchDenseshelfClose(params).then(res => { + if (res) { + const result = JSON.parse(res) + if (result.resultcode === 0 || result.resultcode === '0') { + this.$message.success('密集架合架执行成功') + } else { + this.$message.error(result.resultdata) + } } else { - this.$message.error(res.msg) + this.$message.error('密集架合架执行失败') } }).catch((error) => { console.log(error) @@ -319,15 +348,31 @@ export default { }, // 密集架通风 ventHandle() { + // workmode Y string whole 全通，left 左通，right 右通 + // zone Y int 区域号 + // const params = { + // deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + // quNo: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '' + // } + // const params = { + // deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + // quNo: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '' + // } const params = { - deviceId: this.deviceData.id, - quNo: this.deviceData.areaNo + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + zone: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '', + workmode: 'whole' } - CallExternal.FetchCallExternalVent(params).then(res => { - if (res.success && res.success === '0') { - this.$message.success('密集架通风执行成功') + CallExternal.FetchDenseshelfVentilate(params).then(res => { + if (res) { + const result = JSON.parse(res) + if (result.resultcode === 0 || result.resultcode === '0') { + this.$message.success('密集架通风执行成功') + } else { + this.$message.error(result.resultdata) + } } else { - this.$message.error(res.msg) + this.$message.error('密集架通风执行失败') } }).catch((error) => { console.log(error) @@ -336,15 +381,25 @@ export default { }, // 密集架停止移动 stopMove() { + // zone Y int 区域号 + // const params = { + // deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + // quNo: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '' + // } const params = { - deviceId: this.deviceData.id, - quNo: this.deviceData.areaNo + deviceId: this.deviceData && this.deviceData.id ? this.deviceData.id : '', + zone: this.deviceData && this.deviceData.areaNo ? this.deviceData.areaNo : '' } - CallExternal.FetchCallExternalStopMove(params).then(res => { - if (res.success && res.success === '0') { - this.$message.success('密集架停止移动执行成功') + CallExternal.FetchDenseshelfStop(params).then(res => { + if (res) { + const result = JSON.parse(res) + if (result.resultcode === 0 || result.resultcode === '0') { + this.$message.success('密集架停止移动执行成功') + } else { + this.$message.error(result.resultdata) + } } else { - this.$message.error(res.msg) + this.$message.error('密集架停止移动执行失败') } }).catch((error) => { console.log(error) diff --git a/vue.config.js b/vue.config.js index 5372b5f..21489e8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -37,6 +37,13 @@ module.exports = { pathRewrite: { '^/auth': 'auth' } + }, + '/denseshelf': { + target: process.env.VUE_APP_BASE_API, + changeOrigin: true, + pathRewrite: { + '^/denseshelf': 'denseshelf' + } } } },