From 5326e8543ec7382179be104559ddf9e0cfe864e8 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Mon, 18 Apr 2022 14:21:36 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/product/product-things-model.vue      |  5 +--
 vue/src/views/iot/template/index.vue          | 39 +++++++++----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/vue/src/views/iot/product/product-things-model.vue b/vue/src/views/iot/product/product-things-model.vue
index 088fe600..9b671012 100644
--- a/vue/src/views/iot/product/product-things-model.vue
+++ b/vue/src/views/iot/product/product-things-model.vue
@@ -39,7 +39,7 @@
                 <dict-tag :options="dict.type.iot_data_type" :value="scope.row.datatype" />
             </template>
         </el-table-column>
-        <el-table-column label="数据定义" align="left" prop="specs" min-width="150" class-name="specsColor">
+        <el-table-column label="数据定义" align="left" header-align="center" prop="specs" min-width="150" class-name="specsColor">
             <template slot-scope="scope">
                 <div v-html="formatSpecsDisplay(scope.row.specs)"></div>
             </template>
@@ -355,6 +355,7 @@ export default {
             this.form.datatype = "integer"
             this.form.specs = {
                 enumList: [],
+                arrayType: "int"
             };
         },
         /** 修改按钮操作 */
@@ -543,8 +544,6 @@ export default {
                     value: "",
                     text: ""
                 }];
-            } else if (val == "array") {
-                this.form.specs.arrayType = "int";
             }
         },
         /** 添加枚举项 */
diff --git a/vue/src/views/iot/template/index.vue b/vue/src/views/iot/template/index.vue
index 51077152..0d5e8eb8 100644
--- a/vue/src/views/iot/template/index.vue
+++ b/vue/src/views/iot/template/index.vue
@@ -63,7 +63,7 @@
                     <dict-tag :options="dict.type.iot_data_type" :value="scope.row.datatype" />
                 </template>
             </el-table-column>
-            <el-table-column label="数据定义" align="left" prop="specs" min-width="150" class-name="specsColor">
+            <el-table-column label="数据定义" align="left" header-align="center" prop="specs" min-width="150" class-name="specsColor">
                 <template slot-scope="scope">
                     <div v-html="formatSpecsDisplay(scope.row.specs)"></div>
                 </template>
@@ -75,8 +75,8 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template slot-scope="scope">
-                    <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:template:edit']" >修改</el-button>
-                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:template:remove']" v-if =" canEdit ? true : (scope.row.isSys == '1' ? false : true)">删除</el-button>
+                    <el-button size="small" type="primary" style="padding:5px;" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['iot:template:edit']">修改</el-button>
+                    <el-button size="small" type="danger" style="padding:5px;" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:template:remove']" v-if=" canEdit ? true : (scope.row.isSys == '1' ? false : true)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -278,17 +278,17 @@ export default {
         this.init();
     },
     methods: {
-        init(){
-        if (this.$store.state.user.roles.indexOf("admin") !== -1){
-            this.canEdit = true
-          }
+        init() {
+            if (this.$store.state.user.roles.indexOf("admin") !== -1) {
+                this.canEdit = true
+            }
         },
         /** 查询通用物模型列表 */
         getList() {
             this.loading = true;
-          if (this.$store.state.user.roles.indexOf("admin") === -1){
-            this.queryParams.tenantName = this.$store.state.user.name
-          }
+            if (this.$store.state.user.roles.indexOf("admin") === -1) {
+                this.queryParams.tenantName = this.$store.state.user.name
+            }
             listTemplate(this.queryParams).then((response) => {
                 this.templateList = response.rows;
                 this.total = response.total;
@@ -350,6 +350,7 @@ export default {
             this.form.datatype = "integer"
             this.form.specs = {
                 enumList: [],
+                arrayType: "int"
             };
         },
         /** 修改按钮操作 */
@@ -377,8 +378,8 @@ export default {
                             this.form.isMonitor = 0;
                             this.form.isTop = 0;
                         }
-                      // 添加通用物模型的修改者
-                      this.form.updateBy = this.$store.state.user.name
+                        // 添加通用物模型的修改者
+                        this.form.updateBy = this.$store.state.user.name
                         updateTemplate(this.form).then((response) => {
                             this.$modal.msgSuccess("修改成功");
                             this.open = false;
@@ -428,15 +429,15 @@ export default {
             );
         },
         // 类型改变
-        typeChange(label){
-            if(label==2 || label==3){
-                this.form.isMonitor=0;
+        typeChange(label) {
+            if (label == 2 || label == 3) {
+                this.form.isMonitor = 0;
             }
         },
         // 实时监测改变
-        changeMonitor(isMonitor){
-            if(isMonitor==1 && this.form.datatype!="integer" && this.form.datatype!="decimal"){
-                this.form.datatype="integer";
+        changeMonitor(isMonitor) {
+            if (isMonitor == 1 && this.form.datatype != "integer" && this.form.datatype != "decimal") {
+                this.form.datatype = "integer";
             }
         },
         // 格式化物模型
@@ -467,8 +468,6 @@ export default {
                     value: "",
                     text: ""
                 }];
-            } else if (val == "array") {
-                this.form.specs.arrayType = "int";
             }
         },
         /** 添加枚举项 */