From 15705f24f4f18b7fc1fd415bec2c207d04c88d44 Mon Sep 17 00:00:00 2001
From: "liupo.wu" <liupo.wu@wz-inc.com>
Date: Sat, 15 Jul 2023 09:08:50 +0800
Subject: [PATCH 1/7] fix: gen tool

---
 src/views/tool/gen/index.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 285b7cd..0280809 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -89,12 +89,7 @@
     <!-- 预览界面 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" top="5vh" append-to-body class="scrollbar">
       <el-tabs v-model="preview.activeName">
-        <el-tab-pane
-          v-for="(value, key) in preview.data"
-          :label="(key as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
-          :name="(key as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
-          :key="value"
-        >
+        <el-tab-pane v-for="(value, key) in preview.data" :label="key" :name="key" :key="value">
           <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right"
             >&nbsp;复制</el-link
           >
@@ -139,9 +134,9 @@ const queryParams = ref<TableQuery>({
   dataName: 'master'
 })
 
-const preview = ref <any>({
-  data: {},
-  activeName: 'domain.java'
+const preview = ref({
+  data: {} as Record<string, string>,
+  activeName: ''
 })
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -206,12 +201,19 @@ const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
+
+const fileNameRegExp = /([\w._-]+)\.vm$/
 /** 预览按钮 */
 const handlePreview = async (row: TableVO) => {
   const res = await previewTable(row.tableId)
-  preview.value.data = res.data
+  const data: Record<string, string> = {}
+  for (const key in res.data) {
+    // key: vm/java/controller.java.vm => controller.java
+    data[key.match(fileNameRegExp)?.[1] || key] = res.data[key]
+  }
+  preview.value.data = data
   dialog.visible = true
-  preview.value.activeName = 'domain.java'
+  preview.value.activeName = Object.keys(data)[0]
 }
 /** 复制代码成功 */
 const copyTextSuccess = () => {
-- 
Gitee


From 55ae8943848a4d5bcbf51862e705089b7798a5f7 Mon Sep 17 00:00:00 2001
From: "liupo.wu" <wuliupo@163.com>
Date: Sat, 15 Jul 2023 09:32:59 +0800
Subject: [PATCH 2/7] fix: readme for deploy

---
 README.md      | 32 ++++++++++++++++++++++++++++++--
 vite.config.ts |  4 ++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 431de89..1dbe20c 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ npm i pnpm -g
 pnpm config set registry https://registry.npmmirror.com/
 
 # 安装依赖
-如之前安装老版本，或者使用npm i、yarn、cnpm i安装过node_modules，请先删除在进行安装。
+如之前安装老版本，或者使用 npm i、yarn、cnpm i 安装过 node_modules，请先删除在进行安装。
 pnpm install
 
 # 启动服务
@@ -83,7 +83,35 @@ pnpm run dev
 
 # 构建生产环境 
 yarn build:prod
+
 # 前端访问地址
-http://localhost:8082[奇特目录.md](..%2F..%2F..%2F%CF%C2%D4%D8%2F%C6%E6%CC%D8%C4%BF%C2%BC.md)
+http://localhost:8082
+```
+
+## 生产环境配置示例
 
+- pro 前缀和 `.env.production` 文件中的一致
+- 服务器上静态资源的目录 `/www/wwwroot` 根据实际情况调整
 
+```nginx
+server
+{
+    listen 80;
+    server_name your.domain;
+	index index.html;
+    root /www/wwwroot;
+
+    location /api/
+    {
+        rewrite /api(.*) $1 break;
+        proxy_pass http://127.0.0.1:8086/;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header REMOTE-HOST $remote_addr;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_http_version 1.1;
+    }
+}
+```
diff --git a/vite.config.ts b/vite.config.ts
index 80fdec6..78da735 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://127.0.0.1:8086',
+          target: 'http://112.17.190.29:8000',
           changeOrigin: true,
-          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), ''),
+          // rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), ''),
         },
       },
     },
-- 
Gitee


From dae9df46a7cab9d4f17bca8f756626a9384d2731 Mon Sep 17 00:00:00 2001
From: "liupo.wu" <wuliupo@163.com>
Date: Sun, 16 Jul 2023 11:41:57 +0800
Subject: [PATCH 3/7] fix: element

---
 src/components/Map/index.vue                  |   2 +-
 src/components/Pagination/index.vue           |   6 +-
 src/components/TreeSelect/index.vue           |   2 +-
 src/components/YtSelect/select-device.vue     |   2 +-
 src/components/YtSelect/select-product.vue    |   4 +-
 src/components/common/yt-table-fun.vue        |   2 +-
 src/components/common/yt-table-search.tsx     |   5 +-
 src/components/common/yt-table.tsx            |   1 -
 src/layout/components/Navbar.vue              |   2 +-
 src/views/demo/demo/index.vue                 |  12 +-
 src/views/demo/tree/index.vue                 |  16 +-
 src/views/iot/channel/config.vue              |   2 +-
 .../iot/communication/components/index.vue    |  80 ++++------
 src/views/iot/crudDemo/crudDemo.vue           |   6 +-
 src/views/iot/crudDemo/disperseDemo.vue       |   2 +-
 src/views/iot/equipment/devices/detail.vue    |  46 +++---
 src/views/iot/equipment/devices/list.vue      |  10 +-
 .../devices/modules/childrenDialog.vue        |   2 -
 .../devices/modules/detail/DeviceLog.vue      |  12 +-
 .../detail/DeviceSimulatorProperties.vue      |   2 +-
 .../devices/modules/detail/MqttClient.vue     |  64 ++++----
 .../modules/virtualDevices/bindDevices.vue    |   2 -
 .../devices/modules/virtualDevices/log.vue    |   2 -
 .../devices/modules/virtualDevices/script.vue |   2 -
 src/views/iot/equipment/products/index.vue    |   3 +-
 .../modules/components/PropertyModel.vue      |  45 +++---
 .../modules/modeuls/functionDetail.vue        | 146 +++++++++---------
 .../modules/modeuls/modelNumberDetail.vue     |   6 +-
 .../products/modules/objectModel.vue          |  16 +-
 src/views/iot/ota/upgradePack/index.vue       |   2 -
 .../ruleSys/components/DeviceAction.vue       |  10 +-
 .../ruleSys/components/HttpAction.vue         |   2 +-
 .../ruleSys/components/KafkaAction.vue        |   6 +-
 .../ruleSys/components/MqttAction.vue         |   8 +-
 .../ruleSys/components/TcpAction.vue          |   4 +-
 .../ruleEngine/ruleSys/modules/filtera.vue    |  12 +-
 .../ruleEngine/ruleSys/modules/listener.vue   |   8 +-
 src/views/login.vue                           |   8 +-
 src/views/monitor/logininfor/index.vue        |  10 +-
 src/views/monitor/online/index.vue            |   5 +-
 src/views/monitor/operlog/index.vue           |  10 +-
 src/views/register.vue                        |   8 +-
 src/views/system/config/index.vue             |  12 +-
 src/views/system/dept/index.vue               |  15 +-
 src/views/system/dict/data.vue                |  21 +--
 src/views/system/dict/index.vue               |  14 +-
 src/views/system/menu/index.vue               |  16 +-
 src/views/system/notice/index.vue             |  14 +-
 src/views/system/oss/config.vue               |  12 +-
 src/views/system/oss/index.vue                |  10 +-
 src/views/system/post/index.vue               |  11 +-
 src/views/system/role/authUser.vue            |  11 +-
 src/views/system/role/index.vue               |  24 +--
 src/views/system/role/selectUser.vue          |  10 +-
 src/views/system/tenant/index.vue             |  12 +-
 src/views/system/tenantPackage/index.vue      |  20 +--
 src/views/system/user/authRole.vue            |   8 +-
 src/views/system/user/index.vue               |  42 ++---
 src/views/system/user/profile/resetPwd.vue    |   6 +-
 src/views/system/user/profile/userInfo.vue    |   7 +-
 src/views/tool/gen/basicInfoForm.vue          |   2 +-
 src/views/tool/gen/editTable.vue              |   4 +-
 src/views/tool/gen/genInfoForm.vue            |  10 +-
 src/views/tool/gen/importTable.vue            |  10 +-
 src/views/tool/gen/index.vue                  |   8 +-
 65 files changed, 419 insertions(+), 475 deletions(-)

diff --git a/src/components/Map/index.vue b/src/components/Map/index.vue
index cea8fe2..0742067 100644
--- a/src/components/Map/index.vue
+++ b/src/components/Map/index.vue
@@ -14,7 +14,7 @@
           @change="regeoCode"
           :loading="state.loading"
         >
-          <el-option v-for="item in state.mapAddrOptions" :key="item.value" :label="item.name" :value="item.value"> </el-option>
+          <el-option v-for="item in state.mapAddrOptions" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="设备地图:">
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 5f4ac5b..aca5610 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -7,7 +7,7 @@
       :layout="layout"
       :page-sizes="customPageSize"
       :pager-count="pagerCount"
-      :total="total"
+      :total="total || 0"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
@@ -27,7 +27,7 @@ import { PropType } from 'vue'
 
 const props = defineProps({
   total: {
-    required: true,
+    required: false,
     type: Number
   },
   page: {
@@ -98,7 +98,7 @@ const pageSize = computed({
   }
 })
 function handleSizeChange(val: number) {
-  if (currentPage.value * val > props.total) {
+  if (props.total && currentPage.value * val > props.total) {
     currentPage.value = 1
   }
   emit('pagination', { page: currentPage.value, limit: val })
diff --git a/src/components/TreeSelect/index.vue b/src/components/TreeSelect/index.vue
index c8b9f02..bf8f9d0 100644
--- a/src/components/TreeSelect/index.vue
+++ b/src/components/TreeSelect/index.vue
@@ -22,7 +22,7 @@
           :default-expanded-keys="defaultExpandedKey"
           :filter-node-method="filterNode"
           @node-click="handleNodeClick"
-        ></el-tree>
+        />
       </el-option>
     </el-select>
   </div>
diff --git a/src/components/YtSelect/select-device.vue b/src/components/YtSelect/select-device.vue
index ff7debb..5907b1a 100644
--- a/src/components/YtSelect/select-device.vue
+++ b/src/components/YtSelect/select-device.vue
@@ -1,7 +1,7 @@
 <template>
   <el-input class="cu-input" :placeholder="placeholder" size="small" v-model.trim="name" @clear="onClear" clearable @click="handleSelect">
     <template #append>
-      <el-button type="primaqry" @click="handleSelect">选择</el-button>
+      <el-button type="primary" @click="handleSelect">选择</el-button>
     </template>
   </el-input>
   <el-dialog title="选择设备" v-model="dialogState.show" width="1200px">
diff --git a/src/components/YtSelect/select-product.vue b/src/components/YtSelect/select-product.vue
index ffe3b6c..5a972a6 100644
--- a/src/components/YtSelect/select-product.vue
+++ b/src/components/YtSelect/select-product.vue
@@ -1,7 +1,7 @@
 <template>
   <el-input class="cu-input" size="small" placeholder="请选择产品" v-model.trim="name" @clear="onClear" clearable @click="handleSelect">
     <template #append>
-      <el-button type="primaqry" @click="handleSelect">选择</el-button>
+      <el-button type="primary" @click="handleSelect">选择</el-button>
     </template>
   </el-input>
   <el-dialog title="选择产品" v-model="dialogState.show" width="1200px">
@@ -99,7 +99,7 @@ const handleSelect = () => {
 const cateOptions = ref<any[]>([])
 const getDict = () => {
   getCategoriesAll().then(res => {
-    cateOptions.value = res.data || []
+    cateOptions.value = res?.data || []
     column.value.forEach(item => {
       if (item.key === 'category') {
         item.componentProps.options = cateOptions
diff --git a/src/components/common/yt-table-fun.vue b/src/components/common/yt-table-fun.vue
index 234142d..a856536 100644
--- a/src/components/common/yt-table-fun.vue
+++ b/src/components/common/yt-table-fun.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" v-if="!hide">
     <template #header>
       <el-row justify="space-between" style="margin-bottom: 0;">
-        <el-row :gutter="gutter" align="center" class="mb8">
+        <el-row :gutter="gutter" align="middle" class="mb8">
           <el-col :span="span" v-if="addBtn">
             <el-button v-bind="addBind" type="primary" icon="Plus" @click="emits('handleAdd')">{{ addBtnText }}</el-button>
           </el-col>
diff --git a/src/components/common/yt-table-search.tsx b/src/components/common/yt-table-search.tsx
index 5072a79..9d78b63 100644
--- a/src/components/common/yt-table-search.tsx
+++ b/src/components/common/yt-table-search.tsx
@@ -1,7 +1,6 @@
-import { propTypes } from '@/utils/propTypes'
 import { searchProps } from './props/crudProps'
-import { ElButton, ElDatePicker, ElForm, ElFormItem, ElInput, DateModelType } from 'element-plus'
-import { Component, PropType } from 'vue'
+import { ElButton, ElForm, ElFormItem } from 'element-plus'
+import { PropType } from 'vue'
 import { IColumn } from '@/components/common/types/tableCommon'
 import { componentMap, renderOptions } from '@/components/common/render/useRenderComponent'
 
diff --git a/src/components/common/yt-table.tsx b/src/components/common/yt-table.tsx
index 1848c7e..8266eae 100644
--- a/src/components/common/yt-table.tsx
+++ b/src/components/common/yt-table.tsx
@@ -123,7 +123,6 @@ export default defineComponent({
                 return f[valueName] == toRaw(row[column.key])
               })
               return obj ? obj[labelName] : row[column.key]
-              break
             case 'switch':
               return <ElSwitch value={scope?.row[column.key]}></ElSwitch>
             case 'image':
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 0f197a9..8225b9f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -21,7 +21,7 @@
           @change="dynamicTenantEvent"
           @clear="dynamicClearEvent"
         >
-          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
+          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId" />
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>
 
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index e653249..3acf060 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -102,7 +102,7 @@
 import { listDemo, getDemo, delDemo, addDemo, updateDemo } from '@/api/demo/demo'
 import { DemoVO, DemoQuery, DemoForm } from '@/api/demo/demo/types'
 import { ComponentInternalInstance } from 'vue'
-import { ElForm } from 'element-plus'
+import { FormInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 
@@ -115,8 +115,8 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 
-const queryFormRef = ref(ElForm)
-const demoFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const demoFormRef = ref<FormInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -184,7 +184,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = {...initFormData}
-  demoFormRef.value.resetFields()
+  demoFormRef.value?.resetFields()
 }
 
 /** 搜索按钮操作 */
@@ -195,7 +195,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 
@@ -231,7 +231,7 @@ const handleUpdate = (row?: DemoVO) => {
 
 /** 提交按钮 */
 const submitForm = () => {
-  demoFormRef.value.validate(async (valid: boolean) => {
+  demoFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true
       if (form.value.id) {
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index f1303fe..ebfaecc 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -90,7 +90,7 @@
 import { listTree, getTree, delTree, addTree, updateTree } from '@/api/demo/tree'
 import { TreeVO, TreeQuery, TreeForm } from '@/api/demo/tree/types'
 import { ComponentInternalInstance } from 'vue'
-import { ElForm, ElTable } from 'element-plus'
+import { FormInstance, TableInstance } from 'element-plus'
 
 
 type TreeOption = {
@@ -109,9 +109,9 @@ const showSearch = ref(true)
 const isExpandAll = ref(true)
 const loading = ref(false)
 
-const queryFormRef = ref(ElForm)
-const treeFormRef = ref(ElForm)
-const treeTableRef = ref(ElTable)
+const queryFormRef = ref<FormInstance>()
+const treeFormRef = ref<FormInstance>()
+const treeTableRef = ref<TableInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -185,7 +185,7 @@ const cancel = () => {
 // 表单重置
 const reset = () => {
   form.value = {...initFormData}
-  treeFormRef.value.resetFields()
+  treeFormRef.value?.resetFields()
 }
 
 /** 搜索按钮操作 */
@@ -195,7 +195,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 
@@ -223,7 +223,7 @@ const handleToggleExpandAll = () => {
 /** 展开/折叠操作 */
 const toggleExpandAll = (data: TreeVO[], status: boolean) => {
   data.forEach((item) => {
-    treeTableRef.value.toggleRowExpansion(item, status)
+    treeTableRef.value?.toggleRowExpansion(item, status)
     if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
   })
 }
@@ -247,7 +247,7 @@ const handleUpdate = (row: TreeVO) => {
 
 /** 提交按钮 */
 const submitForm = () => {
-  treeFormRef.value.validate((valid: boolean) => {
+  treeFormRef.value?.validate((valid: boolean) => {
     if (valid) {
       buttonLoading.value = true
       if (form.value.id) {
diff --git a/src/views/iot/channel/config.vue b/src/views/iot/channel/config.vue
index 5fb62af..04ab0c5 100644
--- a/src/views/iot/channel/config.vue
+++ b/src/views/iot/channel/config.vue
@@ -26,7 +26,7 @@
             <div v-if="item.code === getChannelCode(row.channelId)">
               <el-form-item v-for="opt in item.list" :key="opt.value" :label="opt.label + ':'">
                 <el-switch v-if="opt.type === 'switch'" v-model="row.param[opt.value]"></el-switch>
-                <el-input v-else v-model="row.param[opt.value]" :placeholder="'请输入' + opt.label"></el-input>
+                <el-input v-else v-model="row.param[opt.value]" :placeholder="'请输入' + opt.label" />
               </el-form-item>
             </div>
           </div>
diff --git a/src/views/iot/communication/components/index.vue b/src/views/iot/communication/components/index.vue
index 8844f84..0f99da8 100644
--- a/src/views/iot/communication/components/index.vue
+++ b/src/views/iot/communication/components/index.vue
@@ -18,7 +18,7 @@
                 </div>
               </div>
             </template>
-            <el-descriptions :column="1" size="medium" :labelStyle="{ fontWeight: 'bold' }">
+            <el-descriptions :column="1" size="default" :labelStyle="{ fontWeight: 'bold' }">
               <el-descriptions-item label-class-name="custom-label" label="通讯协议">{{
                 com.protocol
               }}</el-descriptions-item>
@@ -60,7 +60,7 @@
           ref="httpConfigForm"
         >
           <el-form-item label="端口" prop="port">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口" />
           </el-form-item>
         </el-form>
         <el-form
@@ -72,7 +72,7 @@
           ref="mqttConfigForm"
         >
           <el-form-item label="端口" prop="port">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口" />
           </el-form-item>
           <el-form-item label="模式" prop="type">
             <el-radio v-model="scope.row.config.type" label="server">服务端模式</el-radio>
@@ -83,17 +83,17 @@
             </div>
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="IP地址" prop="host">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.host" auto-complete="off" placeholder="请输入IP地址"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.host" auto-complete="off" placeholder="请输入IP地址" />
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'server'" label="IP地址" prop="host">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.host" auto-complete="off" placeholder="请输入IP地址"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.host" auto-complete="off" placeholder="请输入IP地址" />
           </el-form-item>
           <el-form-item label="处理方式" prop="parserType">
             <el-select v-model="scope.row.config.parserType" placeholder="请选择通讯协议">
-              <el-option label="不处理" value="不处理"> </el-option>
-              <el-option label="固定长度" value="固定长度"> </el-option>
-              <el-option label="分隔符" value="分隔符"> </el-option>
-              <el-option label="自定义脚本" value="自定义脚本"> </el-option>
+              <el-option label="不处理" value="不处理" />
+              <el-option label="固定长度" value="固定长度" />
+              <el-option label="分隔符" value="分隔符" />
+              <el-option label="自定义脚本" value="自定义脚本" />
             </el-select>
           </el-form-item>
           <el-form-item v-if="scope.row.config.parserType == '固定长度'" label="长度" prop="fix">
@@ -103,7 +103,7 @@
               v-model="scope.row.config.parserConfiguration.fix"
               auto-complete="off"
               placeholder="请输入长度"
-            ></el-input>
+            />
           </el-form-item>
           <el-form-item v-if="scope.row.config.parserType == '分隔符'" label="分隔符" prop="delimited">
             <el-input
@@ -112,7 +112,7 @@
               v-model="scope.row.config.parserConfiguration.delimited"
               auto-complete="off"
               placeholder="请输入分隔符"
-            ></el-input>
+            />
           </el-form-item>
           <el-form-item v-if="scope.row.config.parserType == '自定义脚本'" label="script" prop="fix">
             <el-input
@@ -121,7 +121,7 @@
               v-model="scope.row.config.parserConfiguration.script"
               auto-complete="off"
               placeholder="请输入自定义脚本"
-            ></el-input>
+            />
           </el-form-item>
         </el-form>
         <el-form
@@ -133,7 +133,7 @@
           ref="wsConfigForm"
         >
           <el-form-item label="端口" prop="port">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口" />
           </el-form-item>
           <el-form-item label="模式" prop="type">
             <el-radio v-model="scope.row.config.type" label="server">服务端模式</el-radio>
@@ -153,17 +153,17 @@
                   auto-complete="off"
                   prop="tokenName"
                   :placeholder="accessToken.tokenName==''?'请输入令牌名':accessToken.tokenName"
-                ></el-input>
-                <el-button size="small" type="error" style="margin-left: 10px;" @click="delToken(accessToken, scope.row.config)">删除</el-button>
+                />
+                <el-button size="small" type="danger" style="margin-left: 10px;" @click="delToken(accessToken, scope.row.config)">删除</el-button>
               </el-form-item>
             </div>
             <el-button size="small" @click="addToken(scope.row.config)">新增</el-button>
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="IP" prop="ip">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.ip" auto-complete="off" placeholder="请输入IP地址"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.ip" auto-complete="off" placeholder="请输入IP地址" />
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="URL" prop="url">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.url" auto-complete="off" placeholder="请输入URL"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.url" auto-complete="off" placeholder="请输入URL" />
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="心跳间隔" prop="heartBeatTime">
             <el-input
@@ -172,16 +172,10 @@
               v-model="scope.row.config.heartBeatTime"
               auto-complete="off"
               placeholder="请输入心跳间隔(毫秒)"
-            ></el-input>
+            />
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="心跳包" prop="heartBeatData">
-            <el-input
-              style="width: 250px"
-              size="small"
-              v-model="scope.row.config.heartBeatData"
-              auto-complete="off"
-              placeholder="请输入心跳包数据"
-            ></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.heartBeatData" auto-complete="off" placeholder="请输入心跳包数据" />
           </el-form-item>
         </el-form>
         <el-form
@@ -193,7 +187,7 @@
           ref="mqttConfigForm"
         >
           <el-form-item label="端口" prop="port">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口" />
           </el-form-item>
           <el-form-item label="WebSocket">
             <el-switch v-model="scope.row.config.useWebSocket" active-text="是" inactive-text="否"></el-switch>
@@ -210,44 +204,26 @@
             </div>
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="认证端口" prop="authPort">
-            <el-input
-              style="width: 250px"
-              size="small"
-              v-model="scope.row.config.authPort"
-              auto-complete="off"
-              placeholder="请输入认证端口"
-            ></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.authPort" auto-complete="off" placeholder="请输入认证端口" />
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="地址" prop="broker">
-            <el-input
-              style="width: 250px"
-              size="small"
-              v-model="scope.row.config.broker"
-              auto-complete="off"
-              placeholder="请输入broker地址"
-            ></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.broker" auto-complete="off" placeholder="请输入broker地址" />
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="clientId" prop="clientId">
-            <el-input
-              style="width: 250px"
-              size="small"
-              v-model="scope.row.config.clientId"
-              auto-complete="off"
-              placeholder="请输入clientId"
-            ></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.clientId" auto-complete="off" placeholder="请输入clientId" />
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="用户名" prop="username">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.username" auto-complete="off" placeholder="请输入用户名"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.username" auto-complete="off" placeholder="请输入用户名" />
           </el-form-item>
           <el-form-item v-if="scope.row.config.type == 'client'" label="密码" prop="password">
-            <el-input style="width: 250px" size="small" v-model="scope.row.config.password" auto-complete="off" placeholder="请输入密码"></el-input>
+            <el-input style="width: 250px" size="small" v-model="scope.row.config.password" auto-complete="off" placeholder="请输入密码" />
           </el-form-item>
         </el-form>
       </template>
       <template #jarFileForm="{ row }">
         <div v-if="row.jarFile">
           <el-tag
-            size="medium"
+            size="default"
             type="info"
             closable
             @close="() => {
@@ -270,7 +246,7 @@
         ></upload-file>
       </template>
     </yt-table-form>
-    <conversion-script title="通讯脚本" type="communication" ref="conversionScriptRef"></conversion-script>
+    <conversion-script title="通讯脚本" type="communication" ref="conversionScriptRef" />
   </div>
 </template>
 <script lang="ts" setup>
@@ -278,7 +254,7 @@ import { IColumn } from '@/components/common/types/tableCommon'
 import { generateUUID } from '@/utils'
 import { getComponentList, deleteComponent, addComponent, editComponent, changeState } from '../api/component.api'
 import type { IComponentVO } from '../api/component.api'
-import { getConvertorsList, IConvertorsVO } from '../api/convertors.api'
+import { getConvertorsList } from '../api/convertors.api'
 
 import YtTableFun from '@/components/common/yt-table-fun.vue'
 import YtTableForm from '@/components/common/yt-table-form'
diff --git a/src/views/iot/crudDemo/crudDemo.vue b/src/views/iot/crudDemo/crudDemo.vue
index a88695d..01eecb6 100644
--- a/src/views/iot/crudDemo/crudDemo.vue
+++ b/src/views/iot/crudDemo/crudDemo.vue
@@ -1,13 +1,13 @@
 <template>
   <yt-crud ref="crudRef" :data="data" :column="column">
     <template #sloo="scope">
-      <el-input v-model="scope.row.sloo"></el-input>
+      <el-input v-model="scope.row.sloo" />
     </template>
     <template #slots3Form="scope">
-      <el-input v-model="scope.row.sloo"></el-input>
+      <el-input v-model="scope.row.sloo" />
     </template>
     <template #slots2Search="scope">
-      <el-input v-model="scope.row.sloo"></el-input>
+      <el-input v-model="scope.row.sloo" />
     </template>
   </yt-crud>
 </template>
diff --git a/src/views/iot/crudDemo/disperseDemo.vue b/src/views/iot/crudDemo/disperseDemo.vue
index 627c363..6390321 100644
--- a/src/views/iot/crudDemo/disperseDemo.vue
+++ b/src/views/iot/crudDemo/disperseDemo.vue
@@ -2,7 +2,7 @@
   <basic-layout>
     <yt-table-search :column="column" @handle-search="search">
       <template #slots="item, formModel">
-        <el-input v-model="formModel[item.key]"></el-input>
+        <el-input v-model="formModel[item.key]" />
       </template>
     </yt-table-search>
     <yt-table-fun @handle-add="handleAdd()">
diff --git a/src/views/iot/equipment/devices/detail.vue b/src/views/iot/equipment/devices/detail.vue
index a7c4be3..3e901c2 100644
--- a/src/views/iot/equipment/devices/detail.vue
+++ b/src/views/iot/equipment/devices/detail.vue
@@ -112,15 +112,15 @@
         <el-form :inline="true" :model="state.formInline" class="user-search">
           <el-form-item>
             <el-select v-model="state.formInline.type" placeholder="请选择日志类型">
-              <el-option label="所有" value=""></el-option>
-              <el-option label="状态" value="state"></el-option>
-              <el-option label="事件" value="event"></el-option>
-              <el-option label="属性" value="property"></el-option>
-              <el-option label="服务" value="service"></el-option>
+              <el-option label="所有" value="" />
+              <el-option label="状态" value="state" />
+              <el-option label="事件" value="event" />
+              <el-option label="属性" value="property" />
+              <el-option label="服务" value="service" />
             </el-select>
           </el-form-item>
           <el-form-item label="搜索：">
-            <el-input v-model="state.formInline.identifier" placeholder="日志识符"></el-input>
+            <el-input v-model="state.formInline.identifier" placeholder="日志识符" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="logSearch">搜索</el-button>
@@ -156,10 +156,10 @@
             <template v-slot="fun">
               <el-form v-model="fun.row" label-width="80px" style="width: 500px">
                 <el-form-item label="值" v-if="fun.row.type == 'property'">
-                  <el-input v-model="fun.row.value" size="small"></el-input>
+                  <el-input v-model="fun.row.value" size="small" />
                 </el-form-item>
                 <el-form-item label="内容" v-else>
-                  <el-input type="textarea" v-model="fun.row.content" size="small" rows="4"></el-input>
+                  <el-input type="textarea" v-model="fun.row.content" size="small" rows="4" />
                 </el-form-item>
                 <el-form-item>
                   <el-button type="primary" size="small" @click="sendDeviceMsg(fun.row)">发送</el-button>
@@ -167,27 +167,27 @@
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column sortable prop="type" label="功能类型" width="100"> </el-table-column>
-          <el-table-column sortable prop="name" label="功能名称" width="180"> </el-table-column>
-          <el-table-column sortable prop="identifier" label="标识符" width="150"> </el-table-column>
-          <el-table-column sortable prop="dataTypeName" label="数据类型" width="100"> </el-table-column>
-          <el-table-column sortable prop="params" label="数据定义" width="200"> </el-table-column>
+          <el-table-column sortable prop="type" label="功能类型" width="100" />
+          <el-table-column sortable prop="name" label="功能名称" width="180" />
+          <el-table-column sortable prop="identifier" label="标识符" width="150" />
+          <el-table-column sortable prop="dataTypeName" label="数据类型" width="100" />
+          <el-table-column sortable prop="params" label="数据定义" width="200" />
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="设备配置">
         <DeviceConfig :deviceId="state.deviceId" />
       </el-tab-pane>
       <el-tab-pane label="模拟设备">
-        <DeviceSimulator :thingModelFunctions="state.modelFunctions" :deviceDetail="state.deviceDetail"></DeviceSimulator>
+        <DeviceSimulator :thingModelFunctions="state.modelFunctions" :deviceDetail="state.deviceDetail" />
       </el-tab-pane>
     </el-tabs>
     <el-dialog :title="state.title" v-model="state.propertyWriteFormVisible" width="40%" @close="closeDialog">
       <el-form label-width="120px" :model="state.propertyWriteForm" ref="propertyWriteForm">
         <div style="display: none">
-          <el-input v-model="state.propertyWriteForm.identifier" type="hidden"></el-input>
+          <el-input v-model="state.propertyWriteForm.identifier" type="hidden" />
         </div>
         <el-form-item label="属性值" prop="value">
-          <el-input v-model="state.propertyWriteForm.value" auto-complete="off"></el-input>
+          <el-input v-model="state.propertyWriteForm.value" auto-complete="off" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -200,9 +200,9 @@
     <el-dialog :title="state.title" v-model="state.serviceFormVisible" width="40%" @close="closeDialog">
       <el-form label-width="120px" :model="state.serviceForm" ref="serviceForm">
         <div>
-          <el-input v-model="state.serviceForm.identifier" type="hidden"></el-input>
-          <el-input v-model="state.serviceForm.productKey" type="hidden"></el-input>
-          <el-input v-model="state.serviceForm.deviceName" type="hidden"></el-input>
+          <el-input v-model="state.serviceForm.identifier" type="hidden" />
+          <el-input v-model="state.serviceForm.productKey" type="hidden" />
+          <el-input v-model="state.serviceForm.deviceName" type="hidden" />
         </div>
         <div v-if="state?.serviceForm?.params.length === 0">是否确认调用？</div>
         <el-form-item
@@ -211,7 +211,7 @@
           :label="param.name + '(' + param.identifier + ')'"
           prop="params"
         >
-          <el-input v-model="param.value" auto-complete="off"></el-input>
+          <el-input v-model="param.value" auto-complete="off" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -224,13 +224,13 @@
     <el-dialog title="添加设备标签" v-model="state.showAddTag" width="400px">
       <el-form ref="formRef" :model="state.tagForm" :rules="state.rules" label-width="80px">
         <el-form-item label="标签名称" prop="name">
-          <el-input v-model="state.tagForm.name"></el-input>
+          <el-input v-model="state.tagForm.name" />
         </el-form-item>
         <el-form-item label="标识符" prop="id">
-          <el-input v-model="state.tagForm.id"></el-input>
+          <el-input v-model="state.tagForm.id" />
         </el-form-item>
         <el-form-item label="标签值" prop="value">
-          <el-input v-model="state.tagForm.value"></el-input>
+          <el-input v-model="state.tagForm.value" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitAddTag">提交</el-button>
diff --git a/src/views/iot/equipment/devices/list.vue b/src/views/iot/equipment/devices/list.vue
index f70a37e..14b8de8 100644
--- a/src/views/iot/equipment/devices/list.vue
+++ b/src/views/iot/equipment/devices/list.vue
@@ -220,11 +220,11 @@ const router = useRouter()
 const handleView = (row: any) => {
   if (!row.id) return
   let showMap=false
-  productOptions.value.forEach((p)=>{
-          if (p.productKey == row.productKey ) {
-            showMap=p.isOpenLocate
-          }
-        })
+  productOptions.value.forEach((p) => {
+    if (p.productKey == row.productKey ) {
+      showMap=p.isOpenLocate
+    }
+  })
   router.push(`devicesDetail/${row.id}?showMap=${showMap}`)
 }
 const nodeTypeOptions =  [
diff --git a/src/views/iot/equipment/devices/modules/childrenDialog.vue b/src/views/iot/equipment/devices/modules/childrenDialog.vue
index 7d8fdbb..654d74d 100644
--- a/src/views/iot/equipment/devices/modules/childrenDialog.vue
+++ b/src/views/iot/equipment/devices/modules/childrenDialog.vue
@@ -146,5 +146,3 @@ defineExpose({
   openDialog,
 })
 </script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/equipment/devices/modules/detail/DeviceLog.vue b/src/views/iot/equipment/devices/modules/detail/DeviceLog.vue
index d52b741..9455119 100644
--- a/src/views/iot/equipment/devices/modules/detail/DeviceLog.vue
+++ b/src/views/iot/equipment/devices/modules/detail/DeviceLog.vue
@@ -3,15 +3,15 @@
     <el-form :inline="true" :model="formInline" class="user-search">
       <el-form-item>
         <el-select v-model="formInline.type" placeholder="请选择日志类型">
-          <el-option label="所有" value=""></el-option>
-          <el-option label="状态" value="state"></el-option>
-          <el-option label="事件" value="event"></el-option>
-          <el-option label="属性" value="property"></el-option>
-          <el-option label="服务" value="service"></el-option>
+          <el-option label="所有" value="" />
+          <el-option label="状态" value="state" />
+          <el-option label="事件" value="event" />
+          <el-option label="属性" value="property" />
+          <el-option label="服务" value="service" />
         </el-select>
       </el-form-item>
       <el-form-item label="搜索：">
-        <el-input v-model="formInline.identifier" placeholder="日志识符"></el-input>
+        <el-input v-model="formInline.identifier" placeholder="日志识符" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="logSearch">搜索</el-button>
diff --git a/src/views/iot/equipment/devices/modules/detail/DeviceSimulatorProperties.vue b/src/views/iot/equipment/devices/modules/detail/DeviceSimulatorProperties.vue
index 18f81ad..1e35aff 100644
--- a/src/views/iot/equipment/devices/modules/detail/DeviceSimulatorProperties.vue
+++ b/src/views/iot/equipment/devices/modules/detail/DeviceSimulatorProperties.vue
@@ -7,7 +7,7 @@
             <el-row>
               <el-col :span="18">
                 <el-form-item label="值">
-                  <el-input v-model="fun.row.value" size="small"></el-input>
+                  <el-input v-model="fun.row.value" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
diff --git a/src/views/iot/equipment/devices/modules/detail/MqttClient.vue b/src/views/iot/equipment/devices/modules/detail/MqttClient.vue
index 055d474..96c7252 100644
--- a/src/views/iot/equipment/devices/modules/detail/MqttClient.vue
+++ b/src/views/iot/equipment/devices/modules/detail/MqttClient.vue
@@ -33,24 +33,24 @@
               <el-row :gutter="10">
                 <el-col :span="7">
                   <el-select v-model="connection.protocol" @change="handleProtocolChange">
-                    <el-option label="ws://" value="ws"></el-option>
-                    <el-option label="wss://" value="wss"></el-option>
+                    <el-option label="ws://" value="ws" />
+                    <el-option label="wss://" value="wss" />
                   </el-select>
                 </el-col>
                 <el-col :span="17">
-                  <el-input v-model="connection.host"></el-input>
+                  <el-input v-model="connection.host" />
                 </el-col>
               </el-row>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item prop="port" label="Port">
-              <el-input v-model.number="connection.port" type="number" placeholder="8083/8084"></el-input>
+              <el-input v-model.number="connection.port" type="number" placeholder="8083/8084" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item prop="endpoint" label="Mountpoint">
-              <el-input v-model="connection.endpoint" placeholder="/mqtt"></el-input>
+              <el-input v-model="connection.endpoint" placeholder="/mqtt" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -60,12 +60,12 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="username" label="Username">
-              <el-input v-model="connection.username"></el-input>
+              <el-input v-model="connection.username" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item prop="password" label="Password">
-              <el-input v-model="connection.password"></el-input>
+              <el-input v-model="connection.password" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -78,10 +78,10 @@
         </el-col>
         <el-col :span="2">
           <el-col span="12">
-            <el-button size="small" icon="el-icon-arrow-down" v-if="!showSubFlg" @click="showSubFlg=!showSubFlg"></el-button>
+            <el-button size="small" icon="el-icon-arrow-down" v-if="!showSubFlg" @click="showSubFlg=!showSubFlg" />
           </el-col>
           <el-col span="12">
-            <el-button size="small" icon="el-icon-arrow-up" v-if="showSubFlg" @click="showSubFlg=!showSubFlg"></el-button>
+            <el-button size="small" icon="el-icon-arrow-up" v-if="showSubFlg" @click="showSubFlg=!showSubFlg" />
           </el-col>
         </el-col>
       </el-row>
@@ -90,23 +90,23 @@
         <el-table-column label="说明" width="120">
           <template #default="scope">
             <el-tooltip class="item" effect="dark" :content="scope.row.desc" placement="top-start">
-              <el-input v-model="scope.row.desc"></el-input>
+              <el-input v-model="scope.row.desc" />
             </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column label="topic" width="250">
           <template #default="scope">
             <el-tooltip class="item" effect="dark" :content="scope.row.topic" placement="top-start">
-              <el-input v-model="scope.row.topic" placeholder="topic"></el-input>
+              <el-input v-model="scope.row.topic" placeholder="topic" />
             </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column label="qos">
           <template #default="scope">
             <el-select v-model="scope.row.qos" placeholder="qos">
-              <el-option label="0" value="0"></el-option>
-              <el-option label="1" value="1"></el-option>
-              <el-option label="2" value="2"></el-option>
+              <el-option label="0" value="0" />
+              <el-option label="1" value="1" />
+              <el-option label="2" value="2" />
             </el-select>
           </template>
         </el-table-column>
@@ -122,16 +122,16 @@
                 <el-button size="medium" v-if="scope.row.sub" @click="doUnSubscribe(scope.$index, scope.row)">取消订阅</el-button>
               </el-col>
 
-              <el-col :span="4"
-                ><el-button
+              <el-col :span="4">
+                <el-button
                   type="danger"
                   :disabled="scope.row.sub"
                   size="small"
                   @click="handleDelete(scope.$index, scope.row)"
                   circle
                   icon="el-icon-minus"
-                ></el-button
-              ></el-col>
+                />
+              </el-col>
             </el-row>
           </template>
         </el-table-column>
@@ -145,10 +145,10 @@
         </el-col>
         <el-col :span="2">
           <el-col span="12">
-            <el-button size="small" icon="el-icon-arrow-down" v-if="!showPubFlg" @click="showPubFlg=!showPubFlg"></el-button>
+            <el-button size="small" icon="el-icon-arrow-down" v-if="!showPubFlg" @click="showPubFlg=!showPubFlg" />
           </el-col>
           <el-col span="12">
-            <el-button size="small" icon="el-icon-arrow-up" v-if="showPubFlg" @click="showPubFlg=!showPubFlg"></el-button>
+            <el-button size="small" icon="el-icon-arrow-up" v-if="showPubFlg" @click="showPubFlg=!showPubFlg" />
           </el-col>
         </el-col>
       </el-row>
@@ -156,30 +156,30 @@
         <el-table-column label="说明" width="120" fixed="left">
           <template #default="scope">
             <el-tooltip class="item" effect="dark" :content="scope.row.desc" placement="top-start">
-              <el-input v-model="scope.row.desc"></el-input>
+              <el-input v-model="scope.row.desc" />
             </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column label="topic" width="150">
           <template #default="scope">
             <el-tooltip class="item" effect="dark" :content="scope.row.desc" placement="top-start">
-              <el-input v-model="scope.row.topic"></el-input>
+              <el-input v-model="scope.row.topic" />
             </el-tooltip>
           </template>
         </el-table-column>
 
         <el-table-column label="内容" width="350">
           <template #default="scope">
-            <el-input v-model="scope.row.payload" type="textarea"></el-input>
+            <el-input v-model="scope.row.payload" type="textarea" />
           </template>
         </el-table-column>
 
         <el-table-column label="qos">
           <template #default="scope">
             <el-select v-model="scope.row.qos" placeholder="qos">
-              <el-option label="0" value="0"></el-option>
-              <el-option label="1" value="1"></el-option>
-              <el-option label="2" value="2"></el-option>
+              <el-option label="0" value="0" />
+              <el-option label="1" value="1" />
+              <el-option label="2" value="2" />
             </el-select>
           </template>
         </el-table-column>
@@ -191,26 +191,26 @@
                 <el-button size="medium" :disabled="!client.connected" @click="doPublish(scope.$index, scope.row)">发送</el-button>
               </el-col>
 
-              <el-col :span="4"
-                ><el-button
+              <el-col :span="4">
+                <el-button
                   type="danger"
                   :disabled="scope.row.sub"
                   size="small"
                   @click="handleDeletePublish(scope.$index, scope.row)"
                   circle
                   icon="el-icon-minus"
-                ></el-button
-              ></el-col>
+                />
+              </el-col>
             </el-row>
           </template>
         </el-table-column>
       </el-table>
-      <el-button class="mt-4" style="width: 100%" @click="handleAddPublish" icon="el-icon-plus" v-if="showPubFlg"></el-button>
+      <el-button class="mt-4" style="width: 100%" @click="handleAddPublish" icon="el-icon-plus" v-if="showPubFlg" />
     </el-card>
     <el-card shadow="always" style="margin-bottom:30px;">
       <div class="emq-title">Receive</div>
       <el-col :span="24">
-        <el-input type="textarea" :rows="3" style="margin-bottom: 15px" v-model="receiveNews" readOnly></el-input>
+        <el-input type="textarea" :rows="3" style="margin-bottom: 15px" v-model="receiveNews" readOnly />
       </el-col>
     </el-card>
   </div>
diff --git a/src/views/iot/equipment/devices/modules/virtualDevices/bindDevices.vue b/src/views/iot/equipment/devices/modules/virtualDevices/bindDevices.vue
index 56c3250..569a815 100644
--- a/src/views/iot/equipment/devices/modules/virtualDevices/bindDevices.vue
+++ b/src/views/iot/equipment/devices/modules/virtualDevices/bindDevices.vue
@@ -2,5 +2,3 @@
   <div>虚拟设备详情</div>
 </template>
 <script lang="ts" setup></script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/equipment/devices/modules/virtualDevices/log.vue b/src/views/iot/equipment/devices/modules/virtualDevices/log.vue
index cb0f9cb..4fc5753 100644
--- a/src/views/iot/equipment/devices/modules/virtualDevices/log.vue
+++ b/src/views/iot/equipment/devices/modules/virtualDevices/log.vue
@@ -2,5 +2,3 @@
   <div>日志</div>
 </template>
 <script lang="ts" setup></script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/equipment/devices/modules/virtualDevices/script.vue b/src/views/iot/equipment/devices/modules/virtualDevices/script.vue
index 7564d83..a6b80cc 100644
--- a/src/views/iot/equipment/devices/modules/virtualDevices/script.vue
+++ b/src/views/iot/equipment/devices/modules/virtualDevices/script.vue
@@ -2,5 +2,3 @@
   <div>脚本</div>
 </template>
 <script lang="ts" setup></script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/equipment/products/index.vue b/src/views/iot/equipment/products/index.vue
index ff2776f..aa38b5c 100644
--- a/src/views/iot/equipment/products/index.vue
+++ b/src/views/iot/equipment/products/index.vue
@@ -193,7 +193,7 @@ const getNodeTypeNmae = (type) => {
 let cateOptions: any[] = []
 
 const getCateName = (id: string) => {
-  return cateOptions.find(f => f.id === id).name || ''
+  return cateOptions.find(f => f.id === id)?.name || ''
 }
 const data = ref<IProductsVO[]>([])
 const randomString=(len:number)=> {
@@ -345,6 +345,7 @@ const getData = () => {
 // 获取字典
 const getDict = () => {
   getCategoriesAll().then(res => {
+    res = res || {}
     cateOptions = res.data || []
     column.value.forEach(item => {
       if (item.key === 'category') {
diff --git a/src/views/iot/equipment/products/modules/components/PropertyModel.vue b/src/views/iot/equipment/products/modules/components/PropertyModel.vue
index c97f5e2..cf3fd71 100644
--- a/src/views/iot/equipment/products/modules/components/PropertyModel.vue
+++ b/src/views/iot/equipment/products/modules/components/PropertyModel.vue
@@ -2,20 +2,23 @@
   <div style="width: 100%">
     <el-form ref="formRef" class="model-form" :rules="rules" label-width="120px" :model="propertyRef">
       <el-form-item style="margin-bottom: 18px;" label="名称" prop="name">
-        <el-input v-model="propertyRef.name" auto-complete="off"></el-input>
+        <el-input v-model="propertyRef.name" auto-complete="off" />
+      </el-form-item>
+      <el-form-item label="说明" prop="tips">
+        <el-input type="textarea" v-model="propertyRef.tips" auto-complete="off" />
       </el-form-item>
       <el-form-item style="margin-bottom: 18px;" label="标识符" prop="identifier">
-        <el-input :disabled="isUpdate" v-model="propertyRef.identifier" auto-complete="off"></el-input>
+        <el-input :disabled="isUpdate" v-model="propertyRef.identifier" auto-complete="off" />
       </el-form-item>
       <el-form-item style="margin-bottom: 18px;" label="数据类型" prop="dataType.type">
         <el-select v-model="propertyRef.dataType.type" placeholder="请选择数据类型">
-          <el-option label="int32" value="int32"></el-option>
-          <el-option label="float" value="float"></el-option>
-          <el-option label="bool" value="bool"></el-option>
-          <el-option label="enum" value="enum"></el-option>
-          <el-option label="text" value="text"></el-option>
-          <el-option label="date" value="date"></el-option>
-          <el-option v-if="isProperty" label="position" value="position"></el-option>
+          <el-option label="int32" value="int32" />
+          <el-option label="float" value="float" />
+          <el-option label="bool" value="bool" />
+          <el-option label="enum" value="enum" />
+          <el-option label="text" value="text" />
+          <el-option label="date" value="date" />
+          <el-option v-if="isProperty" label="position" value="position" />
         </el-select>
       </el-form-item>
       <el-form-item style="margin-bottom: 18px;" v-if="isSelectType('position')">
@@ -23,9 +26,9 @@
           <el-col :span="3">定位方式</el-col>
           <el-col :span="6">
             <el-select v-model="propertyRef.dataType.specs.locateType" placeholder="请选择定位方式">
-              <el-option label="经纬度定位" value="lonLat"> </el-option>
-              <el-option label="基站信息定位" value="basestation"> </el-option>
-              <el-option label="IP信息定位" value="ipinfo"> </el-option>
+              <el-option label="经纬度定位" value="lonLat" />
+              <el-option label="基站信息定位" value="basestation" />
+              <el-option label="IP信息定位" value="ipinfo" />
             </el-select>
           </el-col>
         </el-row>
@@ -33,22 +36,22 @@
       <el-form-item style="margin-bottom: 18px;" v-if="isSelectType('int32')">
         <el-col :span="3"> 取值范围 </el-col>
         <el-col :span="5">
-          <el-input v-model="propertyRef.dataType.specs.min" placeholder="最小值"> </el-input>
+          <el-input v-model="propertyRef.dataType.specs.min" placeholder="最小值" />
         </el-col>
         <el-col class="line" :span="1" style="text-align: center;">-</el-col>
         <el-col :span="5">
-          <el-input v-model="propertyRef.dataType.specs.max" placeholder="最大值"> </el-input>
+          <el-input v-model="propertyRef.dataType.specs.max" placeholder="最大值" />
         </el-col>
         <el-col :span="10"></el-col>
       </el-form-item>
       <el-form-item style="margin-bottom: 18px;" v-if="isSelectType('float')">
         <el-col :span="3"> 取值范围 </el-col>
         <el-col :span="3">
-          <el-input v-model="propertyRef.dataType.specs.min" placeholder="最小值"> </el-input>
+          <el-input v-model="propertyRef.dataType.specs.min" placeholder="最小值" />
         </el-col>
         <el-col class="line" :span="1" style="text-align: center;">-</el-col>
         <el-col :span="3">
-          <el-input v-model="propertyRef.dataType.specs.max" placeholder="最大值"> </el-input>
+          <el-input v-model="propertyRef.dataType.specs.max" placeholder="最大值" />
         </el-col>
         <el-col :span="1">&nbsp;</el-col>
         <el-col :span="10">
@@ -61,12 +64,12 @@
         <el-col :span="3">布尔值</el-col>
         <el-col :span="1"> 0 - </el-col>
         <el-col :span="3">
-          <el-input v-model="boolItemRef._true" placeholder="如:否"> </el-input>
+          <el-input v-model="boolItemRef._true" placeholder="如:否" />
         </el-col>
         <el-col :span="1">&nbsp; </el-col>
         <el-col :span="1"> 1 - </el-col>
         <el-col :span="3">
-          <el-input v-model="boolItemRef._false" placeholder="如:是"> </el-input>
+          <el-input v-model="boolItemRef._false" placeholder="如:是" />
         </el-col>
       </el-form-item>
       <el-form-item label=" " style="margin-bottom: 10px;" v-if="isSelectType('enum')">
@@ -74,12 +77,12 @@
           <el-row>
             <el-col :span="3"> 枚举值 </el-col>
             <el-col :span="3">
-              <el-input type="number" v-model="ei.value" placeholder="如:0"> </el-input>
+              <el-input type="number" v-model="ei.value" placeholder="如:0" />
             </el-col>
             <el-col :span="2"> &nbsp; </el-col>
             <el-col :span="3"> 枚举描述 </el-col>
             <el-col :span="5">
-              <el-input v-model="ei.name"> </el-input>
+              <el-input v-model="ei.name" />
             </el-col>
             <el-col :span="1"> &nbsp; </el-col>
             <el-col :span="2">
@@ -92,7 +95,7 @@
       <el-form-item style="margin-bottom: 10px;" v-if="isSelectType('text')">
         <el-col :span="3">数据长度</el-col>
         <el-col :span="3">
-          <el-input v-model="propertyRef.dataType.specs.length" placeholder="数据长度"></el-input>
+          <el-input v-model="propertyRef.dataType.specs.length" placeholder="数据长度" />
         </el-col>
       </el-form-item>
       <el-form-item style="margin-bottom: 10px;" v-if="isSelectType('date')"> String类型的UTC时间戳（毫秒） </el-form-item>
diff --git a/src/views/iot/equipment/products/modules/modeuls/functionDetail.vue b/src/views/iot/equipment/products/modules/modeuls/functionDetail.vue
index 28bac46..71dd6ad 100644
--- a/src/views/iot/equipment/products/modules/modeuls/functionDetail.vue
+++ b/src/views/iot/equipment/products/modules/modeuls/functionDetail.vue
@@ -16,38 +16,37 @@
           :boolItem="state.boolItem"
           :isProperty="true"
           :isUpdate="!state.isAdd"
-        ></property-model>
+        />
       </div>
       <div v-if="isSelectType('service')">
-        <div>
+        <div class="type-service">
           <el-form-item label="名称" prop="name">
-            <el-input v-model="state.modelForm.name" auto-complete="off"></el-input>
+            <el-input v-model="state.modelForm.name" auto-complete="off" />
           </el-form-item>
           <el-form-item label="标识符" prop="identifier">
-            <el-input v-model="state.modelForm.identifier" auto-complete="off"></el-input>
+            <el-input v-model="state.modelForm.identifier" auto-complete="off" />
           </el-form-item>
           <el-form-item label="输入参数" prop="inputData">
-            <ModelParams :modelParams="state.modelForm.raw.inputData" :is-update="!state.isAdd"></ModelParams>
+            <ModelParams :modelParams="state.modelForm.raw.inputData" :is-update="!state.isAdd" />
           </el-form-item>
           <el-form-item label="输出参数" prop="outputData">
-            <ModelParams :modelParams="state.modelForm.raw.outputData" :is-update="!state.isAdd"></ModelParams>
+            <ModelParams :modelParams="state.modelForm.raw.outputData" :is-update="!state.isAdd" />
           </el-form-item>
         </div>
       </div>
       <div v-if="isSelectType('event')">
-        <div>
+        <div class="type-event">
           <el-form-item label="名称" prop="name">
-            <el-input v-model="state.modelForm.name" auto-complete="off"></el-input>
+            <el-input v-model="state.modelForm.name" auto-complete="off" />
           </el-form-item>
           <el-form-item label="标识符" prop="identifier">
-            <el-input v-model="state.modelForm.identifier" auto-complete="off"></el-input>
+            <el-input v-model="state.modelForm.identifier" auto-complete="off" />
           </el-form-item>
           <el-form-item label="输出参数" prop="outputData">
-            <ModelParams :modelParams="state.modelForm.raw.outputData"></ModelParams>
+            <ModelParams :modelParams="state.modelForm.raw.outputData" />
           </el-form-item>
         </div>
       </div>
-      <el-form-item> </el-form-item>
       <el-form-item>
         <el-button @click="cancelEdit">取消</el-button>
         <el-button @click="saveThingModel()" type="primary">保存</el-button>
@@ -155,74 +154,73 @@ const saveThingModel = async () => {
   const valid = await fun()
   if (valid) {
     if (state.isAdd) {
-    if (state.modelForm.type == 'property') {
-      //删除旧的
-      const idx = state.model.properties.findIndex(
-        (p: any) => p.identifier == state.modelForm.raw.identifier
-      )
-      if (idx >= 0) {
-        state.model.properties.splice(idx, 1)
-      }
+      if (state.modelForm.type == 'property') {
+        //删除旧的
+        const idx = state.model.properties.findIndex(
+          (p: any) => p.identifier == state.modelForm.raw.identifier
+        )
+        if (idx >= 0) {
+          state.model.properties.splice(idx, 1)
+        }
+        state.model.properties.push(newProperty())
+      } else if (state.modelForm.type == 'service') {
+        //删除旧的
+        const idx = state.model.services.findIndex(
+          (p: any) => p.identifier == state.modelForm.raw.identifier
+        )
+        if (idx >= 0) {
+          state.model.services.splice(idx, 1)
+        }
 
-      state.model.properties.push(newProperty())
-    } else if (state.modelForm.type == 'service') {
-      //删除旧的
-      const idx = state.model.services.findIndex(
-        (p: any) => p.identifier == state.modelForm.raw.identifier
-      )
-      if (idx >= 0) {
-        state.model.services.splice(idx, 1)
-      }
+        state.model.services.push({
+          identifier: state.modelForm.identifier,
+          name: state.modelForm.name,
+          inputData: state.modelForm.raw.inputData,
+          outputData: state.modelForm.raw.outputData,
+        })
+      } else if (state.modelForm.type == 'event') {
+        //删除旧的
+        const idx = state.model.events.findIndex(
+          (p: any) => p.identifier == state.modelForm.raw.identifier
+        )
+        if (idx >= 0) {
+          state.model.events.splice(idx, 1)
+        }
 
-      state.model.services.push({
-        identifier: state.modelForm.identifier,
-        name: state.modelForm.name,
-        inputData: state.modelForm.raw.inputData,
-        outputData: state.modelForm.raw.outputData,
-      })
-    } else if (state.modelForm.type == 'event') {
-      //删除旧的
-      const idx = state.model.events.findIndex(
-        (p: any) => p.identifier == state.modelForm.raw.identifier
-      )
-      if (idx >= 0) {
-        state.model.events.splice(idx, 1)
+        state.model.events.push({
+          identifier: state.modelForm.identifier,
+          name: state.modelForm.name,
+          outputData: state.modelForm.raw.outputData,
+        })
       }
-
-      state.model.events.push({
-        identifier: state.modelForm.identifier,
-        name: state.modelForm.name,
-        outputData: state.modelForm.raw.outputData,
-      })
-    }
-  } else {
-    if (state.modelForm.type == 'property') {
-      let prop = newProperty()
-      for (var i = 0; i < state.model.properties.length; i++) {
-        if (state.model.properties[i].identifier == prop.identifier) {
-          state.model.properties[i] = prop
+    } else {
+      if (state.modelForm.type == 'property') {
+        let prop = newProperty()
+        for (var i = 0; i < state.model.properties?.length; i++) {
+          if (state.model.properties[i].identifier == prop.identifier) {
+            state.model.properties[i] = prop
+          }
         }
+      } else if (state.modelForm.type == 'service') {
+        state.model.services.forEach((s: any) => {
+          if (s.identifier == state.modelForm.identifier) {
+            s.identifier = state.modelForm.identifier
+            s.name = state.modelForm.name
+            s.inputData = state.modelForm.raw.inputData
+            s.outputData = state.modelForm.raw.outputData
+          }
+        })
+      } else if (state.modelForm.type == 'event') {
+        state.model.events.forEach((s: any) => {
+          if (s.identifier == state.modelForm.identifier) {
+            s.identifier = state.modelForm.identifier
+            s.name = state.modelForm.name
+            s.outputData = state.modelForm.raw.outputData
+          }
+        })
       }
-    } else if (state.modelForm.type == 'service') {
-      state.model.services.forEach((s: any) => {
-        if (s.identifier == state.modelForm.identifier) {
-          s.identifier = state.modelForm.identifier
-          s.name = state.modelForm.name
-          s.inputData = state.modelForm.raw.inputData
-          s.outputData = state.modelForm.raw.outputData
-        }
-      })
-    } else if (state.modelForm.type == 'event') {
-      state.model.events.forEach((s: any) => {
-        if (s.identifier == state.modelForm.identifier) {
-          s.identifier = state.modelForm.identifier
-          s.name = state.modelForm.name
-          s.outputData = state.modelForm.raw.outputData
-        }
-      })
     }
-  }
-  submitThingModelChange()
+    submitThingModelChange()
   }
 }
 
@@ -230,5 +228,3 @@ defineExpose({
   openDialog,
 })
 </script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/equipment/products/modules/modeuls/modelNumberDetail.vue b/src/views/iot/equipment/products/modules/modeuls/modelNumberDetail.vue
index 66600b1..e089e77 100644
--- a/src/views/iot/equipment/products/modules/modeuls/modelNumberDetail.vue
+++ b/src/views/iot/equipment/products/modules/modeuls/modelNumberDetail.vue
@@ -4,10 +4,10 @@
       <el-form-item label="型号" style="width: 300px" prop="model">
         <el-radio v-model="state.modelType" label="1">默认</el-radio>
         <el-radio v-model="state.modelType" label="2">自定义</el-radio>
-        <el-input v-if="state.modelType == '2'" v-model="productModelForm.model" size="small"></el-input>
+        <el-input v-if="state.modelType == '2'" v-model="productModelForm.model" size="small" />
       </el-form-item>
       <el-form-item v-if="state.modelType == '2'" label="型号名称" style="width: 300px" prop="name">
-        <el-input v-model="productModelForm.name" size="small"></el-input>
+        <el-input v-model="productModelForm.name" size="small" />
       </el-form-item>
       <el-form-item label="状态" prop="state">
         <el-radio-group v-model="productModelForm.state" size="small">
@@ -90,5 +90,3 @@ defineExpose({
   openDialog,
 })
 </script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/equipment/products/modules/objectModel.vue b/src/views/iot/equipment/products/modules/objectModel.vue
index 70b8747..acf469f 100644
--- a/src/views/iot/equipment/products/modules/objectModel.vue
+++ b/src/views/iot/equipment/products/modules/objectModel.vue
@@ -1,15 +1,15 @@
 <template>
   <el-dialog title="产品物模型" width="70%" v-model="state.visible" append-to-body top="20px">
     <div v-loading="state.loading">
-      <el-tabs type="border-card">
-        <el-tab-pane label="功能列表">
-          <function-config :id="state.id" :model="state.model"></function-config>
+      <el-tabs type="border-card" v-model="activeTab">
+        <el-tab-pane label="功能列表" :name="0">
+          <function-config v-if="activeTab === 0" :id="state.id" :model="state.model" />
         </el-tab-pane>
-        <el-tab-pane label="TSL">
-          <tsl :id="state.id" :model="state.model"></tsl>
+        <el-tab-pane label="TSL" :name="1">
+          <tsl v-if="activeTab === 1" :id="state.id" :model="state.model" />
         </el-tab-pane>
-        <el-tab-pane label="型号配置">
-          <model-number-config :id="state.id"></model-number-config>
+        <el-tab-pane label="型号配置" :name="2">
+          <model-number-config v-if="activeTab === 2" :id="state.id" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -22,6 +22,8 @@ import { getObjectModel } from '../../api/products.api'
 import FunctionConfig from './functionConfig.vue'
 import ModelNumberConfig from './modelNumberConfig.vue'
 import Tsl from './tsl.vue'
+
+const activeTab = ref(0)
 const state = reactive({
   loading: false,
   visible: false,
diff --git a/src/views/iot/ota/upgradePack/index.vue b/src/views/iot/ota/upgradePack/index.vue
index 734789f..e697da1 100644
--- a/src/views/iot/ota/upgradePack/index.vue
+++ b/src/views/iot/ota/upgradePack/index.vue
@@ -218,5 +218,3 @@ const handleHistory = (row) => {
   historyRef.value.openDialog(row.id)
 }
 </script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/iot/ruleEngine/ruleSys/components/DeviceAction.vue b/src/views/iot/ruleEngine/ruleSys/components/DeviceAction.vue
index 471080e..0d74454 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/DeviceAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/DeviceAction.vue
@@ -8,8 +8,8 @@
         <el-row class="service-box">
           <el-col :span="8">
             <el-select v-model="service.identifier" @change="serviceSelected(service)">
-              <el-option label="设置属性" value="set"></el-option>
-              <el-option v-for="s in servicesList || []" :label="s.name" :value="s.identifier" :key="s.identifier"></el-option>
+              <el-option label="设置属性" value="set" />
+              <el-option v-for="s in servicesList || []" :label="s.name" :value="s.identifier" :key="s.identifier" />
             </el-select>
           </el-col>
           <el-col :span="16" style="padding-left: 5px">
@@ -18,12 +18,12 @@
                 <el-row v-for="param in service.inputData" :key="param.identifier" style="margin-bottom: 10px;">
                   <el-col :span="10">
                     <el-select v-model="param.identifier">
-                      <el-option v-for="prop in propertiesList" :label="prop.name" :value="prop.identifier" :key="prop.identifier"></el-option>
+                      <el-option v-for="prop in propertiesList" :label="prop.name" :value="prop.identifier" :key="prop.identifier" />
                     </el-select>
                   </el-col>
                   <el-col :span="2"> 值: </el-col>
                   <el-col :span="7">
-                    <el-input v-model="param.value"></el-input>
+                    <el-input v-model="param.value" />
                   </el-col>
                   <el-col :span="2">
                     <el-button @click="delParam(service.inputData, param)">-</el-button>
@@ -42,7 +42,7 @@
                   </el-col>
                   <el-col :span="2"> 值: </el-col>
                   <el-col :span="7">
-                    <el-input v-model="param.value"></el-input>
+                    <el-input v-model="param.value" />
                   </el-col>
                 </el-row>
               </el-col>
diff --git a/src/views/iot/ruleEngine/ruleSys/components/HttpAction.vue b/src/views/iot/ruleEngine/ruleSys/components/HttpAction.vue
index df1a3e7..e9cf8fa 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/HttpAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/HttpAction.vue
@@ -2,7 +2,7 @@
   <div>
     <el-form label-width="120px" v-for="service in config.services" :key="service">
       <el-form-item label="推送地址">
-        <el-input v-model="service.url" auto-complete="off" placeholder="http://或https://开头"></el-input>
+        <el-input v-model="service.url" auto-complete="off" placeholder="http://或https://开头" />
       </el-form-item>
       <el-form-item label="转换脚本">
         <code-editor style="width: 100%" v-model:code="service.script"></code-editor>
diff --git a/src/views/iot/ruleEngine/ruleSys/components/KafkaAction.vue b/src/views/iot/ruleEngine/ruleSys/components/KafkaAction.vue
index 5d10be0..32159a8 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/KafkaAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/KafkaAction.vue
@@ -2,15 +2,15 @@
   <div>
     <el-form label-width="120px" v-for="service in configRef.services" :key="service">
       <el-form-item label="broker地址">
-        <el-input v-model="service.services" auto-complete="off" placeholder="127.0.0.1:9092,127.0.0.1:9093"></el-input>
+        <el-input v-model="service.services" auto-complete="off" placeholder="127.0.0.1:9092,127.0.0.1:9093" />
       </el-form-item>
       <el-form-item label="ACK">
         <el-select v-model="service.ack" placeholder="请选择应答级别">
-          <el-option v-for="item in ackOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+          <el-option v-for="item in ackOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="转换脚本">
-        <code-editor style="width: 100%" :code="service.script"></code-editor>
+        <code-editor style="width: 100%" :code="service.script" />
       </el-form-item>
     </el-form>
   </div>
diff --git a/src/views/iot/ruleEngine/ruleSys/components/MqttAction.vue b/src/views/iot/ruleEngine/ruleSys/components/MqttAction.vue
index ef2efa1..a17b086 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/MqttAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/MqttAction.vue
@@ -2,16 +2,16 @@
   <div>
     <el-form label-width="120px" v-for="service in config.services" :key="service">
       <el-form-item label="MQTT地址">
-        <el-input v-model="service.host" auto-complete="off" placeholder="IP地址或域名"></el-input>
+        <el-input v-model="service.host" auto-complete="off" placeholder="IP地址或域名" />
       </el-form-item>
       <el-form-item label="MQTT端口">
-        <el-input v-model="service.port" auto-complete="off" placeholder="输入端口" type="number"></el-input>
+        <el-input v-model="service.port" auto-complete="off" placeholder="输入端口" type="number" />
       </el-form-item>
       <el-form-item label="帐号">
-        <el-input v-model="service.username" auto-complete="off" placeholder="输入帐号"></el-input>
+        <el-input v-model="service.username" auto-complete="off" placeholder="输入帐号" />
       </el-form-item>
       <el-form-item label="密码">
-        <el-input v-model="service.password" auto-complete="off" placeholder="输入密码"></el-input>
+        <el-input v-model="service.password" auto-complete="off" placeholder="输入密码" />
       </el-form-item>
       <el-form-item label="转换脚本">
         <code-editor style="width: 100%" v-model:code="service.script"></code-editor>
diff --git a/src/views/iot/ruleEngine/ruleSys/components/TcpAction.vue b/src/views/iot/ruleEngine/ruleSys/components/TcpAction.vue
index 428a9c6..c5ea1e4 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/TcpAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/TcpAction.vue
@@ -2,10 +2,10 @@
   <div>
     <el-form label-width="120px" v-for="(service,index) in config.services" :key="index">
       <el-form-item label="TCP服务地址">
-        <el-input v-model="service.host" auto-complete="off" placeholder="IP地址或域名"></el-input>
+        <el-input v-model="service.host" auto-complete="off" placeholder="IP地址或域名" />
       </el-form-item>
       <el-form-item label="TCP服务端口">
-        <el-input v-model="service.port" auto-complete="off" placeholder="输入端口" type="number"></el-input>
+        <el-input v-model="service.port" auto-complete="off" placeholder="输入端口" type="number" />
       </el-form-item>
       <el-form-item label="转换脚本">
         <code-editor style="width: 100%" :code="service.script"></code-editor>
diff --git a/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue b/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
index 667d3bf..d2ab4d0 100644
--- a/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
+++ b/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
@@ -42,26 +42,26 @@
                           @change="(e) => conditionChange(cond, stateMap.get(item.pk), e)"
                         >
                           <el-option-group v-for="group in stateMap.get(item.pk)" :key="group.name" :label="group.name">
-                            <el-option v-for="pro in group.items" :label="pro.name" :value="pro.identifier" :key="pro.identifier"></el-option>
+                            <el-option v-for="pro in group.items" :label="pro.name" :value="pro.identifier" :key="pro.identifier" />
                           </el-option-group>
                         </el-select>
                         <el-select v-else v-model="cond.type" @change="handleEmits">
-                          <el-option label="设备属性" value="property" key="property"></el-option>
-                          <el-option label="设备标签" value="tag" key="tag"></el-option>
+                          <el-option label="设备属性" value="property" key="property" />
+                          <el-option label="设备标签" value="tag" key="tag" />
                         </el-select>
                       </el-col>
                       <el-col :span="5" v-if="item.deviceRadio === '使用当前设备'">
-                        <el-input v-model="cond.identifier" auto-complete="off"></el-input>
+                        <el-input v-model="cond.identifier" auto-complete="off" />
                       </el-col>
                       <el-col :span="10">
                         <el-row class="param-item">
                           <el-col :span="8">
                             <el-select v-model="cond.comparator">
-                              <el-option v-for="cp in comparators" :label="cp.name" :value="cp.value" :key="cp.value"></el-option>
+                              <el-option v-for="cp in comparators" :label="cp.name" :value="cp.value" :key="cp.value" />
                             </el-select>
                           </el-col>
                           <el-col :span="10">
-                            <el-input v-model="cond.value" auto-complete="off"></el-input>
+                            <el-input v-model="cond.value" auto-complete="off" />
                           </el-col>
                         </el-row>
                       </el-col>
diff --git a/src/views/iot/ruleEngine/ruleSys/modules/listener.vue b/src/views/iot/ruleEngine/ruleSys/modules/listener.vue
index be9a208..a1d0531 100644
--- a/src/views/iot/ruleEngine/ruleSys/modules/listener.vue
+++ b/src/views/iot/ruleEngine/ruleSys/modules/listener.vue
@@ -36,7 +36,7 @@
                       <el-col :span="7">
                         <el-select v-model="cond.identifier" @change="(e) => conditionChange(cond, (stateMap.get(item.pk)?.modelItems || []), e)">
                           <el-option-group v-for="group in (stateMap.get(item.pk)?.modelItems || [])" :key="group.name" :label="group.name">
-                            <el-option v-for="pro in group.items" :label="pro.name" :value="pro.identifier" :key="pro.identifier"></el-option>
+                            <el-option v-for="pro in group.items" :label="pro.name" :value="pro.identifier" :key="pro.identifier" />
                           </el-option-group>
                         </el-select>
                       </el-col>
@@ -49,16 +49,16 @@
                                 :label="p.name"
                                 :value="p.identifier"
                                 :key="p.identifier"
-                              ></el-option>
+                              />
                             </el-select>
                           </el-col>
                           <el-col :span="6">
                             <el-select v-model="param.comparator">
-                              <el-option v-for="cp in comparators" :label="cp.name" :value="cp.value" :key="cp.value"></el-option>
+                              <el-option v-for="cp in comparators" :label="cp.name" :value="cp.value" :key="cp.value" />
                             </el-select>
                           </el-col>
                           <el-col :span="5">
-                            <el-input v-model="param.value" auto-complete="off"></el-input>
+                            <el-input v-model="param.value" auto-complete="off" />
                           </el-col>
                           <el-col :span="1">
                             <el-button
diff --git a/src/views/login.vue b/src/views/login.vue
index bfac8fc..d42fdc6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,7 +15,7 @@
         <div class="title">登录</div>
         <el-form-item prop="tenantId" v-if="tenantEnabled">
           <el-select v-model="loginForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
-            <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
+            <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId" />
             <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
           </el-select>
         </el-form-item>
@@ -69,7 +69,7 @@ import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 import { useUserStore } from '@/store/modules/user'
 import { LoginData, TenantVO } from '@/api/types'
-import { FormRules } from 'element-plus'
+import { FormInstance, FormRules } from 'element-plus'
 import { to } from 'await-to-js'
 
 const userStore = useUserStore()
@@ -103,12 +103,12 @@ const tenantEnabled = ref(true)
 // 注册开关
 const register = ref(false)
 const redirect = ref(undefined)
-const loginRef = ref(ElForm)
+const loginRef = ref<FormInstance>()
 // 租户列表
 const tenantList = ref<TenantVO[]>([])
 
 const handleLogin = () => {
-  loginRef.value.validate(async (valid:boolean, fields: any) => {
+  loginRef.value?.validate(async (valid:boolean, fields: any) => {
     if (valid) {
       loading.value = true
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 1886b13..0244efb 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -100,7 +100,7 @@
 import { list, delLoginInfo, cleanLoginInfo, unlockLoginInfo } from '@/api/monitor/loginInfo'
 import { ComponentInternalInstance } from 'vue'
 import { LoginInfoQuery, LoginInfoVO } from '@/api/monitor/loginInfo/types'
-import { DateModelType } from 'element-plus'
+import { DateModelType, FormInstance, TableInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 const { sys_common_status } = toRefs<any>(proxy?.useDict('sys_common_status'))
@@ -116,8 +116,8 @@ const total = ref(0)
 const dateRange = ref<[DateModelType,DateModelType]>(['', ''])
 const defaultSort = ref<any>({ prop: 'loginTime', order: 'descending' })
 
-const queryFormRef = ref(ElForm)
-const loginInfoTableRef = ref(ElTable)
+const queryFormRef = ref<FormInstance>()
+const loginInfoTableRef = ref<TableInstance>()
 // 查询参数
 const queryParams = ref<LoginInfoQuery>({
   pageNum: 1,
@@ -145,9 +145,9 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   dateRange.value = ['', '']
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   queryParams.value.pageNum = 1
-  loginInfoTableRef.value.sort(defaultSort.value.prop, defaultSort.value.order)
+  loginInfoTableRef.value?.sort(defaultSort.value.prop, defaultSort.value.order)
 }
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: LoginInfoVO[]) => {
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 225122a..f119b52 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -56,6 +56,7 @@
 import { forceLogout, list as initData } from '@/api/monitor/online'
 import { ComponentInternalInstance } from 'vue'
 import { OnlineQuery, OnlineVO } from '@/api/monitor/online/types'
+import { FormInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 
@@ -63,7 +64,7 @@ const onlineList = ref<OnlineVO[]>([])
 const loading = ref(true)
 const total = ref(0)
 
-const queryFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
 
 const queryParams = ref<OnlineQuery>({
   pageNum: 1,
@@ -87,7 +88,7 @@ const handleQuery = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 强退按钮操作 */
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index cf8b086..3b0a1f6 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -167,7 +167,7 @@
 import { list, delOperlog, cleanOperlog } from '@/api/monitor/operlog'
 import { ComponentInternalInstance } from 'vue'
 import { OperLogForm, OperLogQuery, OperLogVO } from '@/api/monitor/operlog/types'
-import { DateModelType } from 'element-plus'
+import { DateModelType, FormInstance, TableInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 const { sys_oper_type, sys_common_status } = toRefs<any>(proxy?.useDict('sys_oper_type','sys_common_status'))
@@ -181,8 +181,8 @@ const total = ref(0)
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 const defaultSort = ref<any>({ prop: 'operTime', order: 'descending' })
 
-const operLogTableRef = ref(ElTable)
-const queryFormRef = ref(ElForm)
+const operLogTableRef = ref<TableInstance>()
+const queryFormRef = ref<FormInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -247,9 +247,9 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   dateRange.value = ['', '']
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   queryParams.value.pageNum = 1
-  operLogTableRef.value.sort(defaultSort.value.prop, defaultSort.value.order)
+  operLogTableRef.value?.sort(defaultSort.value.prop, defaultSort.value.order)
 }
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: OperLogVO[]) => {
diff --git a/src/views/register.vue b/src/views/register.vue
index 4d98279..d461475 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -4,7 +4,7 @@
       <h3 class="title">{{ title }}</h3>
       <el-form-item prop="tenantId" v-if="tenantEnabled">
         <el-select v-model="registerForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
-          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
+          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId" />
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
         </el-select>
       </el-form-item>
@@ -58,7 +58,7 @@
 <script setup lang="ts">
 import { getCodeImg, register, getTenantList } from '@/api/login'
 import { RegisterForm, TenantVO } from '@/api/types'
-import { FormRules } from 'element-plus'
+import { FormInstance, FormRules } from 'element-plus'
 import { to } from 'await-to-js'
 
 const router = useRouter()
@@ -106,12 +106,12 @@ const registerRules: FormRules = {
 const codeUrl = ref('')
 const loading = ref(false)
 const captchaEnabled = ref(true)
-const registerRef = ref(ElForm)
+const registerRef = ref<FormInstance>()
 // 租户列表
 const tenantList = ref<TenantVO[]>([])
 
 const handleRegister = () => {
-  registerRef.value.validate(async (valid: boolean) => {
+  registerRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       loading.value = true
       const [err] = await to(register(registerForm.value))
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index d78cba9..3b8c93c 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -124,7 +124,7 @@
 import { listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache } from '@/api/system/config'
 import { ConfigForm, ConfigQuery, ConfigVO } from '@/api/system/config/types'
 import { ComponentInternalInstance } from 'vue'
-import { DateModelType } from 'element-plus'
+import { DateModelType, FormInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 const { sys_yes_no } = toRefs<any>(proxy?.useDict('sys_yes_no'))
@@ -138,8 +138,8 @@ const multiple = ref(true)
 const total = ref(0)
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 
-const queryFormRef = ref(ElForm)
-const configFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const configFormRef = ref<FormInstance>()
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -186,7 +186,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = {...initFormData}
-  configFormRef.value.resetFields()
+  configFormRef.value?.resetFields()
 }
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -196,7 +196,7 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   dateRange.value = ['', '']
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 多选框选中数据 */
@@ -226,7 +226,7 @@ const handleUpdate = (row?: ConfigVO) => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  configFormRef.value.validate(async (valid: boolean) => {
+  configFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.id ? await updateConfig(form.value) : await addConfig(form.value)
       proxy?.$modal.msgSuccess('操作成功')
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 85060a9..577fa84 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -132,6 +132,7 @@
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from '@/api/system/dept'
 import { ComponentInternalInstance } from 'vue'
 import { DeptForm, DeptQuery, DeptVO } from '@/api/system/dept/types'
+import { FormInstance, TableInstance } from 'element-plus'
 
 interface DeptOptionsType {
   id: number | string
@@ -153,9 +154,9 @@ const dialog = reactive<DialogOption>({
   title: '',
 })
 
-const deptTableRef = ref(ElTable)
-const queryFormRef = ref(ElForm)
-const deptFormRef = ref(ElForm)
+const deptTableRef = ref<TableInstance>()
+const queryFormRef = ref<FormInstance>()
+const deptFormRef = ref<FormInstance>()
 
 const initFormData: DeptForm = {
   id: undefined,
@@ -204,7 +205,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData }
-  deptFormRef.value.resetFields()
+  deptFormRef.value?.resetFields()
 }
 
 /** 搜索按钮操作 */
@@ -213,7 +214,7 @@ const handleQuery = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 新增按钮操作 */
@@ -241,7 +242,7 @@ const handleToggleExpandAll = () => {
 /** 展开/折叠所有 */
 const toggleExpandAll = (data: DeptVO[], status: boolean) => {
   data.forEach((item) => {
-    deptTableRef.value.toggleRowExpansion(item, status)
+    deptTableRef.value?.toggleRowExpansion(item, status)
     if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
   })
 }
@@ -267,7 +268,7 @@ const handleUpdate = async (row: DeptVO) => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  deptFormRef.value.validate(async (valid: boolean) => {
+  deptFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.id ? await updateDept(form.value) : await addDept(form.value)
       proxy?.$modal.msgSuccess('操作成功')
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 1f8d72a..9b43e49 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -104,12 +104,7 @@
         </el-form-item>
         <el-form-item label="回显样式" prop="listClass">
           <el-select v-model="form.listClass">
-            <el-option
-              v-for="item in listClassOptions"
-              :key="item.value"
-              :label="item.label + '(' + item.value + ')'"
-              :value="item.value"
-            ></el-option>
+            <el-option v-for="item in listClassOptions" :key="item.value" :label="item.label + '(' + item.value + ')'" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="状态" prop="status">
@@ -118,7 +113,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -138,7 +133,7 @@ import { listData, getData, delData, addData, updateData } from '@/api/system/di
 import { DictTypeVO } from '@/api/system/dict/type/types'
 import { ComponentInternalInstance } from 'vue'
 import { DictDataForm, DictDataQuery, DictDataVO } from '@/api/system/dict/data/types'
-import { ElForm } from 'element-plus'
+import { FormInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'))
@@ -154,8 +149,8 @@ const total = ref(0)
 const defaultDictType = ref('')
 const typeOptions = ref<DictTypeVO[]>([])
 
-const dataFormRef = ref(ElForm)
-const queryFormRef = ref(ElForm)
+const dataFormRef = ref<FormInstance>()
+const queryFormRef = ref<FormInstance>()
 
 
 const dialog = reactive<DialogOption>({
@@ -231,7 +226,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData }
-  dataFormRef.value.resetFields()
+  dataFormRef.value?.resetFields()
 }
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -245,7 +240,7 @@ const handleClose = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   queryParams.value.dictType = defaultDictType.value
   handleQuery()
 }
@@ -277,7 +272,7 @@ const handleUpdate = (row?: DictDataVO) => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  dataFormRef.value.validate(async (valid: boolean) => {
+  dataFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.dictCode ? await updateData(form.value) : await addData(form.value)
       useDictStore().removeDict(queryParams.value.dictType)
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 20ae69d..3deff38 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -107,7 +107,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -125,7 +125,7 @@ import useDictStore from '@/store/modules/dict'
 import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type'
 import { ComponentInternalInstance } from 'vue'
 import { DictTypeForm, DictTypeQuery, DictTypeVO } from '@/api/system/dict/type/types'
-import { DateModelType } from 'element-plus'
+import { DateModelType, FormInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'))
@@ -139,8 +139,8 @@ const multiple = ref(true)
 const total = ref(0)
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 
-const dictFormRef = ref(ElForm)
-const queryFormRef = ref(ElForm)
+const dictFormRef = ref<FormInstance>()
+const queryFormRef = ref<FormInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -188,7 +188,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData }
-  dictFormRef.value.resetFields()
+  dictFormRef.value?.resetFields()
 }
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -198,7 +198,7 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   dateRange.value = ['', '']
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 新增按钮操作 */
@@ -228,7 +228,7 @@ const handleUpdate = (row?: DictTypeVO) => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  dictFormRef.value.validate(async (valid: boolean) => {
+  dictFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.id ? await updateType(form.value) : await addType(form.value)
       proxy?.$modal.msgSuccess('操作成功')
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 8ff219a..803bc64 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -264,7 +264,7 @@ import { addMenu, delMenu, getMenu, listMenu, updateMenu } from '@/api/system/me
 import { MenuForm, MenuQuery, MenuVO } from '@/api/system/menu/types'
 import { ComponentInternalInstance } from 'vue'
 import { MenuTypeEnum } from '@/enums/MenuTypeEnum'
-import { ElTable, ElForm } from 'element-plus'
+import { FormInstance, TableInstance } from 'element-plus'
 
 interface MenuOptionsType {
   id: number
@@ -286,8 +286,8 @@ const dialog = reactive<DialogOption>({
   title: '',
 })
 
-const queryFormRef = ref(ElForm)
-const menuFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const menuFormRef = ref<FormInstance>()
 const initFormData = {
   path: '',
   id: undefined,
@@ -314,7 +314,7 @@ const data = reactive<PageData<MenuForm, MenuQuery>>({
   },
 })
 
-const menuTableRef = ref(ElTable)
+const menuTableRef = ref<TableInstance>()
 
 const { queryParams, form, rules } = toRefs<PageData<MenuForm, MenuQuery>>(data)
 /** 查询菜单列表 */
@@ -343,7 +343,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData }
-  menuFormRef.value.resetFields()
+  menuFormRef.value?.resetFields()
 }
 
 /** 搜索按钮操作 */
@@ -352,7 +352,7 @@ const handleQuery = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 新增按钮操作 */
@@ -373,7 +373,7 @@ const handleToggleExpandAll = () => {
 /** 展开/折叠所有 */
 const toggleExpandAll = (data: MenuVO[], status: boolean) => {
   data.forEach((item: MenuVO) => {
-    menuTableRef.value.toggleRowExpansion(item, status)
+    menuTableRef.value?.toggleRowExpansion(item, status)
     if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
   })
 }
@@ -392,7 +392,7 @@ const handleUpdate = async (row: MenuVO) => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  menuFormRef.value.validate(async (valid: boolean) => {
+  menuFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.id ? await updateMenu(form.value) : await addMenu(form.value)
       proxy?.$modal.msgSuccess('操作成功')
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 3930bea..14d7b74 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -88,7 +88,7 @@
           <el-col :span="12">
             <el-form-item label="公告类型" prop="noticeType">
               <el-select v-model="form.noticeType" placeholder="请选择">
-                <el-option v-for="dict in sys_notice_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                <el-option v-for="dict in sys_notice_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -121,7 +121,7 @@
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from '@/api/system/notice'
 import { ComponentInternalInstance } from 'vue'
 import { NoticeForm, NoticeQuery, NoticeVO } from '@/api/system/notice/types'
-import { ElForm } from 'element-plus'
+import { FormInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 const { sys_notice_status, sys_notice_type } = toRefs<any>(proxy?.useDict('sys_notice_status', 'sys_notice_type'))
@@ -134,8 +134,8 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 
-const queryFormRef = ref(ElForm)
-const noticeFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const noticeFormRef = ref<FormInstance>()
 
 
 const dialog = reactive<DialogOption>({
@@ -186,7 +186,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData }
-  noticeFormRef.value.resetFields()
+  noticeFormRef.value?.resetFields()
 }
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -195,7 +195,7 @@ const handleQuery = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 多选框选中数据 */
@@ -225,7 +225,7 @@ const handleUpdate = (row?: NoticeVO) => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  noticeFormRef.value.validate(async (valid: boolean) => {
+  noticeFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.id ? await updateNotice(form.value) : await addNotice(form.value)
       proxy?.$modal.msgSuccess('修改成功')
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 3be10c6..0a285c2 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -140,7 +140,7 @@ import {
 } from '@/api/system/ossConfig'
 import { ComponentInternalInstance } from 'vue'
 import { OssConfigForm, OssConfigQuery, OssConfigVO } from '@/api/system/ossConfig/types'
-import { ElForm } from 'element-plus'
+import { FormInstance } from 'element-plus'
 
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -155,8 +155,8 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 
-const queryFormRef = ref(ElForm)
-const ossConfigFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const ossConfigFormRef = ref<FormInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -259,7 +259,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData }
-  ossConfigFormRef.value.resetFields()
+  ossConfigFormRef.value?.resetFields()
 }
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -268,7 +268,7 @@ const handleQuery = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 选择条数  */
@@ -300,7 +300,7 @@ const handleUpdate = (row?: OssConfigVO) => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  ossConfigFormRef.value.validate(async (valid: boolean) => {
+  ossConfigFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true
       if (form.value.ossConfigId) {
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index b83bb0d..d95e7f1 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -135,7 +135,7 @@ import { listOss, delOss } from '@/api/system/oss'
 import ImagePreview from '@/components/ImagePreview/index.vue'
 import { ComponentInternalInstance } from 'vue'
 import { OssForm, OssQuery, OssVO } from '@/api/system/oss/types'
-import { DateModelType } from 'element-plus'
+import { DateModelType, FormInstance } from 'element-plus'
 
 const router = useRouter()
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -161,8 +161,8 @@ const dialog = reactive<DialogOption>({
 // 默认排序
 const defaultSort = ref({ prop: 'createTime', order: 'ascending' })
 
-const ossFormRef = ref(ElForm)
-const queryFormRef = ref(ElForm)
+const ossFormRef = ref<FormInstance>()
+const queryFormRef = ref<FormInstance>()
 
 const initFormData = {
   file: undefined,
@@ -210,7 +210,7 @@ function cancel() {
 /** 表单重置 */
 function reset() {
   form.value = { ...initFormData }
-  ossFormRef.value.resetFields()
+  ossFormRef.value?.resetFields()
 }
 /** 搜索按钮操作 */
 function handleQuery() {
@@ -221,7 +221,7 @@ function handleQuery() {
 function resetQuery() {
   showTable.value = false
   daterangeCreateTime.value = ['', '']
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   queryParams.value.orderByColumn = defaultSort.value.prop
   queryParams.value.isAsc = defaultSort.value.order
   handleQuery()
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 4de2835..007ca02 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -107,6 +107,7 @@
 <script setup name="Post" lang="ts">
 import { listPost, addPost, delPost, getPost, updatePost } from '@/api/system/post'
 import { PostForm, PostQuery, PostVO } from '@/api/system/post/types'
+import { FormInstance } from 'element-plus'
 import { ComponentInternalInstance } from 'vue'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -120,8 +121,8 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 
-const postFormRef = ref(ElForm)
-const queryFormRef = ref(ElForm)
+const postFormRef = ref<FormInstance>()
+const queryFormRef = ref<FormInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -171,7 +172,7 @@ const cancel = () => {
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData }
-  postFormRef.value.resetFields()
+  postFormRef.value?.resetFields()
 }
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -180,7 +181,7 @@ const handleQuery = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 多选框选中数据 */
@@ -210,7 +211,7 @@ const handleUpdate = (row?: PostVO) => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  postFormRef.value.validate(async (valid: boolean) => {
+  postFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.id ? await updatePost(form.value) : await addPost(form.value)
       proxy?.$modal.msgSuccess('操作成功')
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 50c8f93..819c959 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -70,8 +70,7 @@ import { UserQuery } from '@/api/system/user/types'
 import { ComponentInternalInstance } from 'vue'
 import { UserVO } from '@/api/system/user/types'
 import SelectUser from './selectUser.vue'
-// import { ElForm, ElSelect} from 'element-plus';
-
+import { FormInstance } from 'element-plus'
 
 const route = useRoute()
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -84,7 +83,7 @@ const multiple = ref(true)
 const total = ref(0)
 const userIds = ref<Array<string | number>>([])
 
-const queryFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
 const selectRef = ref(SelectUser)
 
 const queryParams = reactive<UserQuery>({
@@ -114,8 +113,8 @@ const handleQuery=() => {
   getList()
 }
 /** 重置按钮操作 */
-const resetQuery=() =>{
-  queryFormRef.value.resetFields()
+const resetQuery=() => {
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 // 多选框选中数据
@@ -148,5 +147,3 @@ onMounted(() => {
   getList()
 })
 </script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index d9600fa..def6bb7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -136,10 +136,10 @@
             :check-strictly="!form.menuCheckStrictly"
             empty-text="加载中，请稍候"
             :props="{ label: 'label', children: 'children' }"
-          ></el-tree>
+          />
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -161,7 +161,7 @@
         </el-form-item>
         <el-form-item label="权限范围">
           <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="数据权限" v-show="form.dataScope === '2'">
@@ -178,7 +178,7 @@
             :check-strictly="!form.deptCheckStrictly"
             empty-text="加载中，请稍候"
             :props="{ label: 'label', children: 'children' }"
-          ></el-tree>
+          />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -197,7 +197,7 @@ import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/m
 import { RoleVO, RoleForm, RoleQuery, DeptTreeOption } from '@/api/system/role/types'
 import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types'
 import { ComponentInternalInstance } from 'vue'
-import { ElTree, ElForm, DateModelType } from 'element-plus'
+import { ElTree, DateModelType, FormInstance } from 'element-plus'
 
 const router = useRouter()
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -228,9 +228,9 @@ const dataScopeOptions = ref([
   { value: '5', label: '仅本人数据权限' },
 ])
 
-const queryFormRef = ref(ElForm)
-const roleFormRef = ref(ElForm)
-const dataScopeRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const roleFormRef = ref<FormInstance>()
+const dataScopeRef = ref<FormInstance>()
 const menuRef = ref(ElTree)
 const deptRef = ref(ElTree)
 
@@ -293,7 +293,7 @@ const handleQuery = () => {
 /** 重置 */
 const resetQuery = () => {
   dateRange.value = ['', '']
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /**删除按钮操作 */
@@ -361,7 +361,7 @@ const reset = () => {
   deptExpand.value = true
   deptNodeAll.value = false
   form.value = initForm
-  roleFormRef.value.resetFields()
+  roleFormRef.value?.resetFields()
 }
 
 /** 添加角色 */
@@ -449,7 +449,7 @@ const getMenuAllCheckedKeys = () => {
 }
 /** 提交按钮 */
 const submitForm = () => {
-  roleFormRef.value.validate(async (valid: boolean) => {
+  roleFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.menuIds = getMenuAllCheckedKeys()
       form.value.id ? await updateRole(form.value) : await addRole(form.value)
@@ -498,7 +498,7 @@ const submitDataScope = async () => {
 }
 /** 取消按钮（数据权限）*/
 const cancelDataScope = () => {
-  dataScopeRef.value.resetFields()
+  dataScopeRef.value?.resetFields()
   form.value = { ...initForm }
   openDataScope.value = false
 }
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 1c7200b..c460181 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -48,7 +48,7 @@ import { authUserSelectAll, unallocatedUserList } from '@/api/system/role'
 import { UserVO } from '@/api/system/user/types'
 import { UserQuery } from '@/api/system/user/types'
 import { ComponentInternalInstance } from 'vue'
-import { ElForm, ElTable } from 'element-plus'
+import { FormInstance, TableInstance } from 'element-plus'
 
 
 const props = defineProps({
@@ -73,8 +73,8 @@ const queryParams = reactive<UserQuery>({
   phonenumber: undefined
 })
 
-const tableRef = ref(ElTable)
-const queryFormRef = ref(ElForm)
+const tableRef = ref<TableInstance>()
+const queryFormRef = ref<FormInstance>()
 
 const show = () => {
   queryParams.roleId = props.roleId
@@ -86,7 +86,7 @@ const show = () => {
  * 选择行
  */
 const clickRow = (row: any) => {
-  tableRef.value.toggleRowSelection(row)
+  tableRef.value?.toggleRowSelection(row, true)
 }
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: UserVO[]) => {
@@ -106,7 +106,7 @@ const handleQuery = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   getList()
 }
 
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index fc4b3cc..21cbd13 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -144,7 +144,7 @@ import { selectTenantPackage } from '@/api/system/tenantPackage'
 import { TenantForm, TenantQuery, TenantVO } from '@/api/system/tenant/types'
 import { TenantPkgVO } from '@/api/system/tenantPackage/types'
 import { ComponentInternalInstance } from 'vue'
-import { ElForm } from 'element-plus'
+import { FormInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 
@@ -158,8 +158,8 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 
-const queryFormRef = ref(ElForm)
-const tenantFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const tenantFormRef = ref<FormInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -251,7 +251,7 @@ const cancel = () => {
 // 表单重置
 const reset = () => {
   form.value = {...initFormData}
-  tenantFormRef.value.resetFields()
+  tenantFormRef.value?.resetFields()
 }
 
 /** 搜索按钮操作 */
@@ -262,7 +262,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 
@@ -300,7 +300,7 @@ const handleUpdate = (row?: TenantVO) => {
 
 /** 提交按钮 */
 const submitForm = () => {
-  tenantFormRef.value.validate(async (valid: boolean) => {
+  tenantFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true
       if (form.value.id) {
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 937ef7e..34aff76 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -44,16 +44,16 @@
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="状态" align="center" prop="status">
           <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @click="handleStatusChange(scope.row)"></el-switch>
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @click="handleStatusChange(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenantPackage:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenantPackage:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenantPackage:remove']"> </el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenantPackage:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -81,7 +81,7 @@
             :check-strictly="!form.menuCheckStrictly"
             empty-text="加载中，请稍候"
             :props="{ label: 'label', children: 'children' }"
-          ></el-tree>
+          />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -103,7 +103,7 @@ import { treeselect as menuTreeselect, tenantPackageMenuTreeselect } from '@/api
 import { ComponentInternalInstance } from 'vue'
 import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from '@/api/system/tenantPackage/types'
 import { MenuTreeOption } from '@/api/system/menu/types'
-import { CheckboxValueType, ElTree, ElForm } from 'element-plus'
+import { CheckboxValueType, ElTree, FormInstance } from 'element-plus'
 import to from 'await-to-js'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -121,8 +121,8 @@ const menuNodeAll = ref(false)
 const menuOptions = ref<MenuTreeOption[]>([])
 
 const menuTreeRef = ref(ElTree)
-const queryFormRef = ref(ElForm)
-const tenantPackageFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const tenantPackageFormRef = ref<FormInstance>()
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -208,7 +208,7 @@ const reset = () => {
   menuExpand.value = false
   menuNodeAll.value = false
   form.value = {...initFormData}
-  tenantPackageFormRef.value.resetFields()
+  tenantPackageFormRef.value?.resetFields()
 }
 
 /** 搜索按钮操作 */
@@ -219,7 +219,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 
@@ -290,7 +290,7 @@ const handleUpdate = (row?: TenantPkgVO) => {
 
 /** 提交按钮 */
 const submitForm = () => {
-  tenantPackageFormRef.value.validate(async (valid: boolean) => {
+  tenantPackageFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true
       form.value.menuIds = getMenuAllCheckedKeys()
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index 0809885..a88ef3b 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -58,7 +58,7 @@
 import { RoleVO } from '@/api/system/role/types'
 import { getAuthRole, updateAuthRole } from '@/api/system/user'
 import { UserForm } from '@/api/system/user/types'
-import { ElTable } from 'element-plus'
+import { TableInstance } from 'element-plus'
 import { ComponentInternalInstance } from 'vue'
 const route = useRoute()
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -75,11 +75,11 @@ const form = ref<Partial<UserForm>>({
   userId: undefined,
 })
 
-const tableRef = ref(ElTable)
+const tableRef = ref<TableInstance>()
 
 /** 单击选中行数据 */
 const clickRow = (row: RoleVO) => {
-  tableRef.value.toggleRowSelection(row)
+  tableRef.value?.toggleRowSelection(row, true)
 }
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: RoleVO[]) => {
@@ -114,7 +114,7 @@ const getList = async () => {
     await nextTick(() => {
       roles.value.forEach((row) => {
         if (row?.flag) {
-          tableRef.value.toggleRowSelection(row)
+          tableRef.value?.toggleRowSelection(row, true)
         }
       })
     })
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 92f0c98..7b7aaf9 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -15,7 +15,7 @@
             highlight-current
             default-expand-all
             @node-click="handleNodeClick"
-          ></el-tree>
+          />
         </el-card>
       </el-col>
       <el-col :lg="20" :xs="24">
@@ -83,7 +83,7 @@
                   </template>
                 </el-dropdown>
               </el-col>
-              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true"></right-toolbar>
+              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns" :search="true" />
             </el-row>
           </template>
 
@@ -194,7 +194,7 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择">
-                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -211,26 +211,14 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.id"
-                  :label="item.postName"
-                  :value="item.id"
-                  :disabled="item.status == '1'"
-                ></el-option>
+                <el-option v-for="item in postOptions" :key="item.id" :label="item.postName" :value="item.id" :disabled="item.status == '1'" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.id"
-                  :label="item.roleName"
-                  :value="item.id"
-                  :disabled="item.status == '1'"
-                ></el-option>
+                <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id" :disabled="item.status == '1'" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -238,7 +226,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -296,7 +284,7 @@ import { treeselect } from '@/api/system/dept'
 import { DeptVO } from '@/api/system/dept/types'
 import { RoleVO } from '@/api/system/role/types'
 import { PostVO } from '@/api/system/post/types'
-import { DateModelType, ElTree, ElUpload, UploadFile, ElForm } from 'element-plus'
+import { DateModelType, ElTree, ElUpload, UploadFile, FormInstance } from 'element-plus'
 import { to } from 'await-to-js'
 const router = useRouter()
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -342,8 +330,8 @@ const columns = ref<FieldOption[]>([
 ])
 
 const deptTreeRef = ref(ElTree)
-const queryFormRef = ref(ElForm)
-const userFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
+const userFormRef = ref<FormInstance>()
 const uploadRef = ref(ElUpload)
 
 const dialog = reactive<DialogOption>({
@@ -436,7 +424,7 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   dateRange.value = ['', '']
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   queryParams.value.pageNum = 1
   handleQuery()
 }
@@ -545,7 +533,7 @@ const initTreeData = async () => {
 /** 重置操作表单 */
 const reset = () => {
   form.value = { ...initFormData }
-  userFormRef.value.resetFields()
+  userFormRef.value?.resetFields()
 }
 /** 取消按钮 */
 const cancel = () => {
@@ -586,7 +574,7 @@ const handleUpdate = (row?: UserForm) => {
 
 /** 提交按钮 */
 const submitForm = () => {
-  userFormRef.value.validate(async (valid: boolean) => {
+  userFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       form.value.id ? await updateUser(form.value) : await addUser(form.value)
       proxy?.$modal.msgSuccess('操作成功')
@@ -608,8 +596,8 @@ const closeDialog = () => {
  * 重置表单
  */
 const resetForm = () => {
-  userFormRef.value.resetFields()
-  userFormRef.value.clearValidate()
+  userFormRef.value?.resetFields()
+  userFormRef.value?.clearValidate()
 
   form.value.id = undefined
   form.value.status = '1'
@@ -619,5 +607,3 @@ onMounted(() => {
   getList() // 初始化列表数据
 })
 </script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index a58e93a..ad78be2 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -20,12 +20,12 @@
 import { updateUserPwd } from '@/api/system/user'
 import { ComponentInternalInstance } from 'vue'
 import { ResetPwdForm } from '@/api/system/user/types'
-import { ElForm } from 'element-plus'
+import { FormInstance } from 'element-plus'
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 
 
-const pwdRef = ref(ElForm)
+const pwdRef = ref<FormInstance>()
 
 const user = ref<ResetPwdForm>({
   oldPassword: '',
@@ -48,7 +48,7 @@ const rules = ref({
 
 /** 提交按钮 */
 const submit = () => {
-  pwdRef.value.validate(async (valid: boolean) => {
+  pwdRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       await updateUserPwd(user.value.oldPassword, user.value.newPassword)
       proxy?.$modal.msgSuccess('修改成功')
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index a45a116..eb20c45 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -24,10 +24,9 @@
 
 <script setup lang="ts">
 import { updateUserProfile } from '@/api/system/user'
-import { FormRules } from 'element-plus'
+import { FormInstance, FormRules } from 'element-plus'
 import { ComponentInternalInstance } from 'vue'
 import { PropType } from 'vue'
-import { ElForm } from 'element-plus'
 
 const props = defineProps({
   user: {
@@ -38,7 +37,7 @@ const userForm = computed(() => props.user)
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 
-const userRef = ref(ElForm)
+const userRef = ref<FormInstance>()
 
 const rules = ref<FormRules>({
   nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
@@ -49,7 +48,7 @@ const rules = ref<FormRules>({
 
 /** 提交按钮 */
 const submit = () => {
-  userRef.value.validate(async (valid: boolean) => {
+  userRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       await updateUserProfile(props.user)
       proxy?.$modal.msgSuccess('修改成功')
diff --git a/src/views/tool/gen/basicInfoForm.vue b/src/views/tool/gen/basicInfoForm.vue
index 8fd46a5..3c1ff2a 100644
--- a/src/views/tool/gen/basicInfoForm.vue
+++ b/src/views/tool/gen/basicInfoForm.vue
@@ -23,7 +23,7 @@
       </el-col>
       <el-col :span="24">
         <el-form-item label="备注" prop="remark">
-          <el-input type="textarea" :rows="3" v-model="infoForm.remark"></el-input>
+          <el-input type="textarea" :rows="3" v-model="infoForm.remark" />
         </el-form-item>
       </el-col>
     </el-row>
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 429faa1..f3e0c75 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -10,7 +10,7 @@
           <el-table-column label="字段列名" prop="columnName" min-width="10%" :show-overflow-tooltip="true" />
           <el-table-column label="字段描述" min-width="10%">
             <template #default="scope">
-              <el-input v-model="scope.row.columnComment"></el-input>
+              <el-input v-model="scope.row.columnComment" />
             </template>
           </el-table-column>
           <el-table-column label="物理类型" prop="columnType" min-width="10%" :show-overflow-tooltip="true" />
@@ -29,7 +29,7 @@
           </el-table-column>
           <el-table-column label="java属性" min-width="10%">
             <template #default="scope">
-              <el-input v-model="scope.row.javaField"></el-input>
+              <el-input v-model="scope.row.javaField" />
             </template>
           </el-table-column>
 
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 0e89dba..a99ea20 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -139,7 +139,7 @@
                 :key="index"
                 :label="column.columnName + '：' + column.columnComment"
                 :value="column.columnName"
-              ></el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -157,7 +157,7 @@
                 :key="index"
                 :label="column.columnName + '：' + column.columnComment"
                 :value="column.columnName"
-              ></el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -175,7 +175,7 @@
                 :key="index"
                 :label="column.columnName + '：' + column.columnComment"
                 :value="column.columnName"
-              ></el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -194,7 +194,7 @@
               </el-tooltip>
             </template>
             <el-select v-model="infoForm.subTableName" placeholder="请选择" @change="subSelectChange">
-              <el-option v-for="(t, index) in table" :key="index" :label="t.tableName + '：' + t.tableComment" :value="t.tableName"></el-option>
+              <el-option v-for="(t, index) in table" :key="index" :label="t.tableName + '：' + t.tableComment" :value="t.tableName" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -212,7 +212,7 @@
                 :key="index"
                 :label="column.columnName + '：' + column.columnComment"
                 :value="column.columnName"
-              ></el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 07822a1..8deb6c3 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -36,7 +36,7 @@
 import { listDbTable, importTable } from '@/api/tool/gen'
 import { DbTableQuery, DbTableVO } from '@/api/tool/gen/types'
 import { ComponentInternalInstance } from 'vue'
-import { ElTable, ElForm } from 'element-plus'
+import { FormInstance, TableInstance } from 'element-plus'
 
 const total = ref(0)
 const visible = ref(false)
@@ -44,8 +44,8 @@ const tables = ref<Array<string>>([])
 const dbTableList = ref<Array<DbTableVO>>([])
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
 
-const tableRef = ref(ElTable)
-const queryFormRef = ref(ElForm)
+const tableRef = ref<TableInstance>()
+const queryFormRef = ref<FormInstance>()
 
 const queryParams = reactive<DbTableQuery>({
   pageNum: 1,
@@ -63,7 +63,7 @@ const show = () => {
 }
 /** 单击选择行 */
 const clickRow = (row: DbTableVO) => {
-  tableRef.value.toggleRowSelection(row)
+  tableRef.value?.toggleRowSelection(row, true)
 }
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: DbTableVO[]) => {
@@ -82,7 +82,7 @@ const handleQuery = () => {
 }
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 /** 导入按钮操作 */
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 0280809..c0d95e7 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -107,7 +107,7 @@ import { TableQuery, TableVO } from '@/api/tool/gen/types'
 import router from '@/router'
 import importTable from './importTable.vue'
 import { ComponentInternalInstance } from 'vue'
-import { ElForm, DateModelType } from 'element-plus'
+import { DateModelType, FormInstance } from 'element-plus'
 
 const route = useRoute()
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -123,7 +123,7 @@ const tableNames = ref<Array<string>>([])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])
 const uniqueId = ref('')
 
-const queryFormRef = ref(ElForm)
+const queryFormRef = ref<FormInstance>()
 const importRef = ref(importTable)
 
 const queryParams = ref<TableQuery>({
@@ -151,7 +151,7 @@ onActivated(() => {
     uniqueId.value = time as string
     queryParams.value.pageNum = Number(route.query.pageNum)
     dateRange.value = ['', '']
-    queryFormRef.value.resetFields()
+    queryFormRef.value?.resetFields()
     getList()
   }
 })
@@ -198,7 +198,7 @@ const openImportTable = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   dateRange.value = ['', '']
-  queryFormRef.value.resetFields()
+  queryFormRef.value?.resetFields()
   handleQuery()
 }
 
-- 
Gitee


From 13ded7f11f18d820dedba8904a2501309ecdea52 Mon Sep 17 00:00:00 2001
From: "liupo.wu" <wuliupo@163.com>
Date: Sun, 16 Jul 2023 11:42:36 +0800
Subject: [PATCH 4/7] fix: tips

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1dbe20c..d0a2ac0 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ http://localhost:8082
 
 ## 生产环境配置示例
 
-- pro 前缀和 `.env.production` 文件中的一致
+- api 前缀和 `.env.production` 文件中的一致
 - 服务器上静态资源的目录 `/www/wwwroot` 根据实际情况调整
 
 ```nginx
-- 
Gitee


From 97d2be456be7ab8d19a78e8c167389b984e786b0 Mon Sep 17 00:00:00 2001
From: "liupo.wu" <wuliupo@163.com>
Date: Sun, 16 Jul 2023 11:48:07 +0800
Subject: [PATCH 5/7] fix: rollback

---
 vite.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 78da735..80fdec6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -26,9 +26,9 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://112.17.190.29:8000',
+          target: 'http://127.0.0.1:8086',
           changeOrigin: true,
-          // rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), ''),
+          rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), ''),
         },
       },
     },
