diff --git a/package.json b/package.json index e524e39..fd3eebc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gy-calibration", - "version": "1.0.12", + "version": "1.0.0", "description": "谷云开发部开发的断路器标定软件", "main": "./out/main/index.js", "author": "example.com", diff --git a/resources/config/config.js b/resources/config/config.js index 0f0e76f..7a75281 100644 --- a/resources/config/config.js +++ b/resources/config/config.js @@ -2,17 +2,17 @@ module.exports = { //打包配置 - // url: 'http://127.0.0.1:8000', - // wsUrl: 'ws://127.0.0.1:8000', - // swichWsUrl: 'ws://127.0.0.1:8001', - // serialPortUrl: 'http://127.0.0.1:8000', + url: 'http://127.0.0.1:8000', + wsUrl: 'ws://127.0.0.1:8000', + swichWsUrl: 'ws://127.0.0.1:8001', + serialPortUrl: 'http://127.0.0.1:8000', //开发配置 - url: 'http://192.168.1.17:8000', - wsUrl: 'ws://192.168.1.17:8000', - swichWsUrl: 'ws://192.168.1.17:8001', - serialPortUrl: 'http://192.168.1.17:8000', + // url: 'http://192.168.1.17:8000', + // wsUrl: 'ws://192.168.1.17:8000', + // swichWsUrl: 'ws://192.168.1.17:8001', + // serialPortUrl: 'http://192.168.1.17:8000', // 远程连接串口使用 // serialPortUrl: 'http://120.77.172.42:7202', diff --git a/resources/service/config/config.yaml b/resources/service/config/config.yaml index 35ff83b..a4f1fc8 100644 --- a/resources/service/config/config.yaml +++ b/resources/service/config/config.yaml @@ -12,7 +12,7 @@ equipment: HS-9203M-0001 #设备总数 totalNum: 16 #起始端口号 -startAddr: 3 +startAddr: 22 #测试源电压波动比例 fluctuateRatioU: 90 #测试源电压波动比例 diff --git a/resources/service/data.db b/resources/service/data.db index dbd8de0..d610d99 100644 Binary files a/resources/service/data.db and b/resources/service/data.db differ diff --git a/resources/service/hscomconf/hscomconf.ini b/resources/service/hscomconf/hscomconf.ini new file mode 100644 index 0000000..0312717 --- /dev/null +++ b/resources/service/hscomconf/hscomconf.ini @@ -0,0 +1,29 @@ +[Delay] +ErrWaittime=0.5 +SourceWaittime=1 +StdmeterWaittime=2 +Waittime4open=0.2 +PurgeCommDelay=0.05 +SampleTIME=3 +HarmStableTime=3 +HarmReviseTime=2 +IntervalWaitTime=0.05 +BpGrade1=0.05 +BpGrade2=0.1 +DelayAfterGearChange=0.5 +IFCheckGear=0 +CheckGearIntervalTime=1 +CheckGearMaxWaitTIme=7 +ReviseTIme=0 + +[System] +SetMode5300b=0 +ReadMode5300b=1 +HarmReviseMode=0 +IfHarmRevise=1 +HS5300ReadUacSupport=1 +ifThreadLog=1 +HS5300UURevise=0 + +[Debug] +Mode=0 diff --git a/src/main/index.js b/src/main/index.js index 9e867cb..8c7989c 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -117,8 +117,8 @@ if (!gotTheLock) { // 筛选出以.exe结尾的文件 exePluginsExeList = files.filter(file => path.extname(file).toLowerCase() === '.exe'); }); - - child = spawn('./main.exe', [], { cwd: exePath, stdio: ['ignore', 'pipe', 'pipe'] }); + const userDataPath = app.getPath('userData'); + child = spawn('./main.exe', ['--args', userDataPath], { cwd: exePath, stdio: ['ignore', 'pipe', 'pipe'] }); //监听进程的输出 child.stdout.on('data', data => { diff --git a/src/renderer/src/views/calibration/index.vue b/src/renderer/src/views/calibration/index.vue index acc0524..9713769 100644 --- a/src/renderer/src/views/calibration/index.vue +++ b/src/renderer/src/views/calibration/index.vue @@ -778,7 +778,7 @@ const currentScheme = ref({ id: 3, step: 3, voltage: 100, - current: 2, + current: 80, powerFactor: '0.5L', isILeak: true } @@ -1299,7 +1299,7 @@ const addScheme = () => { id: 3, step: 3, voltage: 100, - current: 2, + current: 80, powerFactor: '0.5L', isILeak: true }