liu_li
/
yxk-storeroom-system
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

密集架

master
xuhuajiao 2 weeks ago
parent
44da7c6d0a
commit
60c0c37c98
10 changed files with 285 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .env.development
  2. 99
      src/api/storeManage/deviceManage/device.js
  3. 5
      src/utils/request.js
  4. 43
      src/views/archivesManage/archivesList/module/archivesInfo/index.vue
  5. 30
      src/views/archivesManage/archivesSearch/index.vue
  6. 14
      src/views/archivesManage/caseManage/caseList/index.vue
  7. 26
      src/views/archivesManage/lendManage/components/archiveDetail.vue
  8. 26
      src/views/archivesManage/lendManage/components/lendArchivesList.vue
  9. 115
      src/views/storeManage/warehouse3D/deseCabinet/index.vue
  10. 7
      vue.config.js

4
.env.development
View File

@ -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_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插件 # 是否启用 babel-plugin-dynamic-import-node插件

99
src/api/storeManage/deviceManage/device.js
View File

@ -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
}

5
src/utils/request.js
View File

@ -6,7 +6,6 @@ import store from '../store'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import Config from '@/settings' import Config from '@/settings'
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import { reject } from 'core-js/fn/promise'
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
@ -27,7 +26,7 @@ service.interceptors.request.use(
return config return config
}, },
error => { error => {
Promise.reject(error)
return Promise.reject(error)
} }
) )
@ -48,7 +47,7 @@ service.interceptors.response.use(
message: errorMsg, message: errorMsg,
duration: 5000 duration: 5000
}) })
reject(errorMsg)
return Promise.reject(errorMsg)
} }
} else if (response.data) { } else if (response.data) {
return response.data return response.data

43
src/views/archivesManage/archivesList/module/archivesInfo/index.vue
View File

@ -191,19 +191,42 @@ export default {
} else { } else {
zyNumber = '1' 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 = { 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 { } else {
this.$message.error(res.msg)
this.$message.error('密集架开架执行失败')
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)

30
src/views/archivesManage/archivesSearch/index.vue
View File

@ -515,20 +515,24 @@ export default {
} else { } else {
zyNumber = '1' zyNumber = '1'
} }
console.log('leNumber:', leNumber)
console.log('divNumber:', divNumber)
console.log('zyNumber:', zyNumber)
const params = { 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 { } else {
this.$message.error(res.msg)
this.$message.error('密集架开架执行失败')
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -727,4 +731,8 @@ export default {
background-color: #7A2831; background-color: #7A2831;
} }
} }
::v-deep .el-table__fixed-right-patch{
background-color: transparent;
border: none;
}
</style> </style>

14
src/views/archivesManage/caseManage/caseList/index.vue
View File

@ -27,8 +27,8 @@
</div> </div>
<!-- <div class="app-container container-wrap"> --> <!-- <div class="app-container container-wrap"> -->
<span class="right-top-line" />
<span class="left-bottom-line" />
<!-- <span class="right-top-line" />
<span class="left-bottom-line" /> -->
<!--表格渲染--> <!--表格渲染-->
<el-table <el-table
ref="table" ref="table"
@ -36,7 +36,7 @@
:cell-class-name="cell" :cell-class-name="cell"
:data="crud.data" :data="crud.data"
style="width: 100%;" style="width: 100%;"
height="calc(100vh - 357px)"
height="calc(100vh - 377px)"
@row-dblclick="handleDbClick" @row-dblclick="handleDbClick"
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
@row-click="clickRowHandler" @row-click="clickRowHandler"
@ -66,12 +66,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination />
<!-- </div> -->
<!--新增编辑表单渲染--> <!--新增编辑表单渲染-->
<eForm /> <eForm />
<binding-tag-dlg ref="bindingTag" :binding-id="crud.selections[0] && crud.selections[0].id" :binding-type="2" binding-txt="档案盒" @refresh="crud.refresh" /> <binding-tag-dlg ref="bindingTag" :binding-id="crud.selections[0] && crud.selections[0].id" :binding-type="2" binding-txt="档案盒" @refresh="crud.refresh" />
<open-case-dlg ref="openCase" @refresh="crud.refresh" /> <open-case-dlg ref="openCase" @refresh="crud.refresh" />
<pagination />
<!-- </div> -->
<!-- 档案盒详情 --> <!-- 档案盒详情 -->
<detailDialog ref="detailDom" /> <detailDialog ref="detailDom" />
<!-- 删除弹框 --> <!-- 删除弹框 -->
@ -290,6 +291,9 @@ export default {
}) })
this.crud.refresh() this.crud.refresh()
this.codeLoading = false this.codeLoading = false
}).catch(err => {
console.log(err)
this.codeLoading = false
}) })
}, },
// 打印目录 // 打印目录

