project_boditech_vidas_a8000_v3
/
a8k_app
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

update

tags/v0
zhaohe 7 months ago
parent
5cbc29f944
commit
37bcb54d36
14 changed files with 89 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      appresource/static/engineer/css/app.74a8cb1a.css
  2. 2
      appresource/static/engineer/index.html
  3. 2
      appresource/static/engineer/js/app.549fa95b.js
  4. 1
      appresource/static/engineer/js/app.549fa95b.js.map
  5. 2
      appresource/static/engineer/js/app.c4a7361a.js
  6. 1
      appresource/static/engineer/js/app.c4a7361a.js.map
  7. 4
      appresource/static/engineer/js/chunk-vendors.a96a0e7f.js
  8. 2
      appresource/static/engineer/js/chunk-vendors.a96a0e7f.js.map
  9. 11
      src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java
  10. 30
      src/main/java/a8k/extui/page/data/ProjInfoMgrPage.java
  11. 10
      src/main/resources/db/zapp_a8k_pos_parameter.csv

4
appresource/static/engineer/css/app.74a8cb1a.css
File diff suppressed because it is too large
View File

2
appresource/static/engineer/index.html
View File

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.ce3623b2.js"></script><script defer="defer" src="js/app.549fa95b.js"></script><link href="css/app.61c78ac9.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.a96a0e7f.js"></script><script defer="defer" src="js/app.c4a7361a.js"></script><link href="css/app.74a8cb1a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
appresource/static/engineer/js/app.549fa95b.js
File diff suppressed because it is too large
View File

1
appresource/static/engineer/js/app.549fa95b.js.map
File diff suppressed because it is too large
View File

2
appresource/static/engineer/js/app.c4a7361a.js
File diff suppressed because it is too large
View File

1
appresource/static/engineer/js/app.c4a7361a.js.map
File diff suppressed because it is too large
View File

4
appresource/static/engineer/js/chunk-vendors.a96a0e7f.js
File diff suppressed because it is too large
View File

2
appresource/static/engineer/js/chunk-vendors.a96a0e7f.js.map
File diff suppressed because it is too large
View File

11
src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java
View File

