diff --git a/src/locales/en.ts b/src/locales/en.ts
index 2a82872d..6e50e660 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1192,6 +1192,7 @@ export default {
},
// Equipment Ledger
EquipmentLedger: {
+ images:'Images',
deviceCode: 'Code',
qrcode: 'QR Code/Barcode',
deviceName: 'Name',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 622deb0f..87853fe5 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1184,6 +1184,7 @@ export default {
},
// 设备台账
EquipmentLedger: {
+ images:'图片',
deviceCode: '编码',
qrcode: '二维码/条形码',
deviceName: '名称',
@@ -1191,8 +1192,8 @@ export default {
statusEnabled: '启用',
statusDisabled: '不启用',
deviceType: '类型',
- deviceSpec: '规格',
- deviceModel: '型号',
+ deviceSpec: '规格型号',
+ /* deviceModel: '型号',*/
isSchedueld: '是否排产',
ratedCapacity: '额定产能',
yes: '是',
@@ -1215,7 +1216,7 @@ export default {
placeholderDeviceStatus: '请选择状态',
placeholderDeviceType: '请选择类型',
placeholderDeviceModel: '请输入型号',
- placeholderDeviceSpec: '请输入规格',
+ placeholderDeviceSpec: '请输入规格型号',
placeholderRatedCapacity: '请输入额定产能',
placeholderProductionDate: '请选择生产日期',
placeholderFactoryEntryDate: '请选择入厂日期',
@@ -1273,6 +1274,7 @@ export default {
code: '编码',
qrcode: '二维码/条形码',
name: '名称',
+ deviceSpec:'规格型号',
batchDelete: '批量删除',
description: '描述',
remark: '备注',
@@ -1282,6 +1284,7 @@ export default {
delete: '删除',
placeholderCode: '请输入编码',
placeholderName: '请输入名称',
+ placeholderDeviceSpec: '请输入规格型号',
placeholderDescription: '请输入描述',
placeholderRemark: '请输入备注',
placeholderCount: '请输入数量',
@@ -1548,6 +1551,7 @@ export default {
SpareInfo: {
name: '备件名称',
code: '备件编码',
+ deviceSpec:'规格型号',
qrcode: '二维码/条形码',
standard: '规格',
expiryDay: '保质期天数',
@@ -1561,6 +1565,7 @@ export default {
exportFilename: '备件信息.xls',
placeholderName: '请输入名称',
placeholderCode: '请输入编码',
+ placeholderDeviceSpec: '请输入规格型号',
placeholderUnit: '请选择单位',
placeholderSafetyNumber: '请输入预警库存数量',
placeholderRemark: '请输入备注',
diff --git a/src/views/erp/component/product/ProductForm.vue b/src/views/erp/component/product/ProductForm.vue
index 8125056b..fa0e7cc8 100644
--- a/src/views/erp/component/product/ProductForm.vue
+++ b/src/views/erp/component/product/ProductForm.vue
@@ -36,6 +36,11 @@
+
+
+
+
+
diff --git a/src/views/erp/component/product/index.vue b/src/views/erp/component/product/index.vue
index 24c6ee75..53637cd2 100644
--- a/src/views/erp/component/product/index.vue
+++ b/src/views/erp/component/product/index.vue
@@ -58,6 +58,7 @@
+
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 2aad141e..fc57a430 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -1567,7 +1567,7 @@ const handleShowDeviceAlarmHistory = async () => {
background-color: #fff;
border-radius: 4px;
padding: 16px;
- max-height: calc(100vh - 546px);
+ /* max-height: calc(100vh - 546px);*/
overflow-y: auto;
.empty-grid { // 注意：这里缩进要与上面一致
diff --git a/src/views/mes/criticalComponent/CriticalComponentForm.vue b/src/views/mes/criticalComponent/CriticalComponentForm.vue
index 2d1e3202..ea457acb 100644
--- a/src/views/mes/criticalComponent/CriticalComponentForm.vue
+++ b/src/views/mes/criticalComponent/CriticalComponentForm.vue
@@ -29,6 +29,13 @@
clearable
/>
+
+
+
{
code: detail?.code,
isCode: detail?.isCode ?? false,
name: detail?.name,
+ deviceSpec:detail?.deviceSpec,
description: detail?.description,
count: detail?.count,
remark: detail?.remark,
diff --git a/src/views/mes/criticalComponent/index.vue b/src/views/mes/criticalComponent/index.vue
index f82b4dda..4464392c 100644
--- a/src/views/mes/criticalComponent/index.vue
+++ b/src/views/mes/criticalComponent/index.vue
@@ -74,6 +74,9 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
:label="t('EquipmentManagement.EquipmentKeyItems.name')" align="center" prop="name"
min-width="140" sortable />
+
-->
-
-
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
@@ -162,7 +172,7 @@
-
+
-
+