diff --git a/config/dev.env.js b/config/dev.env.js index c21f267..0151c0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://139.198.16.38:20005"' - BASE_API: '"http://192.168.0.225:8093"' + BASE_API: '"http://139.198.16.38:20006"' + // BASE_API: '"http://192.168.0.225:8093"' }) diff --git a/config/dev.env.js b/config/dev.env.js index c21f267..0151c0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://139.198.16.38:20005"' - BASE_API: '"http://192.168.0.225:8093"' + BASE_API: '"http://139.198.16.38:20006"' + // BASE_API: '"http://192.168.0.225:8093"' }) diff --git a/src/api/query.js b/src/api/query.js index 2fdedee..5117a9c 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -99,4 +99,4 @@ params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) -} \ No newline at end of file +} diff --git a/config/dev.env.js b/config/dev.env.js index c21f267..0151c0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://139.198.16.38:20005"' - BASE_API: '"http://192.168.0.225:8093"' + BASE_API: '"http://139.198.16.38:20006"' + // BASE_API: '"http://192.168.0.225:8093"' }) diff --git a/src/api/query.js b/src/api/query.js index 2fdedee..5117a9c 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -99,4 +99,4 @@ params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) -} \ No newline at end of file +} diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue index bb1db56..bb62a03 100644 --- a/src/views/deviceManage/editDevice.vue +++ b/src/views/deviceManage/editDevice.vue @@ -1,16 +1,16 @@ @@ -52,7 +52,7 @@ data() { var logchecklist = (rule, value, callback) => { if (this.checkList.length === 0) { - callback(new Error('请选择设备类别')) + callback(new Error('Please select device type')) } else { callback() } @@ -60,12 +60,12 @@ const validateIp = (rule, value, callback) => { if (value !== '') { if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) { - callback(new Error('请填写正确的ip地址')) + callback(new Error('Please fill in the correct IP address')) } else { callback() } } else { - callback(new Error('ip地址不能为空')) + callback(new Error('The IP address cannot be null')) } } return { @@ -79,17 +79,17 @@ description: '' }, // 表单 textMap: { - update: '编辑', - create: '新增', - detail: '详情' + update: 'Edit', + create: 'Add', + detail: 'Detail' }, // 表头显示标题 deviceTypeList: null, // 设备类型列表 deviceModelList: null, // 设备型号列表 showDeviceType: true, // 是否显示设备类型选项 showModelType: true, // 是否显示型号选项 rules: { - devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], - devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }], + devCode: [{ required: true, message: 'The device code cannot be null', trigger: ['blur', 'change'] }], + devType: [{ validator: logchecklist, required: true, message: 'Please select device type', trigger: ['blur', 'change'] }], devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }] }, // 前端校验规则 isEditMode: false @@ -160,9 +160,9 @@ that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1) addDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', + this.$confirm('Add success, continue to add?', 'Message', { + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'info' }).then(() => { this.resetForm() @@ -191,7 +191,7 @@ console.log(that.deviceForm) updateDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$message.success('修改成功') + this.$message.success('Edit successfully') this.$emit('watchChild') this.dialogFormVisible = false } diff --git a/config/dev.env.js b/config/dev.env.js index c21f267..0151c0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://139.198.16.38:20005"' - BASE_API: '"http://192.168.0.225:8093"' + BASE_API: '"http://139.198.16.38:20006"' + // BASE_API: '"http://192.168.0.225:8093"' }) diff --git a/src/api/query.js b/src/api/query.js index 2fdedee..5117a9c 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -99,4 +99,4 @@ params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) -} \ No newline at end of file +} diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue index bb1db56..bb62a03 100644 --- a/src/views/deviceManage/editDevice.vue +++ b/src/views/deviceManage/editDevice.vue @@ -1,16 +1,16 @@ @@ -52,7 +52,7 @@ data() { var logchecklist = (rule, value, callback) => { if (this.checkList.length === 0) { - callback(new Error('请选择设备类别')) + callback(new Error('Please select device type')) } else { callback() } @@ -60,12 +60,12 @@ const validateIp = (rule, value, callback) => { if (value !== '') { if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) { - callback(new Error('请填写正确的ip地址')) + callback(new Error('Please fill in the correct IP address')) } else { callback() } } else { - callback(new Error('ip地址不能为空')) + callback(new Error('The IP address cannot be null')) } } return { @@ -79,17 +79,17 @@ description: '' }, // 表单 textMap: { - update: '编辑', - create: '新增', - detail: '详情' + update: 'Edit', + create: 'Add', + detail: 'Detail' }, // 表头显示标题 deviceTypeList: null, // 设备类型列表 deviceModelList: null, // 设备型号列表 showDeviceType: true, // 是否显示设备类型选项 showModelType: true, // 是否显示型号选项 rules: { - devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], - devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }], + devCode: [{ required: true, message: 'The device code cannot be null', trigger: ['blur', 'change'] }], + devType: [{ validator: logchecklist, required: true, message: 'Please select device type', trigger: ['blur', 'change'] }], devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }] }, // 前端校验规则 isEditMode: false @@ -160,9 +160,9 @@ that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1) addDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', + this.$confirm('Add success, continue to add?', 'Message', { + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'info' }).then(() => { this.resetForm() @@ -191,7 +191,7 @@ console.log(that.deviceForm) updateDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$message.success('修改成功') + this.$message.success('Edit successfully') this.$emit('watchChild') this.dialogFormVisible = false } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 8a3c16b..bf381d8 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -3,26 +3,26 @@
-
设备列表
 +
