Merge remote-tracking branch 'origin/main'

das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java

@@ -186,10 +186,9 @@ public class SysIotModelServiceImpl implements SysIotModelService {
         }
         SysIotModelFieldVo sysIotModelFieldQuery = sysIotModelFieldMapper.selectByAttributeCode(sysIotModelFieldDto.getIotModelId(), sysIotModelFieldDto.getAttributeCode());
         if (!(sysIotModelFieldQuery == null)) {
-            if (sysIotModelFieldQuery.getId() != sysIotModelFieldDto.getId()){
+            if (!sysIotModelFieldQuery.getId().equals(sysIotModelFieldDto.getId())){
                 throw new ServiceException("物模型属性code已经存在");
             }
-
         }
         sysIotModelFieldMapper.updateById(sysIotModelField);
 

ui/dasadmin/src/views/backend/auth/model/index.vue

@@ -237,9 +237,14 @@
                         </el-form-item>
                     </template>
                 </div>
-                <el-form-item :label="ModelAttributeFieldsEnums['porder']" prop="porder">
-                    <el-input v-model="attributeForm.porder" :placeholder="'请输入' + ModelAttributeFieldsEnums['porder']"></el-input>
-                </el-form-item>
+                <div class="formRowStyle">
+                    <el-form-item :label="ModelAttributeFieldsEnums['porder']" prop="porder">
+                        <el-input v-model="attributeForm.porder" :placeholder="'请输入' + ModelAttributeFieldsEnums['porder']"></el-input>
+                    </el-form-item>
+                    <el-form-item v-if="attributeForm.attributeType === 138 || attributeForm.attributeType === 139" :label="ModelAttributeFieldsEnums['unit']" prop="unit">
+                        <el-input v-model="attributeForm.unit" :placeholder="'请输入' + ModelAttributeFieldsEnums['unit']"></el-input>
+                    </el-form-item>
+                </div>
                 <el-form-item :label="ModelAttributeFieldsEnums['subSystem']" prop="subSystem">
                     <el-input v-model="attributeForm.subSystem" :placeholder="'请输入' + ModelAttributeFieldsEnums['subSystem']"></el-input>
                 </el-form-item>
@@ -750,6 +755,7 @@ const originAttributeForm: AddModelAttributeType & UpdateModelAttributeType = {
     subSystem: '',
     dataType: '',
     visible: true,
+    unit:'',
     revision: 1,
     createdBy: undefined,
     createdTime: undefined,
@@ -907,8 +913,10 @@ const attributeAndServiceRules = {
 
 const addModelAttributeAndService = () => {
     if (ModelTabs.value === 'attribute') {
+        attributeFormTitle.value = AttributeDialogTitleStateType['add']
         attributeVisible.value = true
     } else {
+        serviceFormTitle.value = serviceDialogTitleStateType['add']
         serviceVisible.value = true
     }
 }
@@ -1110,5 +1118,8 @@ $paginationHeight: 32px;
     .el-select {
         width: 184px;
     }
+    .el-input{
+        width: 184px;
+    }
 }
 </style>

ui/dasadmin/src/views/backend/auth/model/type.ts

@@ -66,6 +66,7 @@ export enum ModelAttributeFieldsEnums {
     'subSystem' = '子系统',
     'dataType' = '数据类型',
     'visible' = '是否可见',
+    'unit'='单位',
     'revision' = '乐观锁',
     'createdBy' = '创建人',
     'createdTime' = '创建时间',
@@ -108,6 +109,7 @@ export type AddModelAttributeType = {
     highSpeed: 0 | 1 | boolean
     subSystem: string
     dataType: attributeTypeDataType | ''
+    unit:string
     visible: 0 | 1 | boolean
     revision: number
     createdBy?: string