-- 
Gitee


From ed10911bec12ad8221f11c58a91dd8f31bc261fc Mon Sep 17 00:00:00 2001
From: "liupo.wu" <wuliupo@163.com>
Date: Sun, 16 Jul 2023 14:31:26 +0800
Subject: [PATCH 6/7] fix: element, lazy-load

---
 src/components/CodeEditor/index.vue           |  5 +-
 src/components/Crontab/index.vue              |  2 +-
 src/components/Crontab/tabIndex.vue           | 34 +++----
 src/components/IconSelect/index.vue           |  4 +-
 src/components/RightToolbar/index.vue         |  2 +-
 src/components/RuoYiDoc/index.vue             |  4 +-
 src/components/RuoYiGit/index.vue             |  4 +-
 src/components/Screenfull/index.vue           |  4 +-
 src/components/StatusTag/index.vue            |  3 +-
 src/components/YTLayout/basic-layout.vue      |  4 +-
 src/components/YtSelect/select-device.vue     |  1 +
 src/components/YtSelect/select-product.vue    |  1 +
 src/components/common/yt-crud.vue             | 14 +--
 src/components/common/yt-table-search.tsx     |  4 +-
 src/components/common/yt-table.tsx            | 14 +--
 src/layout/components/IframeToggle/index.vue  |  2 +-
 src/layout/components/InnerLink/index.vue     |  4 +-
 .../contributor/components/user-item.vue      |  1 +
 src/views/contributor/index.vue               |  4 +-
 src/views/demo/demo/index.vue                 |  8 +-
 src/views/demo/tree/index.vue                 |  4 +-
 src/views/iot/alarm/config.vue                |  3 +-
 src/views/iot/alarm/list.vue                  |  2 +-
 src/views/iot/channel/config.vue              |  2 +-
 src/views/iot/channel/template.vue            |  7 +-
 .../iot/communication/components/index.vue    |  9 +-
 .../iot/communication/convertors/index.vue    |  5 +-
 .../modules/conversionScript.vue              | 14 +--
 src/views/iot/crudDemo/disperseDemo.vue       |  5 +-
 src/views/iot/crudDemo/tenantCrud.vue         | 13 +--
 src/views/iot/equipment/categories/index.vue  |  4 +-
 src/views/iot/equipment/devices/detail.vue    | 89 +++++++++++--------
 src/views/iot/equipment/devices/list.vue      | 12 +--
 .../devices/modules/PropertyChart.vue         |  4 +-
 .../devices/modules/childrenDialog.vue        |  1 +
 .../devices/modules/detail/DeviceLog.vue      |  6 +-
 .../modules/detail/DeviceSimulator.vue        | 76 ++++++++--------
 .../detail/DeviceSimulatorProperties.vue      |  8 +-
 .../devices/modules/detail/MqttClient.vue     |  8 +-
 .../modules/virtualDevices/bindDevices.vue    |  1 +
 .../devices/modules/virtualDevices/log.vue    |  1 +
 .../devices/modules/virtualDevices/script.vue |  1 +
 .../equipment/devices/virtualDeviceConfig.vue | 16 ++--
 .../iot/equipment/devices/virtualDevices.vue  |  9 +-
 src/views/iot/equipment/products/index.vue    |  7 +-
 .../modules/components/ModelParams.vue        | 12 ++-
 .../modules/components/PropertyModel.vue      |  3 -
 .../products/modules/functionConfig.vue       |  5 +-
 .../products/modules/modelNumberConfig.vue    |  3 +-
 .../modules/modeuls/functionDetail.vue        |  7 +-
 .../modules/modeuls/modelNumberDetail.vue     |  3 +-
 .../products/modules/objectModel.vue          |  2 +-
 src/views/iot/messageCenter/list.vue          |  3 +-
 src/views/iot/ota/upgradePack/index.vue       | 12 +--
 .../upgradePack/modules/devicesUpgrades.vue   |  2 +
 .../iot/ota/upgradePack/modules/history.vue   |  5 +-
 .../iot/ruleEngine/modules/logDialog.vue      |  5 +-
 .../ruleSys/components/DeviceAction.vue       |  3 +-
 .../ruleSys/components/HttpAction.vue         |  2 +-
 .../ruleSys/components/MqttAction.vue         |  2 +-
 .../ruleSys/components/TcpAction.vue          |  2 +-
 src/views/iot/ruleEngine/ruleSys/index.vue    | 14 +--
 .../ruleEngine/ruleSys/modules/filtera.vue    |  8 +-
 .../ruleEngine/ruleSys/modules/listener.vue   |  9 +-
 .../iot/ruleEngine/ruleSys/modules/output.vue | 12 ++-
 .../iot/ruleEngine/scheduledTask/index.vue    | 19 ++--
 src/views/monitor/admin/index.vue             |  4 +-
 src/views/monitor/logininfor/index.vue        |  4 +-
 src/views/monitor/operlog/index.vue           |  9 +-
 src/views/monitor/xxljob/index.vue            |  4 +-
 src/views/system/config/index.vue             | 10 +--
 src/views/system/dept/index.vue               |  8 +-
 src/views/system/dict/data.vue                |  8 +-
 src/views/system/dict/index.vue               | 10 +--
 src/views/system/menu/index.vue               | 12 +--
 src/views/system/notice/index.vue             |  8 +-
 src/views/system/oss/config.vue               | 10 +--
 src/views/system/oss/index.vue                | 10 +--
 src/views/system/post/index.vue               |  8 +-
 src/views/system/role/authUser.vue            |  2 +-
 src/views/system/role/index.vue               | 18 ++--
 src/views/system/role/selectUser.vue          | 82 +++++++++--------
 src/views/system/tenant/index.vue             | 10 +--
 src/views/system/tenantPackage/index.vue      |  4 +-
 src/views/system/user/authRole.vue            |  2 +-
 src/views/system/user/index.vue               | 15 ++--
 src/views/system/user/profile/index.vue       |  4 +-
 src/views/system/user/profile/userAvatar.vue  | 13 ++-
 src/views/tool/gen/editTable.vue              | 16 ++--
 src/views/tool/gen/importTable.vue            | 12 +--
 src/views/tool/gen/index.vue                  | 20 ++---
 91 files changed, 424 insertions(+), 438 deletions(-)