Equipment list
 - 同步识别记录 - 设备数据下发 - 删除 - 新增 + Synchronize recognition records + Send data to device + Delete + Add - + - + @@ -71,23 +71,23 @@ }, // 筛选条件 columns: [ { - text: '设备编号', + text: 'Device code', value: 'devCode', align: 'center', width: 140 }, { - text: '业务类型', + text: 'Device types', value: 'devTypeName', align: 'center' }, { - text: '设备IP', + text: 'Device IP', value: 'devIp', align: 'center' }, { - text: '描述', + text: 'Description', value: 'description', align: 'center' } @@ -150,23 +150,23 @@ }) // wellNames = wellNames.slice(0, wellNames.length - 1) this.$confirm( - '确定要删除所选设备吗？', - '确认操作', + 'Are you sure to delete the selected device？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { delDevice(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('删除成功') + this.$message.success('Delete successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 删除设备 @@ -177,23 +177,23 @@ deviceIds.push(value.id) }) this.$confirm( - '确定要将数据下发到所选设备吗？', - '确认操作', + 'Are you sure to send data to the selected devices？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { updateDB(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('下发成功') + this.$message.success('Send successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, syncRecords() { @@ -207,7 +207,7 @@ this.syncRecordShow = true this.$refs.syncRecord.initDialog(this.dialogFormVisible, deviceIds) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 查询数据 diff --git a/config/dev.env.js b/config/dev.env.js index c21f267..0151c0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://139.198.16.38:20005"' - BASE_API: '"http://192.168.0.225:8093"' + BASE_API: '"http://139.198.16.38:20006"' + // BASE_API: '"http://192.168.0.225:8093"' }) diff --git a/src/api/query.js b/src/api/query.js index 2fdedee..5117a9c 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -99,4 +99,4 @@ params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) -} \ No newline at end of file +} diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue index bb1db56..bb62a03 100644 --- a/src/views/deviceManage/editDevice.vue +++ b/src/views/deviceManage/editDevice.vue @@ -1,16 +1,16 @@ @@ -52,7 +52,7 @@ data() { var logchecklist = (rule, value, callback) => { if (this.checkList.length === 0) { - callback(new Error('请选择设备类别')) + callback(new Error('Please select device type')) } else { callback() } @@ -60,12 +60,12 @@ const validateIp = (rule, value, callback) => { if (value !== '') { if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) { - callback(new Error('请填写正确的ip地址')) + callback(new Error('Please fill in the correct IP address')) } else { callback() } } else { - callback(new Error('ip地址不能为空')) + callback(new Error('The IP address cannot be null')) } } return { @@ -79,17 +79,17 @@ description: '' }, // 表单 textMap: { - update: '编辑', - create: '新增', - detail: '详情' + update: 'Edit', + create: 'Add', + detail: 'Detail' }, // 表头显示标题 deviceTypeList: null, // 设备类型列表 deviceModelList: null, // 设备型号列表 showDeviceType: true, // 是否显示设备类型选项 showModelType: true, // 是否显示型号选项 rules: { - devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], - devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }], + devCode: [{ required: true, message: 'The device code cannot be null', trigger: ['blur', 'change'] }], + devType: [{ validator: logchecklist, required: true, message: 'Please select device type', trigger: ['blur', 'change'] }], devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }] }, // 前端校验规则 isEditMode: false @@ -160,9 +160,9 @@ that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1) addDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', + this.$confirm('Add success, continue to add?', 'Message', { + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'info' }).then(() => { this.resetForm() @@ -191,7 +191,7 @@ console.log(that.deviceForm) updateDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$message.success('修改成功') + this.$message.success('Edit successfully') this.$emit('watchChild') this.dialogFormVisible = false } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 8a3c16b..bf381d8 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -3,26 +3,26 @@
-
设备列表
 +
