diff --git a/package.json b/package.json index 69e6f62..fe2260f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "calibration-pc", - "version": "1.0.6", + "name": "gy-calibration", + "version": "1.0.7", "description": "谷云开发部开发的断路器标定软件", "main": "./out/main/index.js", "author": "example.com", diff --git a/src/renderer/index.html b/src/renderer/index.html index 8b3708c..70ce626 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -2,7 +2,7 @@ - 谷云标定工具 + 谷云校表产测 diff --git a/src/renderer/src/assets/iconfont/iconfont.css b/src/renderer/src/assets/iconfont/iconfont.css index 7d0939d..5a75e74 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=1752127229460') format('woff2'), - url('iconfont.woff?t=1752127229460') format('woff'), - url('iconfont.ttf?t=1752127229460') format('truetype'); + src: url('iconfont.woff2?t=1752478848997') format('woff2'), + url('iconfont.woff?t=1752478848997') format('woff'), + url('iconfont.ttf?t=1752478848997') format('truetype'); } .iconfont { @@ -145,6 +145,10 @@ content: "\e772"; } +.icon-icon_duanluqi2:before { + content: "\e9c2"; +} + .icon-icon_caid:before { content: "\e75f"; } diff --git a/src/renderer/src/assets/iconfont/iconfont.ttf b/src/renderer/src/assets/iconfont/iconfont.ttf index e442c27..0f03c50 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.ttf and b/src/renderer/src/assets/iconfont/iconfont.ttf differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff b/src/renderer/src/assets/iconfont/iconfont.woff index 0160f1c..ee8d680 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff and b/src/renderer/src/assets/iconfont/iconfont.woff differ diff --git a/src/renderer/src/assets/iconfont/iconfont.woff2 b/src/renderer/src/assets/iconfont/iconfont.woff2 index c982c26..152ba20 100644 Binary files a/src/renderer/src/assets/iconfont/iconfont.woff2 and b/src/renderer/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/renderer/src/main.js b/src/renderer/src/main.js index 5237f04..888d000 100644 --- a/src/renderer/src/main.js +++ b/src/renderer/src/main.js @@ -5,6 +5,7 @@ import { createApp } from 'vue' import dayjs from 'dayjs' import * as ElementPlusIconsVue from '@element-plus/icons-vue' import ElementPlus from 'element-plus' +import zhCn from 'element-plus/es/locale/lang/zh-cn' import 'element-plus/dist/index.css' import App from '@renderer/App.vue' @@ -18,7 +19,9 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) { } app.use(createPinia()) -app.use(ElementPlus) +app.use(ElementPlus, { + locale: zhCn, +}) app.use(router) app.mount('#app') diff --git a/src/renderer/src/views/calibration/index.vue b/src/renderer/src/views/calibration/index.vue index 3dadb0b..30731c6 100644 --- a/src/renderer/src/views/calibration/index.vue +++ b/src/renderer/src/views/calibration/index.vue @@ -7,11 +7,12 @@ 开始执行 停止 - 操作员编号: + 操作员编号:
刷新列表 + 导出生产数据 配置方案
@@ -25,17 +26,26 @@ P位: {{ activeScheme.schemeType }} + 额定电压(V): {{ activeScheme.configParam.format[1].value }} 额定电流(A): {{ activeScheme.configParam.format[2].value }} + 漏电流(mA): {{ activeScheme.configParam.format[5].value }} +
-
@@ -56,30 +66,35 @@ v-if="device.connectStatus === 1" :class="[ 'iconfont', - 'icon-icon_duanluqi', + 'icon-icon_duanluqi2', 'circuit-breaker', + device.switch === 0 ? 'upsideDown' : '', device.result === 1 ? 'color-green' : device.result === -1 ? 'color-red' : device.result === 2 ? 'color-orange' : '' ]" > -
+

芯片ID: - {{ device.cpuId || '无' }} + {{ device.cpuId || '无' }}

设备端口: {{ device.devicePort || '无' }}

标定结果: - {{ - device.result === 1 ? '成功' : device.result === -1 ? '失败' : device.result === 2 ? '标定中' : '未标定' || '无' + {{ + device.result === 1 ? '成功' : device.result === -1 ? '失败' : device.result === 2 ? '标定中' : '无' || '无' }}

结果描述: - {{ device.resultTxt || '无' }}

- 新增方案 +
+ 新增方案 + 导出方案 + 导入方案 + +
刷新
- + + @@ -222,7 +244,7 @@ - + @@ -243,10 +265,10 @@ - - - - + + + + @@ -264,7 +286,7 @@ 断路器校准参数
-