diff --git a/lan/lan_en.json b/lan/lan_en.json index 42904aba..1e6f3eb2 100755 --- a/lan/lan_en.json +++ b/lan/lan_en.json @@ -79,19 +79,16 @@ "常开模式": "Normal Open Mode", "常开时间": "Normal Open Time", "常开日期": "Normal Open Date", + "添加员工": "Add Employee", + "编辑员工": "Edit Employee", + "节假日": "Holidays", + "打卡方式": "Punching Mode", + "员工是否有钥匙": "If The Employee Has A Key", + "上班时间": "Office Hours", + "下班时间": "Closing Time", + "本周": "This Week", + "单休": "Single Rest", - "company": "Company", - "staff": "Staff", - "work": "Work", - "workday": "Workday", - "holidays": "Holidays", - "punchingMode": "Punching Mode", - "whetherTheEmployeeHasAKey": "If The Employee Has A Key", - "selectKey": "Select Key", - "officeHours": "Office Hours", - "closingTime": "Closing Time", - "thisWeek": "This Week", - "singleDayWeekend": "Single Day Weekend", "twoDaysOff": "Two Days Off", "oddOrEvenDaysOff": "Odd Or Even Days Off", "year": "Year", diff --git a/lan/lan_keys.json b/lan/lan_keys.json index e7389fe5..1d156d54 100755 --- a/lan/lan_keys.json +++ b/lan/lan_keys.json @@ -79,19 +79,16 @@ "常开模式":"常开模式", "常开时间": "常开时间", "常开日期": "常开日期", + "添加员工": "添加员工", + "编辑员工": "编辑员工", + "节假日":"节假日", + "打卡方式":"打卡方式", + "员工是否有钥匙":"员工是否有钥匙", + "上班时间":"上班时间", + "下班时间":"下班时间", + "本周": "本周", + "单休":"单休", - "company":"company", - "staff":"staff", - "work":"work", - "workday":"workday", - "holidays":"holidays", - "punchingMode":"punchingMode", - "whetherTheEmployeeHasAKey":"whetherTheEmployeeHasAKey", - "selectKey":"selectKey", - "officeHours":"officeHours", - "closingTime":"closingTime", - "thisWeek":"thisWeek", - "singleDayWeekend":"singleDayWeekend", "twoDaysOff":"twoDaysOff", "oddOrEvenDaysOff":"oddOrEvenDaysOff", "year":"year", diff --git a/lan/lan_zh.json b/lan/lan_zh.json index abe18616..558cbbe7 100755 --- a/lan/lan_zh.json +++ b/lan/lan_zh.json @@ -79,19 +79,16 @@ "常开模式": "常开模式", "常开时间": "常开时间", "常开日期": "常开日期", + "添加员工": "添加员工", + "编辑员工": "编辑员工", + "节假日": "节假日", + "打卡方式": "打卡方式", + "员工是否有钥匙": "员工是否有钥匙", + "上班时间": "上班时间", + "下班时间": "下班时间", + "本周": "本周", + "单休": "单休", - "company": "公司", - "staff": "员工", - "work": "工作", - "workday": "工作日", - "holidays": "节假日", - "punchingMode": "打卡方式", - "whetherTheEmployeeHasAKey": "员工是否有钥匙", - "selectKey": "选择钥匙", - "officeHours": "上班时间", - "closingTime": "下班时间", - "thisWeek": "本周", - "singleDayWeekend": "单休", "twoDaysOff": "双休", "oddOrEvenDaysOff": "单双休", "year": "年", @@ -440,6 +437,7 @@ "judgmentMethodContent": "人站在屋外,面向入户门。\n如果门的合页或门轴在左边,则门是左开;\n如果门的合页或门轴在右边,则门是右开。\n如果设置错误,将无法正常开关门。\n建议由安装或维修人员操作。", "customMode": "自定义模式", "videoSlot": "录像时段", + "密码": "密码", "卡": "卡", "指纹": "指纹", diff --git a/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart b/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart index 337ce4f7..a792b799 100755 --- a/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInSet/checkingInSet_page.dart @@ -48,7 +48,7 @@ class _CheckingInSetPageState extends State { showCupertinoAlertDialog(context); })), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.staff!.tr, + leftTitel: '员工'.tr, rightTitle: state.staffNumber.value, isHaveLine: true, isHaveDirection: true, @@ -75,8 +75,7 @@ class _CheckingInSetPageState extends State { } })), Obx(() => CommonItem( - leftTitel: - '${TranslationLoader.lanKeys!.workday!.tr}${TranslationLoader.lanKeys!.set!.tr}', + leftTitel: '工作日设置'.tr, rightTitle: state.isCustom.value == true ? state.weekDaysStr.value : (state.weekDays.value.length == 6 ? '单休' : '双休'), isHaveLine: true, isHaveDirection: true, @@ -96,7 +95,7 @@ class _CheckingInSetPageState extends State { } })), CommonItem( - leftTitel: TranslationLoader.lanKeys!.holidays!.tr, + leftTitel: '节假日'.tr, rightTitle: '', isHaveLine: false, isHaveDirection: true, diff --git a/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart b/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart index 2002d346..3411a201 100755 --- a/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInSetWorkTime/checkingInSetWorkTime_page.dart @@ -42,7 +42,7 @@ class _CheckingInSetWorkTimePageState extends State { return Column( children: [ Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.officeHours!.tr, + leftTitel: '上班时间'.tr, rightTitle: state.beginTime.value, isHaveDirection: true, isHaveLine: true, @@ -59,7 +59,7 @@ class _CheckingInSetWorkTimePageState extends State { }); })), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.closingTime!.tr, + leftTitel: '下班时间'.tr, rightTitle: state.endTime.value, isHaveDirection: true, action: () { diff --git a/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart b/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart index c5279af1..71d46bf5 100755 --- a/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInSetWorkdaySet/checkingInSetWorkdaySet_page.dart @@ -27,8 +27,7 @@ class _CheckingInSetWorkdaySetState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: - '${TranslationLoader.lanKeys!.workday!.tr} ${TranslationLoader.lanKeys!.set!.tr}', + barTitle: '工作日设置'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: ListView( @@ -120,12 +119,12 @@ class _CheckingInSetWorkdaySetState extends State { child: Column( children: [ CommonItem( - leftTitel: TranslationLoader.lanKeys!.thisWeek!.tr, + leftTitel: '本周'.tr, rightTitle: '', allHeight: 60.h, isHaveLine: true), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.singleDayWeekend!.tr, + leftTitel: '单休'.tr, rightTitle: '', allHeight: 60.h, isHaveLine: true, diff --git a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart index 71dd3526..7f052475 100755 --- a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetAddStaff/checkingInAddStaff_page.dart @@ -33,8 +33,7 @@ class _CheckingInAddStaffPageState extends State { return Scaffold( backgroundColor: AppColors.mainBackgroundColor, appBar: TitleAppBar( - barTitle: - "${state.isAdd.value == "1" ? '添加'.tr : "编辑".tr}${TranslationLoader.lanKeys!.staff!.tr}", + barTitle: state.isAdd.value == '1' ? '添加员工'.tr : '编辑员工'.tr, haveBack: true, backgroundColor: AppColors.mainColor), body: Column( @@ -50,7 +49,7 @@ class _CheckingInAddStaffPageState extends State { state.staffNameController)), // 选择打卡方式 Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.punchingMode!.tr, + leftTitel: '打卡方式'.tr, rightTitle: state.selectPrintingMethodStr.value, isHaveLine: false, isHaveDirection: true, @@ -425,7 +424,7 @@ class _CheckingInAddStaffPageState extends State { String title = ''; switch (int.parse(state.selectPrintingMethodType.value)) { case 1: - title = TranslationLoader.lanKeys!.whetherTheEmployeeHasAKey!.tr; + title = '员工是否有钥匙'.tr; break; case 2: title = TranslationLoader.lanKeys!.whetherTheEmployeeHasPassword!.tr; diff --git a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart index 49d7c06f..7a73d905 100755 --- a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInSetStaffList/checkingInStaffList_page.dart @@ -34,7 +34,7 @@ class _CheckingInStaffListPageState extends State { return Scaffold( backgroundColor: AppColors.greyBackgroundColor, appBar: TitleAppBar( - barTitle: TranslationLoader.lanKeys!.staff!.tr, + barTitle: '员工'.tr, haveBack: true, backgroundColor: AppColors.mainColor, actionsList: [ diff --git a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInStaffDetail/checkingInStaffDetail_page.dart b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInStaffDetail/checkingInStaffDetail_page.dart index a0a40fcc..3082b103 100755 --- a/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInStaffDetail/checkingInStaffDetail_page.dart +++ b/lib/main/lockDetail/checkingIn/checkingInStaff/checkingInStaffDetail/checkingInStaffDetail_page.dart @@ -53,7 +53,7 @@ class _CheckingInStaffDetailPageState extends State { rightTitle: state.staffListItemData.value.staffName, isHaveLine: true)), Obx(() => CommonItem( - leftTitel: TranslationLoader.lanKeys!.punchingMode!.tr, + leftTitel: '打卡方式'.tr, rightTitle: state.attendanceType.value, isHaveLine: true)), // Obx(() => CommonItem( diff --git a/lib/translations/lanKeyEntity.dart b/lib/translations/lanKeyEntity.dart index 356237f2..9ea45506 100755 --- a/lib/translations/lanKeyEntity.dart +++ b/lib/translations/lanKeyEntity.dart @@ -160,18 +160,18 @@ class LanKeyEntity { this.upgrade, this.leisure, this.checkedIn, - this.company, - this.staff, - this.work, - this.workday, - this.holidays, - this.punchingMode, - this.whetherTheEmployeeHasAKey, - this.selectKey, - this.officeHours, - this.closingTime, - this.thisWeek, - this.singleDayWeekend, + // this.company, + // this.staff, + // this.work, + // this.workday, + // this.holidays, + // this.punchingMode, + // this.whetherTheEmployeeHasAKey, + // this.selectKey, + // this.officeHours, + // this.closingTime, + // this.thisWeek, + // this.singleDayWeekend, this.twoDaysOff, this.oddOrEvenDaysOff, this.year, @@ -623,18 +623,19 @@ class LanKeyEntity { // earlyArrivalList = json['earlyArrivalList']; // lateList = json['lateList']; // hardWorkingList = json['hardWorkingList']; - company = json['company']; - staff = json['staff']; - work = json['work']; - workday = json['workday']; - holidays = json['holidays']; - punchingMode = json['punchingMode']; - whetherTheEmployeeHasAKey = json['whetherTheEmployeeHasAKey']; - selectKey = json['selectKey']; - officeHours = json['officeHours']; - closingTime = json['closingTime']; - thisWeek = json['thisWeek']; - singleDayWeekend = json['singleDayWeekend']; + // company = json['company']; + // staff = json['staff']; + // work = json['work']; + // workday = json['workday']; + // holidays = json['holidays']; + // punchingMode = json['punchingMode']; + // whetherTheEmployeeHasAKey = json['whetherTheEmployeeHasAKey']; + // selectKey = json['selectKey']; + // officeHours = json['officeHours']; + // closingTime = json['closingTime']; + // thisWeek = json['thisWeek']; + // singleDayWeekend = json['singleDayWeekend']; + twoDaysOff = json['twoDaysOff']; oddOrEvenDaysOff = json['oddOrEvenDaysOff']; year = json['year']; @@ -1091,18 +1092,18 @@ class LanKeyEntity { // String? earlyArrivalList; // String? lateList; // String? hardWorkingList; - String? company; - String? staff; - String? work; - String? workday; - String? holidays; - String? punchingMode; - String? whetherTheEmployeeHasAKey; - String? selectKey; - String? officeHours; - String? closingTime; - String? thisWeek; - String? singleDayWeekend; + // String? company; + // String? staff; + // String? work; + // String? workday; + // String? holidays; + // String? punchingMode; + // String? whetherTheEmployeeHasAKey; + // String? selectKey; + // String? officeHours; + // String? closingTime; + // String? thisWeek; + // String? singleDayWeekend; String? twoDaysOff; String? oddOrEvenDaysOff; String? year; @@ -1629,18 +1630,18 @@ class LanKeyEntity { map['nearbyEquipment'] = nearbyEquipment; map['noData'] = noData; map['doorMagneticListTopTip'] = doorMagneticListTopTip; - map['company'] = company; - map['staff'] = staff; - map['work'] = work; - map['workday'] = workday; - map['holidays'] = holidays; - map['punchingMode'] = punchingMode; - map['whetherTheEmployeeHasAKey'] = whetherTheEmployeeHasAKey; - map['selectKey'] = selectKey; - map['officeHours'] = officeHours; - map['closingTime'] = closingTime; - map['thisWeek'] = thisWeek; - map['singleDayWeekend'] = singleDayWeekend; + // map['company'] = company; + // map['staff'] = staff; + // map['work'] = work; + // map['workday'] = workday; + // map['holidays'] = holidays; + // map['punchingMode'] = punchingMode; + // map['whetherTheEmployeeHasAKey'] = whetherTheEmployeeHasAKey; + // map['selectKey'] = selectKey; + // map['officeHours'] = officeHours; + // map['closingTime'] = closingTime; + // map['thisWeek'] = thisWeek; + // map['singleDayWeekend'] = singleDayWeekend; map['twoDaysOff'] = twoDaysOff; map['oddOrEvenDaysOff'] = oddOrEvenDaysOff; map['year'] = year;