From c19ec0f115bfd744c1ab1b85a323a78d4e03b594 Mon Sep 17 00:00:00 2001 From: sheng <905537351@qq.com> Date: Thu, 25 Jun 2026 01:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment-category.js | 2 +- .../equipment-registry.js | 17 + .../production-master-data/production-line.js | 8 + src/locales/en.json | 36 +- src/locales/zh-chs.json | 36 +- .../equipment-registry/index.vue | 572 ++++++++++++------ 6 files changed, 479 insertions(+), 192 deletions(-) diff --git a/src/api/equipment-management/equipment-category.js b/src/api/equipment-management/equipment-category.js index 89581734..44a1a8fd 100644 --- a/src/api/equipment-management/equipment-category.js +++ b/src/api/equipment-management/equipment-category.js @@ -4,7 +4,7 @@ const BASE = 'production_configuration/device_model/device_category/' function apiParams (method, data = {}) { return { - method: `equipment_management_equipment_model_equipment_category_${method}`, + method: `production_configuration_device_model_device_category_${method}`, platform: 'background', ...data } diff --git a/src/api/equipment-management/equipment-registry.js b/src/api/equipment-management/equipment-registry.js index 4ee24c5b..d4623650 100644 --- a/src/api/equipment-management/equipment-registry.js +++ b/src/api/equipment-management/equipment-registry.js @@ -28,6 +28,23 @@ export function batchDeleteItems (data) { return request({ url: BASE + 'batch_delete', method: 'delete', data: params('production_configuration_device_model_device_management_batch_delete', data) }) } +export function getImportTemplate (data) { + return request({ + url: BASE + 'get_import_template', + method: 'post', + responseType: 'blob', + data: params('production_configuration_device_model_device_management_get_import_template', data) + }) +} + +export function importData (data) { + return request({ + url: BASE + 'device_data_import', + method: 'post', + data: params('production_configuration_device_model_device_management_device_data_import', data) + }) +} + export function createExportTask (data) { return request({ url: BASE + 'device_data_export_task', method: 'post', data: params('production_configuration_device_model_device_management_device_export_task', data) }) } diff --git a/src/api/production-master-data/production-line.js b/src/api/production-master-data/production-line.js index 3864b2cb..b3e43be6 100644 --- a/src/api/production-master-data/production-line.js +++ b/src/api/production-master-data/production-line.js @@ -10,6 +10,14 @@ function apiParams (method, data = {}) { } } +export function getProductionLineALL (data) { + return request({ + url: BASE + 'all', + method: 'get', + params: apiParams('all', data) + }) +} + export function getProductionLineList (data) { return request({ url: BASE + 'list', diff --git a/src/locales/en.json b/src/locales/en.json index 273aff10..13dd698c 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -862,16 +862,21 @@ "add": "Add", "edit": "Edit", "delete": "Delete", + "batch_delete": "Batch Delete", + "import": "Import", "export": "Export", "operation": "Operation", - "add_title": "Add", - "edit_title": "Edit", + "add_title": "Add Equipment", + "edit_title": "Edit Equipment", "confirm": "Confirm", "cancel": "Cancel", "tip": "Prompt", "confirm_delete": "Delete this record?", + "confirm_batch_delete": "Batch delete selected equipment?", "confirm_export": "Create export task?", "operation_success": "Operation succeeded", + "create_download_task_success": "Download task created", + "please_select_data": "Please select data", "keyword": "Keyword", "enter_keyword": "Enter keyword", "remark": "Remark", @@ -883,14 +888,41 @@ "enter_device_code": "Enter device code", "device_name": "Device Name", "enter_device_name": "Enter device name", + "device_category": "Device Category", + "select_device_category": "Please select device category", + "design_ppm": "Design PPM", + "enter_design_ppm": "Please enter design PPM", + "ip": "IP", + "enter_ip": "Please enter IP", + "manufacturer": "Manufacturer", + "enter_manufacturer": "Please enter manufacturer", + "fixed_asset_code": "Fixed Asset Code", + "enter_fixed_asset_code": "Please enter fixed asset code", + "entry_time": "Entry Time", + "select_entry_time": "Please select entry time", "device_id": "Device ID", "enter_device_id": "Enter device ID", "device_type": "Device Type", "enter_device_type": "Enter device type", "area": "Area", "enter_area": "Enter area", + "select_area": "Please select area", "line": "Line", "enter_line": "Enter line", + "production_line": "Production Line", + "select_production_line": "Please select production line", + "select_factory_first": "Please select area first", + "length_1_100": "Length must be 1 to 100 characters", + "device_data_import": "Equipment Import", + "import_warning": "Only xlsx or xls files following the template can be uploaded", + "import_table": "Import Table", + "select_file": "Select File", + "download_template": "Download Template", + "preview": "Preview", + "import_template_name": "Equipment Import Template", + "import_file_format_error": "Please upload xls or xlsx file", + "import_missing_column": "Column [{name}] does not exist in the file. Please check.", + "import_no_data": "Please import data first", "standard": "Standard", "enter_standard": "Enter standard", "inspection_item_code": "Inspection Item Code", diff --git a/src/locales/zh-chs.json b/src/locales/zh-chs.json index f556950f..52ad9f57 100644 --- a/src/locales/zh-chs.json +++ b/src/locales/zh-chs.json @@ -862,16 +862,21 @@ "add": "新增", "edit": "编辑", "delete": "删除", + "batch_delete": "批量删除", + "import": "导入", "export": "导出", "operation": "操作", - "add_title": "新增", - "edit_title": "编辑", + "add_title": "新增设备信息", + "edit_title": "编辑设备信息", "confirm": "确定", "cancel": "取消", "tip": "提示", "confirm_delete": "确认删除该记录?", + "confirm_batch_delete": "确认批量删除选中的设备信息?", "confirm_export": "确认创建导出任务?", "operation_success": "操作成功", + "create_download_task_success": "创建下载任务成功", + "please_select_data": "请选择数据", "keyword": "关键字", "enter_keyword": "请输入关键字", "remark": "备注", @@ -883,14 +888,41 @@ "enter_device_code": "请输入设备编码", "device_name": "设备名称", "enter_device_name": "请输入设备名称", + "device_category": "设备类别", + "select_device_category": "请选择设备类别", + "design_ppm": "设计PPM", + "enter_design_ppm": "请输入设计PPM", + "ip": "IP", + "enter_ip": "请输入IP", + "manufacturer": "厂商", + "enter_manufacturer": "请输入厂商", + "fixed_asset_code": "设备固定资产编码", + "enter_fixed_asset_code": "请输入设备固定资产编码", + "entry_time": "进场时间", + "select_entry_time": "请选择进场时间", "device_id": "设备ID", "enter_device_id": "请输入设备ID", "device_type": "设备类别", "enter_device_type": "请输入设备类别", "area": "所属区域", "enter_area": "请输入所属区域", + "select_area": "请选择所区", "line": "所属产线", "enter_line": "请输入所属产线", + "production_line": "产线", + "select_production_line": "请选择产线", + "select_factory_first": "请先选择所区", + "length_1_100": "长度在 1 到 100 个字符", + "device_data_import": "设备信息导入", + "import_warning": "上传的文件后缀必须是 xlsx 或 xls,且根据模板上传,否则不能上传成功", + "import_table": "导入表格", + "select_file": "选择文件", + "download_template": "下载模板", + "preview": "预览", + "import_template_name": "设备数据导入模板", + "import_file_format_error": "请上传 xls 或 xlsx 文件", + "import_missing_column": "文件不存在【{name}】数据列,请检查", + "import_no_data": "请先导入数据", "standard": "标准", "enter_standard": "请输入标准", "inspection_item_code": "点检项目编码", diff --git a/src/views/equipment-management/equipment-model/equipment-registry/index.vue b/src/views/equipment-management/equipment-model/equipment-registry/index.vue index 27d118b3..63f59500 100644 --- a/src/views/equipment-management/equipment-model/equipment-registry/index.vue +++ b/src/views/equipment-management/equipment-model/equipment-registry/index.vue @@ -4,22 +4,25 @@