From 1d2b284ea5c0bf523a7dc3e0c5d8b750876fe27c Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Fri, 23 Sep 2022 14:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ESceneAction/src/EDeviceParam.vue         | 14 +++---
 .../iot/project/profileV2/ETypeCensus.vue     |  1 -
 src/views/system/attribute/index.vue          | 48 +------------------
 3 files changed, 8 insertions(+), 55 deletions(-)

diff --git a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue
index 8eb302b4..245aaa1f 100644
--- a/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue
+++ b/src/views/iot/project/profileV2/ESceneManage/ESceneAction/src/EDeviceParam.vue
@@ -55,7 +55,7 @@
             <el-col
               :span="comdlistOption.length === 1 ? 24 : 12"
               v-for="paramsItem in comdlistOption"
-              :key="paramsItem.funId || getGuid()"
+              :key="paramsItem.funId"
             >
               <el-form-item
                 :label="paramsItem.funName + '：'"
@@ -201,12 +201,12 @@ export default {
       },
       deep: true,
     },
-    paramsDevcie: {
-      handler(val, oldVal) {
-        this.form = this.paramsDevcie;
-      },
-      deep: true,
-    }
+    // paramsDevcie: {
+    //   handler(val, oldVal) {
+    //     this.form = this.paramsDevcie;
+    //   },
+    //   deep: true,
+    // }
   },
   created() {
     this.form = this.paramsDevcie;
diff --git a/src/views/iot/project/profileV2/ETypeCensus.vue b/src/views/iot/project/profileV2/ETypeCensus.vue
index 06d73b9d..849b0fb3 100644
--- a/src/views/iot/project/profileV2/ETypeCensus.vue
+++ b/src/views/iot/project/profileV2/ETypeCensus.vue
@@ -155,7 +155,6 @@ export default {
             }
           }
         }
-        console.log('result-update-', this.templist, list)
         this.updateEcharts();
       },
       deep: true,
diff --git a/src/views/system/attribute/index.vue b/src/views/system/attribute/index.vue
index 108a9de2..615c4ce5 100644
--- a/src/views/system/attribute/index.vue
+++ b/src/views/system/attribute/index.vue
@@ -7,25 +7,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="记录id" prop="recordId">
-        <el-input
-          v-model="queryParams.recordId"
-          placeholder="请输入记录id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="记录状态" prop="recordStatus">
-        <el-select
-          v-model="queryParams.recordStatus"
-          placeholder="请选择记录状态"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="属性值" prop="attributeValue">
         <el-input
           v-model="queryParams.attributeValue"
@@ -61,18 +42,6 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:attribute:edit']"
-          >修改</el-button
-        >
-      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -85,17 +54,6 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:attribute:export']"
-          >导出</el-button
-        >
-      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -108,16 +66,12 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="50" align="center" />
-      <!-- <el-table-column label="序号" align="center" prop="index" width="50" /> -->
-      <!-- <el-table-column label="记录id" align="center" prop="recordId" /> -->
-      <!-- <el-table-column label="记录状态" align="center" prop="recordStatus" /> -->
       <el-table-column
         label="属性KEY"
         align="center"
         prop="enterpriseAttribute"
       />
       <el-table-column label="属性值" align="center" prop="attributeValue" />
-      <!-- <el-table-column label="租户id" align="center" prop="tenantId" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -157,7 +111,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" class="eldialog-wrap" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="属性KEY" prop="enterpriseAttribute">
-          <el-input v-model="form.enterpriseAttribute" placeholder="请输入属性KEY" />
+          <el-input v-model="form.enterpriseAttribute" :disabled="form.recordId != null" placeholder="请输入属性KEY" />
         </el-form-item>
         <el-form-item label="属性值" prop="attributeValue">
           <el-input v-model="form.attributeValue" placeholder="请输入属性值" />