diff --git a/ruoyi-ui/src/views/information/board/editInfo.vue b/ruoyi-ui/src/views/information/board/editInfo.vue index 6fc1be4c..e8409b6b 100644 --- a/ruoyi-ui/src/views/information/board/editInfo.vue +++ b/ruoyi-ui/src/views/information/board/editInfo.vue @@ -92,7 +92,7 @@ - + diff --git a/ruoyi-ui/src/views/information/board/index.vue b/ruoyi-ui/src/views/information/board/index.vue index 65d2921a..7be5863a 100644 --- a/ruoyi-ui/src/views/information/board/index.vue +++ b/ruoyi-ui/src/views/information/board/index.vue @@ -383,6 +383,7 @@ export default { devicePixel: '768*64', label: '门架板768*64', list: [ + { searchValue: null, createBy: null, @@ -391,8 +392,8 @@ export default { updateTime: null, remark: null, params: {}, - deviceId: 65, - deviceName: '门架式可变信息标志K103+900', + deviceId: 595, + deviceName: '门架式可变信息标志K57+595', brandId: 4, iotBoardBrandName: { brandId: 4, @@ -419,7 +420,7 @@ export default { installDate: '2022-12-14T16:06:03.000+08:00', maintainId: 2, collarAgencyId: 555503, - pileNumber: 'K103+900', + pileNumber: 'K57+595', manageAgencyId: 'YG11002', producteDate: null, repairDate: null, @@ -431,7 +432,7 @@ export default { localInfo: 36, routeNumber: null, routeName: null, - deviceIp: '10.0.31.111', + deviceIp: '10.0.81.62', devicePort: null, devicePixel: '768*64', userName: null, @@ -444,8 +445,7 @@ export default { lAlarmHandleStr: null, eqDirection: null, iotDeviceType: null - }, - { + },{ searchValue: null, createBy: null, createTime: null, @@ -453,8 +453,8 @@ export default { updateTime: null, remark: null, params: {}, - deviceId: 595, - deviceName: '门架式可变信息标志K57+595', + deviceId: 600, + deviceName: '门架式可变信息标志K71+600', brandId: 4, iotBoardBrandName: { brandId: 4, @@ -481,7 +481,7 @@ export default { installDate: '2022-12-14T16:06:03.000+08:00', maintainId: 2, collarAgencyId: 555503, - pileNumber: 'K57+595', + pileNumber: 'K71+600', manageAgencyId: 'YG11002', producteDate: null, repairDate: null, @@ -493,7 +493,7 @@ export default { localInfo: 36, routeNumber: null, routeName: null, - deviceIp: '10.0.81.62', + deviceIp: '10.0.81.66', devicePort: null, devicePixel: '768*64', userName: null, @@ -514,8 +514,8 @@ export default { updateTime: null, remark: null, params: {}, - deviceId: 600, - deviceName: '门架式可变信息标志K71+600', + deviceId: 285, + deviceName: '门架式可变信息标志K82+285', brandId: 4, iotBoardBrandName: { brandId: 4, @@ -542,7 +542,7 @@ export default { installDate: '2022-12-14T16:06:03.000+08:00', maintainId: 2, collarAgencyId: 555503, - pileNumber: 'K71+600', + pileNumber: 'K82+285', manageAgencyId: 'YG11002', producteDate: null, repairDate: null, @@ -554,7 +554,7 @@ export default { localInfo: 36, routeNumber: null, routeName: null, - deviceIp: '10.0.81.66', + deviceIp: '10.0.21.61', devicePort: null, devicePixel: '768*64', userName: null, @@ -567,14 +567,136 @@ export default { lAlarmHandleStr: null, eqDirection: null, iotDeviceType: null - } + },{ + searchValue: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null, + remark: null, + params: {}, + deviceId: 208, + deviceName: '门架式可变信息标志k98+208', + brandId: 4, + iotBoardBrandName: { + brandId: 4, + brandName: '光电比特' + }, + routeId: 17, + routeDirection: '济南方向', + deviceMarkingName: null, + deviceTypeId: 202010001, + deviceTypeNumber: 202010004, + deviceModelId: null, + factoryLibrary: null, + userUnitId: 555503, + operatorId: null, + longitude: '117.9554825', + latitude: '36.84254887', + firmId: 18, + purchaseDate: '2022-12-14T16:06:03.000+08:00', + warrantyYears: null, + unitPrice: null, + runStatus: 1, + tunnelId: 'JQ-JiNan-WenZuBei-MJY', + deviceStatus: '1', + installDate: '2022-12-14T16:06:03.000+08:00', + maintainId: 2, + collarAgencyId: 555503, + pileNumber: 'k98+208', + manageAgencyId: 'YG11002', + producteDate: null, + repairDate: null, + operateDate: null, + serviceLife: null, + storageDate: null, + isMonitor: 1, + isConfig: 1, + localInfo: 36, + routeNumber: null, + routeName: null, + deviceIp: '10.0.31.115', + devicePort: null, + devicePixel: '768*64', + userName: null, + passWord: null, + protocolName: null, + deviceTypeIds: null, + lUserID: null, + lAlarmHandle: null, + lUserIDStr: null, + lAlarmHandleStr: null, + eqDirection: null, + iotDeviceType: null + },{ + searchValue: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null, + remark: null, + params: {}, + deviceId: 65, + deviceName: '门架式可变信息标志K103+900', + brandId: 4, + iotBoardBrandName: { + brandId: 4, + brandName: '光电比特' + }, + routeId: 17, + routeDirection: '济南方向', + deviceMarkingName: null, + deviceTypeId: 202010001, + deviceTypeNumber: 202010004, + deviceModelId: null, + factoryLibrary: null, + userUnitId: 555503, + operatorId: null, + longitude: '117.9554825', + latitude: '36.84254887', + firmId: 18, + purchaseDate: '2022-12-14T16:06:03.000+08:00', + warrantyYears: null, + unitPrice: null, + runStatus: 1, + tunnelId: 'JQ-JiNan-WenZuBei-MJY', + deviceStatus: '1', + installDate: '2022-12-14T16:06:03.000+08:00', + maintainId: 2, + collarAgencyId: 555503, + pileNumber: 'K103+900', + manageAgencyId: 'YG11002', + producteDate: null, + repairDate: null, + operateDate: null, + serviceLife: null, + storageDate: null, + isMonitor: 1, + isConfig: 1, + localInfo: 36, + routeNumber: null, + routeName: null, + deviceIp: '10.0.31.111', + devicePort: null, + devicePixel: '768*64', + userName: null, + passWord: null, + protocolName: null, + deviceTypeIds: null, + lUserID: null, + lAlarmHandle: null, + lUserIDStr: null, + lAlarmHandleStr: null, + eqDirection: null, + iotDeviceType: null + }, ] }, { devicePixel: '480*48', label: '雨棚480*48', list: [ - { + /*{ searchValue: null, createBy: null, createTime: null, @@ -635,14 +757,14 @@ export default { lAlarmHandleStr: null, eqDirection: null, iotDeviceType: null - } + }*/ ] }, { devicePixel: '192*160', label: ' 悬臂192*160', list: [ - { + /*{ searchValue: null, createBy: null, createTime: null, @@ -703,7 +825,7 @@ export default { lAlarmHandleStr: null, eqDirection: null, iotDeviceType: null - } + }*/ ] }, { @@ -1217,6 +1339,7 @@ export default { if ("3A" in res.data){ console.log('回读消息------------------------') console.log(res.data) + debugger var contents = res.data['3A'].content for (let i = 0; i < contents.length; i++) { let item = contents[i]