Browse Source

append

try_support_dt100n
zhaohe 3 weeks ago
parent
commit
e4bdabbf65
  1. 4
      appsrc/service/setting/device_ext_setting_mgr_service.cpp
  2. 6
      html/debug/index.html

4
appsrc/service/setting/device_ext_setting_mgr_service.cpp

@ -61,10 +61,10 @@ void DeviceExtSettingMgrService::initialize() {
REG_LINE("设备初始化"); REG_LINE("设备初始化");
REG_EXTFN(initVal1, void(ProjectTypeEnum, int, int, int, int), projType, year, month, day, index); REG_EXTFN(initVal1, void(ProjectTypeEnum, int, int, int, int), projType, year, month, day, index);
REG_EXTFN_VOID_DISPNAME(initVal1, "初始化设备");
REG_EXTFN_VOID_DISPNAME(initVal1, "初始化设备(需重启程序)");
REG_EXTFN(initVal2, void(string), deviceId); REG_EXTFN(initVal2, void(string), deviceId);
REG_EXTFN_VOID_DISPNAME(initVal2, "初始化设备");
REG_EXTFN_VOID_DISPNAME(initVal2, "初始化设备(需重启程序)");
REG_PARAM_DEFAULT_VALS(initVal2, []() { return vector<string>({DAO->getDeviceId()}); }); REG_PARAM_DEFAULT_VALS(initVal2, []() { return vector<string>({DAO->getDeviceId()}); });
// REG_EXTFN_VOID(getSetting, json()); // REG_EXTFN_VOID(getSetting, json());

6
html/debug/index.html

@ -338,6 +338,7 @@
data() { data() {
return { return {
actions: [], actions: [],
curmenu:"",
menuList: [], menuList: [],
actionActiveGroup: null, actionActiveGroup: null,
rawRequestContent: '', rawRequestContent: '',
@ -501,6 +502,8 @@
} }
group.items.push(item); group.items.push(item);
} }
this.actionActiveGroup = this.actions.find(i => i.key === curmenu);
}, },
// action group menu item click // action group menu item click
@ -519,7 +522,7 @@
this.wsCallSlient(request); this.wsCallSlient(request);
} }
this.actionActiveGroup = this.actions.find(i => i.key === event.key);
curmenu = event.key;
}, },
// action execute // action execute
@ -579,6 +582,7 @@
if (null === this.ws) { if (null === this.ws) {
return; return;
} }
console.log('wsCallSlient', request);
this.ws.send(JSON.stringify(request)); this.ws.send(JSON.stringify(request));
}, },
}, },

Loading…
Cancel
Save