diff --git a/vue/.vscode/settings.json b/vue/.vscode/settings.json
new file mode 100644
index 00000000..a7210597
--- /dev/null
+++ b/vue/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "i18n-ally.localesPaths": [
+    "src/lang"
+  ]
+}
\ No newline at end of file
diff --git a/vue/src/views/iot/product/product-edit.vue b/vue/src/views/iot/product/product-edit.vue
index 2d63e85a..6e88bf11 100644
--- a/vue/src/views/iot/product/product-edit.vue
+++ b/vue/src/views/iot/product/product-edit.vue
@@ -34,7 +34,7 @@
                             </el-form-item>
                             <el-form-item :label="$t('product.product-edit.473153-16')" prop="networkMethod">
                                 <el-select v-model="form.networkMethod" :placeholder="$t('product.product-edit.473153-17')" style="width: 100%" :disabled="form.status == 2">
-                                    <el-option v-for="dict in dict.type.iot_network_method" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                                    <el-option v-for="dict in dict.type.iot_network_method" :key="dict.value" :label="dict.label" :value="Number(dict.value)"></el-option>
                                 </el-select>
                             </el-form-item>
 
@@ -48,7 +48,7 @@
                             </el-form-item>
                             <el-form-item :label="$t('product.product-edit.473153-21')" prop="vertificateMethod">
                                 <el-select v-model="form.vertificateMethod" :placeholder="$t('product.product-edit.473153-22')" style="width: 100%" :disabled="form.status == 2 || form.deviceType == 3">
-                                    <el-option v-for="dict in dict.type.iot_vertificate_method" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                                    <el-option v-for="dict in dict.type.iot_vertificate_method" :key="dict.value" :label="dict.label" :value="Number(dict.value)"></el-option>
                                 </el-select>
                             </el-form-item>
                             <el-form-item :label="$t('product.product-edit.473153-25')" prop="productId">
diff --git a/vue/src/views/iot/product/product-things-model.vue b/vue/src/views/iot/product/product-things-model.vue
index d7e794e6..346be0ad 100644
--- a/vue/src/views/iot/product/product-things-model.vue
+++ b/vue/src/views/iot/product/product-things-model.vue
@@ -1,343 +1,339 @@
 <template>