Equipment list
 - 同步识别记录 - 设备数据下发 - 删除 - 新增 + Synchronize recognition records + Send data to device + Delete + Add - + - + @@ -71,23 +71,23 @@ }, // 筛选条件 columns: [ { - text: '设备编号', + text: 'Device code', value: 'devCode', align: 'center', width: 140 }, { - text: '业务类型', + text: 'Device types', value: 'devTypeName', align: 'center' }, { - text: '设备IP', + text: 'Device IP', value: 'devIp', align: 'center' }, { - text: '描述', + text: 'Description', value: 'description', align: 'center' } @@ -150,23 +150,23 @@ }) // wellNames = wellNames.slice(0, wellNames.length - 1) this.$confirm( - '确定要删除所选设备吗？', - '确认操作', + 'Are you sure to delete the selected device？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { delDevice(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('删除成功') + this.$message.success('Delete successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 删除设备 @@ -177,23 +177,23 @@ deviceIds.push(value.id) }) this.$confirm( - '确定要将数据下发到所选设备吗？', - '确认操作', + 'Are you sure to send data to the selected devices？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { updateDB(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('下发成功') + this.$message.success('Send successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, syncRecords() { @@ -207,7 +207,7 @@ this.syncRecordShow = true this.$refs.syncRecord.initDialog(this.dialogFormVisible, deviceIds) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 查询数据 diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue index 59481d0..92b96b5 100644 --- a/src/views/deviceManage/syncRecord.vue +++ b/src/views/deviceManage/syncRecord.vue @@ -1,7 +1,7 @@ @@ -40,7 +40,7 @@ timeRange: [], pickerOptions: { shortcuts: [{ - text: '昨天', + text: 'Yesterday', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(1, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) @@ -48,14 +48,14 @@ picker.$emit('pick', [start, end]) } }, { - text: '最近三天', + text: 'The last three days', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(3, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) picker.$emit('pick', [start, end]) } }, { - text: '最近一周', + text: 'The last week', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(7, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) @@ -102,12 +102,12 @@ let end = moment(this.timeRange[1]) if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) { - this.$message.warning('日期范围不能大于7天') + this.$message.warning('The date range cannot be more than 7 days') end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59') s = s.format('yyyy-MM-DD 00:00:00') } if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) { - this.$message.warning('日期范围不能大于7天') + this.$message.warning('The date range cannot be more than 7 days') end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00') s = s.format('YYYY-MM-DD 23:59:59') } @@ -134,7 +134,7 @@ console.log(res) if (res.code === 200) { this.loading = false - this.$message.success('同步成功') + this.$message.success('Synchronize successfully') this.dialogFormVisible = false this.$emit('watchChild') } @@ -159,6 +159,5 @@ diff --git a/config/dev.env.js b/config/dev.env.js index c21f267..0151c0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://139.198.16.38:20005"' - BASE_API: '"http://192.168.0.225:8093"' + BASE_API: '"http://139.198.16.38:20006"' + // BASE_API: '"http://192.168.0.225:8093"' }) diff --git a/src/api/query.js b/src/api/query.js index 2fdedee..5117a9c 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -99,4 +99,4 @@ params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) -} \ No newline at end of file +} diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue index bb1db56..bb62a03 100644 --- a/src/views/deviceManage/editDevice.vue +++ b/src/views/deviceManage/editDevice.vue @@ -1,16 +1,16 @@ @@ -52,7 +52,7 @@ data() { var logchecklist = (rule, value, callback) => { if (this.checkList.length === 0) { - callback(new Error('请选择设备类别')) + callback(new Error('Please select device type')) } else { callback() } @@ -60,12 +60,12 @@ const validateIp = (rule, value, callback) => { if (value !== '') { if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) { - callback(new Error('请填写正确的ip地址')) + callback(new Error('Please fill in the correct IP address')) } else { callback() } } else { - callback(new Error('ip地址不能为空')) + callback(new Error('The IP address cannot be null')) } } return { @@ -79,17 +79,17 @@ description: '' }, // 表单 textMap: { - update: '编辑', - create: '新增', - detail: '详情' + update: 'Edit', + create: 'Add', + detail: 'Detail' }, // 表头显示标题 deviceTypeList: null, // 设备类型列表 deviceModelList: null, // 设备型号列表 showDeviceType: true, // 是否显示设备类型选项 showModelType: true, // 是否显示型号选项 rules: { - devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], - devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }], + devCode: [{ required: true, message: 'The device code cannot be null', trigger: ['blur', 'change'] }], + devType: [{ validator: logchecklist, required: true, message: 'Please select device type', trigger: ['blur', 'change'] }], devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }] }, // 前端校验规则 isEditMode: false @@ -160,9 +160,9 @@ that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1) addDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', + this.$confirm('Add success, continue to add?', 'Message', { + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'info' }).then(() => { this.resetForm() @@ -191,7 +191,7 @@ console.log(that.deviceForm) updateDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$message.success('修改成功') + this.$message.success('Edit successfully') this.$emit('watchChild') this.dialogFormVisible = false } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 8a3c16b..bf381d8 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -3,26 +3,26 @@
-
设备列表
 +
