From 29ed5a9552535d18f2a9d2c934806d9e733afad5 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Tue, 10 May 2022 09:53:10 +0800 Subject: [PATCH 1/4] change statistics tit --- src/pages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages.json b/src/pages.json index 5304081..a20f254 100644 --- a/src/pages.json +++ b/src/pages.json @@ -100,7 +100,7 @@ { "path": "pages/turnover/turnover", "style": { - "navigationBarTitleText": "营业额" + "navigationBarTitleText": "收入统计" } }, { From 1bdb5b14e398b286efd786ec93d0e8ca7fe51c8a Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Fri, 13 May 2022 15:34:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=8A=A0=20id=E5=8F=82=E6=95=B0=EF=BC=8C=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=90ID1000881=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/subpackage/device/js/device_api.js | 3 ++- src/subpackage/device/pages/switch_manage/switch_manage.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/subpackage/device/js/device_api.js b/src/subpackage/device/js/device_api.js index db8d9c1..80c9df3 100644 --- a/src/subpackage/device/js/device_api.js +++ b/src/subpackage/device/js/device_api.js @@ -23,7 +23,8 @@ export const DEVICE_API = { hardwareInfo:`${ORIGIN}/admin/stadium/hardware/get/`, // 设备信息 hardwareList:`${ORIGIN}/admin/stadium/hardware/list`, // 设备列表 - ouxuanac:`${ORIGIN}/ouxuanac/sendPacket`, // 中控控制 + // ouxuanac:`${ORIGIN}/ouxuanac/sendPacket`, // 中控控制 + ouxuanac:`${ORIGIN}/stadiumOuxuanac/sendPacket`, // 中控控制 20220511 解决那个门禁的东东 // ouxuanac--> http://api.ouxuan.net/project/233/interface/api/10012 接口文档 // ouxuanac--> http://git.ouxuan.net/ouxuanac/ouxuanac-common/src/branch/master/cmd.ts // 接口参数结构 || ouxuanac.md diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue index fa25d6c..7f032aa 100644 --- a/src/subpackage/device/pages/switch_manage/switch_manage.vue +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -217,6 +217,7 @@ export default { let _data = { device: curStoreInfo.device_name, // 中控名, data: _query, // 后端数据结构， 参考src\subpackage\device\js\ouxuanac.md + hardware_id: switchInfo.id + '', // 20220512 新增参数 }; //2021-12-17 群里说的那个锁的 需要全部关闭灯的按钮从 set-rpio 变成 set-rpio-lock 普通开灯保持不变 加锁开灯(长开) set-rpio-lock @@ -229,7 +230,7 @@ export default { // 20220507 门闸 GateControl 要是 hardware_mac_addr 不为空 device_name 替换成 hardware_mac_addr // 另外多做一步 传多一个 "hardware_id":id 给我 if(switchInfo.hardware_type === 'GateControl'&&!!switchInfo.hardware_mac_addr)_data['device'] = switchInfo.hardware_mac_addr; - if(switchInfo.hardware_type === 'GateControl')_data['hardware_id'] = switchInfo.id; + // if(switchInfo.hardware_type === 'GateControl')_data['hardware_id'] = switchInfo.id; return _data; }, From 4e46c141c1465cb9b29b9efb6e15be334ac9e916 Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Mon, 16 May 2022 11:21:06 +0800 Subject: [PATCH 3/4] vtest 1.1.23 --- src/pages/index/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 3ba4f50..ec144a4 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,6 +1,5 @@