From 2510046e4e09c929cdb0d5adcecde62fd3a20cf4 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期六, 07 一月 2023 11:45:19 +0800
Subject: [PATCH] 更新外网订阅
---
src/samples/socketClient.ts | 15 ++++++++++-----
src/views/home/index.vue | 4 ++--
src/samples/sockteStomp.ts | 4 ++++
package.json | 2 +-
electron/main/index.ts | 4 ++--
5 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/electron/main/index.ts b/electron/main/index.ts
index b1f4295..6245fad 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -66,8 +66,8 @@
async function createWindow() {
win = new BrowserWindow({
title: 'Main window',
- fullscreen: false,
- // autoHideMenuBar:true,
+ fullscreen: true,// 开启默认全屏
+ // autoHideMenuBar:true, //关闭菜单栏
webPreferences: {
preload: splash,
nodeIntegration: true,
diff --git a/package.json b/package.json
index a10569e..8a592bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "sign-tool",
- "version": "2.4.0",
+ "version": "2.5.0",
"icon": "public/favicon.ico",
"main": "dist/electron/main/index.js",
"author": "",
diff --git a/src/samples/socketClient.ts b/src/samples/socketClient.ts
index 033d38c..039e4f3 100644
--- a/src/samples/socketClient.ts
+++ b/src/samples/socketClient.ts
@@ -8,11 +8,16 @@
const connect=()=> {
const cong=confingInfoStore().confingInfo
- console.log('获取congf',cong.faceRecogServicePort,cong.faceRecogServiceUrl)
- client.connect({
- port:cong.faceRecogServicePort,
- host:cong.faceRecogServiceUrl
- })
+ if(cong.isUseFaceRecogService){
+ console.log('获取congf',cong.faceRecogServicePort,cong.faceRecogServiceUrl)
+ client.connect({
+ port:cong.faceRecogServicePort,
+ host:cong.faceRecogServiceUrl
+ })
+ }else{
+ console.log('不启用人脸识别')
+ }
+
}
function launchIntervalConnect() {
diff --git a/src/samples/sockteStomp.ts b/src/samples/sockteStomp.ts
index a94df56..55eadf1 100644
--- a/src/samples/sockteStomp.ts
+++ b/src/samples/sockteStomp.ts
@@ -178,6 +178,10 @@
stompClient.subscribe(`/queue/patient/info/${pcName}`,PatientCallback)
// 订阅配置文件事件已经弃用 现在不用更新本地配置文件了
// stompClient.subscribe(`/queue/workstation/config/set/${clientCode}/${pcName}`,configCallback)
+ devices.forEach(el=>{
+ if(stompClient!==null)
+ stompClient.subscribe(`/queue/${clientCode}/${el.deviceName}/result`,callback)
+ })
// 发送配置文件到服务端
stompClient.send(`/app/workstation/config/set/${clientCode}/${pcName}`,{},
JSON.stringify(config))
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f1ad53c..b9c42f8 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -436,8 +436,8 @@
</el-row>
<el-row class="divbody">
<div class="bodeText">
- {{ gao_ya }}/{{ di_ya }}
- <br/>{{mai_bu}}
+ {{ Number(gao_ya) }}/{{ Number(di_ya) }}
+ <br/>{{Number(mai_bu)}}
</div>
</el-row>
</div>
--
Gitblit v1.8.0