From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index f2adb78..9fb23b6 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -521,7 +521,7 @@
hollowState:'涓┖褰撳ぉ杩愯鎯呭喌',
switch:'鍒囨崲',
running:'杩愯涓�',
- stopping:'鍋滄涓�',
+ stopping:'鍋滄',
diffMinutes:'鍒嗛挓',
loadstart:'鍒囧壊寮�濮嬫椂闂�',
loadend:'鍒囧壊缁撴潫鏃堕棿',
@@ -637,17 +637,17 @@
historicaltasks9:'涓┖澶х悊鐗�',
historicaltasks10:'鐢熶骇缁熻',
date:'鏃ユ湡',
- countOutOne: '鍒囧壊涓�绾挎暟閲�',
+ countOutOne: '鍒囧壊涓�绾�',
totalAreaOutOne: '鍒囧壊涓�绾块潰绉�',
- countOutTwo: '鍒囧壊浜岀嚎鏁伴噺',
+ countOutTwo: '鍒囧壊浜岀嚎',
totalAreaOutTwo: '鍒囧壊浜岀嚎闈㈢Н',
- countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖鏁伴噺',
+ countIn: '閽㈠寲鍓嶅ぇ鐞嗙墖',
totalAreaIn: '閽㈠寲鍓嶅ぇ鐞嗙墖闈㈢Н',
- countOut: '閽㈠寲鏁伴噺',
+ countOut: '閽㈠寲',
totalAreaOut: '閽㈠寲闈㈢Н',
- hollowCountOutOne: '涓┖涓�绾挎暟閲�',
+ hollowCountOutOne: '涓┖涓�绾�',
hollowTotalAreaOutOne: '涓┖涓�绾块潰绉�',
- hollowCountOutTwo: '涓┖浜岀嚎鏁伴噺',
+ hollowCountOutTwo: '涓┖浜岀嚎',
hollowTotalAreaOutTwo: '涓┖浜岀嚎闈㈢Н',
},
reportmanage:{
--
Gitblit v1.8.0