Equipment list
 - 同步识别记录 - 设备数据下发 - 删除 - 新增 + Synchronize recognition records + Send data to device + Delete + Add - + - + @@ -71,23 +71,23 @@ }, // 筛选条件 columns: [ { - text: '设备编号', + text: 'Device code', value: 'devCode', align: 'center', width: 140 }, { - text: '业务类型', + text: 'Device types', value: 'devTypeName', align: 'center' }, { - text: '设备IP', + text: 'Device IP', value: 'devIp', align: 'center' }, { - text: '描述', + text: 'Description', value: 'description', align: 'center' } @@ -150,23 +150,23 @@ }) // wellNames = wellNames.slice(0, wellNames.length - 1) this.$confirm( - '确定要删除所选设备吗？', - '确认操作', + 'Are you sure to delete the selected device？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { delDevice(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('删除成功') + this.$message.success('Delete successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 删除设备 @@ -177,23 +177,23 @@ deviceIds.push(value.id) }) this.$confirm( - '确定要将数据下发到所选设备吗？', - '确认操作', + 'Are you sure to send data to the selected devices？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { updateDB(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('下发成功') + this.$message.success('Send successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, syncRecords() { @@ -207,7 +207,7 @@ this.syncRecordShow = true this.$refs.syncRecord.initDialog(this.dialogFormVisible, deviceIds) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 查询数据 diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue index 59481d0..92b96b5 100644 --- a/src/views/deviceManage/syncRecord.vue +++ b/src/views/deviceManage/syncRecord.vue @@ -1,7 +1,7 @@ @@ -40,7 +40,7 @@ timeRange: [], pickerOptions: { shortcuts: [{ - text: '昨天', + text: 'Yesterday', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(1, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) @@ -48,14 +48,14 @@ picker.$emit('pick', [start, end]) } }, { - text: '最近三天', + text: 'The last three days', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(3, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) picker.$emit('pick', [start, end]) } }, { - text: '最近一周', + text: 'The last week', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(7, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) @@ -102,12 +102,12 @@ let end = moment(this.timeRange[1]) if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) { - this.$message.warning('日期范围不能大于7天') + this.$message.warning('The date range cannot be more than 7 days') end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59') s = s.format('yyyy-MM-DD 00:00:00') } if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) { - this.$message.warning('日期范围不能大于7天') + this.$message.warning('The date range cannot be more than 7 days') end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00') s = s.format('YYYY-MM-DD 23:59:59') } @@ -134,7 +134,7 @@ console.log(res) if (res.code === 200) { this.loading = false - this.$message.success('同步成功') + this.$message.success('Synchronize successfully') this.dialogFormVisible = false this.$emit('watchChild') } @@ -159,6 +159,5 @@ diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue index e65e74c..aa4f037 100644 --- a/src/views/memberManage/addIris.vue +++ b/src/views/memberManage/addIris.vue @@ -78,7 +78,7 @@ // 保存虹膜数据 saveIrisData() { if (!this.irisForm.personId || !this.irisForm.idCardNo) { - this.$message.error('人员信息为空，请退回重试') + this.$message.error('The personnel information is empty. Please return to retry') return } this.irisForm.image_zy0 = window.frames['iframeMap'].image0 @@ -87,7 +87,7 @@ this.irisForm.image_yy1 = window.frames['iframeMap'].image3 saveIris(this.irisForm).then(response => { if (response.code === 200) { - this.$message.success('保存虹膜成功') + this.$message.success('Iris saved successfully') this.resetForm() this.$router.push({ path: '/staff' }) } diff --git a/config/dev.env.js b/config/dev.env.js index c21f267..0151c0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://139.198.16.38:20005"' - BASE_API: '"http://192.168.0.225:8093"' + BASE_API: '"http://139.198.16.38:20006"' + // BASE_API: '"http://192.168.0.225:8093"' }) diff --git a/src/api/query.js b/src/api/query.js index 2fdedee..5117a9c 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -99,4 +99,4 @@ params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) -} \ No newline at end of file +} diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue index bb1db56..bb62a03 100644 --- a/src/views/deviceManage/editDevice.vue +++ b/src/views/deviceManage/editDevice.vue @@ -1,16 +1,16 @@ @@ -52,7 +52,7 @@ data() { var logchecklist = (rule, value, callback) => { if (this.checkList.length === 0) { - callback(new Error('请选择设备类别')) + callback(new Error('Please select device type')) } else { callback() } @@ -60,12 +60,12 @@ const validateIp = (rule, value, callback) => { if (value !== '') { if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) { - callback(new Error('请填写正确的ip地址')) + callback(new Error('Please fill in the correct IP address')) } else { callback() } } else { - callback(new Error('ip地址不能为空')) + callback(new Error('The IP address cannot be null')) } } return { @@ -79,17 +79,17 @@ description: '' }, // 表单 textMap: { - update: '编辑', - create: '新增', - detail: '详情' + update: 'Edit', + create: 'Add', + detail: 'Detail' }, // 表头显示标题 deviceTypeList: null, // 设备类型列表 deviceModelList: null, // 设备型号列表 showDeviceType: true, // 是否显示设备类型选项 showModelType: true, // 是否显示型号选项 rules: { - devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], - devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }], + devCode: [{ required: true, message: 'The device code cannot be null', trigger: ['blur', 'change'] }], + devType: [{ validator: logchecklist, required: true, message: 'Please select device type', trigger: ['blur', 'change'] }], devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }] }, // 前端校验规则 isEditMode: false @@ -160,9 +160,9 @@ that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1) addDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', + this.$confirm('Add success, continue to add?', 'Message', { + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'info' }).then(() => { this.resetForm() @@ -191,7 +191,7 @@ console.log(that.deviceForm) updateDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$message.success('修改成功') + this.$message.success('Edit successfully') this.$emit('watchChild') this.dialogFormVisible = false } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 8a3c16b..bf381d8 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -3,26 +3,26 @@