26
src/views/archivesManage/lendManage/components/archiveDetail.vue
View File

@ -162,20 +162,24 @@ export default {
} else { } else {
zyNumber = '1' zyNumber = '1'
} }
console.log('leNumber:', leNumber)
console.log('divNumber:', divNumber)
console.log('zyNumber:', zyNumber)
const params = { 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 { } else {
this.$message.error(res.msg)
this.$message.error('密集架开架执行失败')
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)

26
src/views/archivesManage/lendManage/components/lendArchivesList.vue
View File

@ -219,20 +219,24 @@ export default {
} else { } else {
zyNumber = '1' zyNumber = '1'
} }
console.log('leNumber:', leNumber)
console.log('divNumber:', divNumber)
console.log('zyNumber:', zyNumber)
const params = { 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 { } else {
this.$message.error(res.msg)
this.$message.error('密集架开架执行失败')
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)

115
src/views/storeManage/warehouse3D/deseCabinet/index.vue
View File

@ -206,13 +206,16 @@ export default {
this.getInBorrowByQuCol() this.getInBorrowByQuCol()
} }
}) })
}).catch(err => {
this.loading = false
console.error(err)
}) })
}, },
// 获取密集架左右节/层档案情况 // 获取密集架左右节/层档案情况
async getInBorrowByQuCol() { async getInBorrowByQuCol() {
const params = { 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 colNo: this.cabinetNum
} }
CallExternal.FetchInBorrowByQuCol(params).then(data => { CallExternal.FetchInBorrowByQuCol(params).then(data => {
@ -226,6 +229,8 @@ export default {
}) })
this.setReorderData(this.left, this.sortLeft, false) this.setReorderData(this.left, this.sortLeft, false)
this.setReorderData(this.right, this.sortRight, true) this.setReorderData(this.right, this.sortRight, true)
}).catch(err => {
console.error(err)
}) })
}, },
// 分出左右后重新排序，根据节和层从下往上，left-从右往左， right-从左往右 // 分出左右后重新排序，根据节和层从下往上，left-从右往左， right-从左往右
@ -281,19 +286,31 @@ export default {
}, },
// 开架 // 开架
openCol() { 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 = { 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 { } else {
this.$message.error(res.msg)
this.$message.error('密集架开架执行失败')
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -302,15 +319,27 @@ export default {
}, },
// 合架 // 合架
resetCol() { 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 = { 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 { } else {
this.$message.error(res.msg)
this.$message.error('密集架合架执行失败')
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -319,15 +348,31 @@ export default {
}, },
// 密集架通风 // 密集架通风
ventHandle() { 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 = { 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 { } else {
this.$message.error(res.msg)
this.$message.error('密集架通风执行失败')
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
@ -336,15 +381,25 @@ export default {
}, },
// 密集架停止移动 // 密集架停止移动
stopMove() { 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 = { 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 { } else {
this.$message.error(res.msg)
this.$message.error('密集架停止移动执行失败')
} }
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)

7
vue.config.js
View File

@ -37,6 +37,13 @@ module.exports = {
pathRewrite: { pathRewrite: {
'^/auth': 'auth' '^/auth': 'auth'
} }
},
'/denseshelf': {
target: process.env.VUE_APP_BASE_API,
changeOrigin: true,
pathRewrite: {
'^/denseshelf': 'denseshelf'
}
} }
} }
}, },

Write Preview
Loading…
Cancel
Save