Merge branch 'develop' into gtz

2022-03-15 16:59:11 +08:00
parent 9eea286c08 d4e0384e10
commit 8502f5d7d1
12 changed files with 682 additions and 1053 deletions
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -2,7 +2,7 @@
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:58:12
+ * @LastEditTime: 2022-03-15 10:16:52
 */
 export default {
  visual: {
@@ -171,7 +171,11 @@ export default {
    remark: '备注',
    PositionNo: '位置序号',
    PositionCode: '位置编码',
-    PositionCodeAlias: '位置编码别名'
+    PositionCodeAlias: '位置编码别名',
+    scrapped: '报废',
+    normal: '正常',
+    repairing: '维修中'
+
  },
  equipment: {
    shortName: '名称缩写',