diff --git a/src/assets/imgs/dashboard_img.png b/src/assets/imgs/dashboard_img.png index d1e9fa77..b93c27b1 100644 Binary files a/src/assets/imgs/dashboard_img.png and b/src/assets/imgs/dashboard_img.png differ diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue index c014e3a8..060d7243 100644 --- a/src/views/erp/product/product/ProductForm.vue +++ b/src/views/erp/product/product/ProductForm.vue @@ -116,7 +116,7 @@ :precision="0" class="!w-1/1" /> - + diff --git a/src/views/iot/devicemodel/components/DeviceModelAttributeForm.vue b/src/views/iot/devicemodel/components/DeviceModelAttributeForm.vue index e470d3b9..0e2ca7d7 100644 --- a/src/views/iot/devicemodel/components/DeviceModelAttributeForm.vue +++ b/src/views/iot/devicemodel/components/DeviceModelAttributeForm.vue @@ -127,7 +127,8 @@ const formData = ref({ const formRules = reactive({ attributeCode: [{ required: true, message: t('DataCollection.DeviceModel.validatorAttributeCodeRequired'), trigger: 'blur' }], attributeName: [{ required: true, message: t('DataCollection.DeviceModel.validatorAttributeNameRequired'), trigger: 'blur' }], - dataType: [{ required: true, message: t('DataCollection.DeviceModel.validatorDataTypeRequired'), trigger: 'change' }] + dataType: [{ required: true, message: t('DataCollection.DeviceModel.validatorDataTypeRequired'), trigger: 'change' }], + attributeType: [{ required: true, message: '点位类型不能为空', trigger: 'change' }] }) const formRef = ref() // 表单 Ref const unitList = ref([]) // 产品单位列表 diff --git a/src/views/mes/task/components/TaskDetailList.vue b/src/views/mes/task/components/TaskDetailList.vue index 51b33a68..9f588552 100644 --- a/src/views/mes/task/components/TaskDetailList.vue +++ b/src/views/mes/task/components/TaskDetailList.vue @@ -29,13 +29,13 @@ > {{ t('ProductionPlan.Task.detailListViewActionText') }} - {{ t('ProductionPlan.Task.detailListMaterialActionText') }} - + -->