From 902ba88c2f4a18d5ae393be0fba7c547aaccdc01 Mon Sep 17 00:00:00 2001 From: fhysy <1149505133@qq.com> Date: Fri, 20 Jun 2025 15:24:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(renderer):=20=E4=BC=98=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=8A=9F=E8=83=BD=E5=92=8C=E7=95=8C=E9=9D=A2=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 iconfont 文件,添加新的图标 - 重构日志显示逻辑,支持不同类型的消息 - 添加方案详情展示区域 - 优化方案编辑界面布局 - 实现日志滚动和展开/收缩功能 - 添加版本号动态显示 - 优化 WebSocket 连接管理 --- electron.vite.config.mjs | 4 + package.json | 4 +- src/renderer/src/assets/iconfont/iconfont.css | 46 +++- src/renderer/src/assets/iconfont/iconfont.ttf | Bin 10024 -> 13836 bytes .../src/assets/iconfont/iconfont.woff | Bin 6412 -> 8600 bytes .../src/assets/iconfont/iconfont.woff2 | Bin 5500 -> 7340 bytes src/renderer/src/views/calibration/index.vue | 243 +++++++++++++++--- 7 files changed, 258 insertions(+), 39 deletions(-) diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs index 3e72548..29774e3 100644 --- a/electron.vite.config.mjs +++ b/electron.vite.config.mjs @@ -2,8 +2,12 @@ import { resolve } from 'path' import { defineConfig, externalizeDepsPlugin } from 'electron-vite' import vue from '@vitejs/plugin-vue' import VueDevTools from 'vite-plugin-vue-devtools'; +import pkg from './package.json' export default defineConfig({ + define: { + 'import.meta.env.VITE_APP_VERSION': JSON.stringify(pkg.version) + }, main: { plugins: [externalizeDepsPlugin()] }, diff --git a/package.json b/package.json index 7ac4e50..1cbba41 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calibration-pc", - "version": "1.0.0", + "version": "1.0.9", "description": "谷云开发部开发的断路器标定软件", "main": "./out/main/index.js", "author": "example.com", @@ -21,12 +21,10 @@ "@electron-toolkit/preload": "^3.0.1", "@electron-toolkit/utils": "^3.0.0", "axios": "^1.7.2", - "calibration-pc": "file:", "dayjs": "^1.11.13", "electron-updater": "^6.1.7", "element-plus": "^2.7.6", "file-saver": "^2.0.5", - "gateway-app": "file:", "pinia": "^2.1.7", "vue-router": "^4.4.0", "xlsx": "^0.18.5" diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index f6df065..6e771ca 100644 --- a/src/renderer/src/assets/iconfont/iconfont.css +++ b/src/renderer/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4622943 */ - src: url('iconfont.woff2?t=1743060096253') format('woff2'), - url('iconfont.woff?t=1743060096253') format('woff'), - url('iconfont.ttf?t=1743060096253') format('truetype'); + src: url('iconfont.woff2?t=1750322442953') format('woff2'), + url('iconfont.woff?t=1750322442953') format('woff'), + url('iconfont.ttf?t=1750322442953') format('truetype'); } .iconfont { @@ -13,6 +13,46 @@ -moz-osx-font-smoothing: grayscale; } +.icon-rizhi:before { + content: "\e61c"; +} + +.icon-bug:before { + content: "\e725"; +} + +.icon-caozuorizhi:before { + content: "\e610"; +} + +.icon-rizhishenji:before { + content: "\e666"; +} + +.icon-chenggong:before { + content: "\e615"; +} + +.icon-rizhi1:before { + content: "\e613"; +} + +.icon-chenggong1:before { + content: "\e616"; +} + +.icon-bug-fill:before { + content: "\e773"; +} + +.icon-bug-line:before { + content: "\e774"; +} + +.icon-kongtiaoguizhuduanluqiAA:before { + content: "\e68e"; +} + .icon--_saomaqiang:before { content: "\e640"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index 6123c125b40f0337f62404d58e0235417e791d80..a19d60a42af33a8ea953d3b2e29ea4001aa5a10a 100644 GIT binary patch delta 4629 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 SI4Tm=L^>_7`YAmm1pWXQL(X{s diff --git a/src/renderer/src/assets/iconfont/iconfont.woff b/src/renderer/src/assets/iconfont/iconfont.woff index 78308d8f46237843cda240320803227c439be656..d4dd5d77e2c8b57c43cebda75c970d8fb1cb9ca6 100644 GIT binary patch delta 8178 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 EvA^Oo{iS;XUR4ZH=8Xr+@qR080~oW6QVJCF(k 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 diff --git a/src/renderer/src/views/calibration/index.vue b/src/renderer/src/views/calibration/index.vue index 626f897..18e7686 100644 --- a/src/renderer/src/views/calibration/index.vue +++ b/src/renderer/src/views/calibration/index.vue @@ -2,7 +2,7 @@

- + 开始执行 @@ -13,6 +13,20 @@ 设置
+
+ 系列: {{ activeScheme.series }} + 框架: {{ activeScheme.framework }} + 类型: {{ activeScheme.schemeType }} + {{ item.unit ? item.name + '(' + item.unit + ')' : item.name }}: {{ item.value }} +
@@ -46,16 +60,42 @@
- +
- {{ item }} + + + + + + + + + + + + + + + + + + {{ item.time }} {{ item.msg }}
@@ -96,14 +144,33 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + 断路器校准参数
@@ -121,7 +188,7 @@ 校准精度(%)
- +
@@ -132,21 +199,26 @@ 添加步骤
- - - + + + + + + + + - + - + @@ -160,11 +232,11 @@ - + @@ -562,6 +706,23 @@ const deleteCalibrationStep = index => { color: white; flex-shrink: 0; } +.scheme-list { + background: #ccc; + padding: 10px; + font-size: 13px; + display: flex; + align-items: center; + justify-content: space-between; + .scheme-item { + margin-left: 10px; + &:first-child { + margin-left: 0; + } + .scheme-value { + font-weight: bold; + } + } +} .header-left, .header-center, @@ -627,6 +788,9 @@ const deleteCalibrationStep = index => { display: flex; flex-direction: column; flex-shrink: 0; + &.open-log { + height: 350px; + } } .log-output { @@ -680,6 +844,19 @@ const deleteCalibrationStep = index => { display: flex; align-items: center; justify-content: space-between; + .btn-box { + display: flex; + align-items: center; + .log-box-operate-item { + display: flex; + align-items: center; + margin-right: 10px; + cursor: pointer; + .icon-icon_gengxin { + margin-left: 2px; + } + } + } } .version-info { text-align: right;