From 16c4117fba2b2ea74194d7aeea76e2c6c81bc0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 2 Jul 2024 09:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/deviceMode/editDeviceMode.vue      | 17 ++++++++++++-----
 .../src/views/business/deviceMode/index.vue     |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue b/ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue
index 12ce6f4..0e5f8d0 100644
--- a/ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue
+++ b/ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue
@@ -51,6 +51,8 @@
 
           </el-form-item>
         </el-col>
+
+
         <el-col :span="24">
           <el-form-item label="语言" prop="language_code" v-if="false">
             <el-select v-model="info.languageCode" placeholder="请选择">
@@ -63,8 +65,13 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="模型类型" prop="deviceModelType">
+            <el-input placeholder="请输入模型类型" v-model="info.deviceModelType"/>
+          </el-form-item>
+        </el-col>
 
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="设备模型图片" prop="deviceModePic">
             <el-upload
               single
@@ -513,11 +520,11 @@ export default {
         this.attributesData = (res.data.deviceModeFunctionMap)['1'];
         const servicesData = (res.data.deviceModeFunctionMap)['2'];
         const eventsData = (res.data.deviceModeFunctionMap)['3'];
-        if(servicesData != null && servicesData!==''){
-          this.servicesData =servicesData;
+        if (servicesData != null && servicesData !== '') {
+          this.servicesData = servicesData;
         }
-        if(servicesData != null && eventsData!==''){
-          this.eventsData =eventsData;
+        if (servicesData != null && eventsData !== '') {
+          this.eventsData = eventsData;
         }
         this.deviceModeId = deviceModeId;
         if (res.data.deviceMode.deviceModePic != null) {
diff --git a/ruoyi-ui/src/views/business/deviceMode/index.vue b/ruoyi-ui/src/views/business/deviceMode/index.vue
index 1564b17..a9f4ab8 100644
--- a/ruoyi-ui/src/views/business/deviceMode/index.vue
+++ b/ruoyi-ui/src/views/business/deviceMode/index.vue
@@ -101,6 +101,7 @@
       <el-table-column label="模型名称" align="center" prop="deviceModeName"/>
       <el-table-column label="所属租户" align="center" prop="tenantName"/>
       <el-table-column label="所属场景" align="center" prop="sceneName"/>
+      <el-table-column label="模型类型" align="center" prop="deviceModelType"/>
       <el-table-column label="定位标识" align="center" prop="gpsFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.hw_device_mode_gps_flag" :value="scope.row.gpsFlag"/>