diff --git a/public/webA/index.js b/public/webA/index.js index 395bdf6..4cc7bee 100644 --- a/public/webA/index.js +++ b/public/webA/index.js @@ -993,7 +993,7 @@ var createScene = function() { ); player_balloon_js1.size = 0.1; player_balloon_js1.name = "1"; - player_balloon_js1.nameID = "cabinet01"; + player_balloon_js1.nameID = "01"; player_balloon_js1.cellIndex = 0; player_balloon_js1.position = new BABYLON.Vector3(-2.5, 3.5, -0.72); player_balloon_js1.isPickable = true; @@ -1009,7 +1009,7 @@ var createScene = function() { ); player_balloon_js2.size = 0.1; player_balloon_js2.name = "2"; - player_balloon_js2.nameID = "cabinet02"; + player_balloon_js2.nameID = "02"; player_balloon_js2.cellIndex = 0; player_balloon_js2.position = new BABYLON.Vector3(-2.5, 3.5, -0.38); @@ -1026,7 +1026,7 @@ var createScene = function() { ); player_balloon_js3.size = 0.1; player_balloon_js3.name = "3"; - player_balloon_js3.nameID = "cabinet03"; + player_balloon_js3.nameID = "03"; player_balloon_js3.cellIndex = 0; player_balloon_js3.position = new BABYLON.Vector3(-2.5, 3.5, -0.03); @@ -1043,7 +1043,7 @@ var createScene = function() { ); player_balloon_js4.size = 0.1; player_balloon_js4.name = "4"; - player_balloon_js4.nameID = "cabinet04"; + player_balloon_js4.nameID = "04"; player_balloon_js4.cellIndex = 0; player_balloon_js4.position = new BABYLON.Vector3(-2.5, 3.5, 0.3); @@ -1060,7 +1060,7 @@ var createScene = function() { ); player_balloon_js5.size = 0.1; player_balloon_js5.name = "5"; - player_balloon_js5.nameID = "cabinet05"; + player_balloon_js5.nameID = "05"; player_balloon_js5.cellIndex = 0; player_balloon_js5.position = new BABYLON.Vector3(-2.5, 3.5, 0.64); @@ -1077,7 +1077,7 @@ var createScene = function() { ); player_balloon_js6.size = 0.1; player_balloon_js6.name = "6"; - player_balloon_js6.nameID = "cabinet06"; + player_balloon_js6.nameID = "06"; player_balloon_js6.cellIndex = 0; player_balloon_js6.position = new BABYLON.Vector3(-2.5, 3.5, 0.98); @@ -1094,7 +1094,7 @@ var createScene = function() { ); player_balloon_js7.size = 0.1; player_balloon_js7.name = "7"; - player_balloon_js7.nameID = "cabinet07"; + player_balloon_js7.nameID = "07"; player_balloon_js7.cellIndex = 0; player_balloon_js7.position = new BABYLON.Vector3(-2.5, 3.5, 1.32); @@ -1111,7 +1111,7 @@ var createScene = function() { ); player_balloon_js8.size = 0.1; player_balloon_js8.name = "8"; - player_balloon_js8.nameID = "cabinet08"; + player_balloon_js8.nameID = "08"; player_balloon_js8.cellIndex = 0; player_balloon_js8.position = new BABYLON.Vector3(-2.5, 3.5, 1.66); player_balloon_js8.isPickable = true; @@ -1127,7 +1127,7 @@ var createScene = function() { ); player_balloon_js9.size = 0.1; player_balloon_js9.name = "9"; - player_balloon_js9.nameID = "cabinet09"; + player_balloon_js9.nameID = "09"; player_balloon_js9.cellIndex = 0; player_balloon_js9.position = new BABYLON.Vector3(-2.5, 3.5, 2); //-2.3895861905112934, 3.402393519214794, z: 0.3225995832152506 @@ -1143,7 +1143,7 @@ var createScene = function() { ); player_balloon_js10.size = 0.1; player_balloon_js10.name = "10"; - player_balloon_js10.nameID = "cabinet10"; + player_balloon_js10.nameID = "10"; player_balloon_js10.cellIndex = 0; player_balloon_js10.position = new BABYLON.Vector3(-2.5, 3.5, 2.33); player_balloon_js10.isPickable = true; diff --git a/src/assets/images/panel-n.png b/src/assets/images/panel-n.png new file mode 100644 index 0000000..4622043 Binary files /dev/null and b/src/assets/images/panel-n.png differ diff --git a/src/assets/images/panel-y.png b/src/assets/images/panel-y.png new file mode 100644 index 0000000..ce2268b Binary files /dev/null and b/src/assets/images/panel-y.png differ diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue index ee70b37..91c9155 100644 --- a/src/views/archivesManage/archivesList/index.vue +++ b/src/views/archivesManage/archivesList/index.vue @@ -3,7 +3,7 @@ -
+
档案门类
@@ -25,7 +25,7 @@ -
+
隐藏固定状态栏
@@ -39,7 +39,7 @@ /> - + @@ -86,6 +86,20 @@ import pagination from '@crud/Pagination' import detailDialog from './module/detailDialog.vue' export default { name: 'CaseList', + filters: { + storageTypeStatus(val) { + switch (val) { + case 0: + return '未入' + case 1: + return '待入' + case 2: + return '已入' + case 3: + return '待出' + } + } + }, components: { eForm, crudOperation, rrOperation, pagination, BindingTagDlg, openCaseDlg, detailDialog }, mixins: [presenter(), crud()], cruds() { @@ -144,9 +158,11 @@ export default { label: '条形码', value: 'barcode' } - ] + ], + storageTypeVal: null } }, + methods: { clickRowHandler(row) { this.$refs.table.toggleRowSelection(row) @@ -188,12 +204,14 @@ export default { }, // 单元格样式 cell({ row, columnIndex }) { - if (row.depositNum === 0 && columnIndex === 2) { // 未入 + if (row.storageType === 0) { // 未入 return 'fail-clear' - } else if (row.depositNum === '待入' && columnIndex === 2) { // 待入 + } else if (row.storageType === 1) { // 待入 return 'no-clear' - } else if (row.depositNum === '待入' && columnIndex === 2) { // 已入 + } else if (row.storageType === 2) { // 已入 return 'have-clear' + } else if (row.storageType === 3) { // 待出 + return 'other-clear' } }, // 删除 diff --git a/src/views/storeManage/warehouse3D/archivesStorage/index.vue b/src/views/storeManage/warehouse3D/archivesStorage/index.vue index 718c2c3..d7b6e3b 100644 --- a/src/views/storeManage/warehouse3D/archivesStorage/index.vue +++ b/src/views/storeManage/warehouse3D/archivesStorage/index.vue @@ -113,7 +113,7 @@ export default { document.getElementById('myIframe').onload = function() { _this.deviceState() } - // window.addEventListener('message', this.handleMessageDevice) + window.addEventListener('message', this.handleMessageDevice) }, methods: { // 传入设备状态data / 给iframe传初始值 @@ -148,14 +148,16 @@ export default { }, '*') }, // 点击查看设备状况 / 密集架列号 - // handleMessageDevice(event) { - // const _this = this - // if (event.data && event.data.data) { - // const data = event.data.data - // _this.deviceId = data - // console.log(_this.deviceId) - // } - // }, + handleMessageDevice(event) { + const _this = this + if (event.data && event.data.data) { + const data = event.data.data + _this.deviceId = data + console.log(_this.deviceId) + _this.$router.push('/storeManage/deseCabinet') + localStorage.setItem('cabinetNum', _this.deviceId) + } + }, // 设置温湿度 handleAQI(deviceId, wendu, sidu) { window.frames['iframeMap'].setAlertValue(deviceId, wendu, sidu) diff --git a/src/views/storeManage/warehouse3D/deseCabinet/data.json b/src/views/storeManage/warehouse3D/deseCabinet/data.json new file mode 100644 index 0000000..1b15d3c --- /dev/null +++ b/src/views/storeManage/warehouse3D/deseCabinet/data.json @@ -0,0 +1,247 @@ +{ + "totalData": 36, + "leftData":[ + { + "outNum": 1, + "inNum": 2 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 10 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 30, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + } + ], + "rightData":[ + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 1, + "inNum": 2 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 15, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + }, + { + "outNum": 0, + "inNum": 0 + } + ] +} \ No newline at end of file diff --git a/src/views/storeManage/warehouse3D/deseCabinet/index.vue b/src/views/storeManage/warehouse3D/deseCabinet/index.vue new file mode 100644 index 0000000..c715fa9 --- /dev/null +++ b/src/views/storeManage/warehouse3D/deseCabinet/index.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/src/views/storeManage/warehouse3D/index.vue b/src/views/storeManage/warehouse3D/index.vue index 85306bd..54a151c 100644 --- a/src/views/storeManage/warehouse3D/index.vue +++ b/src/views/storeManage/warehouse3D/index.vue @@ -46,6 +46,10 @@ export default { mounted() { // 监听 iframe 传来的值 window.addEventListener('message', this.handleMessageEvent) + if (localStorage.getItem('isDeseCabinetPage')) { + this.activeIndex = 1 + localStorage.removeItem('isDeseCabinetPage') + } }, methods: { handleMessageEvent(event) {