-
设备列表
 +
Equipment list
 - 同步识别记录 - 设备数据下发 - 删除 - 新增 + Synchronize recognition records + Send data to device + Delete + Add - + - + @@ -71,23 +71,23 @@ }, // 筛选条件 columns: [ { - text: '设备编号', + text: 'Device code', value: 'devCode', align: 'center', width: 140 }, { - text: '业务类型', + text: 'Device types', value: 'devTypeName', align: 'center' }, { - text: '设备IP', + text: 'Device IP', value: 'devIp', align: 'center' }, { - text: '描述', + text: 'Description', value: 'description', align: 'center' } @@ -150,23 +150,23 @@ }) // wellNames = wellNames.slice(0, wellNames.length - 1) this.$confirm( - '确定要删除所选设备吗？', - '确认操作', + 'Are you sure to delete the selected device？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { delDevice(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('删除成功') + this.$message.success('Delete successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 删除设备 @@ -177,23 +177,23 @@ deviceIds.push(value.id) }) this.$confirm( - '确定要将数据下发到所选设备吗？', - '确认操作', + 'Are you sure to send data to the selected devices？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { updateDB(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('下发成功') + this.$message.success('Send successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, syncRecords() { @@ -207,7 +207,7 @@ this.syncRecordShow = true this.$refs.syncRecord.initDialog(this.dialogFormVisible, deviceIds) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 查询数据 diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue index 59481d0..92b96b5 100644 --- a/src/views/deviceManage/syncRecord.vue +++ b/src/views/deviceManage/syncRecord.vue @@ -1,7 +1,7 @@ @@ -40,7 +40,7 @@ timeRange: [], pickerOptions: { shortcuts: [{ - text: '昨天', + text: 'Yesterday', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(1, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) @@ -48,14 +48,14 @@ picker.$emit('pick', [start, end]) } }, { - text: '最近三天', + text: 'The last three days', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(3, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) picker.$emit('pick', [start, end]) } }, { - text: '最近一周', + text: 'The last week', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(7, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) @@ -102,12 +102,12 @@ let end = moment(this.timeRange[1]) if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) { - this.$message.warning('日期范围不能大于7天') + this.$message.warning('The date range cannot be more than 7 days') end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59') s = s.format('yyyy-MM-DD 00:00:00') } if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) { - this.$message.warning('日期范围不能大于7天') + this.$message.warning('The date range cannot be more than 7 days') end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00') s = s.format('YYYY-MM-DD 23:59:59') } @@ -134,7 +134,7 @@ console.log(res) if (res.code === 200) { this.loading = false - this.$message.success('同步成功') + this.$message.success('Synchronize successfully') this.dialogFormVisible = false this.$emit('watchChild') } @@ -159,6 +159,5 @@ diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue index e65e74c..aa4f037 100644 --- a/src/views/memberManage/addIris.vue +++ b/src/views/memberManage/addIris.vue @@ -78,7 +78,7 @@ // 保存虹膜数据 saveIrisData() { if (!this.irisForm.personId || !this.irisForm.idCardNo) { - this.$message.error('人员信息为空，请退回重试') + this.$message.error('The personnel information is empty. Please return to retry') return } this.irisForm.image_zy0 = window.frames['iframeMap'].image0 @@ -87,7 +87,7 @@ this.irisForm.image_yy1 = window.frames['iframeMap'].image3 saveIris(this.irisForm).then(response => { if (response.code === 200) { - this.$message.success('保存虹膜成功') + this.$message.success('Iris saved successfully') this.resetForm() this.$router.push({ path: '/staff' }) } diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index da6fca2..fe6de5e 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -5,47 +5,47 @@ - - + + - - + + - - + + - - + + - + + placeholder="Select date"/> - - + + - - + + @@ -53,13 +53,13 @@ - - + + - - + + @@ -67,22 +67,22 @@ - - + + - - + + - - + + @@ -105,11 +105,11 @@ class="avatar-uploader" action="string" accept=".jpg,.jpeg,.png"> - 点击上传照片 + Upload photo - 读取身份证 + Read id card @@ -117,9 +117,9 @@