diff --git a/src/components/CodeEditor/index.vue b/src/components/CodeEditor/index.vue
index 9a8c788..c1e9ac3 100644
--- a/src/components/CodeEditor/index.vue
+++ b/src/components/CodeEditor/index.vue
@@ -1,8 +1,7 @@
 <template>
-  <div>
-    <codemirror class="code" ref="editScript" v-model="codeModel" :extensions="extensions" v-bind="cmOption" @ready="handleReady"></codemirror>
-  </div>
+  <codemirror class="code" ref="editScript" v-model="codeModel" :extensions="extensions" v-bind="cmOption" @ready="handleReady" />
 </template>
+
 <script lang="ts" setup>
 import { Codemirror } from 'vue-codemirror'
 import { javascript } from '@codemirror/lang-javascript'
diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue
index d4fa498..2bd755d 100644
--- a/src/components/Crontab/index.vue
+++ b/src/components/Crontab/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="Cron表达式生成器" v-model="cronDialog">
-    <table-index ref="cronBoxRef" @fill="cronFill"></table-index>
+    <table-index v-if="cronDialog" ref="cronBoxRef" @fill="cronFill" />
     <template #footer>
       <el-button type="primary" @click="submitFill">确定</el-button>
       <el-button type="warning" @click="clearCron">重置</el-button>
