diff --git a/src/api/storeManage/deviceManage/device.js b/src/api/storeManage/deviceManage/device.js index 251ad51..27f17d3 100644 --- a/src/api/storeManage/deviceManage/device.js +++ b/src/api/storeManage/deviceManage/device.js @@ -1,147 +1,156 @@ -import request from '@/utils/request' - -export function getSupplier() { - return request({ - url: 'api/supplier/dropdown-list', - method: 'get' - }) -} - -export function add(data) { - const url = getUrl(data, 'add') - return request({ - url: url, - method: 'post', - data - }) -} - -export function del(data) { - return request({ - url: '/api/device/delete', - method: 'delete', - data - }) -} - -export function edit(data) { - const url = getUrl(data, 'edit') - return request({ - url: url, - method: 'put', - data - }) -} - -export function getDeviceType() { - return request({ - url: 'api/device/type', - method: 'get' - }) -} - -export function getDeviceById(params) { - return request({ - url: 'api/device/state', - method: 'get', - params - }) -} -export function getDesecabinetById(params) { - return request({ - url: 'api/desecabinet/query', - method: 'get', - params - }) -} - -export function getRotarycabinetById(params) { - return request({ - url: 'api/rotarycabinet/query', - method: 'get', - params - }) -} - -function getUrl(data, optTYpe) { - let url = 'api/desecabinet/' - if (data.deviceTypeId.name === '密集架') { - url = 'api/desecabinet/' - } else if (data.deviceTypeId.name === '回转柜') { - url = 'api/rotarycabinet/' - } else if (data.deviceTypeId.name === '摄像头') { - url = 'api/camera/' - } else if (data.deviceTypeId.name === '空调' || data.deviceTypeId.name === '桌面式RFID读写器' || data.deviceTypeId.name === '盘点机' || data.deviceTypeId.name === '恒湿机' || data.deviceTypeId.name === '漏水传感器' || data.deviceTypeId.name === '温湿度感应器' || data.deviceTypeId.name === '空气质量检测设备' || data.deviceTypeId.name === '漏水传感器') { - url = 'api/insidedevices/' - } else if (data.deviceTypeId.name === '通道门' || data.deviceTypeId.name === '手持式RFID读写器') { - url = 'api/outsidedevices/' - } - if (optTYpe === 'add') { - url += 'create' - } else if (optTYpe === 'edit') { - url += 'update' - } - return url -} -export function getDeviceList(params) { - return request({ - url: 'api/device/list', - method: 'get', - params - }) -} - -// 根据区列获取在库已借数 -export function FetchInBorrowByQuCol(params) { - return request({ - url: 'api/tag/getInBorrowByQuCol', - method: 'get', - params - }) -} - -export function unbind(data) { - return request({ - url: 'api/displayconfig/unbind', - method: 'post', - data - }) -} - -// 打开架体具体某一列 -export function FetchCallExternalOpenCol(params) { - return request({ - url: 'api/callExternal/openCol', - method: 'get', - params - }) -} - -// 密集架合架 -export function FetchCallExternalResetCol(params) { - return request({ - url: 'api/callExternal/reset', - method: 'get', - params - }) -} - -// 密集架通风 -export function FetchCallExternalVent(params) { - return request({ - url: 'api/callExternal/vent', - method: 'get', - params - }) -} - -// 停止移动 -export function FetchCallExternalStopMove(params) { - return request({ - url: 'api/callExternal/stopMove', - method: 'get', - params - }) -} - -export default { add, edit, del, getSupplier, getDeviceType, getDeviceById, getDesecabinetById, getRotarycabinetById, getDeviceList, FetchInBorrowByQuCol, unbind, FetchCallExternalOpenCol, FetchCallExternalResetCol, FetchCallExternalVent, FetchCallExternalStopMove } +import request from '@/utils/request' +import qs from 'qs' + +export function getSupplier() { + return request({ + url: 'api/supplier/dropdown-list', + method: 'get' + }) +} + +export function add(data) { + const url = getUrl(data, 'add') + return request({ + url: url, + method: 'post', + data + }) +} + +export function del(data) { + return request({ + url: '/api/device/delete', + method: 'delete', + data + }) +} + +export function edit(data) { + const url = getUrl(data, 'edit') + return request({ + url: url, + method: 'put', + data + }) +} + +export function getDeviceType() { + return request({ + url: 'api/device/type', + method: 'get' + }) +} + +export function getDeviceById(params) { + return request({ + url: 'api/device/state', + method: 'get', + params + }) +} +export function getDesecabinetById(params) { + return request({ + url: 'api/desecabinet/query', + method: 'get', + params + }) +} + +export function getRotarycabinetById(params) { + return request({ + url: 'api/rotarycabinet/query', + method: 'get', + params + }) +} + +function getUrl(data, optTYpe) { + let url = 'api/desecabinet/' + if (data.deviceTypeId.name === '密集架') { + url = 'api/desecabinet/' + } else if (data.deviceTypeId.name === '回转柜') { + url = 'api/rotarycabinet/' + } else if (data.deviceTypeId.name === '摄像头') { + url = 'api/camera/' + } else if (data.deviceTypeId.name === '空调' || data.deviceTypeId.name === '桌面式RFID读写器' || data.deviceTypeId.name === '盘点机' || data.deviceTypeId.name === '恒湿机' || data.deviceTypeId.name === '漏水传感器' || data.deviceTypeId.name === '温湿度感应器' || data.deviceTypeId.name === '空气质量检测设备' || data.deviceTypeId.name === '漏水传感器') { + url = 'api/insidedevices/' + } else if (data.deviceTypeId.name === '通道门' || data.deviceTypeId.name === '手持式RFID读写器') { + url = 'api/outsidedevices/' + } + if (optTYpe === 'add') { + url += 'create' + } else if (optTYpe === 'edit') { + url += 'update' + } + return url +} +export function getDeviceList(params) { + return request({ + url: 'api/device/list', + method: 'get', + params + }) +} + +// 根据设备id查看设备是否在线 +export function FetchIsOnline(params) { + return request({ + url: 'api/device/isOnline' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 根据区列获取在库已借数 +export function FetchInBorrowByQuCol(params) { + return request({ + url: 'api/tag/getInBorrowByQuCol', + method: 'get', + params + }) +} + +export function unbind(data) { + return request({ + url: 'api/displayconfig/unbind', + method: 'post', + data + }) +} + +// 打开架体具体某一列 +export function FetchCallExternalOpenCol(params) { + return request({ + url: 'api/callExternal/openCol', + method: 'get', + params + }) +} + +// 密集架合架 +export function FetchCallExternalResetCol(params) { + return request({ + url: 'api/callExternal/reset', + method: 'get', + params + }) +} + +// 密集架通风 +export function FetchCallExternalVent(params) { + return request({ + url: 'api/callExternal/vent', + method: 'get', + params + }) +} + +// 停止移动 +export function FetchCallExternalStopMove(params) { + return request({ + url: 'api/callExternal/stopMove', + method: 'get', + params + }) +} + +export default { add, edit, del, getSupplier, getDeviceType, getDeviceById, getDesecabinetById, getRotarycabinetById, getDeviceList, FetchIsOnline, FetchInBorrowByQuCol, unbind, FetchCallExternalOpenCol, FetchCallExternalResetCol, FetchCallExternalVent, FetchCallExternalStopMove } diff --git a/src/api/storeManage/displayConfig/index.js b/src/api/storeManage/displayConfig/index.js index 6ea08ff..276cbe6 100644 --- a/src/api/storeManage/displayConfig/index.js +++ b/src/api/storeManage/displayConfig/index.js @@ -1,19 +1,19 @@ -import request from '@/utils/request' - -export function list(params) { - return request({ - url: 'api/displayconfig/list', - method: 'get', - params - }) -} - -export function bind(data) { - return request({ - url: 'api/displayconfig/bind', - method: 'post', - data - }) -} - -export default { list, bind } +import request from '@/utils/request' +import qs from 'qs' + +export function list(params) { + return request({ + url: 'api/displayconfig/list' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +export function bind(data) { + return request({ + url: 'api/displayconfig/bind', + method: 'post', + data + }) +} + +export default { list, bind } diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 6faf234..dacee2f 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -122,6 +122,8 @@ export default { totalDeviceNum: 0, onlineDeviceNum: 0, offlineDeviceNum: 0, + onlineDevice: [], + offDevice: [], deviveTitle: '在线设备', deviceVisible: false, tableLoading: false, @@ -136,7 +138,8 @@ export default { mounted() { this.handleArchivesNum() this.handleCaseNum() - this.handleTotalDeviceNum() + this.getDevice() + // this.handleTotalDeviceNum() }, methods: { handleSetLineChartData(type) { @@ -176,23 +179,27 @@ export default { } } }, - getDeviceDetail(type) { - this.tableLoading = true - this.deviceVisible = true + getDevice() { getDeviceOnoff().then(data => { - if (type === 'on') { - this.deviveTitle = '在线设备' - this.tableDeviceData = this.data.online - } else { - this.deviveTitle = '离线设备' - this.tableDeviceData = this.data.offline - } - - setTimeout(() => { - this.tableLoading = false - }, 1000) + this.getDeviceFlag = true + this.totalDeviceNum = data.deviceall.length + this.onlineDeviceNum = data.online.length + this.offlineDeviceNum = data.offline.length + this.onlineDevice = data.online + this.offDevice = data.offline }) }, + getDeviceDetail(type) { + this.deviceVisible = true + this.tableDeviceData = [] + if (type === 'on') { + this.deviveTitle = '在线设备' + this.tableDeviceData = this.onlineDevice + } else { + this.deviveTitle = '离线设备' + this.tableDeviceData = this.offDevice + } + }, // 档案总数 handleArchivesNum() { FetchGetArchivesNum().then(data => { Internal Server Error - yxk-storeroom-system - 阅行客代码库

500


Gitea Version: 1.14.1