-  <div style="padding-left: 20px">
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-if="productInfo.status == 1">{{ $t('product.product-things-model.142341-0') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-upload2" size="mini" @click="handleSelect"
-          v-if="productInfo.status == 1">{{ $t('product.product-things-model.142341-1') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">{{ $t('refresh') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="info" plain icon="el-icon-view" size="mini" @click="handleOpenThingsModel">{{ $t('product.product-things-model.142341-3') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-link type="danger" style="padding-top: 5px" :underline="false">{{ $t('product.product-things-model.142341-4') }}</el-link>
-      </el-col>
-    </el-row>
+    <div style="padding-left: 20px">
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-if="productInfo.status == 1">{{ $t('product.product-things-model.142341-0') }}</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" plain icon="el-icon-upload2" size="mini" @click="handleSelect" v-if="productInfo.status == 1">{{ $t('product.product-things-model.142341-1') }}</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">{{ $t('refresh') }}</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="info" plain icon="el-icon-view" size="mini" @click="handleOpenThingsModel">{{ $t('product.product-things-model.142341-3') }}</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-link type="danger" style="padding-top: 5px" :underline="false">{{ $t('product.product-things-model.142341-4') }}</el-link>
+            </el-col>
+        </el-row>
 
-    <el-table v-loading="loading" :data="modelList" size="mini">
-      <el-table-column :label="$t('product.product-things-model.142341-8')" align="center" prop="modelName" width="230" />
-      <el-table-column :label="$t('product.product-things-model.142341-9')" align="center" prop="identifier" />
-      <el-table-column :label="$t('product.product-things-model.142341-12')" align="center" prop="" width="80">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isChart" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('product.product-things-model.142341-13')" align="center" prop="" width="75">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isMonitor" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('product.product-things-model.142341-14')" align="center" prop="" width="75">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isReadonly" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('product.product-things-model.142341-15')" align="center" prop="" width="75">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isHistory" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('product.product-things-model.142341-16')" align="center" prop="type" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.iot_things_type" :value="scope.row.type" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('product.product-things-model.142341-17')" align="center" prop="datatype" width="80">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.iot_data_type" :value="scope.row.datatype" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('product.product-things-model.142341-18')" 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>
-      </el-table-column>
-      <el-table-column :label="$t('product.product-things-model.142341-19')" align="center" prop="formula" />
-      <el-table-column :label="$t('product.product-things-model.142341-20')" align="center" prop="modelOrder" width="80" />
-      <el-table-column :label="$t('opation')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-if="productInfo.status != 2">{{ $t('product.product-things-model.142341-84') }}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-if="productInfo.status != 2">{{ $t('del') }}</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table v-loading="loading" :data="modelList" size="mini">
+            <el-table-column :label="$t('product.product-things-model.142341-8')" align="center" prop="modelName" width="230" />
+            <el-table-column :label="$t('product.product-things-model.142341-9')" align="center" prop="identifier" />
+            <el-table-column :label="$t('product.product-things-model.142341-12')" align="center" prop="" width="80">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isChart" />
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('product.product-things-model.142341-13')" align="center" prop="" width="75">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isMonitor" />
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('product.product-things-model.142341-14')" align="center" prop="" width="75">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isReadonly" />
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('product.product-things-model.142341-15')" align="center" prop="" width="75">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.iot_yes_no" :value="scope.row.isHistory" />
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('product.product-things-model.142341-16')" align="center" prop="type" width="100">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.iot_things_type" :value="scope.row.type" />
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('product.product-things-model.142341-17')" align="center" prop="datatype" width="80">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.iot_data_type" :value="scope.row.datatype" />
+                </template>
+            </el-table-column>
+            <el-table-column :label="$t('product.product-things-model.142341-18')" 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>
+            </el-table-column>
+            <el-table-column :label="$t('product.product-things-model.142341-19')" align="center" prop="formula" />
+            <el-table-column :label="$t('product.product-things-model.142341-20')" align="center" prop="modelOrder" width="80" />
+            <el-table-column :label="$t('opation')" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="productInfo.status != 2">{{ $t('product.product-things-model.142341-84') }}</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="productInfo.status != 2">{{ $t('del') }}</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <!-- 添加或修改物模型对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item :label="$t('product.product-things-model.142341-24')" prop="modelName">
-          <el-input v-model="form.modelName" :placeholder="$t('product.product-things-model.142341-25')" style="width: 385px" />
-        </el-form-item>
-        <el-form-item :label="$t('product.product-things-model.142341-26')" prop="identifier">
-          <el-input v-model="form.identifier" :placeholder="$t('product.product-things-model.142341-27')" style="width: 385px" />
-        </el-form-item>
-        <el-form-item :label="$t('product.product-things-model.142341-28')" prop="modelOrder">
-          <el-input-number v-model="form.modelOrder" :placeholder="$t('product.product-things-model.142341-29')" type="number" style="width: 386px"
-            controls-position="right" />
-        </el-form-item>
-        <el-form-item :label="$t('product.product-things-model.142341-30')" prop="type">
-          <el-radio-group v-model="form.type" @change="typeChange(form.type)">
-            <el-radio-button label="1">{{ $t('product.product-things-model.142341-31') }}</el-radio-button>
-            <el-radio-button label="2">{{ $t('product.product-things-model.142341-32') }}</el-radio-button>
-            <el-radio-button label="3">{{ $t('product.product-things-model.142341-33') }}</el-radio-button>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item :label="$t('product.product-things-model.142341-34')" prop="property">
-          <el-checkbox name="isChart" :label="$t('product.product-things-model.142341-12')" @change="isChartChange" v-show="form.type == 1" v-model="form.isChart"
-            :true-label="1" :false-label="0"></el-checkbox>
-          <el-checkbox name="isMonitor" :label="$t('product.product-things-model.142341-13')" @change="isMonitorChange" v-show="form.type == 1"
-            v-model="form.isMonitor" :true-label="1" :false-label="0"></el-checkbox>
-          <el-checkbox name="isReadonly" :label="$t('product.product-things-model.142341-35')" @change="isReadonlyChange" :disabled="form.type == 3"
-            v-model="form.isReadonly" :true-label="1" :false-label="0"></el-checkbox>
-          <el-checkbox name="isHistory" :label="$t('product.product-things-model.142341-15')" v-model="form.isHistory" :true-label="1"
-            :false-label="0"></el-checkbox>
-          <el-checkbox name="isSharePerm" :label="$t('product.product-things-model.142341-36')" v-model="form.isSharePerm" :true-label="1"
-            :false-label="0"></el-checkbox>
-        </el-form-item>
-        <el-divider></el-divider>
-        <el-form-item :label="$t('product.product-things-model.142341-17')" prop="datatype">
-          <el-select v-model="form.datatype" :placeholder="$t('product.product-things-model.142341-37')" @change="dataTypeChange" style="width: 175px">
-            <el-option key="integer" :label="$t('product.product-things-model.142341-38')" value="integer"></el-option>
-            <el-option key="decimal" :label="$t('product.product-things-model.142341-39')" value="decimal"></el-option>
-            <el-option key="bool" :label="$t('product.product-things-model.142341-40')" value="bool" :disabled="form.isChart == 1"></el-option>
-            <el-option key="enum" :label="$t('product.product-things-model.142341-41')" value="enum" :disabled="form.isChart == 1"></el-option>
-            <el-option key="string" :label="$t('product.product-things-model.142341-42')" value="string" :disabled="form.isChart == 1"></el-option>
-            <el-option key="array" :label="$t('product.product-things-model.142341-43')" value="array" :disabled="form.isChart == 1"></el-option>
-            <el-option key="object" :label="$t('product.product-things-model.142341-44')" value="object" :disabled="form.isChart == 1"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('product.product-things-model.142341-45')" v-if="form.datatype == 'integer'">
-              <el-row>
-                <el-col :span="9">
-                  <el-input v-model="form.specs.min" :placeholder="$t('product.product-things-model.142341-46')" controls-position="right" type="number"
-                    style="width: 174px;" @input="handleEdit" />
-                </el-col>
-                <el-col :span="2" align="center">{{ $t('product.product-things-model.142341-47') }}</el-col>
-                <el-col :span="9">
-                  <el-input v-model="form.specs.max" :placeholder="$t('product.product-things-model.142341-48')" type="number" controls-position="right"
-                    style="width: 174px;" @input="handleEditmax" />
-                </el-col>
-              </el-row>
-         </el-form-item>
-            <el-form-item :label="$t('product.product-things-model.142341-45')" v-if="form.datatype == 'decimal'">
-              <el-row>
-                <el-col :span="9">
-                  <el-input v-model="form.specs.min" :placeholder="$t('product.product-things-model.142341-46')" controls-position="right" type="number"
-                    style="width: 174px;" />
-                </el-col>
-                <el-col :span="2" align="center">{{ $t('product.product-things-model.142341-47') }}</el-col>
-                <el-col :span="9">
-                  <el-input v-model="form.specs.max" :placeholder="$t('product.product-things-model.142341-48')" type="number" controls-position="right"
-                    style="width: 174px;" />
-                </el-col>
-              </el-row>
-            </el-form-item>
-          <div v-if="form.datatype == 'integer' || form.datatype == 'decimal'">
-          <el-form-item :label="$t('product.product-things-model.142341-49')">
-            <el-input v-model="form.specs.unit" :placeholder="$t('product.product-things-model.142341-50')" style="width: 385px" />
-          </el-form-item>
-          <el-form-item :label="$t('product.product-things-model.142341-51')">
-            <el-input-number v-model="form.specs.step" :placeholder="$t('product.product-things-model.142341-52')" type="number" style="width: 386px"
-              controls-position="right" />
-          </el-form-item>
-          <el-form-item :label="$t('product.product-things-model.142341-19')" prop="formula">
-            <template slot="label">
-              <span>{{ $t('product.product-things-model.142341-19') }}</span>
-             <el-tooltip style="cursor: pointer" effect="light" placement="top">
-                <div slot="content">
-                  {{ $t('product.product-things-model.142341-53') }}
-                  <br />
-                  {{ $t('product.product-things-model.142341-54') }}
-                  <br />
-                  {{ $t('product.product-things-model.142341-55') }}
-                  <br />
-                  {{ $t('product.product-things-model.142341-56') }}
-                  <br />
-                  {{ $t('product.product-things-model.142341-57') }}
-                  <br />
-                  {{ $t('product.product-things-model.142341-58') }}
-                  <br />
-                  {{ $t('product.product-things-model.142341-59') }}
-                  <br />
-                  {{ $t('product.product-things-model.142341-60') }}
-                  <br />
+        <!-- 添加或修改物模型对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+                <el-form-item :label="$t('product.product-things-model.142341-24')" prop="modelName">
+                    <el-input v-model="form.modelName" :placeholder="$t('product.product-things-model.142341-25')" style="width: 385px" />
+                </el-form-item>
+                <el-form-item :label="$t('product.product-things-model.142341-26')" prop="identifier">
+                    <el-input v-model="form.identifier" :placeholder="$t('product.product-things-model.142341-27')" style="width: 385px" />
+                </el-form-item>
+                <el-form-item :label="$t('product.product-things-model.142341-28')" prop="modelOrder">
+                    <el-input-number v-model="form.modelOrder" :placeholder="$t('product.product-things-model.142341-29')" type="number" style="width: 386px" controls-position="right" />
+                </el-form-item>
+                <el-form-item :label="$t('product.product-things-model.142341-30')" prop="type">
+                    <el-radio-group v-model="form.type" @change="typeChange(form.type)">
+                        <el-radio-button label="1">{{ $t('product.product-things-model.142341-31') }}</el-radio-button>
+                        <el-radio-button label="2">{{ $t('product.product-things-model.142341-32') }}</el-radio-button>
+                        <el-radio-button label="3">{{ $t('product.product-things-model.142341-33') }}</el-radio-button>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="$t('product.product-things-model.142341-34')" prop="property">
+                    <el-checkbox name="isChart" :label="$t('product.product-things-model.142341-12')" @change="isChartChange" v-show="form.type == 1" v-model="form.isChart" :true-label="1" :false-label="0"></el-checkbox>
+                    <el-checkbox
+                        name="isMonitor"
+                        :label="$t('product.product-things-model.142341-13')"
+                        @change="isMonitorChange"
+                        v-show="form.type == 1"
+                        v-model="form.isMonitor"
+                        :true-label="1"
+                        :false-label="0"
+                    ></el-checkbox>
+                    <el-checkbox
+                        name="isReadonly"
+                        :label="$t('product.product-things-model.142341-35')"
+                        @change="isReadonlyChange"
+                        :disabled="form.type == 3"
+                        v-model="form.isReadonly"
+                        :true-label="1"
+                        :false-label="0"
+                    ></el-checkbox>
+                    <el-checkbox name="isHistory" :label="$t('product.product-things-model.142341-15')" v-model="form.isHistory" :true-label="1" :false-label="0"></el-checkbox>
+                    <el-checkbox name="isSharePerm" :label="$t('product.product-things-model.142341-36')" v-model="form.isSharePerm" :true-label="1" :false-label="0"></el-checkbox>
+                </el-form-item>
+                <el-divider></el-divider>
+                <el-form-item :label="$t('product.product-things-model.142341-17')" prop="datatype">
+                    <el-select v-model="form.datatype" :placeholder="$t('product.product-things-model.142341-37')" @change="dataTypeChange" style="width: 175px">
+                        <el-option key="integer" :label="$t('product.product-things-model.142341-38')" value="integer"></el-option>
+                        <el-option key="decimal" :label="$t('product.product-things-model.142341-39')" value="decimal"></el-option>
+                        <el-option key="bool" :label="$t('product.product-things-model.142341-40')" value="bool" :disabled="form.isChart == 1"></el-option>
+                        <el-option key="enum" :label="$t('product.product-things-model.142341-41')" value="enum" :disabled="form.isChart == 1"></el-option>
+                        <el-option key="string" :label="$t('product.product-things-model.142341-42')" value="string" :disabled="form.isChart == 1"></el-option>
+                        <el-option key="array" :label="$t('product.product-things-model.142341-43')" value="array" :disabled="form.isChart == 1"></el-option>
+                        <el-option key="object" :label="$t('product.product-things-model.142341-44')" value="object" :disabled="form.isChart == 1"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="$t('product.product-things-model.142341-45')" v-if="form.datatype == 'integer'">
+                    <el-row>
+                        <el-col :span="9">
+                            <el-input v-model="form.specs.min" :placeholder="$t('product.product-things-model.142341-46')" controls-position="right" type="number" style="width: 174px" @input="handleEdit" />
+                        </el-col>
+                        <el-col :span="2" align="center">{{ $t('product.product-things-model.142341-47') }}</el-col>
+                        <el-col :span="9">
+                            <el-input v-model="form.specs.max" :placeholder="$t('product.product-things-model.142341-48')" type="number" controls-position="right" style="width: 174px" @input="handleEditmax" />
+                        </el-col>
+                    </el-row>
+                </el-form-item>
+                <el-form-item :label="$t('product.product-things-model.142341-45')" v-if="form.datatype == 'decimal'">
+                    <el-row>
+                        <el-col :span="9">
+                            <el-input v-model="form.specs.min" :placeholder="$t('product.product-things-model.142341-46')" controls-position="right" type="number" style="width: 174px" />
+                        </el-col>
+                        <el-col :span="2" align="center">{{ $t('product.product-things-model.142341-47') }}</el-col>
+                        <el-col :span="9">
+                            <el-input v-model="form.specs.max" :placeholder="$t('product.product-things-model.142341-48')" type="number" controls-position="right" style="width: 174px" />
+                        </el-col>
+                    </el-row>
+                </el-form-item>
+                <div v-if="form.datatype == 'integer' || form.datatype == 'decimal'">
+                    <el-form-item :label="$t('product.product-things-model.142341-49')">
+                        <el-input v-model="form.specs.unit" :placeholder="$t('product.product-things-model.142341-50')" style="width: 385px" />
+                    </el-form-item>
+                    <el-form-item :label="$t('product.product-things-model.142341-51')">
+                        <el-input-number v-model="form.specs.step" :placeholder="$t('product.product-things-model.142341-52')" type="number" style="width: 386px" controls-position="right" />
+                    </el-form-item>
+                    <el-form-item :label="$t('product.product-things-model.142341-19')" prop="formula">
+                        <template slot="label">
+                            <span>{{ $t('product.product-things-model.142341-19') }}</span>
+                            <el-tooltip style="cursor: pointer" effect="light" placement="top">
+                                <div slot="content">
+                                    {{ $t('product.product-things-model.142341-53') }}
+                                    <br />
+                                    {{ $t('product.product-things-model.142341-54') }}
+                                    <br />
+                                    {{ $t('product.product-things-model.142341-55') }}
+                                    <br />
+                                    {{ $t('product.product-things-model.142341-56') }}
+                                    <br />
+                                    {{ $t('product.product-things-model.142341-57') }}
+                                    <br />
+                                    {{ $t('product.product-things-model.142341-58') }}
+                                    <br />
+                                    {{ $t('product.product-things-model.142341-59') }}
+                                    <br />
+                                    {{ $t('product.product-things-model.142341-60') }}
+                                    <br />
+                                </div>
+                                <i class="el-icon-question" />
+                            </el-tooltip>
+                        </template>
+                        <el-input v-model="form.formula" style="width: 385px" />
+                    </el-form-item>
                 </div>
-                <i class="el-icon-question" />
-              </el-tooltip>
-            </template>
-            <el-input v-model="form.formula" style="width: 385px" />
-          </el-form-item>
-        </div>
 
-        <div v-if="form.datatype == 'bool'">
-          <el-form-item :label="$t('product.product-things-model.142341-63')" prop="">
-            <el-row style="margin-bottom: 10px">
-              <el-col :span="9">
-                <el-input v-model="form.specs.falseText" :placeholder="$t('product.product-things-model.142341-64')" />
-              </el-col>
-              <el-col :span="10" :offset="1">{{ $t('product.product-things-model.142341-65') }}</el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="9">
-                <el-input v-model="form.specs.trueText" :placeholder="$t('product.product-things-model.142341-66')" />
-              </el-col>
-              <el-col :span="10" :offset="1">{{ $t('product.product-things-model.142341-67') }}</el-col>
-            </el-row>
-          </el-form-item>
-        </div>
+                <div v-if="form.datatype == 'bool'">
+                    <el-form-item :label="$t('product.product-things-model.142341-63')" prop="">
+                        <el-row style="margin-bottom: 10px">
+                            <el-col :span="9">
+                                <el-input v-model="form.specs.falseText" :placeholder="$t('product.product-things-model.142341-64')" />
+                            </el-col>
+                            <el-col :span="10" :offset="1">{{ $t('product.product-things-model.142341-65') }}</el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="9">
+                                <el-input v-model="form.specs.trueText" :placeholder="$t('product.product-things-model.142341-66')" />
+                            </el-col>
+                            <el-col :span="10" :offset="1">{{ $t('product.product-things-model.142341-67') }}</el-col>
+                        </el-row>
+                    </el-form-item>
+                </div>
 
-        <div v-if="form.datatype == 'enum'">
-          <el-form-item :label="$t('product.product-things-model.142341-68')">
-            <el-select v-model="form.specs.showWay" :placeholder="$t('product.product-things-model.142341-69')" style="width: 175px">
-              <el-option key="select" :label="$t('product.product-things-model.142341-70')" value="select"></el-option>
-              <el-option key="button" :label="$t('product.product-things-model.142341-71')" value="button"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('product.product-things-model.142341-72')" prop="">
-            <el-row v-for="(item, index) in form.specs.enumList" :key="'enum' + index" style="margin-bottom: 10px">
-              <el-col :span="9">
-                <el-input v-model="item.value" :placeholder="$t('product.product-things-model.142341-73')" />
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-input v-model="item.text" :placeholder="$t('product.product-things-model.142341-74')" />
-              </el-col>
-              <el-col :span="2" :offset="1" v-if="index != 0"><a style="color: #f56c6c"
-                  @click="removeEnumItem(index)">{{ $t('del') }}</a></el-col>
-            </el-row>
-            <div>
-              +
-              <a style="color: #409eff" @click="addEnumItem()">{{ $t('product.product-things-model.142341-75') }}</a>
+                <div v-if="form.datatype == 'enum'">
+                    <el-form-item :label="$t('product.product-things-model.142341-68')">
+                        <el-select v-model="form.specs.showWay" :placeholder="$t('product.product-things-model.142341-69')" style="width: 175px">
+                            <el-option key="select" :label="$t('product.product-things-model.142341-70')" value="select"></el-option>
+                            <el-option key="button" :label="$t('product.product-things-model.142341-71')" value="button"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="$t('product.product-things-model.142341-72')" prop="">
+                        <el-row v-for="(item, index) in form.specs.enumList" :key="'enum' + index" style="margin-bottom: 10px">
+                            <el-col :span="9">
+                                <el-input v-model="item.value" :placeholder="$t('product.product-things-model.142341-73')" />
+                            </el-col>
+                            <el-col :span="11" :offset="1">
+                                <el-input v-model="item.text" :placeholder="$t('product.product-things-model.142341-74')" />
+                            </el-col>
+                            <el-col :span="2" :offset="1" v-if="index != 0">
+                                <a style="color: #f56c6c" @click="removeEnumItem(index)">{{ $t('del') }}</a>
+                            </el-col>
+                        </el-row>
+                        <div>
+                            +
+                            <a style="color: #409eff" @click="addEnumItem()">{{ $t('product.product-things-model.142341-75') }}</a>
+                        </div>
+                    </el-form-item>
+                </div>
+
+                <div v-if="form.datatype == 'string'">
+                    <el-form-item :label="$t('product.product-things-model.142341-76')" prop="">
+                        <el-row>
+                            <el-col :span="9">
+                                <el-input v-model="form.specs.maxLength" :placeholder="$t('product.product-things-model.142341-77')" type="number" />
+                            </el-col>
+                            <el-col :span="14" :offset="1">{{ $t('product.product-things-model.142341-78') }}</el-col>
+                        </el-row>
+                    </el-form-item>
+                </div>
+
+                <div v-if="form.datatype == 'array'">
+                    <el-form-item :label="$t('product.product-things-model.142341-79')" prop="">
+                        <el-row>
+                            <el-col :span="9">
+                                <el-input v-model="form.specs.arrayCount" :placeholder="$t('product.product-things-model.142341-80')" type="number" />
+                            </el-col>
+                        </el-row>
+                    </el-form-item>
+                    <el-form-item :label="$t('product.product-things-model.142341-81')" prop="">
+                        <el-radio-group v-model="form.specs.arrayType">
+                            <el-radio label="integer">{{ $t('product.product-things-model.142341-38') }}</el-radio>
+                            <el-radio label="decimal">{{ $t('product.product-things-model.142341-39') }}</el-radio>
+                            <el-radio label="string">{{ $t('product.product-things-model.142341-42') }}</el-radio>
+                            <el-radio label="object">{{ $t('product.product-things-model.142341-44') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item :label="$t('product.product-things-model.142341-82')" v-if="form.specs.arrayType == 'object'">
+                        <div style="background-color: #f8f8f8; border-radius: 5px">
+                            <el-row style="padding: 0 10px 5px" v-for="(item, index) in form.specs.params" :key="index">
+                                <div style="margin-top: 5px" v-if="index == 0"></div>
+                                <el-col :span="18">
+                                    <el-input readonly v-model="item.name" size="mini" :placeholder="$t('product.product-things-model.142341-83')" style="margin-top: 3px">
+                                        <template slot="prepend">
+                                            <el-tag size="mini" effect="dark" style="margin-left: -21px; height: 26px; line-height: 26px">{{ item.order }}</el-tag>
+                                            {{ form.identifier + '_' + item.id }}
+                                        </template>
+                                        <el-button slot="append" @click="editParameter(item, index)" size="small">{{ $t('product.product-things-model.142341-84') }}</el-button>
+                                    </el-input>
+                                </el-col>
+                                <el-col :span="2" :offset="2">
+                                    <el-button size="small" plain type="danger" style="padding: 5px" icon="el-icon-delete" @click="removeParameter(index)">{{ $t('del') }}</el-button>
+                                </el-col>
+                            </el-row>
+                        </div>
+                        <div>
+                            +
+                            <a style="color: #409eff" @click="addParameter()">{{ $t('product.product-things-model.142341-85') }}</a>
+                        </div>
+                    </el-form-item>
+                </div>
+                <div v-if="form.datatype == 'object'">
+                    <el-form-item :label="$t('product.product-things-model.142341-87')" prop="">
+                        <div style="background-color: #f8f8f8; border-radius: 5px">
+                            <el-row style="padding: 0 10px 5px" v-for="(item, index) in form.specs.params" :key="index">
+                                <div style="margin-top: 5px" v-if="index == 0"></div>
+                                <el-col :span="18">
+                                    <el-input readonly v-model="item.name" size="mini" :placeholder="$t('product.product-things-model.142341-88')" style="margin-top: 3px">
+                                        <template slot="prepend">
+                                            <el-tag size="mini" effect="dark" style="margin-left: -21px; height: 26px; line-height: 26px">{{ item.order }}</el-tag>
+                                            {{ form.identifier + '_' + item.id }}
+                                        </template>
+                                        <el-button slot="append" @click="editParameter(item, index)" size="small">{{ $t('product.product-things-model.142341-84') }}</el-button>
+                                    </el-input>
+                                </el-col>
+                                <el-col :span="2" :offset="2">
+                                    <el-button size="small" plain type="danger" style="padding: 5px" icon="el-icon-delete" @click="removeParameter(index)">{{ $t('del') }}</el-button>
+                                </el-col>
+                            </el-row>
+                        </div>
+                        <div>
+                            +
+                            <a style="color: #409eff" @click="addParameter()">{{ $t('product.product-things-model.142341-85') }}</a>
+                        </div>
+                    </el-form-item>
+                </div>
+            </el-form>
+
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">{{ $t('confirm') }}</el-button>
+                <el-button @click="cancel">{{ $t('cancel') }}</el-button>
             </div>
-          </el-form-item>
-        </div>
+        </el-dialog>
 
-        <div v-if="form.datatype == 'string'">
-          <el-form-item :label="$t('product.product-things-model.142341-76')" prop="">
-            <el-row>
-              <el-col :span="9">
-                <el-input v-model="form.specs.maxLength" :placeholder="$t('product.product-things-model.142341-77')" type="number" />
-              </el-col>
-              <el-col :span="14" :offset="1">{{ $t('product.product-things-model.142341-78') }}</el-col>
-            </el-row>
-          </el-form-item>
-        </div>
+        <!--物模型参数类型-->
+        <things-parameter :data="paramData" @dataEvent="getParamData($event)" />
 
-        <div v-if="form.datatype == 'array'">
-          <el-form-item :label="$t('product.product-things-model.142341-79')" prop="">
-            <el-row>
-              <el-col :span="9">
-                <el-input v-model="form.specs.arrayCount" :placeholder="$t('product.product-things-model.142341-80')" type="number" />
-              </el-col>
-            </el-row>
-          </el-form-item>
-          <el-form-item :label="$t('product.product-things-model.142341-81')" prop="">
-            <el-radio-group v-model="form.specs.arrayType">
-              <el-radio label="integer">{{ $t('product.product-things-model.142341-38') }}</el-radio>
-              <el-radio label="decimal">{{ $t('product.product-things-model.142341-39') }}</el-radio>
-              <el-radio label="string">{{ $t('product.product-things-model.142341-42') }}</el-radio>
-              <el-radio label="object">{{ $t('product.product-things-model.142341-44') }}</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item :label="$t('product.product-things-model.142341-82')" v-if="form.specs.arrayType == 'object'">
-            <div style="background-color: #f8f8f8; border-radius: 5px">
-              <el-row style="padding: 0 10px 5px" v-for="(item, index) in form.specs.params" :key="index">
-                <div style="margin-top: 5px" v-if="index == 0"></div>
-                <el-col :span="18">
-                  <el-input readonly v-model="item.name" size="mini" :placeholder="$t('product.product-things-model.142341-83')" style="margin-top: 3px">
-                    <template slot="prepend">
-                      <el-tag size="mini" effect="dark" style="margin-left: -21px; height: 26px; line-height: 26px">{{
-                        item.order }}</el-tag>
-                      {{ form.identifier + '_' + item.id }}
-                    </template>
-                    <el-button slot="append" @click="editParameter(item, index)" size="small">{{ $t('product.product-things-model.142341-84') }}</el-button>
-                  </el-input>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                  <el-button size="small" plain type="danger" style="padding: 5px" icon="el-icon-delete"
-                    @click="removeParameter(index)">{{ $t('del') }}</el-button>
-                </el-col>
-              </el-row>
+        <!-- 导入通用物模型对话框 -->
+        <el-dialog :title="title" :visible.sync="openSelect" width="800px" append-to-body>
+            <product-select-template ref="productSelectTemplate" @idsToParentEvent="getChildData($event)" />
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="importSelect">{{ $t('import') }}</el-button>
+                <el-button @click="cancelSelect">{{ $t('cancel') }}</el-button>
             </div>
-            <div>
-              +
-              <a style="color: #409eff" @click="addParameter()">{{ $t('product.product-things-model.142341-85') }}</a>
+        </el-dialog>
+
+        <!-- 物模型JSON -->
+        <el-dialog :title="title" :visible.sync="openThingsModel" width="600px" append-to-body>
+            <div style="border: 1px solid #ccc; margin-top: -15px; height: 600px; overflow: scroll">
+                <json-viewer :value="thingsModel" :expand-depth="10" copyable>
+                    <template v-slot:copy>{{ $t('product.product-things-model.142341-92') }}</template>
+                </json-viewer>
             </div>
-          </el-form-item>
-        </div>
-        <div v-if="form.datatype == 'object'">
-          <el-form-item :label="$t('product.product-things-model.142341-87')" prop="">
-            <div style="background-color: #f8f8f8; border-radius: 5px">
-              <el-row style="padding: 0 10px 5px" v-for="(item, index) in form.specs.params" :key="index">
-                <div style="margin-top: 5px" v-if="index == 0"></div>
-                <el-col :span="18">
-                  <el-input readonly v-model="item.name" size="mini" :placeholder="$t('product.product-things-model.142341-88')" style="margin-top: 3px">
-                    <template slot="prepend">
-                      <el-tag size="mini" effect="dark" style="margin-left: -21px; height: 26px; line-height: 26px">{{
-                        item.order }}</el-tag>
-                      {{ form.identifier + '_' + item.id }}
-                    </template>
-                    <el-button slot="append" @click="editParameter(item, index)" size="small">{{ $t('product.product-things-model.142341-84') }}</el-button>
-                  </el-input>
-                </el-col>
-                <el-col :span="2" :offset="2">
-                  <el-button size="small" plain type="danger" style="padding: 5px" icon="el-icon-delete"
-                    @click="removeParameter(index)">{{ $t('del') }}</el-button>
-                </el-col>
-              </el-row>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="info" @click="handleCloseThingsModel">{{ $t('close') }}</el-button>
             </div>
-            <div>
-              +
-              <a style="color: #409eff" @click="addParameter()">{{ $t('product.product-things-model.142341-85') }}</a>
-            </div>
-          </el-form-item>
-        </div>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{ $t('confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('cancel') }}</el-button>
-      </div>
-    </el-dialog>
-
-    <!--物模型参数类型-->
-    <things-parameter :data="paramData" @dataEvent="getParamData($event)" />
-
-    <!-- 导入通用物模型对话框 -->
-    <el-dialog :title="title" :visible.sync="openSelect" width="800px" append-to-body>
-      <product-select-template ref="productSelectTemplate" @idsToParentEvent="getChildData($event)" />
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="importSelect">{{ $t('import') }}</el-button>
-        <el-button @click="cancelSelect">{{ $t('cancel') }}</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 物模型JSON -->
-    <el-dialog :title="title" :visible.sync="openThingsModel" width="600px" append-to-body>
-      <div style="border: 1px solid #ccc; margin-top: -15px; height: 600px; overflow: scroll">
-        <json-viewer :value="thingsModel" :expand-depth="10" copyable>
-          <template v-slot:copy>{{ $t('product.product-things-model.142341-92') }}</template>
-        </json-viewer>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="info" @click="handleCloseThingsModel">{{ $t('close') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-
+        </el-dialog>
+    </div>
 </template>
 
 <style>
 .specsColor {
-  background-color: #fcfcfc;
+    background-color: #fcfcfc;
 }
 </style>
 
@@ -349,637 +345,666 @@ import thingsParameter from '../template/parameter';
 import { listModel, getModel, delModel, addModel, updateModel, importModel } from '@/api/iot/model';
 
 export default {
-  name: 'product-things-model',
-  dicts: ['iot_things_type', 'iot_data_type', 'iot_yes_no'],
-  components: {
-    productSelectTemplate,
-    thingsParameter,
-    JsonViewer,
-  },
-  props: {
-    product: {
-      type: Object,
-      default: null,
+    name: 'product-things-model',
+    dicts: ['iot_things_type', 'iot_data_type', 'iot_yes_no'],
+    components: {
+        productSelectTemplate,
+        thingsParameter,
+        JsonViewer,
     },
-  },
-  watch: {
-    // 获取到父组件传递的productId后，刷新列表
-    product: function (newVal, oldVal) {
-      this.productInfo = newVal;
-      if (this.productInfo && this.productInfo.productId != 0) {
-        this.queryParams.productId = this.productInfo.productId;
-        this.queryParams.isModbus = this.productInfo.isModbus;
-        this.getList();
-      }
-    },
-  },
-  data() {
-    return {
-      // 物模型
-      thingsModel: {},
-      // 父组件接收的产品信息
-      productInfo: {},
-      // 子组件选中的id数组
-      templateIds: [],
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 产品物模型表格数据
-      modelList: [],
-       //是否为小数的判断
-       isDecimal: '',
-      isDecimalMax: '',
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      openSelect: false,
-      openThingsModel: false,
-      // 查询参数
-      queryParams: {
-        productId: 0,
-        pageNum: 1,
-        pageSize: 100,
-      },
-      // 表单参数
-      form: {},
-      // 对象类型参数
-      paramData: {
-        index: -1,
-        parameter: {},
-      },
-      //是否是modbus
-      isModbus: false,
-      slaveList: [],
-      slave: {},
-      // 表单校验
-      rules: {
-        modelName: [
-          {
-            required: true,
-            message: this.$t('product.product-things-model.142341-94'),
-            trigger: 'blur',
-          },
-          {
-            min: 1,
-            max: 64,
-            message: this.$i18n.t('product.product-things-model.142341-94'),
-            trigger: 'blur',
-          },
-        ],
-        identifier: [
-          {
-            required: true,
-            message: this.$t('product.product-things-model.142341-95'),
-            trigger: 'blur',
-          },
-          {
-            min: 1,
-            max: 32,
-            message: this.$i18n.t('product.product-things-model.142341-95'),
-            trigger: 'blur',
-          },
-        ],
-        modelOrder: [
-          {
-            required: true,
-            message: this.$t('product.product-things-model.142341-96'),
-            trigger: 'blur',
-          }, {
-            type: 'number',
-            min: -2147483648,
-            max: 2147483647,
-            message: this.$t('product.product-things-model.142341-96'),
-            trigger: 'blur',
-          },
-        ],
-        type: [
-          {
-            required: true,
-            message: this.$t('product.product-things-model.142341-97'),
-            trigger: 'change',
-          },
-
-        ],
-        datatype: [
-          {
-            required: true,
-            message: this.$t('product.product-things-model.142341-98'),
-            trigger: 'change',
-          },
-        ],
-      },
-    };
-  },
-  created() { },
-  methods: {
-    /**查询产品物模型列表 */
-    getList() {
-      this.loading = true;
-      listModel(this.queryParams).then((response) => {
-        this.modelList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        templateId: null,
-        templateName: null,
-        userId: null,
-        userName: null,
-        tenantId: null,
-        tenantName: null,
-        identifier: null,
-        modelOrder: 0,
-        type: 1,
-        datatype: 'integer',
-        isSys: null,
-        isChart: 1,
-        isHistory: 1,
-        isSharePerm: 1,
-        isMonitor: 1,
-        isReadonly: 1,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null,
-        specs: {
-          enumList: [
-            {
-              value: '',
-              text: '',
-            },
-          ],
-          arrayType: 'integer',
-          arrayCount: 5,
-          showWay: 'select', // 显示方式select=下拉选择框，button=按钮
-          params: [],
+    props: {
+        product: {
+            type: Object,
+            default: null,
         },
-      };
-      this.resetForm('form');
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+    watch: {
+        // 获取到父组件传递的productId后，刷新列表
+        product: function (newVal, oldVal) {
+            this.productInfo = newVal;
+            if (this.productInfo && this.productInfo.productId != 0) {
+                this.queryParams.productId = this.productInfo.productId;
+                this.queryParams.isModbus = this.productInfo.isModbus;
+                this.getList();
+            }
+        },
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm');
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = this.$t('product.product-things-model.142341-99');
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const modelId = row.modelId;
-      getModel(modelId).then((response) => {
-        let tempForm = response.data;
-        this.open = true;
-        this.title = this.$t('product.product-things-model.142341-100');
-        // Json转对象
-        tempForm.specs = JSON.parse(tempForm.specs);
-        if (!tempForm.specs.enumList) {
-          tempForm.specs.showWay = 'select';
-          tempForm.specs.enumList = [
-            {
-              value: '',
-              text: '',
+    data() {
+        return {
+            // 物模型
+            thingsModel: {},
+            // 父组件接收的产品信息
+            productInfo: {},
+            // 子组件选中的id数组
+            templateIds: [],
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 产品物模型表格数据
+            modelList: [],
+            //是否为小数的判断
+            isDecimal: '',
+            isDecimalMax: '',
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            openSelect: false,
+            openThingsModel: false,
+            // 查询参数
+            queryParams: {
+                productId: 0,
+                pageNum: 1,
+                pageSize: 100,
+            },
+            // 表单参数
+            form: {},
+            // 对象类型参数
+            paramData: {
+                index: -1,
+                parameter: {},
+            },
+            //是否是modbus
+            isModbus: false,
+            slaveList: [],
+            slave: {},
+            // 表单校验
+            rules: {
+                modelName: [
+                    {
+                        required: true,
+                        message: this.$t('product.product-things-model.142341-94'),
+                        trigger: 'blur',
+                    },
+                    {
+                        min: 1,
+                        max: 64,
+                        message: this.$i18n.t('product.product-things-model.142341-94'),
+                        trigger: 'blur',
+                    },
+                ],
+                identifier: [
+                    {
+                        required: true,
+                        message: this.$t('product.product-things-model.142341-95'),
+                        trigger: 'blur',
+                    },
+                    {
+                        min: 1,
+                        max: 32,
+                        message: this.$i18n.t('product.product-things-model.142341-95'),
+                        trigger: 'blur',
+                    },
+                ],
+                modelOrder: [
+                    {
+                        required: true,
+                        message: this.$t('product.product-things-model.142341-96'),
+                        trigger: 'blur',
+                    },
+                    {
+                        type: 'number',
+                        min: -2147483648,
+                        max: 2147483647,
+                        message: this.$t('product.product-things-model.142341-96'),
+                        trigger: 'blur',
+                    },
+                ],
+                type: [
+                    {
+                        required: true,
+                        message: this.$t('product.product-things-model.142341-97'),
+                        trigger: 'change',
+                    },
+                ],
+                datatype: [
+                    {
+                        required: true,
+                        message: this.$t('product.product-things-model.142341-98'),
+                        trigger: 'change',
+                    },
+                ],
             },
-          ];
-        }
-        if (!tempForm.specs.arrayType) {
-          tempForm.specs.arrayType = 'integer';
-        }
-        if (!tempForm.specs.arrayCount) {
-          tempForm.specs.arrayCount = 5;
-        }
-        if (!tempForm.specs.params) {
-          tempForm.specs.params = [];
-        }
-        // 对象和数组中参数删除前缀
-        if ((tempForm.specs.type == 'array' && tempForm.specs.arrayType == 'object') || tempForm.specs.type == 'object') {
-          for (let i = 0; i < tempForm.specs.params.length; i++) {
-            tempForm.specs.params[i].id = String(tempForm.specs.params[i].id).substring(String(tempForm.identifier).length + 1);
-          }
-        }
-        this.form = tempForm;
-      });
-    },
-    /**查看物模型 */
-    handleOpenThingsModel() {
-      this.title = this.$t('product.product-things-model.142341-101');
-      // 生成物模型
-      this.thingsModel = {
-        properties: [],
-        functions: [],
-        events: [],
-      };
-      for (var i = 0; i < this.modelList.length; i++) {
-        let thingsItem = {};
-        thingsItem.id = this.modelList[i].identifier;
-        thingsItem.name = this.modelList[i].modelName;
-        if (this.modelList[i].type == 1) {
-          //属性
-          thingsItem.isChart = this.modelList[i].isChart;
-          thingsItem.isMonitor = this.modelList[i].isMonitor;
-          thingsItem.isHistory = this.modelList[i].isHistory;
-          thingsItem.isSharePerm = this.modelList[i].isSharePerm;
-          thingsItem.isReadonly = this.modelList[i].isReadonly;
-          thingsItem.datatype = JSON.parse(this.modelList[i].specs);
-          this.thingsModel.properties.push(thingsItem);
-        } else if (this.modelList[i].type == 2) {
-          // 功能
-          thingsItem.isHistory = this.modelList[i].isHistory;
-          thingsItem.isSharePerm = this.modelList[i].isSharePerm;
-          thingsItem.isReadonly = this.modelList[i].isReadonly;
-          thingsItem.datatype = JSON.parse(this.modelList[i].specs);
-          this.thingsModel.functions.push(thingsItem);
-        } else if (this.modelList[i].type == 3) {
-          // 事件
-          thingsItem.isHistory = this.modelList[i].isHistory;
-          thingsItem.isSharePerm = this.modelList[i].isSharePerm;
-          thingsItem.isReadonly = this.modelList[i].isReadonly;
-          thingsItem.datatype = JSON.parse(this.modelList[i].specs);
-          this.thingsModel.events.push(thingsItem);
-        }
-      }
-
-      this.openThingsModel = true;
-    },
-    /**关闭物模型 */
-    handleCloseThingsModel() {
-      this.openThingsModel = false;
-    },
-    /** 选择物模型 */
-    handleSelect() {
-      this.openSelect = true;
-      this.title = this.$t('product.product-things-model.142341-1');
-      this.form.type = 1;
-      this.form.datatype = 'integer';
-      this.form.specs = {
-        enumList: [],
-      };
-    },
-    // 取消导入通用物模型按钮
-    cancelSelect() {
-      this.openSelect = false;
-      this.$refs.productSelectTemplate.$refs.selectTemplateTable.clearSelection();
-    },
-    // 获取子组件的值
-    getChildData(data) {
-      this.templateIds = data;
-    },
-    // 导入通用物模型按钮
-    importSelect() {
-      if (this.templateIds != null && this.templateIds.length > 0) {
-        var importData = {
-          productId: this.productInfo.productId,
-          productName: this.productInfo.productName,
-          templateIds: this.templateIds,
         };
-        importModel(importData).then((response) => {
-          this.$modal.msgSuccess(response.msg);
-          this.openSelect = false;
-          this.$refs.productSelectTemplate.$refs.selectTemplateTable.clearSelection();
-          this.getList();
-        });
-      }
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          // 验证对象或对象数组中的参数不能为空
-          if (this.form.datatype == 'object' || (this.form.datatype == 'array' && this.form.specs.arrayType == 'object')) {
-            if (!this.form.specs.params || this.form.specs.params == 0) {
-              this.$modal.msgError(this.$t('product.product-things-model.142341-102'));
-              return;
-            }
-          }
-          // 验证对象参数标识符不能相同
-          if (this.form.specs.params && this.form.specs.params.length > 0) {
-            let arr = this.form.specs.params.map((item) => item.id).sort();
-            for (let i = 0; i < arr.length; i++) {
-              if (arr[i] == arr[i + 1]) {
-                this.$modal.msgError(this.$i18n.t('product.product-things-model.142341-105', [arr[i]]));
-                return;
-              }
-            }
-          }
-          //验证输入的取值范围最大值不能小于最小值
-          if (this.form.datatype == 'integer' || this.form.datatype == 'decimal') {
-            if (parseFloat(this.form.specs.min) > parseFloat(this.form.specs.max)) {
-              this.$modal.msgError(this.$t('product.product-things-model.142341-143'));
-              return;
-            }
-          }
-          if (this.form.datatype == 'decimal') {
-            this.hasDecimalPoint();
-            this.hasDecimalPointMax();
-            if (this.isDecimal === false || this.isDecimalMax === false) {
-              this.$modal.msgError(this.$t('product.product-things-model.142341-144'));
-              return;
-            }
-          }
-          //验证模型特性为图表展示时，数据类型是否为整数或者小数
-          if ((this.form.isChart == 1 && this.form.datatype != 'integer') && (this.form.isChart == 1 && this.form.datatype != 'decimal')) {
-            this.$modal.msgError(this.$t('product.product-things-model.142341-106'));
-          }
-          else if (this.form.modelId != null) {
-            // 格式化specs
-            let tempForm = JSON.parse(JSON.stringify(this.form));
-            tempForm.specs = this.formatThingsSpecs();
-            if (this.form.type == 2) {
-              tempForm.isMonitor = 0;
-              tempForm.isChart = 0;
-            } else if (this.form.type == 3) {
-              tempForm.isMonitor = 0;
-              tempForm.isChart = 0;
-            }
-            updateModel(tempForm).then((response) => {
-              this.$modal.msgSuccess(this.$t('product.product-things-model.142341-107'));
-              this.open = false;
-              this.getList();
+    created() {},
+    methods: {
+        /**查询产品物模型列表 */
+        getList() {
+            this.loading = true;
+            listModel(this.queryParams).then((response) => {
+                this.modelList = response.rows;
+                this.total = response.total;
+                this.loading = false;
             });
-          } else {
-            // 格式化specs
-            let tempForm = JSON.parse(JSON.stringify(this.form));
-            tempForm.specs = this.formatThingsSpecs();
-            tempForm.productId = this.productInfo.productId;
-            tempForm.productName = this.productInfo.productName;
-            if (this.form.type == 2) {
-              tempForm.isMonitor = 0;
-            } else if (this.form.type == 3) {
-              tempForm.isMonitor = 0;
-              tempForm.isChart = 0;
-            }
-            addModel(tempForm).then((response) => {
-              this.$modal.msgSuccess(this.$t('product.product-things-model.142341-108'));
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const modelIds = row.modelId;
-      // if (!this.queryParams.isModbus) {
-      this.$modal
-        .confirm(this.$i18n.t('product.product-things-model.142341-109', [modelIds]))
-        .then(function () {
-          return delModel(modelIds);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess(this.$t('product.product-things-model.142341-111'));
-        })
-        .catch(() => { });
-      // } else {
-      //   this.$modal.alert('采集点删除请在采集点模板修改');
-      // }
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        'iot/model/export',
-        {
-          ...this.queryParams,
         },
-        `model_${new Date().getTime()}.xlsx`
-      );
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                templateId: null,
+                templateName: null,
+                userId: null,
+                userName: null,
+                tenantId: null,
+                tenantName: null,
+                identifier: null,
+                modelOrder: 0,
+                type: 1,
+                datatype: 'integer',
+                isSys: null,
+                isChart: 1,
+                isHistory: 1,
+                isSharePerm: 1,
+                isMonitor: 1,
+                isReadonly: 1,
+                delFlag: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                remark: null,
+                specs: {
+                    enumList: [
+                        {
+                            value: '',
+                            text: '',
+                        },
+                    ],
+                    arrayType: 'integer',
+                    arrayCount: 5,
+                    showWay: 'select', // 显示方式select=下拉选择框，button=按钮
+                    params: [],
+                },
+            };
+            this.resetForm('form');
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm');
+            this.handleQuery();
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = this.$t('product.product-things-model.142341-99');
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const modelId = row.modelId;
+            getModel(modelId).then((response) => {
+                let tempForm = response.data;
+                this.open = true;
+                this.title = this.$t('product.product-things-model.142341-100');
+                // Json转对象
+                tempForm.specs = JSON.parse(tempForm.specs);
+                if (!tempForm.specs.enumList) {
+                    tempForm.specs.showWay = 'select';
+                    tempForm.specs.enumList = [
+                        {
+                            value: '',
+                            text: '',
+                        },
+                    ];
+                }
+                if (!tempForm.specs.arrayType) {
+                    tempForm.specs.arrayType = 'integer';
+                }
+                if (!tempForm.specs.arrayCount) {
+                    tempForm.specs.arrayCount = 5;
+                }
+                if (!tempForm.specs.params) {
+                    tempForm.specs.params = [];
+                }
+                // 对象和数组中参数删除前缀
+                if ((tempForm.specs.type == 'array' && tempForm.specs.arrayType == 'object') || tempForm.specs.type == 'object') {
+                    for (let i = 0; i < tempForm.specs.params.length; i++) {
+                        tempForm.specs.params[i].id = String(tempForm.specs.params[i].id).substring(String(tempForm.identifier).length + 1);
+                    }
+                }
+                this.form = tempForm;
+            });
+        },
+        /**查看物模型 */
+        handleOpenThingsModel() {
+            this.title = this.$t('product.product-things-model.142341-101');
+            // 生成物模型
+            this.thingsModel = {
+                properties: [],
+                functions: [],
+                events: [],
+            };
+            for (var i = 0; i < this.modelList.length; i++) {
+                let thingsItem = {};
+                thingsItem.id = this.modelList[i].identifier;
+                thingsItem.name = this.modelList[i].modelName;
+                if (this.modelList[i].type == 1) {
+                    //属性
+                    thingsItem.isChart = this.modelList[i].isChart;
+                    thingsItem.isMonitor = this.modelList[i].isMonitor;
+                    thingsItem.isHistory = this.modelList[i].isHistory;
+                    thingsItem.isSharePerm = this.modelList[i].isSharePerm;
+                    thingsItem.isReadonly = this.modelList[i].isReadonly;
+                    thingsItem.datatype = JSON.parse(this.modelList[i].specs);
+                    this.thingsModel.properties.push(thingsItem);
+                } else if (this.modelList[i].type == 2) {
+                    // 功能
+                    thingsItem.isHistory = this.modelList[i].isHistory;
+                    thingsItem.isSharePerm = this.modelList[i].isSharePerm;
+                    thingsItem.isReadonly = this.modelList[i].isReadonly;
+                    thingsItem.datatype = JSON.parse(this.modelList[i].specs);
+                    this.thingsModel.functions.push(thingsItem);
+                } else if (this.modelList[i].type == 3) {
+                    // 事件
+                    thingsItem.isHistory = this.modelList[i].isHistory;
+                    thingsItem.isSharePerm = this.modelList[i].isSharePerm;
+                    thingsItem.isReadonly = this.modelList[i].isReadonly;
+                    thingsItem.datatype = JSON.parse(this.modelList[i].specs);
+                    this.thingsModel.events.push(thingsItem);
+                }
+            }
+
+            this.openThingsModel = true;
+        },
+        /**关闭物模型 */
+        handleCloseThingsModel() {
+            this.openThingsModel = false;
+        },
+        /** 选择物模型 */
+        handleSelect() {
+            this.openSelect = true;
+            this.title = this.$t('product.product-things-model.142341-1');
+            this.form.type = 1;
+            this.form.datatype = 'integer';
+            this.form.specs = {
+                enumList: [],
+            };
+        },
+        // 取消导入通用物模型按钮
+        cancelSelect() {
+            this.openSelect = false;
+            this.$refs.productSelectTemplate.$refs.selectTemplateTable.clearSelection();
+        },
+        // 获取子组件的值
+        getChildData(data) {
+            this.templateIds = data;
+        },
+        // 导入通用物模型按钮
+        importSelect() {
+            if (this.templateIds != null && this.templateIds.length > 0) {
+                var importData = {
+                    productId: this.productInfo.productId,
+                    productName: this.productInfo.productName,
+                    templateIds: this.templateIds,
+                };
+                importModel(importData).then((response) => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.openSelect = false;
+                    this.$refs.productSelectTemplate.$refs.selectTemplateTable.clearSelection();
+                    this.getList();
+                });
+            }
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    // 验证对象或对象数组中的参数不能为空
+                    if (this.form.datatype == 'object' || (this.form.datatype == 'array' && this.form.specs.arrayType == 'object')) {
+                        if (!this.form.specs.params || this.form.specs.params == 0) {
+                            this.$modal.msgError(this.$t('product.product-things-model.142341-102'));
+                            return;
+                        }
+                    }
+                    // 验证对象参数标识符不能相同
+                    if (this.form.specs.params && this.form.specs.params.length > 0) {
+                        let arr = this.form.specs.params.map((item) => item.id).sort();
+                        for (let i = 0; i < arr.length; i++) {
+                            if (arr[i] == arr[i + 1]) {
+                                this.$modal.msgError(this.$i18n.t('product.product-things-model.142341-105', [arr[i]]));
+                                return;
+                            }
+                        }
+                    }
+                    //验证输入的取值范围最大值不能小于最小值
+                    if (this.form.datatype == 'integer' || this.form.datatype == 'decimal') {
+                        if (parseFloat(this.form.specs.min) > parseFloat(this.form.specs.max)) {
+                            this.$modal.msgError(this.$t('product.product-things-model.142341-143'));
+                            return;
+                        }
+                    }
+                    if (this.form.datatype == 'decimal') {
+                        this.hasDecimalPoint();
+                        this.hasDecimalPointMax();
+                        if (this.isDecimal === false || this.isDecimalMax === false) {
+                            this.$modal.msgError(this.$t('product.product-things-model.142341-144'));
+                            return;
+                        }
+                    }
+                    //验证模型特性为图表展示时，数据类型是否为整数或者小数
+                    if (this.form.isChart == 1 && this.form.datatype != 'integer' && this.form.isChart == 1 && this.form.datatype != 'decimal') {
+                        this.$modal.msgError(this.$t('product.product-things-model.142341-106'));
+                    } else if (this.form.modelId != null) {
+                        // 格式化specs
+                        let tempForm = JSON.parse(JSON.stringify(this.form));
+                        tempForm.specs = this.formatThingsSpecs();
+                        if (this.form.type == 2) {
+                            tempForm.isMonitor = 0;
+                            tempForm.isChart = 0;
+                        } else if (this.form.type == 3) {
+                            tempForm.isMonitor = 0;
+                            tempForm.isChart = 0;
+                        }
+                        updateModel(tempForm).then((response) => {
+                            this.$modal.msgSuccess(this.$t('product.product-things-model.142341-107'));
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        // 格式化specs
+                        let tempForm = JSON.parse(JSON.stringify(this.form));
+                        tempForm.specs = this.formatThingsSpecs();
+                        tempForm.productId = this.productInfo.productId;
+                        tempForm.productName = this.productInfo.productName;
+                        if (this.form.type == 2) {
+                            tempForm.isMonitor = 0;
+                        } else if (this.form.type == 3) {
+                            tempForm.isMonitor = 0;
+                            tempForm.isChart = 0;
+                        }
+                        addModel(tempForm).then((response) => {
+                            this.$modal.msgSuccess(this.$t('product.product-things-model.142341-108'));
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const modelIds = row.modelId;
+            // if (!this.queryParams.isModbus) {
+            this.$modal
+                .confirm(this.$i18n.t('product.product-things-model.142341-109', [modelIds]))
+                .then(function () {
+                    return delModel(modelIds);
+                })
+                .then(() => {
+                    this.getList();
+                    this.$modal.msgSuccess(this.$t('product.product-things-model.142341-111'));
+                })
+                .catch(() => {});
+            // } else {
+            //   this.$modal.alert('采集点删除请在采集点模板修改');
+            // }
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'iot/model/export',
+                {
+                    ...this.queryParams,
+                },
+                `model_${new Date().getTime()}.xlsx`
+            );
+        },
+        // 类型改变
+        typeChange(type) {
+            if (type == 1) {
+                this.form.isChart = 1;
+                this.form.isHistory = 1;
+                this.form.isSharePerm = 1;
+                this.form.isMonitor = 1;
+                this.form.isReadonly = 1;
+                this.form.datatype = 'integer';
+            } else if (type == 2) {
+                this.form.isChart = 0;
+                this.form.isHistory = 1;
+                this.form.isSharePerm = 1;
+                this.form.isMonitor = 0;
+                this.form.isReadonly = 0;
+            } else if (type == 3) {
+                this.form.isChart = 0;
+                this.form.isHistory = 1;
+                this.form.isSharePerm = 0;
+                this.form.isMonitor = 0;
+                this.form.isReadonly = 1;
+            }
+        },
+        // 是否图表展示改变
+        isChartChange() {
+            if (this.form.isChart == 1) {
+                this.form.isReadonly = 1;
+            } else {
+                this.form.isMonitor = 0;
+            }
+        },
+        // 是否实时监测改变
+        isMonitorChange() {
+            if (this.form.isMonitor == 1) {
+                this.form.isReadonly = 1;
+                this.form.isChart = 1;
+            }
+        },
+        // 是否只读数据改变
+        isReadonlyChange() {
+            if (this.form.isReadonly == 0) {
+                this.form.isMonitor = 0;
+                this.form.isChart = 0;
+            }
+        },
+        // 格式化物模型
+        formatThingsSpecs() {
+            var data = {};
+            data.type = this.form.datatype;
+            if (this.form.datatype == 'integer' || this.form.datatype == 'decimal') {
+                data.min = Number(this.form.specs.min ? this.form.specs.min : 0);
+                data.max = Number(this.form.specs.max ? this.form.specs.max : 100);
+                data.unit = this.form.specs.unit ? this.form.specs.unit : '';
+                data.step = Number(this.form.specs.step ? this.form.specs.step : 1);
+            } else if (this.form.datatype == 'string') {
+                data.maxLength = Number(this.form.specs.maxLength ? this.form.specs.maxLength : 1024);
+            } else if (this.form.datatype == 'bool') {
+                data.falseText = this.form.specs.falseText ? this.form.specs.falseText : this.$t('product.product-things-model.142341-113');
+                data.trueText = this.form.specs.trueText ? this.form.specs.trueText : this.$t('product.product-things-model.142341-114');
+            } else if (this.form.datatype == 'enum') {
+                data.showWay = this.form.specs.showWay;
+                if (this.form.specs.enumList && this.form.specs.enumList[0].text != '') {
+                    data.enumList = this.form.specs.enumList;
+                } else {
+                    data.showWay = 'select';
+                    data.enumList = [
+                        {
+                            value: '0',
+                            text: this.$t('product.product-things-model.142341-115'),
+                        },
+                        {
+                            value: '1',
+                            text: this.$t('product.product-things-model.142341-116'),
+                        },
+                    ];
+                }
+            } else if (this.form.datatype == 'array') {
+                data.arrayType = this.form.specs.arrayType;
+                data.arrayCount = this.form.specs.arrayCount ? this.form.specs.arrayCount : 5;
+                if (data.arrayType == 'object') {
+                    data.params = this.form.specs.params;
+                    // 物模型名称作为参数的标识符前缀
+                    for (let i = 0; i < data.params.length; i++) {
+                        data.params[i].id = this.form.identifier + '_' + data.params[i].id;
+                    }
+                }
+            } else if (this.form.datatype == 'object') {
+                data.params = this.form.specs.params;
+                // 物模型名称作为参数的标识符前缀
+                for (let i = 0; i < data.params.length; i++) {
+                    data.params[i].id = this.form.identifier + '_' + data.params[i].id;
+                }
+            }
+            return JSON.stringify(data);
+        },
+        /** 数据类型改变 */
+        dataTypeChange(val) {
+            this.form.specs = {
+                enumList: [
+                    {
+                        value: '',
+                        text: '',
+                    },
+                ],
+                arrayType: 'integer',
+                arrayCount: 5,
+                showWay: 'select',
+                params: [],
+            };
+        },
+        /** 添加枚举项 */
+        addEnumItem() {
+            this.form.specs.enumList.push({
+                value: '',
+                text: '',
+            });
+        },
+        /** 删除枚举项 */
+        removeEnumItem(index) {
+            this.form.specs.enumList.splice(index, 1);
+        },
+        /** 格式化显示数据定义 */
+        formatSpecsDisplay(json) {
+            let specs = JSON.parse(json);
+            if (specs.type === 'integer' || specs.type === 'decimal' || specs.type === 'INT16' || specs.type === 'INT') {
+                return (
+                    "<span style='width:50%;display:inline-block;'>" +
+                    this.$t('product.product-things-model.142341-117') +
+                    '<span style="color:#F56C6C">' +
+                    specs.max +
+                    '</span></span>' +
+                    this.$t('product.product-things-model.142341-118') +
+                    '<span style="color:#F56C6C">' +
+                    specs.min +
+                    "</span><br /><span style='width:50%;display:inline-block;'>" +
+                    this.$t('product.product-things-model.142341-119') +
+                    '<span style="color:#F56C6C">' +
+                    specs.step +
+                    '</span></span>' +
+                    this.$t('product.product-things-model.142341-120') +
+                    '<span style="color:#F56C6C">' +
+                    specs.unit
+                );
+            } else if (specs.type === 'string') {
+                return this.$t('product.product-things-model.142341-121') + '<span style="color:#F56C6C">' + specs.maxLength + '</span>';
+            } else if (specs.type === 'array') {
+                return (
+                    "<span style='width:50%;display:inline-block;'>" +
+                    this.$t('product.product-things-model.142341-122') +
+                    '<span style="color:#F56C6C">' +
+                    specs.arrayType +
+                    '</span></span>' +
+                    this.$t('product.product-things-model.142341-123') +
+                    '<span style="color:#F56C6C">' +
+                    specs.arrayCount
+                );
+            } else if (specs.type === 'enum') {
+                let items = '';
+                for (let i = 0; i < specs.enumList.length; i++) {
+                    items = items + "<span style='width:50%;display:inline-block;'>" + specs.enumList[i].value + "：<span style='color:#F56C6C'>" + specs.enumList[i].text + '</span></span>';
+                    if (i > 0 && i % 2 != 0) {
+                        items = items + '<br />';
+                    }
+                }
+                return items;
+            } else if (specs.type === 'bool') {
+                return '<span style=\'width:50%;display:inline-block;\'>0：<span style="color:#F56C6C">' + specs.falseText + '</span></span>1：<span style="color:#F56C6C">' + specs.trueText;
+            } else if (specs.type === 'object') {
+                let items = '';
+                for (let i = 0; i < specs.params.length; i++) {
+                    items = items + "<span style='width:50%;display:inline-block;'>" + specs.params[i].name + "：<span style='color:#F56C6C'>" + specs.params[i].datatype.type + '</span></span>';
+                    if (i > 0 && i % 2 != 0) {
+                        items = items + '<br />';
+                    }
+                }
+                return items;
+            }
+        },
+        /** 添加参数 */
+        addParameter() {
+            this.paramData = {
+                index: -1,
+                parameter: {},
+            };
+        },
+        /** 编辑参数*/
+        editParameter(data, index) {
+            this.paramData = null;
+            this.paramData = {
+                index: index,
+                parameter: data,
+            };
+        },
+        /** 删除动作 */
+        removeParameter(index) {
+            this.form.specs.params.splice(index, 1);
+        },
+        /**获取设置的参数对象*/
+        getParamData(data) {
+            if (data.index == -1) {
+                this.form.specs.params.push(data.parameter);
+            } else {
+                this.form.specs.params[data.index] = data.parameter;
+                // 解决数组在界面中不更新问题
+                this.$set(this.form.specs.params, data.index, this.form.specs.params[data.index]);
+            }
+        },
+        // 在输入最小值改变时触发
+        handleEdit(e) {
+            let value = e.replace(/[^\-\d]/g, ''); // 只能输入-和数字
+            value = value.replace(/\-{2,}/g, '-'); // -只能保留一个
+            value = value.replace(/(\d)\-/g, '$1'); // 数字后面不能接-，不能出现类似-11-2,12-，11-23
+            value = value.replace(/(-)0+/g, '$1'); // 不能出现-0,-001,-0001类似
+            value = value.replace(/(-\d{10})\d*/, '$1'); // 最多保留10位整数
+            this.form.specs.min = value;
+        },
+        // 在输入最大值改变时触发
+        handleEditmax(e) {
+            let value = e.replace(/[^\-\d]/g, ''); // 只能输入-和数字
+            value = value.replace(/\-{2,}/g, '-'); // -只能保留一个
+            value = value.replace(/(\d)\-/g, '$1'); // 数字后面不能接-，不能出现类似-11-2,12-，11-23
+            value = value.replace(/(-)0+/g, '$1'); // 不能出现-0,-001,-0001类似
+            value = value.replace(/(-\d{10})\d*/, '$1'); // 最多保留10位整数
+            this.form.specs.max = value;
+        },
+        //数据类型为小数的校验
+        hasDecimalPoint() {
+            const regex = /^-?\d+\.\d+$/; // 使用正则表达式匹配小数点格式
+            this.isDecimal = regex.test(this.form.specs.min);
+            return this.isDecimal;
+        },
+        hasDecimalPointMax() {
+            const regex = /^-?\d+\.\d+$/; // 使用正则表达式匹配小数点格式
+            this.isDecimalMax = regex.test(this.form.specs.max);
+            return this.isDecimalMax;
+        },
     },
-    // 类型改变
-    typeChange(type) {
-      if (type == 1) {
-        this.form.isChart = 1;
-        this.form.isHistory = 1;
-        this.form.isSharePerm = 1;
-        this.form.isMonitor = 1;
-        this.form.isReadonly = 1;
-        this.form.datatype = 'integer';
-      } else if (type == 2) {
-        this.form.isChart = 0;
-        this.form.isHistory = 1;
-        this.form.isSharePerm = 1;
-        this.form.isMonitor = 0;
-        this.form.isReadonly = 0;
-      } else if (type == 3) {
-        this.form.isChart = 0;
-        this.form.isHistory = 1;
-        this.form.isSharePerm = 0;
-        this.form.isMonitor = 0;
-        this.form.isReadonly = 1;
-      }
-    },
-    // 是否图表展示改变
-    isChartChange() {
-      if (this.form.isChart == 1) {
-        this.form.isReadonly = 1;
-      } else {
-        this.form.isMonitor = 0;
-      }
-    },
-    // 是否实时监测改变
-    isMonitorChange() {
-      if (this.form.isMonitor == 1) {
-        this.form.isReadonly = 1;
-        this.form.isChart = 1;
-      }
-    },
-    // 是否只读数据改变
-    isReadonlyChange() {
-      if (this.form.isReadonly == 0) {
-        this.form.isMonitor = 0;
-        this.form.isChart = 0;
-      }
-    },
-    // 格式化物模型
-    formatThingsSpecs() {
-      var data = {};
-      data.type = this.form.datatype;
-      if (this.form.datatype == 'integer' || this.form.datatype == 'decimal') {
-        data.min = Number(this.form.specs.min ? this.form.specs.min : 0);
-        data.max = Number(this.form.specs.max ? this.form.specs.max : 100);
-        data.unit = this.form.specs.unit ? this.form.specs.unit : '';
-        data.step = Number(this.form.specs.step ? this.form.specs.step : 1);
-      } else if (this.form.datatype == 'string') {
-        data.maxLength = Number(this.form.specs.maxLength ? this.form.specs.maxLength : 1024);
-      } else if (this.form.datatype == 'bool') {
-        data.falseText = this.form.specs.falseText ? this.form.specs.falseText : this.$t('product.product-things-model.142341-113');
-        data.trueText = this.form.specs.trueText ? this.form.specs.trueText : this.$t('product.product-things-model.142341-114');
-      } else if (this.form.datatype == 'enum') {
-        data.showWay = this.form.specs.showWay;
-        if (this.form.specs.enumList && this.form.specs.enumList[0].text != '') {
-          data.enumList = this.form.specs.enumList;
-        } else {
-          data.showWay = 'select';
-          data.enumList = [
-            {
-              value: '0',
-              text: this.$t('product.product-things-model.142341-115'),
-            },
-            {
-              value: '1',
-              text: this.$t('product.product-things-model.142341-116'),
-            },
-          ];
-        }
-      } else if (this.form.datatype == 'array') {
-        data.arrayType = this.form.specs.arrayType;
-        data.arrayCount = this.form.specs.arrayCount ? this.form.specs.arrayCount : 5;
-        if (data.arrayType == 'object') {
-          data.params = this.form.specs.params;
-          // 物模型名称作为参数的标识符前缀
-          for (let i = 0; i < data.params.length; i++) {
-            data.params[i].id = this.form.identifier + '_' + data.params[i].id;
-          }
-        }
-      } else if (this.form.datatype == 'object') {
-        data.params = this.form.specs.params;
-        // 物模型名称作为参数的标识符前缀
-        for (let i = 0; i < data.params.length; i++) {
-          data.params[i].id = this.form.identifier + '_' + data.params[i].id;
-        }
-      }
-      return JSON.stringify(data);
-    },
-    /** 数据类型改变 */
-    dataTypeChange(val) { },
-    /** 添加枚举项 */
-    addEnumItem() {
-      this.form.specs.enumList.push({
-        value: '',
-        text: '',
-      });
-    },
-    /** 删除枚举项 */
-    removeEnumItem(index) {
-      this.form.specs.enumList.splice(index, 1);
-    },
-    /** 格式化显示数据定义 */
-    formatSpecsDisplay(json) {
-      let specs = JSON.parse(json);
-      if (specs.type === 'integer' || specs.type === 'decimal' || specs.type === 'INT16' || specs.type === 'INT') {
-        return (
-          '<span style=\'width:50%;display:inline-block;\'>' + this.$t('product.product-things-model.142341-117') + '<span style="color:#F56C6C">' +
-          specs.max +
-          '</span></span>' + this.$t('product.product-things-model.142341-118') + '<span style="color:#F56C6C">' +
-          specs.min +
-          '</span><br /><span style=\'width:50%;display:inline-block;\'>' + this.$t('product.product-things-model.142341-119') + '<span style="color:#F56C6C">' +
-          specs.step +
-          '</span></span>' + this.$t('product.product-things-model.142341-120') + '<span style="color:#F56C6C">' +
-          specs.unit
-        );
-      } else if (specs.type === 'string') {
-        return this.$t('product.product-things-model.142341-121') + '<span style="color:#F56C6C">' + specs.maxLength + '</span>';
-      } else if (specs.type === 'array') {
-        return '<span style=\'width:50%;display:inline-block;\'>' + this.$t('product.product-things-model.142341-122') + '<span style="color:#F56C6C">' + specs.arrayType + '</span></span>' + this.$t('product.product-things-model.142341-123') + '<span style="color:#F56C6C">' + specs.arrayCount;
-      } else if (specs.type === 'enum') {
-        let items = '';
-        for (let i = 0; i < specs.enumList.length; i++) {
-          items = items + "<span style='width:50%;display:inline-block;'>" + specs.enumList[i].value + "：<span style='color:#F56C6C'>" + specs.enumList[i].text + '</span></span>';
-          if (i > 0 && i % 2 != 0) {
-            items = items + '<br />';
-          }
-        }
-        return items;
-      } else if (specs.type === 'bool') {
-        return '<span style=\'width:50%;display:inline-block;\'>0：<span style="color:#F56C6C">' + specs.falseText + '</span></span>1：<span style="color:#F56C6C">' + specs.trueText;
-      } else if (specs.type === 'object') {
-        let items = '';
-        for (let i = 0; i < specs.params.length; i++) {
-          items = items + "<span style='width:50%;display:inline-block;'>" + specs.params[i].name + "：<span style='color:#F56C6C'>" + specs.params[i].datatype.type + '</span></span>';
-          if (i > 0 && i % 2 != 0) {
-            items = items + '<br />';
-          }
-        }
-        return items;
-      }
-    },
-    /** 添加参数 */
-    addParameter() {
-      this.paramData = {
-        index: -1,
-        parameter: {},
-      };
-    },
-    /** 编辑参数*/
-    editParameter(data, index) {
-      this.paramData = null;
-      this.paramData = {
-        index: index,
-        parameter: data,
-      };
-    },
-    /** 删除动作 */
-    removeParameter(index) {
-      this.form.specs.params.splice(index, 1);
-    },
-    /**获取设置的参数对象*/
-    getParamData(data) {
-      if (data.index == -1) {
-        this.form.specs.params.push(data.parameter);
-      } else {
-        this.form.specs.params[data.index] = data.parameter;
-        // 解决数组在界面中不更新问题
-        this.$set(this.form.specs.params, data.index, this.form.specs.params[data.index]);
-      }
-    },
-    // 在输入最小值改变时触发
-    handleEdit(e) {
-      let value = e.replace(/[^\-\d]/g, ""); // 只能输入-和数字
-      value = value.replace(/\-{2,}/g, "-"); // -只能保留一个
-      value = value.replace(/(\d)\-/g, "$1"); // 数字后面不能接-，不能出现类似-11-2,12-，11-23
-      value = value.replace(/(-)0+/g, "$1"); // 不能出现-0,-001,-0001类似
-      value = value.replace(/(-\d{10})\d*/, '$1') // 最多保留10位整数
-      this.form.specs.min = value;
-    },
-    // 在输入最大值改变时触发
-    handleEditmax(e) {
-      let value = e.replace(/[^\-\d]/g, ""); // 只能输入-和数字
-      value = value.replace(/\-{2,}/g, "-"); // -只能保留一个
-      value = value.replace(/(\d)\-/g, "$1"); // 数字后面不能接-，不能出现类似-11-2,12-，11-23
-      value = value.replace(/(-)0+/g, "$1"); // 不能出现-0,-001,-0001类似
-      value = value.replace(/(-\d{10})\d*/, '$1') // 最多保留10位整数
-      this.form.specs.max = value;
-    },
-    //数据类型为小数的校验
-    hasDecimalPoint() {
-      const regex = /^-?\d+\.\d+$/; // 使用正则表达式匹配小数点格式
-      this.isDecimal = regex.test(this.form.specs.min);
-      return this.isDecimal;
-    },
-    hasDecimalPointMax() {
-      const regex = /^-?\d+\.\d+$/; // 使用正则表达式匹配小数点格式
-      this.isDecimalMax = regex.test(this.form.specs.max);
-      return this.isDecimalMax;
-    },
-  },
 };
 </script>
diff --git a/vue/src/views/iot/template/index.vue b/vue/src/views/iot/template/index.vue
index 4c8b4836..c5859397 100644
--- a/vue/src/views/iot/template/index.vue
+++ b/vue/src/views/iot/template/index.vue
@@ -766,7 +766,18 @@ export default {
         },
         /** 数据类型改变 */
         dataTypeChange(val) {
-            this.form.specs = {};
+            this.form.specs = {
+                enumList: [
+                        {
+                            value: '',
+                            text: '',
+                        },
+                    ],
+                    arrayType: 'integer',
+                    arrayCount: 5,
+                    showWay: 'select',
+                    params: [],
+            };
         },
         /** 添加枚举项 */
         addEnumItem() {