diff --git a/src/components/Crontab/tabIndex.vue b/src/components/Crontab/tabIndex.vue
index 34d6cb0..51ecf40 100644
--- a/src/components/Crontab/tabIndex.vue
+++ b/src/components/Crontab/tabIndex.vue
@@ -1,32 +1,32 @@
 <template>
   <div>
-    <el-tabs type="border-card">
-      <el-tab-pane label="秒" v-if="shouldHide('second')">
-        <CrontabSecond @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronsecond" />
+    <el-tabs type="border-card" v-model="activeTab">
+      <el-tab-pane label="秒" name="second" v-if="shouldHide('second')">
+        <CrontabSecond v-if="activeTab === 'second'" @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronsecond" />
       </el-tab-pane>
 
-      <el-tab-pane label="分钟" v-if="shouldHide('min')">
-        <CrontabMin @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronmin" />
+      <el-tab-pane label="分钟" name="minute" v-if="shouldHide('min')">
+        <CrontabMin v-if="activeTab === 'minute'" @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronmin" />
       </el-tab-pane>
 
-      <el-tab-pane label="小时" v-if="shouldHide('hour')">
-        <CrontabHour @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronhour" />
+      <el-tab-pane label="小时" name="hour" v-if="shouldHide('hour')">
+        <CrontabHour v-if="activeTab === 'hour'" @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronhour" />
       </el-tab-pane>
 
