From 4f7dc253fc50f69ddadcf67d31219adcc69c81c5 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Thu, 25 Dec 2025 17:18:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=9C=80=E6=B1=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- public/static/测试.dlt | 2 +- .../caseManage/caseList/index.vue | 8 +- src/views/archivesManage/safeDoor/index.vue | 8 +- src/views/components/printRfid-w.vue | 357 ++++++++++++++++++ src/views/components/printRfid.vue | 123 +++--- 6 files changed, 446 insertions(+), 54 deletions(-) create mode 100644 src/views/components/printRfid-w.vue diff --git a/.env.development b/.env.development index f528759..01aa4b1 100644 --- a/.env.development +++ b/.env.development @@ -15,7 +15,7 @@ ENV = 'development' VUE_APP_BASE_API = 'http://192.168.99.72:7090' VUE_APP_WS_API = 'ws://192.168.99.72:7090' VUE_APP_WEBRTCSTREAMER_API = '127.0.0.1:8000' -VUE_APP_SDEVID = "D003" +VUE_APP_SDEVID = "D005" VUE_APP_PRINTNJ='http://127.0.0.1:9001/' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/public/static/测试.dlt b/public/static/测试.dlt index aa7c4d0..d7c970f 100644 --- a/public/static/测试.dlt +++ b/public/static/测试.dlt @@ -1,4 +1,4 @@ { "Version": "1.1.0.1", - "Data": "84F6F9E0AD9F93949E999BE8D103EBDDE1DFE4E2E5E3F3EA0D0FF7CAA9B3AFAAEACECBBE11FA2EBB2D2F3218EBCACFF1C0CCCD10FE301305150C2F343217F0D99E8D8D909E97A09993BB9AA6A6EAD305EDA3A5F0E70A0C0DF5C6AAA6BAA8B8FCF529120211082D2D2E16F7EAF21A03350DFE02FF160D2B2D2E16F6DCCDC3DCCBAB91949DE1CAFC8CFDFF0001E9C4ACA2A99CA3A4AEC7B0A2AFA9B5F8E113FBEB0D062A292A2B15E2CFC6D6C7D3CDD1DA0DF62910070200142D2F30C00F2F3435DDBDA1948DA392B49E8EA4E8D1039204060709F09CF2DB0DF5E2E9F8EF1214152610CC10F92B15040716313132BF1134262710EFC9CBC1D1C9C4C61B0130E2C3F5F7F9F9FAE2B18E97A3E7D002EAB9A9979CF0E6090B0C0D0EF6D0D6F9E214FCDBCDBCBE060406140B2E323132331BF5BCEDD1C4EBCAD1CDD1BF170332170C1CD3F6F9F9FAFBE3C3A694A8E8D103EB285A852A637E305D9633608EF8EF121415262912BA11FA2E1406080D0A0B1A11342627292916C013FC2E16040F0B091B12F5F7F9F9FAE28EE5CDFFE7DAE9E00305060709F0ABF2DB0DF5E8F7EE111314152610EEC3C5C0E9D5CAD31900321AFCCCC6CFC6100C2F2C2D2E2F17F7CCCBC9EB96869DE0C9FBE3D5D7E6DD0002030405EDC79FD0A4A8B1F4DD0FF7EAF9F0131526292B10EAC1EEC2D6CCD2D71902341CFF0E06282F302C2D15EFC6E8CDD5D8CC9397949DE1CAFCE5D7E6DD0002030405EDC4A9A4AEC1A5B5B4AFABB3F9E214FCFE040410072A2E2D2E2F19F7D3DBCBEBBFCFCFC9CAD213FC2E16091B0F2F3435F6F7E0C18E9096BB9E9AA4C4A6A7A9ECD507F0E2F1E80B0D0E0F10F8C9ADA9BDBBCD12F82A1207140B2E323132331BE8EEC4C9CBCAE5BCC6D216FF3419091B12F5F7F9F9FAE2AFC69B9FA29CBFA39FA9EDD609F0E3F2E90C0E0F1011F9D4DCB2C6CBC6DEBAC4D214FD2F190A1910333526272910F0F8C9CDD0CAEDD4CDD41B04F6DED2E0F9FBFCFE8AABFF018EE00305EDBECCC9CFF2DB0D9C0E1011F9C9A4B0CCE5C5CECE12FD2D1507190E3133341CE0C4CEE2C117FB2D15160D3332301BF09A89B28BE1CAFCE5E5DCFF0102EAC49AAAA39FF0D90BBA9B0D0F101112FAC9A5BFCD12F82A12F2E6F4160F30323334350DE7EE10FE3013F1E7F50C0D0A171134F6F7F9F9E1BB92C4A69ABC9BA7A3A795EDD609F0E2F2E90C0E0F1011F9D8BCAACE10FA2911C0D2C3C3160F30323334350DECD1BED7ECC6D2D216FF3419F1D8C6AC8C90E0D7FAFCFEFEFFE7B8A6ABA9C2AAA2F0D80AF2E4E4F5EC0F11121314FCDDDBE7C3CFCF15FC2E16E4E81910333526272910E8C213FC2E16171131303435F6DEB98FB795A29CE5CE00E8DBEA0305060795B5090B980C9A" + "Data": "84F6F9E0AD9F93949E999BE8D103EBDDE1DFE4E2E5E3F3EA0D0FF7CAA9B3AFAAEACECBBE11FA2EBB2D2F3218EBCACFF1C0CCCD10FE301305150C2F343217F0D99E8D8D909E97A09993BB9AA6A6EAD305EDA3A5F0E70A0C0DF5C6AAA6BAA8B8FCF529120211082D2D2E16F7EAF21A03350DFE02FF160D2B2D2E16F6DCCDC3DCCBAB91949DE1CAFC8CFDFF0001E9C4ACA2A99CA3A4AEC7B0A2AFA9B5F8E113FBEB0D062A292A2B15E2CFC6D6C7D3CDD1DA0DF62910070200142D2F30C00F2F3435DDBDA1948DA392B49E8EA4E8D1039204060709F09CF2DB0DF5E2E9F8EF1214152610CC10F92B15040716313132BF1134262710EFC9CBC1D1C9C4C61B0130E2C3F5F7F9F9FAE2B18E97A3E7D002EAB9A9979CF0E6090B0C0D0EF6D0D6F9E214FCECD1C1CD06C6D6C9D2160F30323334350DE7BFEFD7CBE8C7D3CFD3C419FF341CCEDED6F8FAFBFCFEE5C4A896AAEAD305ED2A5D872B6580325F98356290FAF11426292B2911BC15FC2E160A0A0D0C0D1C032629292F3013BD15FE301B060B0D0EDDD4F8F9FAFBFCE590E6CF01E9DCEBE2050709090AF2ADF4DD0FF7EAF9F0131526292B10EDC5C9C2E9D7CED51902341CEEBEC9D1CC17092C2E2F303419F3CED08BAD99889EE2CBFEE5D6D9E8DF0204050607F0C9A0D2A6AAB3F6DF11F9ECFBF225292B292A12EEC3EEC4DACED2D91B04260E02100C2F2C2D2E2F17F4C8E4CFDA9A8E9699959FE3CDFEE6D9E8DF0204050607F0C6AAA6B0C3A7B7B6B1ADB5FBE42610030403120B2C2E2F323119F9D5DDBDDDC2D1D5D0C7CF15FE301B0B171134F6F7F9F9E1C3909398BCA09CA6C6A8A9ABEED809F1E4F3EA0D0F101112FACBAFBBD1C0CD11FA2E1407160F30323334350DDAF1C6CFD2C7E2BEC8D41B01301B0EDDD4F8F9FAFBFCE5B1C79DA1A49EC1A5A1ABF0D80AF2E5F4EB0E10111213FBD6EEC6CBCBC5E0BEC6D2160131190C1B12252729292F17EDF5CBCFD2CFEFD0CFD9DDC6F9E0D3E2FBFEFEFF8CAD010390E20507F0C0CDCBD1F4DD0F9E101213FBCBB6C4D1E5C4D0D214FD2F190919103335260EE3C6D4E9BE14FD2F171B0F2F3435DDB29D8BB38DE3CDFEE6E7DE010304ECC69CADA5A0F2DB0DBC9D0F11121314FCDBB9C4CD11FA2E14F2E8F8180F323435262710E9F417FB2D15F3E9FA0E090C1CD3F6F9F9FAFBE3BE94C5A89CBE9DA9A5A997F0D80AF2E4F4EB0E10111213FBDACEBED310F92B15C2D2C5C7180F323435262710EED7C5D4E9C8D4D41B01301BF69A88AF8E91E2D9FDFEFF0001E9BAA8ADABC4ADA4F1DA0CF4E6E6F7EE111314152610E2DBE6C5D3D115FE3218E4EA1B12252729292F17E5BF15FE301B190D3335F6F7F9E0BA91B998A49DE7D002EADDEC0507090996B70B0D9A0E9C" } \ No newline at end of file diff --git a/src/views/archivesManage/caseManage/caseList/index.vue b/src/views/archivesManage/caseManage/caseList/index.vue index f9e9c6a..8164999 100644 --- a/src/views/archivesManage/caseManage/caseList/index.vue +++ b/src/views/archivesManage/caseManage/caseList/index.vue @@ -289,7 +289,7 @@ export default { const codeEPCRes = await RFID.codeEpc({ op: 'RFID_CodeEPC', sDevID: sDevID, - EAS: '1', + EAS: '0', Type: '2', // 1 档案 2 盒 3 层位 Code: this.crud.selections[0].id // 使用选中行的ID作为Code }) @@ -303,7 +303,7 @@ export default { const epcData = result.epc || result.EPC this.$message.success('EPC数据获取成功,开始打印...') - // 2. 构造多条模板数据 + // 2. 多条模板数据 // const printDataList = [ // { elemID: 'epc-id', actualData: epcData }, // // { elemID: 'tid-id', actualData: tidData }, @@ -318,8 +318,8 @@ export default { // this.crud.refresh() const caseId = this.crud.selections[0].id // 获取盒ID const printDataList = [ - { elemID: 'epc-id', actualData: epcData, caseId: caseId }, - { elemID: 'case-name', actualData: this.crud.selections[0].caseName, caseId: caseId } + { elemID: 'EPC-01', actualData: epcData, caseId: caseId }, + { elemID: 'Case-name', actualData: this.crud.selections[0].caseName, caseId: caseId } ] try { const printResult = await this.$refs.printRFID.handlePrint(printDataList) diff --git a/src/views/archivesManage/safeDoor/index.vue b/src/views/archivesManage/safeDoor/index.vue index 0e423db..4bb0767 100644 --- a/src/views/archivesManage/safeDoor/index.vue +++ b/src/views/archivesManage/safeDoor/index.vue @@ -3,11 +3,11 @@
- + 解除报警 - + 恢复报警 @@ -66,7 +66,7 @@ export default { step: 0, // 初始设为 0,点击后才设为 1 errorStep: 0, // 错误步骤 isProcessing: false, // 是否正在处理中 - currentEAS: 1, // 当前要设置的EAS值 1-恢复报警 0-解除报警 + currentEAS: 0, // 当前要设置的EAS值 0-恢复报警 1-解除报警 currentOperation: '恢复', // 当前操作名称 step1Message: '请放入标签', step2Message: '放入标签后开始读取标签', @@ -99,7 +99,7 @@ export default { async handleAlarmOperation(easValue) { // 设置当前操作类型 this.currentEAS = easValue - this.currentOperation = easValue === 1 ? '恢复' : '解除' + this.currentOperation = easValue === 0 ? '恢复' : '解除' // 初始化步骤(此时 step 才会被设为 1) this.initStepInfo() diff --git a/src/views/components/printRfid-w.vue b/src/views/components/printRfid-w.vue new file mode 100644 index 0000000..27a0f91 --- /dev/null +++ b/src/views/components/printRfid-w.vue @@ -0,0 +1,357 @@ + + + + + diff --git a/src/views/components/printRfid.vue b/src/views/components/printRfid.vue index 99b3ad8..73a3927 100644 --- a/src/views/components/printRfid.vue +++ b/src/views/components/printRfid.vue @@ -4,12 +4,28 @@
打印
+ +