- 重置 - 保存 - 下一步，注册虹膜 + Reset + Save + Next, Collect iris
@@ -145,12 +145,12 @@ const validateIDCard = (rule, value, callback) => { if (value !== '') { if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) { - callback(new Error('请输入合法的身份证号')) + callback(new Error('Please enter a valid id number')) } else { callback() } } else { - callback(new Error('身份证号不能为空')) + callback(new Error('The id number cannot be empty')) } } return { @@ -185,13 +185,13 @@ dutyList: [], // 职务列表 nationList: [], // 民族列表 rules: { - personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }], - name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }], + personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }], + name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }], idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }], - deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }], - duty: [{ required: true, message: '职务必选', trigger: 'change' }], - sex: [{ required: true, message: '性别必选', trigger: 'blur' }], - birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }] + deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }], + duty: [{ required: true, message: 'Duty is required', trigger: 'change' }], + sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }], + birthday: [{ required: true, message: 'Birth date is required', trigger: ['blur'] }] }, dialogVisible: false, labelPosition: 'right', @@ -304,7 +304,7 @@ this.personForm.ext.certificationUnit = window.frames['iframeIDCard'].IssuedAt this.personForm.ext.address = window.frames['iframeIDCard'].Address } else { - this.$message.warning('读卡失败') + this.$message.warning('Read failed') } // const baseUrl = getProject().register_url // // const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo @@ -362,7 +362,7 @@ this.personForm.id = response.data.id this.personForm.personCode = response.data.code this.isSave = true - this.$message.success('保存成功!') + this.$message.success('Save successfully!') } this.canSave = true }).catch(() => { @@ -371,14 +371,14 @@ } else if (this.isSave === true && this.isEditMode === false) { updatePerson(this.personForm).then(response => { if (response.code === 200) { - this.$message.success('保存成功!') + this.$message.success('Save successfully!') } this.canSave = true }) } else { updatePerson(this.personForm).then(response => { if (response.code === 200) { - this.$message.success('保存成功!') + this.$message.success('Save successfully!') } this.canSave = true }) @@ -402,7 +402,7 @@ window.location.href = url } } else { - this.$message.warning('请先保存用户基本信息') + this.$message.warning('Please save the basic information first') } }, // 图片上传 @@ -429,11 +429,11 @@ console.log(file.size) const isLt2M = file.size / 1024 < 200 if (!isJPG) { - this.$message.error('上传图片只能是 JPG 或 PNG 格式!') + this.$message.error('Only JPG or PNG formats are supported!') res = false } if (!isLt2M) { - this.$message.error('上传图片大小不能超过 200KB!') + this.$message.error('The image size cannot exceed 200KB!') res = false } return res diff --git a/config/dev.env.js b/config/dev.env.js index c21f267..0151c0c 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,6 +6,6 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://139.198.16.38:20005"' - BASE_API: '"http://192.168.0.225:8093"' + BASE_API: '"http://139.198.16.38:20006"' + // BASE_API: '"http://192.168.0.225:8093"' }) diff --git a/src/api/query.js b/src/api/query.js index 2fdedee..5117a9c 100644 --- a/src/api/query.js +++ b/src/api/query.js @@ -99,4 +99,4 @@ params, responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob }) -} \ No newline at end of file +} diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue index bb1db56..bb62a03 100644 --- a/src/views/deviceManage/editDevice.vue +++ b/src/views/deviceManage/editDevice.vue @@ -1,16 +1,16 @@ @@ -52,7 +52,7 @@ data() { var logchecklist = (rule, value, callback) => { if (this.checkList.length === 0) { - callback(new Error('请选择设备类别')) + callback(new Error('Please select device type')) } else { callback() } @@ -60,12 +60,12 @@ const validateIp = (rule, value, callback) => { if (value !== '') { if ((/((25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))/).test(value) === false) { - callback(new Error('请填写正确的ip地址')) + callback(new Error('Please fill in the correct IP address')) } else { callback() } } else { - callback(new Error('ip地址不能为空')) + callback(new Error('The IP address cannot be null')) } } return { @@ -79,17 +79,17 @@ description: '' }, // 表单 textMap: { - update: '编辑', - create: '新增', - detail: '详情' + update: 'Edit', + create: 'Add', + detail: 'Detail' }, // 表头显示标题 deviceTypeList: null, // 设备类型列表 deviceModelList: null, // 设备型号列表 showDeviceType: true, // 是否显示设备类型选项 showModelType: true, // 是否显示型号选项 rules: { - devCode: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], - devType: [{ validator: logchecklist, required: true, message: '请选择业务类型', trigger: ['blur', 'change'] }], + devCode: [{ required: true, message: 'The device code cannot be null', trigger: ['blur', 'change'] }], + devType: [{ validator: logchecklist, required: true, message: 'Please select device type', trigger: ['blur', 'change'] }], devIp: [{ validator: validateIp, required: true, trigger: ['blur', 'change'] }] }, // 前端校验规则 isEditMode: false @@ -160,9 +160,9 @@ that.deviceForm.devType = that.deviceForm.devType.substr(0, that.deviceForm.devType.length - 1) addDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$confirm('新增成功，是否继续新增?', '提示', { - confirmButtonText: '是', - cancelButtonText: '否', + this.$confirm('Add success, continue to add?', 'Message', { + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'info' }).then(() => { this.resetForm() @@ -191,7 +191,7 @@ console.log(that.deviceForm) updateDevice(that.deviceForm).then(response => { if (response.code === 200) { - this.$message.success('修改成功') + this.$message.success('Edit successfully') this.$emit('watchChild') this.dialogFormVisible = false } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 8a3c16b..bf381d8 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -3,26 +3,26 @@
-
设备列表
 +
Equipment list
 - 同步识别记录 - 设备数据下发 - 删除 - 新增 + Synchronize recognition records + Send data to device + Delete + Add - + - + @@ -71,23 +71,23 @@ }, // 筛选条件 columns: [ { - text: '设备编号', + text: 'Device code', value: 'devCode', align: 'center', width: 140 }, { - text: '业务类型', + text: 'Device types', value: 'devTypeName', align: 'center' }, { - text: '设备IP', + text: 'Device IP', value: 'devIp', align: 'center' }, { - text: '描述', + text: 'Description', value: 'description', align: 'center' } @@ -150,23 +150,23 @@ }) // wellNames = wellNames.slice(0, wellNames.length - 1) this.$confirm( - '确定要删除所选设备吗？', - '确认操作', + 'Are you sure to delete the selected device？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { delDevice(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('删除成功') + this.$message.success('Delete successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 删除设备 @@ -177,23 +177,23 @@ deviceIds.push(value.id) }) this.$confirm( - '确定要将数据下发到所选设备吗？', - '确认操作', + 'Are you sure to send data to the selected devices？', + 'Confirm the operation', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: 'Yes', + cancelButtonText: 'No', type: 'warning' } ).then(() => { updateDB(deviceIds).then(response => { if (response.code === 200) { - this.$message.success('下发成功') + this.$message.success('Send successfully') this.fetchData() } }) }) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, syncRecords() { @@ -207,7 +207,7 @@ this.syncRecordShow = true this.$refs.syncRecord.initDialog(this.dialogFormVisible, deviceIds) } else { - this.$message.error('至少选中一项') + this.$message.error('Choose one device at least') } }, // 查询数据 diff --git a/src/views/deviceManage/syncRecord.vue b/src/views/deviceManage/syncRecord.vue index 59481d0..92b96b5 100644 --- a/src/views/deviceManage/syncRecord.vue +++ b/src/views/deviceManage/syncRecord.vue @@ -1,7 +1,7 @@ @@ -40,7 +40,7 @@ timeRange: [], pickerOptions: { shortcuts: [{ - text: '昨天', + text: 'Yesterday', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(1, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) @@ -48,14 +48,14 @@ picker.$emit('pick', [start, end]) } }, { - text: '最近三天', + text: 'The last three days', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(3, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) picker.$emit('pick', [start, end]) } }, { - text: '最近一周', + text: 'The last week', onClick(picker) { const end = moment().subtract(1, 'days').set({ hour: 23, minute: 59, second: 59, millisecond: 999 }) const start = moment().subtract(7, 'days').set({ hour: 0, minute: 0, second: 0, millisecond: 0 }) @@ -102,12 +102,12 @@ let end = moment(this.timeRange[1]) if (end.valueOf() - s.valueOf() > (7 * 24 * 60 * 60 * 1000)) { - this.$message.warning('日期范围不能大于7天') + this.$message.warning('The date range cannot be more than 7 days') end = moment(s).add(7, 'days').format('YYYY-MM-DD 23:59:59') s = s.format('yyyy-MM-DD 00:00:00') } if (s.valueOf() - end.valueOf() > (7 * 24 * 60 * 60 * 1000)) { - this.$message.warning('日期范围不能大于7天') + this.$message.warning('The date range cannot be more than 7 days') end = moment(s).subtract(7, 'days').format('YYYY-MM-DD 00:00:00') s = s.format('YYYY-MM-DD 23:59:59') } @@ -134,7 +134,7 @@ console.log(res) if (res.code === 200) { this.loading = false - this.$message.success('同步成功') + this.$message.success('Synchronize successfully') this.dialogFormVisible = false this.$emit('watchChild') } @@ -159,6 +159,5 @@ diff --git a/src/views/memberManage/addIris.vue b/src/views/memberManage/addIris.vue index e65e74c..aa4f037 100644 --- a/src/views/memberManage/addIris.vue +++ b/src/views/memberManage/addIris.vue @@ -78,7 +78,7 @@ // 保存虹膜数据 saveIrisData() { if (!this.irisForm.personId || !this.irisForm.idCardNo) { - this.$message.error('人员信息为空，请退回重试') + this.$message.error('The personnel information is empty. Please return to retry') return } this.irisForm.image_zy0 = window.frames['iframeMap'].image0 @@ -87,7 +87,7 @@ this.irisForm.image_yy1 = window.frames['iframeMap'].image3 saveIris(this.irisForm).then(response => { if (response.code === 200) { - this.$message.success('保存虹膜成功') + this.$message.success('Iris saved successfully') this.resetForm() this.$router.push({ path: '/staff' }) } diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue index da6fca2..fe6de5e 100644 --- a/src/views/memberManage/addPerson.vue +++ b/src/views/memberManage/addPerson.vue @@ -5,47 +5,47 @@ - - + + - - + + - - + + - - + + - + + placeholder="Select date"/> - - + + - - + + @@ -53,13 +53,13 @@ - - + + - - + + @@ -67,22 +67,22 @@ - - + + - - + + - - + + @@ -105,11 +105,11 @@ class="avatar-uploader" action="string" accept=".jpg,.jpeg,.png"> - 点击上传照片 + Upload photo - 读取身份证 + Read id card @@ -117,9 +117,9 @@