-      <el-tab-pane label="日" v-if="shouldHide('day')">
-        <CrontabDay @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronday" />
+      <el-tab-pane label="日" name="day" v-if="shouldHide('day')">
+        <CrontabDay v-if="activeTab === 'day'" @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronday" />
       </el-tab-pane>
 
-      <el-tab-pane label="月" v-if="shouldHide('month')">
-        <CrontabMonth @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronmonth" />
+      <el-tab-pane label="月" name="month" v-if="shouldHide('month')">
+        <CrontabMonth v-if="activeTab === 'month'" @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronmonth" />
       </el-tab-pane>
 
-      <el-tab-pane label="周" v-if="shouldHide('week')">
-        <CrontabWeek @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronweek" />
+      <el-tab-pane label="周" name="week" v-if="shouldHide('week')">
+        <CrontabWeek v-if="activeTab === 'week'" @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronweek" />
       </el-tab-pane>
 
-      <el-tab-pane label="年" v-if="shouldHide('year')">
-        <CrontabYear @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronyear" />
+      <el-tab-pane label="年" name="year" v-if="shouldHide('year')">
+        <CrontabYear v-if="activeTab === 'year'" @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronyear" />
       </el-tab-pane>
     </el-tabs>
 
@@ -66,7 +66,7 @@
           </tbody>
         </table>
       </div>
-      <CrontabResult :ex="crontabValueString"></CrontabResult>
+      <CrontabResult :ex="crontabValueString" />
 
       <!-- <div class="pop_btn">
         <el-button type="primary" @click="submitFill">确定</el-button>
@@ -90,6 +90,7 @@ import CrontabResult from './result.vue'
 export default {
   data() {
     return {
+      activeTab: 'second',
       tabTitles: ['秒', '分钟', '小时', '日', '月', '周', '年'],
       tabActive: 0,
       myindex: 0,
@@ -334,6 +335,7 @@ export default {
   }
 }
 </script>
+
 <style scoped>
 .pop_btn {
   text-align: center;
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 1448c6a..1140f54 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -9,8 +9,8 @@
     <el-popover shadow="none" :visible="visible" placement="bottom-end" trigger="click" :width="450">
       <template #reference>
         <div @click="visible = !visible" class="cursor-pointer text-[#999] absolute right-[10px] top-0 height-[32px] leading-[32px]">
-          <i-ep-caret-top v-show="visible"></i-ep-caret-top>
-          <i-ep-caret-bottom v-show="!visible"></i-ep-caret-bottom>
+          <i-ep-caret-top v-show="visible" />
+          <i-ep-caret-bottom v-show="!visible" />
         </div>
       </template>
 
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 2a3fece..8fff29b 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -12,7 +12,7 @@
       </el-tooltip>
     </el-row>
     <el-dialog :title="title" v-model="open" append-to-body>
-      <el-transfer :titles="['显示', '隐藏']" v-model="value" :data="columns" @change="dataChange"></el-transfer>
+      <el-transfer v-if="open" :titles="['显示', '隐藏']" v-model="value" :data="columns" @change="dataChange" />
     </el-dialog>
   </div>
 </template>
diff --git a/src/components/RuoYiDoc/index.vue b/src/components/RuoYiDoc/index.vue
index 028aa0e..d54476f 100644
--- a/src/components/RuoYiDoc/index.vue
+++ b/src/components/RuoYiDoc/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <svg-icon icon-class="question" @click="goto" />
-  </div>
+  <svg-icon icon-class="question" @click="goto" />
 </template>
 
 <script setup>
diff --git a/src/components/RuoYiGit/index.vue b/src/components/RuoYiGit/index.vue
index 05c91b0..9e585b2 100644
--- a/src/components/RuoYiGit/index.vue
+++ b/src/components/RuoYiGit/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <svg-icon icon-class="github" @click="goto" />
-  </div>
+  <svg-icon icon-class="github" @click="goto" />
 </template>
 
 <script setup>
diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index 1997258..d59bda8 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" @click="toggle" />
-  </div>
+  <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'" @click="toggle" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/StatusTag/index.vue b/src/components/StatusTag/index.vue
index 772eeb8..42972f5 100644
--- a/src/components/StatusTag/index.vue
+++ b/src/components/StatusTag/index.vue
@@ -4,11 +4,12 @@
     <div class="txt">{{ text }}</div>
   </div>
 </template>
+
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { PropType } from 'vue'
 type TTypeTxt = 'primary' | 'danger' | 'success' | 'info' | 'warning'
-const props = defineProps({
+defineProps({
   text: propTypes.string.def(''),
   type: {
     type: String as PropType<TTypeTxt>,
diff --git a/src/components/YTLayout/basic-layout.vue b/src/components/YTLayout/basic-layout.vue
index e155c58..1e14399 100644
--- a/src/components/YTLayout/basic-layout.vue
+++ b/src/components/YTLayout/basic-layout.vue
@@ -2,9 +2,7 @@
   <div class="p-3 basic-layout">
     <div class="main-box">
       <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-        <div>
-          <slot></slot>
-        </div>
+        <slot />
       </transition>
     </div>
   </div>
diff --git a/src/components/YtSelect/select-device.vue b/src/components/YtSelect/select-device.vue
index 5907b1a..90991fb 100644
--- a/src/components/YtSelect/select-device.vue
+++ b/src/components/YtSelect/select-device.vue
@@ -6,6 +6,7 @@
   </el-input>
   <el-dialog title="选择设备" v-model="dialogState.show" width="1200px">
     <yt-crud
+      v-if="dialogState.show"
       ref="ytCrudRef"
       :data="data"
       :column="column"
diff --git a/src/components/YtSelect/select-product.vue b/src/components/YtSelect/select-product.vue
index 5a972a6..1807423 100644
--- a/src/components/YtSelect/select-product.vue
+++ b/src/components/YtSelect/select-product.vue
@@ -6,6 +6,7 @@
   </el-input>
   <el-dialog title="选择产品" v-model="dialogState.show" width="1200px">
     <yt-crud
+      v-if="dialogState.show"
       ref="ytCrudRef"
       :data="data"
       :column="column"
diff --git a/src/components/common/yt-crud.vue b/src/components/common/yt-crud.vue
index 4710cb6..ca75d56 100644
--- a/src/components/common/yt-crud.vue
+++ b/src/components/common/yt-crud.vue
@@ -7,7 +7,7 @@
           v-bind="{
             ...scope,
           }"
-        ></slot>
+        />
       </template>
     </yt-table-search>
     <yt-table-fun
@@ -21,7 +21,7 @@
       @handle-add="handleAdd()"
     >
       <template #rightToolbar>
-        <slot name="rightToolbar"></slot>
+        <slot name="rightToolbar" />
       </template>
       <yt-table
         v-bind="bind.tableBind"
@@ -39,7 +39,7 @@
         @row-click="rowClick"
       >
         <template #customTable>
-          <slot name="customTable" :handle-update="handleUpdate" :handle-delete="handleDel" :handle-view="handleView"></slot>
+          <slot name="customTable" :handle-update="handleUpdate" :handle-delete="handleDel" :handle-view="handleView" />
         </template>
         <template #menuSlot="scope">
           <slot
@@ -47,7 +47,7 @@
             v-bind="{
             ...scope,
           }"
-          ></slot>
+          />
         </template>
         <template v-for="(item, index) in tableSlots" :key="index" #[item]="scope">
           <slot
@@ -55,7 +55,7 @@
             v-bind="{
             ...scope,
             }"
-          ></slot>
+          />
         </template>
       </yt-table>
     </yt-table-fun>
@@ -74,7 +74,7 @@
           v-bind="{
             ...scope,
           }"
-        ></slot>
+        />
       </template>
       <template v-for="(item, index) in formItemSlots" :key="index" #[item]="scope">
         <slot
@@ -82,7 +82,7 @@
           v-bind="{
             ...scope,
           }"
-        ></slot>
+        />
       </template>
     </yt-table-form>
   </div>
diff --git a/src/components/common/yt-table-search.tsx b/src/components/common/yt-table-search.tsx
index 9d78b63..bc3d7a3 100644
--- a/src/components/common/yt-table-search.tsx
+++ b/src/components/common/yt-table-search.tsx
@@ -92,14 +92,14 @@ export default defineComponent({
                     padding: '8px',
                   }}
                   loading={props.loading}
-                ></ElButton>
+                />
                 <ElButton
                   onClick={resetQuery}
                   style={{
                     padding: '8px',
                   }}
                   icon="Refresh"
-                ></ElButton>
+                />
               </ElFormItem>
             </ElForm>
           </div>
diff --git a/src/components/common/yt-table.tsx b/src/components/common/yt-table.tsx
index 8266eae..281b602 100644
--- a/src/components/common/yt-table.tsx
+++ b/src/components/common/yt-table.tsx
@@ -2,7 +2,7 @@
 import { propTypes } from '@/utils/propTypes'
 import { PropType } from 'vue'
 import { tableProps } from './props/crudProps'
-import { IColumn, TFormType } from '@/components/common/types/tableCommon'
+import { IColumn } from '@/components/common/types/tableCommon'
 import { ElButton, ElSwitch, ElTable, ElTableColumn, ElPopconfirm, ElTooltip, ElDivider, ElImage } from 'element-plus'
 import Pagination from '@/components/Pagination/index.vue'
 import { formatDate } from '@/utils/formatTime'
@@ -53,7 +53,7 @@ export default defineComponent({
                     return {}
                   }}
                   onClick={() => emit('handleView', scope.row)}
-                ></ElButton>
+                />
               </ElTooltip>
               <ElDivider direction="vertical" />
             </div>
@@ -70,7 +70,7 @@ export default defineComponent({
                     if (props.editPermi) return { vHasPermi: props.editPermi }
                     return {}
                   }}
-                ></ElButton>
+                />
               </ElTooltip>
               <ElDivider direction="vertical" />
             </div>
@@ -89,7 +89,7 @@ export default defineComponent({
                           if (props.delPermi) return { vHasPermi: props.delPermi }
                           return {}
                         }}
-                      ></ElButton>
+                      />
                     ),
                   }}
                 </ElPopconfirm>
@@ -124,7 +124,7 @@ export default defineComponent({
               })
               return obj ? obj[labelName] : row[column.key]
             case 'switch':