@ -1,6 +1,8 @@
package a8k.extui.mgr;
import a8k.extui.page.data.DeviceActionParameterSettingPage;
import a8k.extui.page.data.ProjInfoMgrPage;
import a8k.extui.page.pos_calibration.MiniServoReferencePointIniter;
import a8k.extui.page.pos_calibration.*;
import a8k.extui.page.action_operation.*;
@ -33,6 +35,7 @@ public class ExtApiPageGroupCfgMgr {
debug,//
driverDebug,
Verification,
Data,
}
@Data
@ -95,6 +98,10 @@ public class ExtApiPageGroupCfgMgr {
displayRefreshPage(PageGroupType.Verification);
}
public void dataRefreshPage() {
displayRefreshPage(PageGroupType.Data);
}
@PostConstruct
void init() {
@ -151,6 +158,10 @@ public class ExtApiPageGroupCfgMgr {
page.addFunction("驱动调试", this::driverDebugRefreshPage);
cfgList.add(new Config(PageGroupType.driverDebug, PipetteCtrlDriverPage.getPageClass(), "移液抢驱动"));
page.addFunction("数据", this::dataRefreshPage);
cfgList.add(new Config(PageGroupType.Data, DeviceActionParameterSettingPage.class, "设备动作参数设置"));
cfgList.add(new Config(PageGroupType.Data, ProjInfoMgrPage.class, "项目信息管理"));
page.addFunction("前端测试助手", this::frontEndDebugUtilsRefreshPage);
cfgList.add(new Config(PageGroupType.FrontEndDebugUtils, FakeReactionRecordGeneratorPage.class, "虚拟反应记录生成"));

30
src/main/java/a8k/extui/page/data/ProjInfoMgrPage.java
View File

@ -1,7 +1,11 @@
package a8k.extui.page.data;
import a8k.app.a8ktype.exception.AppException;
import a8k.app.controler.filemgr.StorageControler;
import a8k.app.dao.db.DeviceActionParameterDao;
import a8k.app.service.data.ProjIdCardInfoMgrService;
import a8k.app.service.data.ProjInfoMgrService;
import a8k.app.utils.ProjBuildinInfo;
import a8k.extui.mgr.ExtApiPageMgr;
import a8k.extui.type.ExtUIPageCfg;
import a8k.extui.type.param.ExtUIFile;
@ -11,12 +15,20 @@ import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.Map;
@Component
@Slf4j
public class ProjInfoMgrPage {
@Resource
ExtApiPageMgr extApiPageMgr;
@Resource
ProjIdCardInfoMgrService projIdCardInfoMgrService;
@Resource
ProjInfoMgrService projInfoMgrService;
//
// 1. 查询设备支持的项目信息
// 2. 查询设备支持的单位范围
@ -26,6 +38,24 @@ public class ProjInfoMgrPage {
@PostConstruct
void init() throws NoSuchMethodException {
ExtUIPageCfg page = new ExtUIPageCfg(this);
page.addFunction("获取项目信息", this::getProjInfoBreifList);
page.addFunction("获取项目详细信息", this::getProjInfoById);
extApiPageMgr.addPage(page);
}
public Map<String, String> getProjInfoBreifList() throws AppException {
var allproj = projInfoMgrService.getAllProjBuildInInfo();
Map<String, String> result = new java.util.HashMap<>();
for (var proj : allproj) {
result.put(proj.projBaseInfo.projId.toString(),
String.format("%s(%s)", proj.projBaseInfo.projName, proj.optMark));
}
return result;
}
public ProjBuildinInfo getProjInfoById(Integer projId) throws AppException {
return projInfoMgrService.getProjBuildInInfo(projId);
}
}

10
src/main/resources/db/zapp_a8k_pos_parameter.csv
View File

@ -94,15 +94,15 @@ id,service,key,valType,val,chName
95,PipetteGunLLFParamMgr,STOOL_TEST_TUBE_LLF_VEL,Integer,"{""value"":25}",<粪便试管>液面跟随速度
96,PipetteGunLLFParamMgr,LARGE_BS_BOTTLE_LLF_VEL,Integer,"{""value"":10}",<大瓶缓冲液>液面跟随速度
97,OptModuleExtParamsMgr,OptScanRefPos,Integer,"{""value"":4418}",光学扫描参考坐标
98,OptModuleExtParamsMgr,FOptScanShift,Integer,"{""value"":2220}",F光学扫描偏移
99,OptModuleExtParamsMgr,FOptEmissionIntensity,Integer,"{""value"":180}",F发射强度
100,OptModuleExtParamsMgr,FOptScanGainVal,Double,"{""value"":5.0}",F光学扫描放大倍数
98,OptModuleExtParamsMgr,FOptScanShift,Integer,"{""value"":2200}",F光学扫描偏移
99,OptModuleExtParamsMgr,FOptEmissionIntensity,Integer,"{""value"":255}",F发射强度
100,OptModuleExtParamsMgr,FOptScanGainVal,Double,"{""value"":1.1}",F光学扫描放大倍数
101,OptModuleExtParamsMgr,TOptScanShift,Integer,"{""value"":1080}",T光学扫描偏移
102,OptModuleExtParamsMgr,TOptEmissionIntensity,Integer,"{""value"":20}",T发射强度
103,OptModuleExtParamsMgr,TOptScanGainVal,Double,"{""value"":0.5}",T光学扫描放大倍数
104,OptModuleParamsMgr,PullerTargetPos,Integer,"{""value"":1147}",拉板目标位置
105,OptModuleParamsMgr,OptScanerDropPos,Integer,"{""value"":-349}",丢板坐标
106,OptModuleParamsMgr,OptScanerScandbyPos,Integer,"{""value"":305}",扫描待机位
105,OptModuleParamsMgr,OptScanerDropPos,Integer,"{""value"":-337}",丢板坐标
106,OptModuleParamsMgr,OptScanerScandbyPos,Integer,"{""value"":1358}",扫描待机位
107,TemperatureCtrlParamMgr,IncubatorTCMTempOffset,Double,"{""value"":0}",<孵育仓>温度偏移
108,TemperatureCtrlParamMgr,PlatesBoxTCMTempOffset,Double,"{""value"":0}",<板夹仓>温度偏移
109,TubePreProcesPosParamMgr,GripperServoOpenPos,Integer,"{""value"":1637}",<抓手>张开位置

Write Preview
Loading…
Cancel
Save