From 1db030b3556d3b53e92284a2ad70d70f50f2a803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= <ypgaop@isoftstone.com>
Date: Thu, 24 Oct 2024 10:33:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=EF=BC=9A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/backend/auth/model/index.vue      | 17 ++++++++++++++---
 .../src/views/backend/auth/model/type.ts        |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ui/dasadmin/src/views/backend/auth/model/index.vue b/ui/dasadmin/src/views/backend/auth/model/index.vue
index 9fdcedd6..7f4a49ca 100644
--- a/ui/dasadmin/src/views/backend/auth/model/index.vue
+++ b/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>
diff --git a/ui/dasadmin/src/views/backend/auth/model/type.ts b/ui/dasadmin/src/views/backend/auth/model/type.ts
index fb32c728..0293db06 100644
--- a/ui/dasadmin/src/views/backend/auth/model/type.ts
+++ b/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

From c4513b0c18bb531639d7dd7fc1969b9585726892 Mon Sep 17 00:00:00 2001
From: yu <tianyu414x@126.com>
Date: Thu, 24 Oct 2024 11:17:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7=E6=8E=A5=E5=8F=A3,?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B1=9E=E6=80=A7=E7=BC=96=E7=A0=81=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=E6=80=A7=E4=BC=98=E5=8C=96;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/equipment/service/impl/SysIotModelServiceImpl.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
index ba0b63e7..05e86556 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
+++ b/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);