-              return <ElSwitch value={scope?.row[column.key]}></ElSwitch>
+              return <ElSwitch value={scope?.row[column.key]} />
             case 'image':
               return (
                 <ElImage
@@ -134,7 +134,7 @@ export default defineComponent({
                   z-index={888888}
                   preview-src-list={[row[column.key]]}
                   src={row[column.key]}
-                ></ElImage>
+                />
               )
             default:
               break
@@ -210,7 +210,7 @@ export default defineComponent({
           slots.customTable?.()
         )}
         {!props.pageHide && (
-          <Pagination total={props.total} v-model:page={pageObj.pageNum} v-model:limit={pageObj.pageSize} onPagination={changePage}></Pagination>
+          <Pagination total={props.total} v-model:page={pageObj.pageNum} v-model:limit={pageObj.pageSize} onPagination={changePage} />
         )}
       </div>
     )
diff --git a/src/layout/components/IframeToggle/index.vue b/src/layout/components/IframeToggle/index.vue
index 4eeb53d..78e4d77 100644
--- a/src/layout/components/IframeToggle/index.vue
+++ b/src/layout/components/IframeToggle/index.vue
@@ -6,7 +6,7 @@
       :iframeId="'iframe' + index"
       v-show="route.path === item.path"
       :src="item.meta ? item.meta.link : ''"
-    ></inner-link>
+    />
   </transition-group>
 </template>
 
diff --git a/src/layout/components/InnerLink/index.vue b/src/layout/components/InnerLink/index.vue
index 9fb0032..212c1b6 100644
--- a/src/layout/components/InnerLink/index.vue
+++ b/src/layout/components/InnerLink/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div :style="'height:' + height">
-    <iframe :id="iframeId" style="width: 100%; height: 100%" :src="src" frameborder="no"></iframe>
+    <iframe :id="iframeId" style="width: 100%; height: 100%" :src="src" frameborder="no" />
   </div>
 </template>
 
 <script setup lang="ts">
-const props = defineProps({
+defineProps({
   src: {
     type: String,
     default: '/'
diff --git a/src/views/contributor/components/user-item.vue b/src/views/contributor/components/user-item.vue
index 95af065..e1e7429 100644
--- a/src/views/contributor/components/user-item.vue
+++ b/src/views/contributor/components/user-item.vue
@@ -15,6 +15,7 @@
     </div>
   </div>
 </template>
+
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import defaultImg from '@/assets/images/profile.jpg'
diff --git a/src/views/contributor/index.vue b/src/views/contributor/index.vue
index 4c4781f..05160ed 100644
--- a/src/views/contributor/index.vue
+++ b/src/views/contributor/index.vue
@@ -16,7 +16,7 @@
           <div class="user" v-if="item.children">
             <el-row :gutter="16" type="flex">
               <el-col :span="8" v-for="user in item.children" :key="user.id">
-                <user-item :data="user"></user-item>
+                <user-item :data="user" />
               </el-col>
             </el-row>
           </div>
@@ -45,7 +45,7 @@
           <div class="join-box">
             <div class="item" v-for="(item, index) in joinList" :key="index" @click="goLink(item.url)">
               <div class="icon">
-                <svg-icon :icon-class="item.icon" className="icon-svg" color="#0070FF"></svg-icon>
+                <svg-icon :icon-class="item.icon" className="icon-svg" color="#0070FF" />
               </div>
               <div class="text">{{ item.title }}</div>
             </div>
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index 3acf060..d181f73 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -43,7 +43,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['demo:demo:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -58,10 +58,10 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['demo:demo:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['demo:demo:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:demo:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:demo:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -71,7 +71,7 @@
     </el-card>
     <!-- 添加或修改测试单对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="demoFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="部门id" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入部门id" />
         </el-form-item>
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index ebfaecc..70ff7d9 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -23,7 +23,7 @@
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
       <el-table
@@ -55,7 +55,7 @@
     </el-card>
     <!-- 添加或修改测试树对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="treeFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="treeFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="父id" prop="parentId">
           <el-tree-select
             v-model="form.parentId"
diff --git a/src/views/iot/alarm/config.vue b/src/views/iot/alarm/config.vue
index c9a8584..001e7fa 100644
--- a/src/views/iot/alarm/config.vue
+++ b/src/views/iot/alarm/config.vue
@@ -14,9 +14,10 @@
       :total="state.total"
       v-model:page="state.page"
       v-model:query="state.query"
-    ></yt-crud>
+    />
   </div>
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 import { getConfigList, saveConfig, deleteConfig } from './api/alarm.api'
diff --git a/src/views/iot/alarm/list.vue b/src/views/iot/alarm/list.vue
index d5f58bc..525bc61 100644
--- a/src/views/iot/alarm/list.vue
+++ b/src/views/iot/alarm/list.vue
@@ -17,7 +17,7 @@
       :total="state.total"
       v-model:page="state.page"
       v-model:query="state.query"
-    ></yt-crud>
+    />
   </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/iot/channel/config.vue b/src/views/iot/channel/config.vue
index 04ab0c5..3b1f0d0 100644
--- a/src/views/iot/channel/config.vue
+++ b/src/views/iot/channel/config.vue
@@ -25,7 +25,7 @@
           <div v-for="item in state.typeObj" :key="item.code">
             <div v-if="item.code === getChannelCode(row.channelId)">
               <el-form-item v-for="opt in item.list" :key="opt.value" :label="opt.label + ':'">
-                <el-switch v-if="opt.type === 'switch'" v-model="row.param[opt.value]"></el-switch>
+                <el-switch v-if="opt.type === 'switch'" v-model="row.param[opt.value]" />
                 <el-input v-else v-model="row.param[opt.value]" :placeholder="'请输入' + opt.label" />
               </el-form-item>
             </div>
diff --git a/src/views/iot/channel/template.vue b/src/views/iot/channel/template.vue
index 1a1e7a8..f6ac18e 100644
--- a/src/views/iot/channel/template.vue
+++ b/src/views/iot/channel/template.vue
@@ -14,9 +14,10 @@
       @onLoad="getData"
       @saveFun="onSave"
       @delFun="onDelete"
-    ></yt-crud>
+    />
   </div>
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 
@@ -102,7 +103,3 @@ const onDelete = async (row: any) => {
   getData()
 }
 </script>
-
-<!-- <style lang="scss" scoped>
-
-</style> -->
diff --git a/src/views/iot/communication/components/index.vue b/src/views/iot/communication/components/index.vue
index 0f99da8..2ba3ceb 100644
--- a/src/views/iot/communication/components/index.vue
+++ b/src/views/iot/communication/components/index.vue
@@ -11,7 +11,7 @@
                   <el-popconfirm title="确认要删除吗？" @confirm="handleDelete(com)">
                     <template #reference>
                       <div>
-                        <el-button icon="Delete" link type="danger"></el-button>
+                        <el-button icon="Delete" link type="danger" />
                       </div>
                     </template>
                   </el-popconfirm>
@@ -37,8 +37,7 @@
                   size="large"
                   style="--el-switch-on-color: #029D40; --el-switch-off-color: #DFDFDF"
                   @change="stateChange(com)"
-                >
-                </el-switch>
+                />
               </el-descriptions-item>
               <el-descriptions-item label-class-name="custom-label" label="操作">
                 <el-button @click="handleEdit(com)" link icon="Edit" type="primary">修改</el-button>
@@ -190,7 +189,7 @@
             <el-input style="width: 250px" size="small" v-model="scope.row.config.port" auto-complete="off" placeholder="请输入端口" />
           </el-form-item>
           <el-form-item label="WebSocket">
-            <el-switch v-model="scope.row.config.useWebSocket" active-text="是" inactive-text="否"></el-switch>
+            <el-switch v-model="scope.row.config.useWebSocket" active-text="是" inactive-text="否" />
             <div>
               <el-tag v-if="scope.row.config.useWebSocket == true" type="info"> 通过websocket连接mqtt broker </el-tag>
             </div>
@@ -243,7 +242,7 @@
           @stringSuccess="(res) => uploadJarSuccess(res, row)"
           uploadType="url"
           uploadUrl="/protocol/uploadJar"
-        ></upload-file>
+        />
       </template>
     </yt-table-form>
     <conversion-script title="通讯脚本" type="communication" ref="conversionScriptRef" />
diff --git a/src/views/iot/communication/convertors/index.vue b/src/views/iot/communication/convertors/index.vue
index f9c4db1..4234cbf 100644
--- a/src/views/iot/communication/convertors/index.vue
+++ b/src/views/iot/communication/convertors/index.vue
@@ -20,13 +20,14 @@
     >
       <template #menuSlot="scope">
         <el-tooltip class="box-item" effect="dark" content="编辑转换脚本" placement="top">
-          <el-button link type="primary" icon="Switch" @click="handleConversionScript(scope.row)"></el-button>
+          <el-button link type="primary" icon="Switch" @click="handleConversionScript(scope.row)" />
         </el-tooltip>
       </template>
     </yt-crud>
-    <conversion-script title="转换脚本" ref="conversionScriptRef"></conversion-script>
+    <conversion-script title="转换脚本" ref="conversionScriptRef" />
   </div>
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 
diff --git a/src/views/iot/communication/modules/conversionScript.vue b/src/views/iot/communication/modules/conversionScript.vue
index aa9b956..18370b8 100644
--- a/src/views/iot/communication/modules/conversionScript.vue
+++ b/src/views/iot/communication/modules/conversionScript.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="dialogModel" width="80%" append-to-body :fullscreen="isFullscreen">
-    <template #header>
+    <template #header v-if="dialogModel">
       <span class="el-dialog__title">{{ title + '编写' }}</span>
       <div class="header-icon">
         <el-icon v-if="!isFullscreen" @click="isFullscreen = true"><FullScreen /></el-icon>
@@ -26,19 +26,19 @@
     </template>
     <!-- <el-row>
       脚本语言:
-      <el-radio v-model="editScript.typ" label="js"></el-radio>
+      <el-radio v-model="editScript.typ" label="js" />
     </el-row> -->
-    <el-row justify="space-between" class="row-box" v-loading="loading">
+    <el-row v-if="dialogModel" justify="space-between" class="row-box" v-loading="loading">
       <el-col :span="16">
         {{ title }}：
         <div v-if="editScript.typ == 'js'">new (function () {</div>
-        <code-editor v-model:code="editScript.script"></code-editor>
+        <code-editor v-model:code="editScript.script" />
         <div v-if="editScript.typ == 'js'">})()</div>
       </el-col>
       <el-col :span="7" class="right-box">
         测试数据：
         <div style="height: 200px; overflow: auto">
-          <code-editor v-model:code="testDataScript.script"></code-editor>
+          <code-editor v-model:code="testDataScript.script" />
         </div>
         <el-row style="padding: 5px 5px">
           <el-col :span="10"> 测试结果： </el-col>
@@ -53,7 +53,7 @@
           </el-col>
         </el-row>
         <div>
-          <el-input type="textarea" v-model="testDataScript.testResult" :readonly="true" :rows="7"> </el-input>
+          <el-input type="textarea" v-model="testDataScript.testResult" :readonly="true" :rows="7" />
         </div>
       </el-col>
     </el-row>
@@ -63,6 +63,7 @@
     </template>
   </el-dialog>
 </template>
+
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { getConverterScript, editConverterScript } from '../api/convertors.api'
@@ -70,7 +71,6 @@ import { getComponentDetail, saveComponentScript } from '../api/component.api'
 
 import CodeEditor from '@/components/CodeEditor/index.vue'
 
-
 const dialogModel = ref(false)
 const props = defineProps({
   title: propTypes.string.def('标题'),
diff --git a/src/views/iot/crudDemo/disperseDemo.vue b/src/views/iot/crudDemo/disperseDemo.vue
index 6390321..de2e365 100644
--- a/src/views/iot/crudDemo/disperseDemo.vue
+++ b/src/views/iot/crudDemo/disperseDemo.vue
@@ -8,17 +8,18 @@
     <yt-table-fun @handle-add="handleAdd()">
       <yt-table :data="data" :column="column" @handle-update="handleUpdate" @handle-delete="handleDel" @handle-view="handleView">
         <template #slots="row">
-          <el-switch v-model="row.slots"></el-switch>
+          <el-switch v-model="row.slots" />
         </template>
       </yt-table>
     </yt-table-fun>
     <yt-table-form ref="tableFormRef" :column="column">
       <template #slots="col, data">
-        <el-switch v-model="data.slots"></el-switch>
+        <el-switch v-model="data.slots" />
       </template>
     </yt-table-form>
   </basic-layout>
 </template>
+
 <script lang="ts" setup>
 import YtTableSearch from '@/components/common/yt-table-search'
 import YtTableFun from '@/components/common/yt-table-fun.vue'
diff --git a/src/views/iot/crudDemo/tenantCrud.vue b/src/views/iot/crudDemo/tenantCrud.vue
index 8318f4a..a162b91 100644
--- a/src/views/iot/crudDemo/tenantCrud.vue
+++ b/src/views/iot/crudDemo/tenantCrud.vue
@@ -1,18 +1,11 @@
 <template>
-  <yt-crud
-    ref="crudRef"
-    v-model:queryParams="queryParams"
-    :data="data"
-    :column="column"
-    :loading="loading"
-    @save-fun="saveFun"
-    @change="onLoad"
-  ></yt-crud>
+  <yt-crud ref="crudRef" v-model:queryParams="queryParams" :data="data" :column="column" :loading="loading" @save-fun="saveFun" @change="onLoad" />
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 
-import { listTenant, getTenant, delTenant, addTenant, updateTenant } from '@/api/system/tenant'
+import { listTenant, addTenant, updateTenant } from '@/api/system/tenant'
 
 import { ElLoading } from 'element-plus'
 import YtCrud from '@/components/common/yt-crud.vue'
diff --git a/src/views/iot/equipment/categories/index.vue b/src/views/iot/equipment/categories/index.vue
index d491112..119a008 100644
--- a/src/views/iot/equipment/categories/index.vue
+++ b/src/views/iot/equipment/categories/index.vue
@@ -17,10 +17,10 @@
       @onLoad="getData"
       @delFun="onDelete"
       @saveFun="onSave"
-    >
-    </yt-crud>
+    />
   </div>
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 
diff --git a/src/views/iot/equipment/devices/detail.vue b/src/views/iot/equipment/devices/detail.vue
index 3e901c2..95470bf 100644
--- a/src/views/iot/equipment/devices/detail.vue
+++ b/src/views/iot/equipment/devices/detail.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="box">
+  <div class="box equipment-detail">
     <el-page-header @back="goBack" content="设备详情"></el-page-header>
     <el-divider></el-divider>
     <el-tabs v-loading="loading" v-model="state.activeName" @tab-click="handleClick">
       <el-tab-pane label="基本信息" name="base">
-        <el-row :gutter="20">
+        <el-row :gutter="20" v-if="state.activeName === 'base'">
           <el-col :span="12">
             <el-descriptions :column="1" border :labelStyle="{ 'font-weight': 'bold' }">
               <el-descriptions-item label="设备ID">{{
@@ -44,18 +44,19 @@
           }}</el-descriptions-item>
         </el-descriptions>
       </el-tab-pane>
+
       <el-tab-pane label="属性" name="property">
-        <el-table :data="state.properties" border v-loading="state.loading" style="width: 100%">
-          <el-table-column prop="name" label="属性名" width="180">
+        <el-table v-if="state.activeName === 'property'" :data="state.properties" border v-loading="state.loading" style="width: 100%">
+          <el-table-column prop="name" label="属性名" width="250">
             <template v-slot="scope"> {{ scope.row.name }}({{ scope.row.identifier }}) </template>
           </el-table-column>
-          <el-table-column prop="value" label="属性值" width="180">
+          <el-table-column prop="value" label="属性值">
             <template v-slot="scope">
               <span>{{ scope.row.value }} &nbsp;</span>
               <el-button @click="showPropertyHistory(scope.row)" size="small">历史</el-button>
             </template>
           </el-table-column>
-          <el-table-column label="可读写">
+          <el-table-column label="可读写" width="80">
             <template v-slot="scope">
               <el-tag v-if="!scope.row.write" type="info" size="small" effect="plain">只读</el-tag>
               <el-button @click="showWriteProperty(scope.row)" v-if="scope.row.write" size="small" type="success" plain>可写</el-button>
@@ -91,8 +92,9 @@
           <PropertyChart :name="state.propertyHistory.name" :properties="state.propertyHistory.data"></PropertyChart>
         </div>
       </el-tab-pane>
+
       <el-tab-pane label="服务" name="service">
-        <el-table :data="state.services" border v-loading="state.loading" style="width: 100%">
+        <el-table v-if="state.activeName === 'service'" :data="state.services" border v-loading="state.loading" style="width: 100%">
           <el-table-column label="服务名称" width="180">
             <template v-slot="scope"> {{ scope.row.name }}({{ scope.row.identifier }}) </template>
           </el-table-column>
@@ -103,13 +105,14 @@
           </el-table-column>
           <el-table-column label="参数">
             <template v-slot="scope">
-              {{ scope.row.inputData }}
+              <pre class="equipment-param">{{ scope.row.inputData }}</pre>
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
+
       <el-tab-pane label="日志" name="event">
-        <el-form :inline="true" :model="state.formInline" class="user-search">
+        <el-form v-if="state.activeName === 'event'" :inline="true" :model="state.formInline" class="user-search">
           <el-form-item>
             <el-select v-model="state.formInline.type" placeholder="请选择日志类型">
               <el-option label="所有" value="" />
@@ -133,18 +136,20 @@
               {{formatDate(scope.row.time) }}
             </template>
           </el-table-column>
-          <el-table-column prop="type" label="类型" width="80"> </el-table-column>
-          <el-table-column prop="name" label="名称(标识符)" width="180"> </el-table-column>
+          <el-table-column prop="type" label="类型" width="80" />
+          <el-table-column prop="name" label="名称(标识符)" width="180" />
           <el-table-column label="内容">
             <template v-slot="scope">
-              {{ scope.row.content.data }}
+              <pre class="equipment-param">{{ scope.row.content.data }}</pre>
             </template>
           </el-table-column>
         </el-table>
-        <Pagination :data="state.formInline" @onPagePaging="getEvents"></Pagination>
+        <Pagination :data="state.formInline" @onPagePaging="getEvents" />
       </el-tab-pane>
-      <el-tab-pane label="模拟上报">
+
+      <el-tab-pane label="模拟上报" name="report">
         <el-table
+          v-if="state.activeName === 'report'"
           :data="state.modelFunctions"
           highlight-current-row
           v-loading="state.loading"
@@ -154,7 +159,7 @@
         >
           <el-table-column type="expand" label="上报">
             <template v-slot="fun">
-              <el-form v-model="fun.row" label-width="80px" style="width: 500px">
+              <el-form inline v-model="fun.row" label-width="80px">
                 <el-form-item label="值" v-if="fun.row.type == 'property'">
                   <el-input v-model="fun.row.value" size="small" />
                 </el-form-item>
@@ -171,18 +176,21 @@
           <el-table-column sortable prop="name" label="功能名称" width="180" />
           <el-table-column sortable prop="identifier" label="标识符" width="150" />
           <el-table-column sortable prop="dataTypeName" label="数据类型" width="100" />
-          <el-table-column sortable prop="params" label="数据定义" width="200" />
+          <el-table-column sortable prop="params" label="数据定义" />
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="设备配置">
-        <DeviceConfig :deviceId="state.deviceId" />
+
+      <el-tab-pane label="设备配置" name="config">
+        <DeviceConfig v-if="state.activeName === 'config'" :deviceId="state.deviceId" />
       </el-tab-pane>
-      <el-tab-pane label="模拟设备">
-        <DeviceSimulator :thingModelFunctions="state.modelFunctions" :deviceDetail="state.deviceDetail" />
+
+      <el-tab-pane label="模拟设备" name="simulator">
+        <DeviceSimulator v-if="state.activeName === 'simulator'" :thingModelFunctions="state.modelFunctions" :deviceDetail="state.deviceDetail" />
       </el-tab-pane>
     </el-tabs>
+
     <el-dialog :title="state.title" v-model="state.propertyWriteFormVisible" width="40%" @close="closeDialog">
-      <el-form label-width="120px" :model="state.propertyWriteForm" ref="propertyWriteForm">
+      <el-form v-if="state.propertyWriteFormVisible" label-width="120px" :model="state.propertyWriteForm" ref="propertyWriteForm">
         <div style="display: none">
           <el-input v-model="state.propertyWriteForm.identifier" type="hidden" />
         </div>
@@ -197,21 +205,18 @@
         </div>
       </template>
     </el-dialog>
+
     <el-dialog :title="state.title" v-model="state.serviceFormVisible" width="40%" @close="closeDialog">
-      <el-form label-width="120px" :model="state.serviceForm" ref="serviceForm">
+      <el-form v-if="state.serviceFormVisible" label-width="120px" :model="state.serviceForm" ref="serviceForm">
         <div>
           <el-input v-model="state.serviceForm.identifier" type="hidden" />
           <el-input v-model="state.serviceForm.productKey" type="hidden" />
           <el-input v-model="state.serviceForm.deviceName" type="hidden" />
         </div>
         <div v-if="state?.serviceForm?.params.length === 0">是否确认调用？</div>
-        <el-form-item
-          v-for="param in state.serviceForm.params"
-          :key="param.identifier"
-          :label="param.name + '(' + param.identifier + ')'"
-          prop="params"
-        >
+        <el-form-item v-for="param in state.serviceForm.params" :key="param.identifier" :label="param.identifier" prop="params">
           <el-input v-model="param.value" auto-complete="off" />
+          <div class="form-tips">{{ param.name }}</div>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -221,8 +226,9 @@
         </div>
       </template>
     </el-dialog>
+
     <el-dialog title="添加设备标签" v-model="state.showAddTag" width="400px">
-      <el-form ref="formRef" :model="state.tagForm" :rules="state.rules" label-width="80px">
+      <el-form v-if="state.showAddTag" ref="formRef" :model="state.tagForm" :rules="state.rules" label-width="80px">
         <el-form-item label="标签名称" prop="name">
           <el-input v-model="state.tagForm.name" />
         </el-form-item>
@@ -239,6 +245,7 @@
     </el-dialog>
   </div>
 </template>
+
 <script lang="ts" setup>
 import { formatDate } from '@/utils/formatTime'
 import { getObjectModel } from '@/views/iot/equipment/api/products.api'
@@ -387,7 +394,7 @@ const getdata = () => {
     if (data?.locate.longitude && data.locate.latitude) {
       state.mapLnglat = data.locate.longitude + ',' + data.locate.latitude
     }
-    state.showDeviceMap=JSON.parse(showMap as string)
+    state.showDeviceMap = JSON.parse(showMap as string)
     //取设备物模型信息
     console.log('state.thingModel', state.thingModel)
     if (!state.thingModel) {
@@ -416,7 +423,7 @@ const getdata = () => {
         model = data.model || {}
         let modelFuncs: any[] = []
         model.properties.forEach((p) => {
-          let params = JSON.stringify(p.dataType.specs || '{}')
+          let params = JSON.stringify(p.dataType.specs || '{}', null, 4)
           modelFuncs.push({
             raw: p,
             type: 'property',
@@ -438,8 +445,8 @@ const getdata = () => {
             name: e.name,
             identifier: e.identifier,
             dataTypeName: '-',
-            params: JSON.stringify(output),
-            content: JSON.stringify(output),
+            params: JSON.stringify(output, null, 4),
+            content: JSON.stringify(output, null, 4),
           })
         })
         model.services.forEach((s) => {
@@ -457,8 +464,8 @@ const getdata = () => {
             name: s.name + '回复',
             identifier: s.identifier + '_reply',
             dataTypeName: '-',
-            params: JSON.stringify(output),
-            content: JSON.stringify(output),
+            params: JSON.stringify(output, null, 4),
+            content: JSON.stringify(output, null, 4),
           })
         })
         state.modelFunctions = modelFuncs
@@ -718,4 +725,16 @@ logSearch()
   padding: 15px;
   background: #fff;
 }
+.form-tips {
+  font-size: 12px;
+  line-height: 14px;
+}
+.equipment-param {
+  max-height: 160px;
+  overflow: hidden auto;
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  font-size: 12px;
+  line-height: 14px;
+}
 </style>
diff --git a/src/views/iot/equipment/devices/list.vue b/src/views/iot/equipment/devices/list.vue
index 14b8de8..5843520 100644
--- a/src/views/iot/equipment/devices/list.vue
+++ b/src/views/iot/equipment/devices/list.vue
@@ -148,7 +148,7 @@
               <el-divider direction="vertical" />
               <el-popconfirm title="是否确认删除?" @confirm="handleDelete(item)">
                 <template #reference>
-                  <el-button type="danger" icon="Delete" plain></el-button>
+                  <el-button type="danger" icon="Delete" plain />
                 </template>
               </el-popconfirm>
             </div>
@@ -162,17 +162,17 @@
       <template #menuSlot="scope">
         <!-- TODO: 没接口,nodeType无法获取，得改成 ！= 0 -->
         <el-tooltip class="box-item" effect="dark" content="子设备" placement="top">
-          <el-button link icon="Box" :disabled="scope.row.nodeType == 0" @click="showChidrenDevices(scope.row)"></el-button>
+          <el-button link icon="Box" :disabled="scope.row.nodeType == 0" @click="showChidrenDevices(scope.row)" />
         </el-tooltip>
         <el-divider direction="vertical" />
         <el-tooltip class="box-item" effect="dark" content="详情" placement="top">
-          <el-button link type="primary" icon="View" @click="handleView(scope.row)"></el-button>
+          <el-button link type="primary" icon="View" @click="handleView(scope.row)" />
         </el-tooltip>
         <el-divider direction="vertical" />
         <el-tooltip class="box-item" effect="dark" content="删除" placement="top">
           <el-popconfirm title="是否确认删除该数据" @confirm="handleDelete(scope.row)">
             <template #reference>
-              <el-button link type="danger" icon="Delete"></el-button>
+              <el-button link type="danger" icon="Delete" />
             </template>
           </el-popconfirm>
         </el-tooltip>
@@ -184,16 +184,16 @@
         </div>
       </template>
     </yt-crud>
-    <children-dialog ref="childrenDialogRef"></children-dialog>
+    <children-dialog ref="childrenDialogRef" />
   </div>
 </template>
+
 <script lang="ts" setup>
 import defaultImg from '@/assets/images/pic_device.png'
 import { IColumn } from '@/components/common/types/tableCommon'
 import { ComponentInternalInstance } from 'vue'
 import { getDevicesList, deleteDevices, saveDevices,getParentDevices, deleteBatchDevices } from '../api/devices.api'
 import { getProductsList,IProductsVO } from '../api/products.api'
-import { formatDate } from '@/utils/formatTime'
 
 import Map from '@/components/Map/index.vue'
 import ChildrenDialog from './modules/childrenDialog.vue'
diff --git a/src/views/iot/equipment/devices/modules/PropertyChart.vue b/src/views/iot/equipment/devices/modules/PropertyChart.vue
index 1d6f3ba..6a9805f 100644
--- a/src/views/iot/equipment/devices/modules/PropertyChart.vue
+++ b/src/views/iot/equipment/devices/modules/PropertyChart.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <v-chart class="chart" ref="chart" />
-  </div>
+  <v-chart class="chart" ref="chart" />
 </template>
 
 <script>
diff --git a/src/views/iot/equipment/devices/modules/childrenDialog.vue b/src/views/iot/equipment/devices/modules/childrenDialog.vue
index 654d74d..9624966 100644
--- a/src/views/iot/equipment/devices/modules/childrenDialog.vue
+++ b/src/views/iot/equipment/devices/modules/childrenDialog.vue
@@ -1,6 +1,7 @@
 <template>
   <el-dialog v-model="state.show" title="子设备列表" width="1100px">
     <yt-table
+      v-if="state.show"
       :column="columns"
       :data="data"
       :total="state.total"
diff --git a/src/views/iot/equipment/devices/modules/detail/DeviceLog.vue b/src/views/iot/equipment/devices/modules/detail/DeviceLog.vue
index 9455119..f28ce2d 100644
--- a/src/views/iot/equipment/devices/modules/detail/DeviceLog.vue
+++ b/src/views/iot/equipment/devices/modules/detail/DeviceLog.vue
@@ -28,15 +28,15 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="type" label="类型" width="80"> </el-table-column>
-      <el-table-column prop="name" label="名称(标识符)" width="180"> </el-table-column>
+      <el-table-column prop="type" label="类型" width="80" />
+      <el-table-column prop="name" label="名称(标识符)" width="180" />
       <el-table-column label="内容">
         <template #default="scope">
           {{ scope.row.content.data }}
         </template>
       </el-table-column>
     </el-table>
-    <Pagination :data="formInline" @onPagePaging="getEvents"></Pagination>
+    <Pagination :data="formInline" @onPagePaging="getEvents" />
   </div>
 </template>
 
diff --git a/src/views/iot/equipment/devices/modules/detail/DeviceSimulator.vue b/src/views/iot/equipment/devices/modules/detail/DeviceSimulator.vue
index f738e42..d006659 100644
--- a/src/views/iot/equipment/devices/modules/detail/DeviceSimulator.vue
+++ b/src/views/iot/equipment/devices/modules/detail/DeviceSimulator.vue
@@ -1,34 +1,28 @@
 <template>
   <el-row>
     <el-col :span="12">
-      <el-tabs type="border-card">
-        <el-tab-pane label="上行指令调试">
-          <el-tabs type="border-card">
+      <el-tabs type="border-card" v-model="activeTab">
+        <el-tab-pane label="上行指令调试" name="up">
+          <el-tabs type="border-card" v-if="activeTab === 'up'">
             <el-tab-pane label="属性上报">
-              <DeviceSimulatorProperties :properties="properties" :deviceDetail="this.deviceDetail" propertiesTyp="属性上报"
-                >S</DeviceSimulatorProperties
-              >
+              <DeviceSimulatorProperties :properties="properties" :deviceDetail="this.deviceDetail" propertiesTyp="属性上报" />
             </el-tab-pane>
             <el-tab-pane label="事件上报">
-              <DeviceSimulatorProperties :properties="events" :deviceDetail="deviceDetail" propertiesTyp="事件上报"></DeviceSimulatorProperties>
+              <DeviceSimulatorProperties :properties="events" :deviceDetail="deviceDetail" propertiesTyp="事件上报" />
             </el-tab-pane>
           </el-tabs>
         </el-tab-pane>
-        <el-tab-pane label="下行指令调试">
-          <el-tabs type="border-card">
+        <el-tab-pane label="下行指令调试" name="down">
+          <el-tabs type="border-card" v-if="activeTab === 'down'">
             <el-tab-pane label="属性调试">
-              <DeviceSimulatorProperties
-                :properties="properties"
-                :deviceDetail="this.deviceDetail"
-                propertiesTyp="属性调试"
-              ></DeviceSimulatorProperties>
+              <DeviceSimulatorProperties :properties="properties" :deviceDetail="this.deviceDetail" propertiesTyp="属性调试" />
             </el-tab-pane>
-            <el-tab-pane label="服务调用"></el-tab-pane>
+            <el-tab-pane label="服务调用" />
           </el-tabs>
         </el-tab-pane>
         <!-- TODO:不兼容后面改 -->
         <!-- <el-tab-pane label="mqtt模拟器"> -->
-        <!--   <MqttClient :deviceDetail="this.deviceDetail"></MqttClient> -->
+        <!--   <MqttClient :deviceDetail="this.deviceDetail" /> -->
         <!-- </el-tab-pane> -->
       </el-tabs>
       <el-divider direction="vertical" />
@@ -36,7 +30,7 @@
     <el-col :span="12">
       <el-tabs type="border-card">
         <el-tab-pane label="设备日志">
-          <device-log :deviceDetail="this.deviceDetail" :thingModelEvents="events" :thingModelServices="services"></device-log>
+          <device-log :deviceDetail="this.deviceDetail" :thingModelEvents="events" :thingModelServices="services" />
         </el-tab-pane>
         <!-- <el-tab-pane label="服务器日志"> </el-tab-pane> -->
       </el-tabs>
@@ -60,30 +54,32 @@ export default{
       }
     },
     data(){
-        return {
+      return {
+        activeTab: 'up',
         connection: {
-        protocol: 'ws',
-        host: 'broker.emqx.io',
-        // ws: 8083; wss: 8084
-        port: 8083,
-        endpoint: '/mqtt',
-        // for more options, please refer to https://github.com/mqttjs/MQTT.js#mqttclientstreambuilder-options
-        clean: true,
-        connectTimeout: 30 * 1000, // ms
-        reconnectPeriod: 4000, // ms
-        clientId:
-          'emqx_vue_' +
-          Math.random()
-            .toString(16)
-            .substring(2, 8),
-        // auth
-        username: 'emqx_test',
-        password: 'emqx_test',
-      },qosList: [0, 1, 2],
-      client: {
-        connected: false,
-      },
-        }
+          protocol: 'ws',
+          host: 'broker.emqx.io',
+          // ws: 8083; wss: 8084
+          port: 8083,
+          endpoint: '/mqtt',
+          // for more options, please refer to https://github.com/mqttjs/MQTT.js#mqttclientstreambuilder-options
+          clean: true,
+          connectTimeout: 30 * 1000, // ms
+          reconnectPeriod: 4000, // ms
+          clientId:
+            'emqx_vue_' +
+            Math.random()
+              .toString(16)
+              .substring(2, 8),
+          // auth
+          username: 'emqx_test',
+          password: 'emqx_test',
+        },
+        qosList: [0, 1, 2],
+        client: {
+          connected: false,
+        },
+      }
     },
     computed:{
       properties(){
diff --git a/src/views/iot/equipment/devices/modules/detail/DeviceSimulatorProperties.vue b/src/views/iot/equipment/devices/modules/detail/DeviceSimulatorProperties.vue
index 1e35aff..934a196 100644
--- a/src/views/iot/equipment/devices/modules/detail/DeviceSimulatorProperties.vue
+++ b/src/views/iot/equipment/devices/modules/detail/DeviceSimulatorProperties.vue
@@ -30,10 +30,10 @@
         </template>
       </el-table-column>
 
-      <el-table-column sortable prop="name" label="功能名称" width="180"> </el-table-column>
-      <el-table-column sortable prop="identifier" label="标识符" width="150"> </el-table-column>
-      <el-table-column sortable prop="dataTypeName" label="数据类型" width="100"> </el-table-column>
-      <el-table-column sortable prop="params" label="数据定义" width="200"> </el-table-column>
+      <el-table-column sortable prop="name" label="功能名称" width="180" />
+      <el-table-column sortable prop="identifier" label="标识符" width="150" />
+      <el-table-column sortable prop="dataTypeName" label="数据类型" width="100" />
+      <el-table-column sortable prop="params" label="数据定义" width="200" />
     </el-table>
     <el-button type="primary" @click="sendThingModelMsg()" v-if="this.propertiesTyp == '属性上报'">发送</el-button>
     <el-button type="primary" @click="sendAllPropertiesGet()" v-if="this.propertiesTyp == '属性调试'">获取</el-button>
diff --git a/src/views/iot/equipment/devices/modules/detail/MqttClient.vue b/src/views/iot/equipment/devices/modules/detail/MqttClient.vue
index 96c7252..505a0b7 100644
--- a/src/views/iot/equipment/devices/modules/detail/MqttClient.vue
+++ b/src/views/iot/equipment/devices/modules/detail/MqttClient.vue
@@ -3,10 +3,10 @@
     <el-card shadow="always" style="margin-bottom:30px;">
       <el-row>
         <el-col span="12">
-          <el-button size="small" icon="el-icon-setting" v-if="!showConfigFlg" @click="handleShowConfig()"></el-button>
+          <el-button size="small" icon="el-icon-setting" v-if="!showConfigFlg" @click="handleShowConfig()" />
         </el-col>
         <el-col span="12">
-          <el-button size="small" icon="el-icon-arrow-up" v-if="showConfigFlg" @click="handleShowConfig()"></el-button>
+          <el-button size="small" icon="el-icon-arrow-up" v-if="showConfigFlg" @click="handleShowConfig()" />
         </el-col>
         <el-col span="3" push="9">
           <el-button
@@ -55,7 +55,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="clientId" label="Client ID">
-              <el-input v-model="connection.clientId" :placeholder="clientId"> </el-input>
+              <el-input v-model="connection.clientId" :placeholder="clientId" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -136,7 +136,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-button class="mt-4" style="width: 100%" @click="handleAdd" icon="el-icon-plus" v-if="showSubFlg"></el-button>
+      <el-button class="mt-4" style="width: 100%" @click="handleAdd" icon="el-icon-plus" v-if="showSubFlg" />
     </el-card>
     <el-card shadow="always" style="margin-bottom:30px;">
       <el-row>
diff --git a/src/views/iot/equipment/devices/modules/virtualDevices/bindDevices.vue b/src/views/iot/equipment/devices/modules/virtualDevices/bindDevices.vue
index 569a815..e8491e0 100644
--- a/src/views/iot/equipment/devices/modules/virtualDevices/bindDevices.vue
+++ b/src/views/iot/equipment/devices/modules/virtualDevices/bindDevices.vue
@@ -1,4 +1,5 @@
 <template>
   <div>虚拟设备详情</div>
 </template>
+
 <script lang="ts" setup></script>
diff --git a/src/views/iot/equipment/devices/modules/virtualDevices/log.vue b/src/views/iot/equipment/devices/modules/virtualDevices/log.vue
index 4fc5753..7bc3c53 100644
--- a/src/views/iot/equipment/devices/modules/virtualDevices/log.vue
+++ b/src/views/iot/equipment/devices/modules/virtualDevices/log.vue
@@ -1,4 +1,5 @@
 <template>
   <div>日志</div>
 </template>
+
 <script lang="ts" setup></script>
diff --git a/src/views/iot/equipment/devices/modules/virtualDevices/script.vue b/src/views/iot/equipment/devices/modules/virtualDevices/script.vue
index a6b80cc..1ebbec2 100644
--- a/src/views/iot/equipment/devices/modules/virtualDevices/script.vue
+++ b/src/views/iot/equipment/devices/modules/virtualDevices/script.vue
@@ -1,4 +1,5 @@
 <template>
   <div>脚本</div>
 </template>
+
 <script lang="ts" setup></script>
diff --git a/src/views/iot/equipment/devices/virtualDeviceConfig.vue b/src/views/iot/equipment/devices/virtualDeviceConfig.vue
index e30fa03..302d08a 100644
--- a/src/views/iot/equipment/devices/virtualDeviceConfig.vue
+++ b/src/views/iot/equipment/devices/virtualDeviceConfig.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="box">
-    <el-page-header @back="goBack" content="虚拟设备详情"></el-page-header>
+    <el-page-header @back="goBack" content="虚拟设备详情" />
     <el-divider></el-divider>
     <!-- 头部信息 -->
     <el-form :inline="true" label-width="80px">
@@ -23,27 +23,25 @@
     </el-form>
     <el-tabs v-model="state.activeName">
       <el-tab-pane label="绑定设备" name="config">
-        <bind-devices></bind-devices>
+        <bind-devices v-if="state.activeName === 'config'" />
       </el-tab-pane>
       <el-tab-pane label="脚本" name="script">
-        <script-box></script-box>
+        <script-box v-if="state.activeName === 'script'" />
       </el-tab-pane>
       <el-tab-pane label="日志" name="log">
-        <log></log>
+        <device-log v-if="state.activeName === 'log'" />
       </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 <script lang="ts" setup>
 import BindDevices from './modules/virtualDevices/bindDevices.vue'
-import Log from './modules/virtualDevices/log.vue'
+import DeviceLog from './modules/virtualDevices/log.vue'
 import ScriptBox from './modules/virtualDevices/script.vue'
 import { ElNotification } from 'element-plus'
-import { setVirtualDeviceState,runVirtualDevices,IChangeStateVO } from '../api/virtualDevices.api'
+import { setVirtualDeviceState, runVirtualDevices } from '../api/virtualDevices.api'
 
-const route = useRoute()
 const router = useRouter()
-const { id } = route.params
 const goBack = () => {
   router.back()
 }
@@ -62,7 +60,7 @@ const data = ref({
   'state': 'stopped',
   'createAt': 1653839152090
 })
-const state = reactive<any>({
+const state = reactive({
   detail: {},
   activeName: 'config',
   typeName: {
diff --git a/src/views/iot/equipment/devices/virtualDevices.vue b/src/views/iot/equipment/devices/virtualDevices.vue
index c3e0cd0..d277a79 100644
--- a/src/views/iot/equipment/devices/virtualDevices.vue
+++ b/src/views/iot/equipment/devices/virtualDevices.vue
@@ -12,7 +12,7 @@
     >
       <template #menuSlot="scope">
         <el-tooltip class="box-item" effect="dark" content="配置" placement="top">
-          <el-button link type="primary" icon="Setting" @click="handleConfig(scope.row.id)"></el-button>
+          <el-button link type="primary" icon="Setting" @click="handleConfig(scope.row.id)" />
         </el-tooltip>
       </template>
       <template #state="scope">
@@ -21,7 +21,7 @@
       </template>
       <template #triggerExpression1FormItem="{column, row}">
         <el-form-item v-if="row.trigger === 'cron'" :label="column.label" :prop="column.key">
-          <crontab-box v-model="row[column.key]"></crontab-box>
+          <crontab-box v-model="row[column.key]" />
         </el-form-item>
       </template>
       <template #triggerExpression2FormItem="{column, row}">
@@ -36,6 +36,7 @@
     </yt-crud>
   </div>
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 import { deleteVirtualDevices, batchDeleteVirtualDevices, getVirtualDevicesList, saveVirtualDevices } from '../api/virtualDevices.api'
@@ -208,7 +209,3 @@ const options = reactive({
   column,
 })
 </script>
-
-<!-- <style lang="scss" scoped>
-
-</style> -->
diff --git a/src/views/iot/equipment/products/index.vue b/src/views/iot/equipment/products/index.vue
index aa38b5c..3ccc2e7 100644
--- a/src/views/iot/equipment/products/index.vue
+++ b/src/views/iot/equipment/products/index.vue
@@ -95,7 +95,7 @@
               <el-divider direction="vertical" />
               <el-popconfirm title="是否确认删除?" @confirm="handleDel(item)">
                 <template #reference>
-                  <el-button type="danger" icon="Delete" plain></el-button>
+                  <el-button type="danger" icon="Delete" plain />
                 </template>
               </el-popconfirm>
             </div>
@@ -104,7 +104,7 @@
       </template>
       <template #menuSlot="scope">
         <el-tooltip class="box-item" effect="dark" content="物模型" placement="top">
-          <el-button link type="primary" icon="ScaleToOriginal" @click="openObjectModel(scope.row)"></el-button>
+          <el-button link type="primary" icon="ScaleToOriginal" @click="openObjectModel(scope.row)" />
         </el-tooltip>
       </template>
       <template #rightToolbar>
@@ -161,9 +161,10 @@
         </el-radio-group>
       </template>
     </yt-crud>
-    <object-model ref="objectModelRef"></object-model>
+    <object-model ref="objectModelRef" />
   </div>
 </template>
+
 <script lang="ts" setup>
 import defaultImg from '@/assets/images/pic_device.png'
 import { IColumn } from '@/components/common/types/tableCommon'
diff --git a/src/views/iot/equipment/products/modules/components/ModelParams.vue b/src/views/iot/equipment/products/modules/components/ModelParams.vue
index 71b5648..9064a2a 100644
--- a/src/views/iot/equipment/products/modules/components/ModelParams.vue
+++ b/src/views/iot/equipment/products/modules/components/ModelParams.vue
@@ -1,9 +1,9 @@
 <template>
   <div style="width: 100%;">
     <el-table v-if="!state.showPropertyParam" size="small" :data="modelParams" highlight-current-row border style="width: 100%;">
-      <el-table-column prop="name" label="参数名称" width="100"> </el-table-column>
-      <el-table-column prop="identifier" label="标识符" width="180"> </el-table-column>
-      <el-table-column prop="dataType.type" label="类型" width="80"> </el-table-column>
+      <el-table-column prop="name" label="参数名称" width="100" />
+      <el-table-column prop="identifier" label="标识符" width="180" />
+      <el-table-column prop="dataType.type" label="类型" width="80" />
       <el-table-column label="操作">
         <template v-slot:header>
           <el-button @click="addParams" type="primary" size="small" plain>添加参数</el-button>
@@ -27,9 +27,9 @@
           :boolItem="state.boolItem"
           :isProperty="false"
           :is-update="!state.isAdd"
-        ></property-model>
+        />
         <el-row>
-          <el-col :span="16">&nbsp;</el-col>
+          <el-col :span="16" />
           <el-col :span="8">
             <el-button size="small" @click="cancelEditParam()">取消</el-button>
             <el-button size="small" @click="saveParam()" type="primary">保存</el-button>
@@ -137,5 +137,3 @@ async function saveParam() {
   state.showPropertyParam = false
 }
 </script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/iot/equipment/products/modules/components/PropertyModel.vue b/src/views/iot/equipment/products/modules/components/PropertyModel.vue
index cf3fd71..890793d 100644
--- a/src/views/iot/equipment/products/modules/components/PropertyModel.vue
+++ b/src/views/iot/equipment/products/modules/components/PropertyModel.vue
@@ -4,9 +4,6 @@
       <el-form-item style="margin-bottom: 18px;" label="名称" prop="name">
         <el-input v-model="propertyRef.name" auto-complete="off" />
       </el-form-item>
-      <el-form-item label="说明" prop="tips">
-        <el-input type="textarea" v-model="propertyRef.tips" auto-complete="off" />
-      </el-form-item>
       <el-form-item style="margin-bottom: 18px;" label="标识符" prop="identifier">
         <el-input :disabled="isUpdate" v-model="propertyRef.identifier" auto-complete="off" />
       </el-form-item>
diff --git a/src/views/iot/equipment/products/modules/functionConfig.vue b/src/views/iot/equipment/products/modules/functionConfig.vue
index 9b7d879..48675bf 100644
--- a/src/views/iot/equipment/products/modules/functionConfig.vue
+++ b/src/views/iot/equipment/products/modules/functionConfig.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="function-config">
     <yt-table-fun @handle-add="handleAdd">
       <yt-table
         :selection="false"
@@ -19,9 +19,10 @@
         </template>
       </yt-table>
     </yt-table-fun>
-    <function-detail ref="functionDetailRef" :id="id" :model="model"></function-detail>
+    <function-detail ref="functionDetailRef" :id="id" :model="model" />
   </div>
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 import { propTypes } from '@/utils/propTypes'
diff --git a/src/views/iot/equipment/products/modules/modelNumberConfig.vue b/src/views/iot/equipment/products/modules/modelNumberConfig.vue
index 995ff2f..5da12db 100644
--- a/src/views/iot/equipment/products/modules/modelNumberConfig.vue
+++ b/src/views/iot/equipment/products/modules/modelNumberConfig.vue
@@ -20,8 +20,9 @@
       </template>
     </yt-table>
   </yt-table-fun>
-  <modelNumber-detail ref="modelNumberDetailRef" @on-success="getData"></modelNumber-detail>
+  <modelNumber-detail ref="modelNumberDetailRef" @on-success="getData" />
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 import { propTypes } from '@/utils/propTypes'
diff --git a/src/views/iot/equipment/products/modules/modeuls/functionDetail.vue b/src/views/iot/equipment/products/modules/modeuls/functionDetail.vue
index 71dd6ad..f9a4380 100644
--- a/src/views/iot/equipment/products/modules/modeuls/functionDetail.vue
+++ b/src/views/iot/equipment/products/modules/modeuls/functionDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="state.dialogShow" destroy-on-close width="950px" :title="!state.isAdd ? '编辑功能' : '新增功能'">
-    <el-form class="model-form" :rules="rules" label-width="120px" :model="state.modelForm" ref="modelFormRef">
+    <el-form v-if="state.dialogShow" class="model-form" :rules="rules" label-width="120px" :model="state.modelForm" ref="modelFormRef">
       <el-form-item label="功能类型">
         <el-radio-group :disabled="!state.isAdd" v-model="state.modelForm.type" size="small">
           <el-radio-button label="property">属性</el-radio-button>
@@ -54,6 +54,7 @@
     </el-form>
   </el-dialog>
 </template>
+
 <script lang="ts" setup>
 import { ParseProperty } from '@/views/iot/equipment/products/util'
 import { saveObjectModel } from '../../../api/products.api'
@@ -202,7 +203,7 @@ const saveThingModel = async () => {
           }
         }
       } else if (state.modelForm.type == 'service') {
-        state.model.services.forEach((s: any) => {
+        state.model.services?.forEach((s: any) => {
           if (s.identifier == state.modelForm.identifier) {
             s.identifier = state.modelForm.identifier
             s.name = state.modelForm.name
@@ -211,7 +212,7 @@ const saveThingModel = async () => {
           }
         })
       } else if (state.modelForm.type == 'event') {
-        state.model.events.forEach((s: any) => {
+        state.model.events?.forEach((s: any) => {
           if (s.identifier == state.modelForm.identifier) {
             s.identifier = state.modelForm.identifier
             s.name = state.modelForm.name
diff --git a/src/views/iot/equipment/products/modules/modeuls/modelNumberDetail.vue b/src/views/iot/equipment/products/modules/modeuls/modelNumberDetail.vue
index e089e77..f720c63 100644
--- a/src/views/iot/equipment/products/modules/modeuls/modelNumberDetail.vue
+++ b/src/views/iot/equipment/products/modules/modeuls/modelNumberDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="state.dialogShow" :title="productModelForm.id ? '编辑' : '新增' + '功能'">
-    <el-form ref="productModelFormRef" :model="productModelForm" :rules="state.scriptRules" label-width="80px">
+    <el-form v-if="state.dialogShow" ref="productModelFormRef" :model="productModelForm" :rules="state.scriptRules" label-width="80px">
       <el-form-item label="型号" style="width: 300px" prop="model">
         <el-radio v-model="state.modelType" label="1">默认</el-radio>
         <el-radio v-model="state.modelType" label="2">自定义</el-radio>
@@ -30,6 +30,7 @@
     </el-form>
   </el-dialog>
 </template>
+
 <script lang="ts" setup>
 import { saveProductModel } from '../../../api/products.api'
 
diff --git a/src/views/iot/equipment/products/modules/objectModel.vue b/src/views/iot/equipment/products/modules/objectModel.vue
index acf469f..e75cc1c 100644
--- a/src/views/iot/equipment/products/modules/objectModel.vue
+++ b/src/views/iot/equipment/products/modules/objectModel.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog title="产品物模型" width="70%" v-model="state.visible" append-to-body top="20px">
-    <div v-loading="state.loading">
+    <div v-if="state.visible" v-loading="state.loading">
       <el-tabs type="border-card" v-model="activeTab">
         <el-tab-pane label="功能列表" :name="0">
           <function-config v-if="activeTab === 0" :id="state.id" :model="state.model" />
diff --git a/src/views/iot/messageCenter/list.vue b/src/views/iot/messageCenter/list.vue
index 651848c..c6f20df 100644
--- a/src/views/iot/messageCenter/list.vue
+++ b/src/views/iot/messageCenter/list.vue
@@ -18,11 +18,12 @@
       }"
     >
       <template #status="{ row }">
-        <el-switch v-model="row.status" disabled></el-switch>
+        <el-switch v-model="row.status" disabled />
       </template>
     </yt-crud>
   </div>
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 
diff --git a/src/views/iot/ota/upgradePack/index.vue b/src/views/iot/ota/upgradePack/index.vue
index e697da1..10a9685 100644
--- a/src/views/iot/ota/upgradePack/index.vue
+++ b/src/views/iot/ota/upgradePack/index.vue
@@ -26,27 +26,27 @@
         uploadUrl="/ota/package/upload"
         uploadType="url"
         @uploadSuccess="(list) => uploadSuccess(row, list)"
-      ></file-upload>
+      />
       <a v-else :href="row.url" target="_blank">{{ row.url }}</a>
     </template>
     <template #productKeyForm="{ row }">
       <div style="width: 250px;">
         {{ row.productKey }}
-        <select-product v-model:pk="row.productKey"></select-product>
+        <select-product v-model:pk="row.productKey" />
       </div>
     </template>
     <template #menuSlot="scope">
       <el-tooltip class="box-item" effect="dark" content="设备升级" placement="top">
-        <el-button link type="primary" icon="Upload" @click="handleUpgrades(scope.row)"></el-button>
+        <el-button link type="primary" icon="Upload" @click="handleUpgrades(scope.row)" />
       </el-tooltip>
       <el-divider direction="vertical" />
       <el-tooltip class="box-item" effect="dark" content="升级历史" placement="top">
-        <el-button link type="primary" icon="Document" @click="handleHistory(scope.row)"></el-button>
+        <el-button link type="primary" icon="Document" @click="handleHistory(scope.row)" />
       </el-tooltip>
     </template>
   </yt-crud>
-  <devices-upgraders ref="devicesUpgradersRef"></devices-upgraders>
-  <history-dialog ref="historyRef"></history-dialog>
+  <devices-upgraders ref="devicesUpgradersRef" />
+  <history-dialog ref="historyRef" />
 </template>
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
diff --git a/src/views/iot/ota/upgradePack/modules/devicesUpgrades.vue b/src/views/iot/ota/upgradePack/modules/devicesUpgrades.vue
index 7cf5eb5..3875f4e 100644
--- a/src/views/iot/ota/upgradePack/modules/devicesUpgrades.vue
+++ b/src/views/iot/ota/upgradePack/modules/devicesUpgrades.vue
@@ -1,6 +1,7 @@
 <template>
   <el-dialog title="设备升级" width="800" v-model="state.visible" :before-close="beforeClose" v-loading="state.loading">
     <el-transfer
+      v-if="state.visible"
       v-model="value"
       :props="{
         key: 'id',
@@ -18,6 +19,7 @@
     </template>
   </el-dialog>
 </template>
+
 <script lang="ts" setup>
 import { getDevices } from '../../api/upgradePack.api'
 
diff --git a/src/views/iot/ota/upgradePack/modules/history.vue b/src/views/iot/ota/upgradePack/modules/history.vue
index 738774c..afa68c0 100644
--- a/src/views/iot/ota/upgradePack/modules/history.vue
+++ b/src/views/iot/ota/upgradePack/modules/history.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog v-model="state.visible" title="升级历史">
-    <el-collapse v-model="state.activeName" accordion>
+    <el-collapse v-if="state.visible" v-model="state.activeName" accordion>
       <el-collapse-item v-for="(item, index) in data" :title="item.title" :name="index" :key="index">
         <div class="dn-list flex" v-for="dItem in item.data" :key="dItem.id">
           <div class="title flex">
@@ -9,13 +9,14 @@
             <el-tag v-if="dItem.status === '失败'" class="ml-2" size="small" type="danger">失败</el-tag>
           </div>
           <el-tooltip class="box-item" effect="dark" content="查看详情" placement="top">
-            <el-button link type="primary" icon="View"></el-button>
+            <el-button link type="primary" icon="View" />
           </el-tooltip>
         </div>
       </el-collapse-item>
     </el-collapse>
   </el-dialog>
 </template>
+
 <script lang="ts" setup>
 
 const state = reactive({
diff --git a/src/views/iot/ruleEngine/modules/logDialog.vue b/src/views/iot/ruleEngine/modules/logDialog.vue
index 4028324..2b420d7 100644
--- a/src/views/iot/ruleEngine/modules/logDialog.vue
+++ b/src/views/iot/ruleEngine/modules/logDialog.vue
@@ -10,7 +10,7 @@
     @on-load="getData"
     v-model="dialog"
   >
-    <div class="mb10">
+    <div v-if="dialog" class="mb10">
       <el-button type="primary" plain icon="Refresh" @click="getData">刷新</el-button>
       <ElPopconfirm :title="`是否确认删除该${type === 'rule' ? '规则' : '任务'}所有日志？`" @confirm="handleDelete">
         <template #reference>
@@ -18,7 +18,7 @@
         </template>
       </ElPopconfirm>
     </div>
-    <yt-table :data="data" :column="column" :menu="false" :selection="false">
+    <yt-table v-if="dialog" :data="data" :column="column" :menu="false" :selection="false">
       <template #state="scope">
         {{ getStateName(scope.row.state) }}
       </template>
@@ -28,6 +28,7 @@
     </yt-table>
   </el-dialog>
 </template>
+
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { getRulesLog, clearRulesLog } from '../api/rule.api'
diff --git a/src/views/iot/ruleEngine/ruleSys/components/DeviceAction.vue b/src/views/iot/ruleEngine/ruleSys/components/DeviceAction.vue
index 0d74454..7fd88d8 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/DeviceAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/DeviceAction.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="select-device" style="width: 240px;margin-bottom: 10px;display: inherit;">
-    <select-device v-model:dn="selectedDn" placeholder="选择设备" @on-select="hadnleSelectDevice"></select-device>
+    <select-device v-model:dn="selectedDn" placeholder="选择设备" @on-select="hadnleSelectDevice" />
   </div>
   <div v-if="selectedDn">
     <el-row v-for="service in servicesRef" :key="service.identifier" style="margin-bottom: 10px;">
@@ -59,7 +59,6 @@
 </template>
 
 <script>
-import { propTypes } from '@/utils/propTypes'
 import { getObjectModel } from '@/views/iot/equipment/api/products.api'
 
 import SelectDevice from '@/components/YtSelect/select-device.vue'
diff --git a/src/views/iot/ruleEngine/ruleSys/components/HttpAction.vue b/src/views/iot/ruleEngine/ruleSys/components/HttpAction.vue
index e9cf8fa..d8a29a2 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/HttpAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/HttpAction.vue
@@ -5,7 +5,7 @@
         <el-input v-model="service.url" auto-complete="off" placeholder="http://或https://开头" />
       </el-form-item>
       <el-form-item label="转换脚本">
-        <code-editor style="width: 100%" v-model:code="service.script"></code-editor>
+        <code-editor style="width: 100%" v-model:code="service.script" />
       </el-form-item>
     </el-form>
   </div>
diff --git a/src/views/iot/ruleEngine/ruleSys/components/MqttAction.vue b/src/views/iot/ruleEngine/ruleSys/components/MqttAction.vue
index a17b086..2032ad6 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/MqttAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/MqttAction.vue
@@ -14,7 +14,7 @@
         <el-input v-model="service.password" auto-complete="off" placeholder="输入密码" />
       </el-form-item>
       <el-form-item label="转换脚本">
-        <code-editor style="width: 100%" v-model:code="service.script"></code-editor>
+        <code-editor style="width: 100%" v-model:code="service.script" />
       </el-form-item>
     </el-form>
   </div>
diff --git a/src/views/iot/ruleEngine/ruleSys/components/TcpAction.vue b/src/views/iot/ruleEngine/ruleSys/components/TcpAction.vue
index c5ea1e4..559cb2f 100644
--- a/src/views/iot/ruleEngine/ruleSys/components/TcpAction.vue
+++ b/src/views/iot/ruleEngine/ruleSys/components/TcpAction.vue
@@ -8,7 +8,7 @@
         <el-input v-model="service.port" auto-complete="off" placeholder="输入端口" type="number" />
       </el-form-item>
       <el-form-item label="转换脚本">
-        <code-editor style="width: 100%" :code="service.script"></code-editor>
+        <code-editor style="width: 100%" :code="service.script" />
       </el-form-item>
     </el-form>
   </div>
diff --git a/src/views/iot/ruleEngine/ruleSys/index.vue b/src/views/iot/ruleEngine/ruleSys/index.vue
index a9e0a68..ad896fe 100644
--- a/src/views/iot/ruleEngine/ruleSys/index.vue
+++ b/src/views/iot/ruleEngine/ruleSys/index.vue
@@ -20,7 +20,7 @@
           inactive-value="stopped"
           disabled
           style="--el-switch-on-color: #029D40; --el-switch-off-color: #DFDFDF"
-        ></el-switch>
+        />
         <!-- <div v-if="scope.row.state === 'stopped'" style="color: red;">已停止</div>
         <div v-if="scope.row.state === 'running'" style="color: green;">运行中</div> -->
       </template>
@@ -29,27 +29,27 @@
       </template>
       <template #menuSlot="scope">
         <el-tooltip class="box-item" effect="dark" content="停止" placement="top">
-          <el-button v-if="scope.row.state === 'running'" link type="danger" icon="SwitchButton" @click="handlePause(scope.row)"></el-button>
+          <el-button v-if="scope.row.state === 'running'" link type="danger" icon="SwitchButton" @click="handlePause(scope.row)" />
         </el-tooltip>
         <el-tooltip class="box-item" effect="dark" content="开启" placement="top">
-          <el-button v-if="scope.row.state === 'stopped'" link type="success" icon="Open" @click="handleOpen(scope.row)"></el-button>
+          <el-button v-if="scope.row.state === 'stopped'" link type="success" icon="Open" @click="handleOpen(scope.row)" />
         </el-tooltip>
       </template>
       <template #customFormItem="{row}">
         <el-tabs v-model="activeName" type="border-card">
           <el-tab-pane label="监听器" :name="1">
-            <listener v-model:listeners="row.listeners"></listener>
+            <listener v-if="activeName === 1" v-model:listeners="row.listeners" />
           </el-tab-pane>
           <el-tab-pane label="过滤器" :name="2">
-            <filtera v-model:filters="row.filters"></filtera>
+            <filtera v-if="activeName === 2" v-model:filters="row.filters" />
           </el-tab-pane>
           <el-tab-pane label="输出" :name="3">
-            <Output v-model:list="row.actions" type="rule" actions="device,http,mqtt,kafka,tcp"></Output>
+            <Output v-if="activeName === 3" v-model:list="row.actions" type="rule" actions="device,http,mqtt,kafka,tcp" />
           </el-tab-pane>
         </el-tabs>
       </template>
     </yt-crud>
-    <log-dialog ref="logDialogRef" title="场景执行日志"></log-dialog>
+    <log-dialog ref="logDialogRef" title="场景执行日志" />
   </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue b/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
index d2ab4d0..842dfbf 100644
--- a/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
+++ b/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
@@ -67,13 +67,7 @@
                       </el-col>
                     </el-row>
                   </div>
-                  <el-button
-                    type="danger"
-                    size="small"
-                    icon="Delete"
-                    style="margin-left: 10px;"
-                    @click="handleRemoveCondition(item, condIndex)"
-                  ></el-button>
+                  <el-button type="danger" size="small" icon="Delete" style="margin-left: 10px;" @click="handleRemoveCondition(item, condIndex)" />
                 </div>
               </div>
             </div>
diff --git a/src/views/iot/ruleEngine/ruleSys/modules/listener.vue b/src/views/iot/ruleEngine/ruleSys/modules/listener.vue
index a1d0531..a0188fd 100644
--- a/src/views/iot/ruleEngine/ruleSys/modules/listener.vue
+++ b/src/views/iot/ruleEngine/ruleSys/modules/listener.vue
@@ -10,15 +10,10 @@
                   <el-radio label="device" size="large">设备监听</el-radio>
                 </el-radio-group>
                 <div class="item">
-                  <select-product v-model:pk="item.pk" @on-select="(row) => handleSelectProduct(row)"></select-product>
+                  <select-product v-model:pk="item.pk" @on-select="(row) => handleSelectProduct(row)" />
                 </div>
                 <div class="item" v-if="item.pk">
-                  <select-device
-                    v-model:dn="item.deviceDn"
-                    placeholder="默认全部设备"
-                    :product-pk="item.pk || ''"
-                    @on-select="handleEmits"
-                  ></select-device>
+                  <select-device v-model:dn="item.deviceDn" placeholder="默认全部设备" :product-pk="item.pk || ''" @on-select="handleEmits" />
                 </div>
               </div>
               <div style="padding-right: 10px;">
diff --git a/src/views/iot/ruleEngine/ruleSys/modules/output.vue b/src/views/iot/ruleEngine/ruleSys/modules/output.vue
index 95f24dc..d2ba025 100644
--- a/src/views/iot/ruleEngine/ruleSys/modules/output.vue
+++ b/src/views/iot/ruleEngine/ruleSys/modules/output.vue
@@ -22,19 +22,19 @@
             </div>
           </template>
           <div class="condition-box" v-if="item.type === 'device'">
-            <DeviceAction ref="deviceActionRef" v-model:services="item.services"></DeviceAction>
+            <DeviceAction ref="deviceActionRef" v-model:services="item.services" />
           </div>
           <div class="condition-box" v-if="item.type === 'http'">
-            <HttpAction :config="item"></HttpAction>
+            <HttpAction :config="item" />
           </div>
           <div class="condition-box" v-if="item.type === 'mqtt'">
-            <MqttAction :config="item"></MqttAction>
+            <MqttAction :config="item" />
           </div>
           <div class="condition-box" v-if="item.type === 'kafka'">
-            <KafkaAction :config="item"></KafkaAction>
+            <KafkaAction :config="item" />
           </div>
           <div class="condition-box" v-if="item.type === 'tcp'">
-            <TcpAction :config="item"></TcpAction>
+            <TcpAction :config="item" />
           </div>
         </el-collapse-item>
       </el-collapse>
@@ -44,8 +44,6 @@
 </template>
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
-
-import SelectDevice from '@/components/YtSelect/select-device.vue'
 import DeviceAction from '../components/DeviceAction.vue'
 import HttpAction from '../components/HttpAction.vue'
 import MqttAction from '../components/MqttAction.vue'
diff --git a/src/views/iot/ruleEngine/scheduledTask/index.vue b/src/views/iot/ruleEngine/scheduledTask/index.vue
index cca159a..f451e53 100644
--- a/src/views/iot/ruleEngine/scheduledTask/index.vue
+++ b/src/views/iot/ruleEngine/scheduledTask/index.vue
@@ -27,7 +27,7 @@
           inactive-value="stopped"
           disabled
           style="--el-switch-on-color: #029D40; --el-switch-off-color: #DFDFDF"
-        ></el-switch>
+        />
       </template>
       <template #log="scope">
         <el-button size="small" type="primary" @click="handleViewLog(scope.row.id)">查看</el-button>
@@ -36,24 +36,24 @@
         <el-popconfirm title="确认要删除？" @confirm="handleDelete(scope.row)" class="mg-left-10">
           <template #reference>
             <el-tooltip class="box-item" effect="dark" content="删除" placement="top">
-              <el-button :disabled="scope.row.state != 'running'" link type="danger" icon="Delete"></el-button>
+              <el-button :disabled="scope.row.state != 'running'" link type="danger" icon="Delete" />
             </el-tooltip>
           </template>
         </el-popconfirm>
         <el-divider direction="vertical" />
         <el-tooltip v-if="scope.row.state === 'running'" class="box-item" effect="dark" content="停止" placement="top">
-          <el-button link type="danger" icon="Close" @click="handleStop(scope.row)"></el-button>
+          <el-button link type="danger" icon="Close" @click="handleStop(scope.row)" />
         </el-tooltip>
         <el-tooltip v-else-if="scope.row.state === 'stopped'" class="box-item" effect="dark" content="开启" placement="top">
-          <el-button link type="success" icon="Open" @click="handleOpen(scope.row)"></el-button>
+          <el-button link type="success" icon="Open" @click="handleOpen(scope.row)" />
         </el-tooltip>
         <el-tooltip v-else-if="scope.row.state === 'finished'" class="box-item" effect="dark" content="重新启动" placement="top">
-          <el-button link type="success" icon="Refresh" @click="handleReload(scope.row)"></el-button>
+          <el-button link type="success" icon="Refresh" @click="handleReload(scope.row)" />
         </el-tooltip>
       </template>
       <template #expressionFormItem="{column, row}">
         <el-form-item v-if="row.type === 'timer'" :label="column.label" :prop="column.key">
-          <crontab-box v-model:value="row.expression"></crontab-box>
+          <crontab-box v-model:value="row.expression" />
         </el-form-item>
       </template>
       <template #secondsFormItem="{column, row}">
@@ -72,12 +72,13 @@
         </el-form-item>
       </template>
       <template #actionForm="{ row }">
-        <optput style="width: 100%;" v-model:list="row.actions" actions="device"></optput>
+        <optput style="width: 100%;" v-model:list="row.actions" actions="device" />
       </template>
     </yt-crud>
-    <log-dialog ref="logDialogRef" type="task"></log-dialog>
+    <log-dialog ref="logDialogRef" type="task" />
   </div>
 </template>
+
 <script lang="ts" setup>
 import { IColumn } from '@/components/common/types/tableCommon'
 import { getTaskList, saveTask, stopTask, reloadTask, startTask, deleteTask } from '../api/scheduledTask.api'
@@ -296,5 +297,3 @@ const getData = () => {
   state.loading = false
 }
 </script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/monitor/admin/index.vue b/src/views/monitor/admin/index.vue
index c69436d..902fe7c 100644
--- a/src/views/monitor/admin/index.vue
+++ b/src/views/monitor/admin/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <i-frame v-model:src="url"></i-frame>
-  </div>
+  <i-frame v-model:src="url" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 0244efb..bb6b049 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -23,7 +23,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            ></el-date-picker>
+            />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -52,7 +52,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:logininfor:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 3b0a1f6..e48f204 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -28,7 +28,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            ></el-date-picker>
+            />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -52,7 +52,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['monitor:operlog:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -108,7 +108,7 @@
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="详细" placement="top">
-              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:operlog:query']"> </el-button>
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:operlog:query']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -116,9 +116,10 @@
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
+
     <!-- 操作日志详细 -->
     <el-dialog title="操作日志详细" v-model="dialog.visible" width="700px" append-to-body>
-      <el-form :model="form" label-width="100px">
+      <el-form v-if="dialog.visible" :model="form" label-width="100px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
diff --git a/src/views/monitor/xxljob/index.vue b/src/views/monitor/xxljob/index.vue
index 383341b..1356535 100644
--- a/src/views/monitor/xxljob/index.vue
+++ b/src/views/monitor/xxljob/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <i-frame v-model:src="url"></i-frame>
-  </div>
+  <i-frame v-model:src="url" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 3b8c93c..eebdda2 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -23,7 +23,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            ></el-date-picker>
+            />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -54,7 +54,7 @@
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Refresh" @click="handleRefreshCache" v-hasPermi="['system:config:remove']">刷新缓存</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -78,10 +78,10 @@
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:config:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:config:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -91,7 +91,7 @@
 
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="configFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="configFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="参数名称" prop="configName">
           <el-input v-model="form.configName" placeholder="请输入参数名称" />
         </el-form-item>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 577fa84..bb06bf0 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -28,7 +28,7 @@
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -40,8 +40,8 @@
         ref="deptTableRef"
         :default-expand-all="isExpandAll"
       >
-        <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-        <el-table-column prop="orderNum" align="center" label="排序" width="200"></el-table-column>
+        <el-table-column prop="deptName" label="部门名称" width="260" />
+        <el-table-column prop="orderNum" align="center" label="排序" width="200" />
         <el-table-column prop="status" align="center" label="状态" width="100">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -69,7 +69,7 @@
     </el-card>
 
     <el-dialog :title="dialog.title" v-model="dialog.visible" destroy-on-close append-to-bod width="600px">
-      <el-form ref="deptFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="deptFormRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 9b43e49..28cb8ed 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -43,7 +43,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -73,10 +73,10 @@
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -86,7 +86,7 @@
     </el-card>
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="dataFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="dataFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />
         </el-form-item>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 3deff38..864afc4 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -23,7 +23,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            ></el-date-picker>
+            />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -52,7 +52,7 @@
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Refresh" @click="handleRefreshCache" v-hasPermi="['system:dict:remove']">刷新缓存</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -81,10 +81,10 @@
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -93,7 +93,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog v-if="dialog.visible" :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="dictFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="form.dictName" placeholder="请输入字典名称" />
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 803bc64..7903247 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -28,7 +28,7 @@
           <el-col :span="1.5">
             <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -41,15 +41,15 @@
         ref="menuTableRef"
         :default-expand-all="isExpandAll"
       >
-        <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+        <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160" />
         <el-table-column prop="icon" label="图标" align="center" width="100">
           <template #default="scope">
             <svg-icon :icon-class="scope.row.icon" />
           </template>
         </el-table-column>
-        <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
-        <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="orderNum" label="排序" width="60" />
+        <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true" />
+        <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" />
         <el-table-column prop="status" label="状态" width="80">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
@@ -77,7 +77,7 @@
     </el-card>
 
     <el-dialog :title="dialog.title" v-model="dialog.visible" destroy-on-close append-to-bod width="750px">
-      <el-form ref="menuFormRef" :model="form" :rules="rules" label-width="100px">
+      <el-form v-if="dialog.visible" ref="menuFormRef" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="上级菜单">
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 14d7b74..8d5455b 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -38,7 +38,7 @@
               删除
             </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -65,10 +65,10 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:notice:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:notice:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -78,7 +78,7 @@
     </el-card>
     <!-- 添加或修改公告对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="780px" append-to-body>
-      <el-form ref="noticeFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="noticeFormRef" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="公告标题" prop="noticeTitle">
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 0a285c2..e61f643 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -37,7 +37,7 @@
               删除
             </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -59,16 +59,16 @@
         </el-table-column>
         <el-table-column label="是否默认" align="center" prop="status" v-if="columns[8].visible">
           <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:oss:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:oss:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -78,7 +78,7 @@
     </el-card>
     <!-- 添加或修改对象存储配置对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="800px" append-to-body>
-      <el-form ref="ossConfigFormRef" :model="form" :rules="rules" label-width="120px">
+      <el-form v-if="dialog.visible" ref="ossConfigFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="配置key" prop="configKey">
           <el-input v-model="form.configKey" placeholder="请输入配置key" />
         </el-form-item>
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index d95e7f1..a051151 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -21,7 +21,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            ></el-date-picker>
+            />
           </el-form-item>
           <el-form-item label="服务商" prop="service">
             <el-input v-model="queryParams.service" placeholder="请输入服务商" clearable style="width: 200px" @keyup.enter="handleQuery" />
@@ -62,7 +62,7 @@
           <el-col :span="1.5">
             <el-button type="info" plain icon="Operation" @click="handleOssConfig" v-hasPermi="['system:oss:list']">配置管理</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -101,10 +101,10 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="下载" placement="top">
-              <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['system:oss:download']"></el-button>
+              <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-hasPermi="['system:oss:download']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:oss:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -114,7 +114,7 @@
     </el-card>
     <!-- 添加或修改OSS对象存储对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="ossFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="ossFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="文件名">
           <fileUpload v-model="form.file" v-if="type === 0" />
           <imageUpload v-model="form.file" v-if="type === 1" />
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 007ca02..aec31ef 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -38,7 +38,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:post:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -61,10 +61,10 @@
         <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -75,7 +75,7 @@
 
     <!-- 添加或修改岗位对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="postFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="postFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="岗位名称" prop="postName">
           <el-input v-model="form.postName" placeholder="请输入岗位名称" />
         </el-form-item>
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 819c959..c5bcaca 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -30,7 +30,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Close" @click="handleClose">关闭</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :search="true"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :search="true" />
         </el-row>
       </template>
       <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index def6bb7..4e6c5a4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -23,7 +23,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            ></el-date-picker>
+            />
           </el-form-item>
 
           <el-form-item>
@@ -49,7 +49,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:role:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -61,7 +61,7 @@
         <el-table-column label="显示顺序" prop="roleSort" width="100" />
         <el-table-column label="状态" align="center" width="100">
           <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime">
@@ -73,16 +73,16 @@
         <el-table-column fixed="right" label="操作" width="180">
           <template #default="scope">
             <el-tooltip content="修改" placement="top" v-if="scope.row.id !== 1">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top" v-if="scope.row.id !== 1">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']" />
             </el-tooltip>
             <el-tooltip content="数据权限" placement="top" v-if="scope.row.id !== 1">
-              <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+              <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)" v-hasPermi="['system:role:edit']" />
             </el-tooltip>
             <el-tooltip content="分配用户" placement="top" v-if="scope.row.id !== 1">
-              <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
+              <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -98,7 +98,7 @@
     </el-card>
 
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="roleFormRef" :model="form" :rules="rules" label-width="100px">
+      <el-form v-if="dialog.visible" ref="roleFormRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
@@ -152,7 +152,7 @@
 
     <!-- 分配角色数据权限对话框 -->
     <el-dialog :title="dialog.title" v-model="openDataScope" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px" ref="dataScopeRef">
+      <el-form v-if="dialog.visible" :model="form" label-width="80px" ref="dataScopeRef">
         <el-form-item label="角色名称">
           <el-input v-model="form.roleName" :disabled="true" />
         </el-form-item>
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index c460181..ffed6a6 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -1,46 +1,44 @@
 <template>
-  <el-row>
-    <el-dialog title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
-      <el-form :model="queryParams" ref="queryFormRef" :inline="true">
-        <el-form-item label="用户名称" prop="userName">
-          <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="phonenumber">
-          <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <el-row>
-        <el-table @row-click="clickRow" ref="tableRef" :data="userList" @selection-change="handleSelectionChange" height="260px">
-          <el-table-column type="selection" width="55"></el-table-column>
-          <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
-          <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
-          <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-          <el-table-column label="状态" align="center" prop="status">
-            <template #default="scope">
-              <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template #default="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-      </el-row>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="handleSelectUser">确 定</el-button>
-          <el-button @click="visible = false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </el-row>
+  <el-dialog title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
+    <el-form v-if="visible" :model="queryParams" ref="queryFormRef" :inline="true">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phonenumber">
+        <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row>
+      <el-table @row-click="clickRow" ref="tableRef" :data="userList" @selection-change="handleSelectionChange" height="260px">
+        <el-table-column type="selection" width="55" />
+        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
+        <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
+        <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
+        <el-table-column label="状态" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-row>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleSelectUser">确 定</el-button>
+        <el-button @click="visible = false">取 消</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup name="SelectUser" lang="ts">
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 21cbd13..3aaa7a1 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -42,7 +42,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:tenant:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -61,20 +61,20 @@
         </el-table-column>
         <el-table-column label="租户状态" align="center" prop="status">
           <template #default="scope">
-            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenant:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenant:edit']" />
             </el-tooltip>
             <el-tooltip content="同步套餐" placement="top">
               <el-button link type="primary" icon="Refresh" @click="handleSyncTenantPackage(scope.row)" v-hasPermi="['system:tenant:edit']">
               </el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenant:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenant:remove']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -84,7 +84,7 @@
     </el-card>
     <!-- 添加或修改租户对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="tenantFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="tenantFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="企业名称" prop="companyName">
           <el-input v-model="form.companyName" placeholder="请输入企业名称" />
         </el-form-item>
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 34aff76..33fe450 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -33,7 +33,7 @@
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:tenantPackage:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
@@ -64,7 +64,7 @@
 
     <!-- 添加或修改租户套餐对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="tenantPackageFormRef" :model="form" :rules="rules" label-width="80px">
+      <el-form v-if="dialog.visible" ref="tenantPackageFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="套餐名称" prop="packageName">
           <el-input v-model="form.packageName" placeholder="请输入套餐名称" />
         </el-form-item>
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index a88ef3b..411bc25 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -33,7 +33,7 @@
               <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
+          <el-table-column type="selection" :reserve-selection="true" width="55" />
           <el-table-column label="角色编号" align="center" prop="roleId" />
           <el-table-column label="角色名称" align="center" prop="roleName" />
           <el-table-column label="权限字符" align="center" prop="roleKey" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 7b7aaf9..2cc2e73 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -42,7 +42,7 @@
                   range-separator="-"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
-                ></el-date-picker>
+                />
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" @click="handleQuery" icon="Search">搜索</el-button>
@@ -103,7 +103,7 @@
             <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
             <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
               <template #default="scope">
-                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)" />
               </template>
             </el-table-column>
 
@@ -116,18 +116,18 @@
             <el-table-column label="操作" fixed="right" width="180" class-name="small-padding fixed-width">
               <template #default="scope">
                 <el-tooltip content="修改" placement="top" v-if="scope.row.id !== 1">
-                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']" />
                 </el-tooltip>
                 <el-tooltip content="删除" placement="top" v-if="scope.row.id !== 1">
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']" />
                 </el-tooltip>
 
                 <el-tooltip content="重置密码" placement="top" v-if="scope.row.id !== 1">
-                  <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
+                  <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']" />
                 </el-tooltip>
 
                 <el-tooltip content="分配角色" placement="top" v-if="scope.row.id !== 1">
-                  <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+                  <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']" />
                 </el-tooltip>
               </template>
             </el-table-column>
@@ -146,7 +146,7 @@
 
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body @close="closeDialog">
-      <el-form :model="form" :rules="rules" ref="userFormRef" label-width="80px">
+      <el-form v-if="dialog.visible" :model="form" :rules="rules" ref="userFormRef" label-width="80px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
@@ -242,6 +242,7 @@
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
       <el-upload
+        v-if="upload.open"
         ref="uploadRef"
         :limit="1"
         accept=".xlsx, .xls"
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 2ca3a61..8962464 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -50,10 +50,10 @@
           </template>
           <el-tabs v-model="activeTab">
             <el-tab-pane label="基本资料" name="userinfo">
-              <userInfo :user="userForm" />
+              <userInfo v-if="activeTab === 'userinfo'" :user="userForm" />
             </el-tab-pane>
             <el-tab-pane label="修改密码" name="resetPwd">
-              <resetPwd />
+              <resetPwd v-if="activeTab === 'resetPwd'" />
             </el-tab-pane>
           </el-tabs>
         </el-card>
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 1374aca..23768ce 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -2,7 +2,7 @@
   <div class="user-info-head" @click="editCropper()">
     <img :src="options.img as string" title="点击上传头像" class="img-circle img-lg" />
     <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
-      <el-row>
+      <el-row v-if="open">
         <el-col :xs="24" :md="12" :style="{ height: '350px' }">
           <vue-cropper
             ref="cropper"
@@ -23,8 +23,7 @@
           </div>
         </el-col>
       </el-row>
-      <br />
-      <el-row>
+      <el-row v-if="open">
         <el-col :lg="2" :md="2">
           <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
             <el-button>
@@ -34,16 +33,16 @@
           </el-upload>
         </el-col>
         <el-col :lg="{ span: 1, offset: 2 }" :md="2">
-          <el-button icon="Plus" @click="changeScale(1)"></el-button>
+          <el-button icon="Plus" @click="changeScale(1)" />
         </el-col>
         <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-          <el-button icon="Minus" @click="changeScale(-1)"></el-button>
+          <el-button icon="Minus" @click="changeScale(-1)" />
         </el-col>
         <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-          <el-button icon="RefreshLeft" @click="rotateLeft()"></el-button>
+          <el-button icon="RefreshLeft" @click="rotateLeft()" />
         </el-col>
         <el-col :lg="{ span: 1, offset: 1 }" :md="2">
-          <el-button icon="RefreshRight" @click="rotateRight()"></el-button>
+          <el-button icon="RefreshRight" @click="rotateRight()" />
         </el-col>
         <el-col :lg="{ span: 2, offset: 6 }" :md="2">
           <el-button type="primary" @click="uploadImg()">提 交</el-button>
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index f3e0c75..2f93bb2 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -2,10 +2,10 @@
   <el-card>
     <el-tabs v-model="activeName">
       <el-tab-pane label="基本信息" name="basic">
-        <basic-info-form ref="basicInfo" :info="info" />
+        <basic-info-form v-if="activeName === 'basic'" ref="basicInfo" :info="info" />
       </el-tab-pane>
       <el-tab-pane label="字段信息" name="columnInfo">
-        <el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
+        <el-table v-if="activeName === 'columnInfo'" ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
           <el-table-column label="序号" type="index" min-width="5%" />
           <el-table-column label="字段列名" prop="columnName" min-width="10%" :show-overflow-tooltip="true" />
           <el-table-column label="字段描述" min-width="10%">
@@ -35,22 +35,22 @@
 
           <el-table-column label="插入" min-width="5%">
             <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isInsert"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isInsert" />
             </template>
           </el-table-column>
           <el-table-column label="编辑" min-width="5%">
             <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isEdit"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isEdit" />
             </template>
           </el-table-column>
           <el-table-column label="列表" min-width="5%">
             <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isList"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isList" />
             </template>
           </el-table-column>
           <el-table-column label="查询" min-width="5%">
             <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery" />
             </template>
           </el-table-column>
           <el-table-column label="查询方式" min-width="10%">
@@ -69,7 +69,7 @@
           </el-table-column>
           <el-table-column label="必填" min-width="5%">
             <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox>
+              <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired" />
             </template>
           </el-table-column>
           <el-table-column label="显示类型" min-width="12%">
@@ -100,7 +100,7 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="生成信息" name="genInfo">
-        <gen-info-form ref="genInfo" :info="info" :tables="tables" />
+        <gen-info-form v-if="activeName === 'genInfo'" ref="genInfo" :info="info" :tables="tables" />
       </el-tab-pane>
     </el-tabs>
     <el-form label-width="100px">
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 8deb6c3..8a31879 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 导入表 -->
   <el-dialog title="导入表" v-model="visible" width="800px" top="5vh" append-to-body>
-    <el-form :model="queryParams" ref="queryFormRef" :inline="true">
+    <el-form v-if="visible" :model="queryParams" ref="queryFormRef" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
@@ -15,11 +15,11 @@
     </el-form>
     <el-row>
       <el-table @row-click="clickRow" ref="tableRef" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="createTime" label="创建时间"></el-table-column>
-        <el-table-column prop="updateTime" label="更新时间"></el-table-column>
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true" />
+        <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true" />
+        <el-table-column prop="createTime" label="创建时间" />
+        <el-table-column prop="updateTime" label="更新时间" />
       </el-table>
       <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-row>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index c0d95e7..d0959f5 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -20,7 +20,7 @@
               range-separator="-"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
-            ></el-date-picker>
+            />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -47,12 +47,12 @@
               删除
             </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
         </el-row>
       </template>
 
       <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="55"></el-table-column>
+        <el-table-column type="selection" align="center" width="55" />
         <el-table-column label="序号" type="index" width="50" align="center">
           <template #default="scope">
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
@@ -66,19 +66,19 @@
         <el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="预览" placement="top">
-              <el-button link type="primary" icon="View" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']"></el-button>
+              <el-button link type="primary" icon="View" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']" />
             </el-tooltip>
             <el-tooltip content="编辑" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']" />
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']" />
             </el-tooltip>
             <el-tooltip content="同步" placement="top">
-              <el-button link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button>
+              <el-button link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']" />
             </el-tooltip>
             <el-tooltip content="生成代码" placement="top">
-              <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']"></el-button>
+              <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']" />
             </el-tooltip>
           </template>
         </el-table-column>
@@ -88,12 +88,12 @@
 
     <!-- 预览界面 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" top="5vh" append-to-body class="scrollbar">
-      <el-tabs v-model="preview.activeName">
+      <el-tabs v-if="dialog.visible" v-model="preview.activeName">
         <el-tab-pane v-for="(value, key) in preview.data" :label="key" :name="key" :key="value">
           <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right"
             >&nbsp;复制</el-link
           >
-          <pre>{{ value }}</pre>
+          <pre v-if="preview.activeName === key">{{ value }}</pre>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-- 
Gitee


From dac72e3b4f677afcef3514ea500c4bc73955206e Mon Sep 17 00:00:00 2001
From: "liupo.wu" <wuliupo@163.com>
Date: Sun, 16 Jul 2023 14:38:02 +0800
Subject: [PATCH 7/7] fix: unused

---
 src/views/iot/ruleEngine/ruleSys/modules/filtera.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue b/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
index 842dfbf..462f827 100644
--- a/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
+++ b/src/views/iot/ruleEngine/ruleSys/modules/filtera.vue
@@ -16,11 +16,7 @@
                   </el-radio-group>
                 </div>
                 <div class="item" v-if="item.deviceRadio === '指定设备'">
-                  <select-device
-                    v-model:dn="item.deviceDn"
-                    placeholder="选择设备"
-                    @on-select="(row) => hadnleSelectDevice(row, item)"
-                  ></select-device>
+                  <select-device v-model:dn="item.deviceDn" placeholder="选择设备" @on-select="(row) => hadnleSelectDevice(row, item)" />
                 </div>
               </div>
               <div style="padding-right: 10px;">
-- 
Gitee