- 重置 - 保存 - 下一步，注册虹膜 + Reset + Save + Next, Collect iris
@@ -145,12 +145,12 @@ const validateIDCard = (rule, value, callback) => { if (value !== '') { if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) { - callback(new Error('请输入合法的身份证号')) + callback(new Error('Please enter a valid id number')) } else { callback() } } else { - callback(new Error('身份证号不能为空')) + callback(new Error('The id number cannot be empty')) } } return { @@ -185,13 +185,13 @@ dutyList: [], // 职务列表 nationList: [], // 民族列表 rules: { - personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }], - name: [{ required: true, message: '姓名必填', trigger: ['blur', 'change'] }], + personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }], + name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }], idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }], - deptid: [{ required: true, message: '单位/部门必选', trigger: 'change' }], - duty: [{ required: true, message: '职务必选', trigger: 'change' }], - sex: [{ required: true, message: '性别必选', trigger: 'blur' }], - birthday: [{ required: true, message: '出生日期必填', trigger: ['blur'] }] + deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }], + duty: [{ required: true, message: 'Duty is required', trigger: 'change' }], + sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }], + birthday: [{ required: true, message: 'Birth date is required', trigger: ['blur'] }] }, dialogVisible: false, labelPosition: 'right', @@ -304,7 +304,7 @@ this.personForm.ext.certificationUnit = window.frames['iframeIDCard'].IssuedAt this.personForm.ext.address = window.frames['iframeIDCard'].Address } else { - this.$message.warning('读卡失败') + this.$message.warning('Read failed') } // const baseUrl = getProject().register_url // // const url = 'openIE:' + baseUrl + '?token=' + token + '_id=' + id + '_idCardNo=' + idCardNo @@ -362,7 +362,7 @@ this.personForm.id = response.data.id this.personForm.personCode = response.data.code this.isSave = true - this.$message.success('保存成功!') + this.$message.success('Save successfully!') } this.canSave = true }).catch(() => { @@ -371,14 +371,14 @@ } else if (this.isSave === true && this.isEditMode === false) { updatePerson(this.personForm).then(response => { if (response.code === 200) { - this.$message.success('保存成功!') + this.$message.success('Save successfully!') } this.canSave = true }) } else { updatePerson(this.personForm).then(response => { if (response.code === 200) { - this.$message.success('保存成功!') + this.$message.success('Save successfully!') } this.canSave = true }) @@ -402,7 +402,7 @@ window.location.href = url } } else { - this.$message.warning('请先保存用户基本信息') + this.$message.warning('Please save the basic information first') } }, // 图片上传 @@ -429,11 +429,11 @@ console.log(file.size) const isLt2M = file.size / 1024 < 200 if (!isJPG) { - this.$message.error('上传图片只能是 JPG 或 PNG 格式!') + this.$message.error('Only JPG or PNG formats are supported!') res = false } if (!isLt2M) { - this.$message.error('上传图片大小不能超过 200KB!') + this.$message.error('The image size cannot exceed 200KB!') res = false } return res diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue index 9216c82..3d7fcf9 100644 --- a/src/views/memberManage/listStaff.vue +++ b/src/views/memberManage/listStaff.vue @@ -72,9 +72,9 @@