diff --git a/ruoyi-ui/src/api/plc/device.js b/ruoyi-ui/src/api/plc/device.js
new file mode 100644
index 0000000..e94ee6e
--- /dev/null
+++ b/ruoyi-ui/src/api/plc/device.js
@@ -0,0 +1,129 @@
+import request from '@/utils/request'
+import {parseStrEmpty} from "@/utils/ruoyi";
+
+// 查询设备信息列表
+export function listDevice(query) {
+  return request({
+    url: '/business/plcDevice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备信息详细
+export function getDevice(deviceId) {
+  return request({
+    url: '/business/plcDevice/' + deviceId,
+    method: 'get'
+  })
+}
+
+// 新增设备信息
+export function addDevice(data) {
+  return request({
+    url: '/business/plcDevice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备信息
+export function updateDevice(data) {
+  return request({
+    url: '/business/plcDevice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备信息
+export function delDevice(deviceId) {
+  return request({
+    url: '/business/plcDevice/' + deviceId,
+    method: 'delete'
+  })
+}
+
+
+// 查询场景信息列表供查询页面选择使用（例如下拉列表）
+export function getScenes(query) {
+  return request({
+    url: '/business/device/getScenes',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询场景信息列表供编辑页面选择使用（例如下拉列表）
+export function getEditedScenes(query) {
+  return request({
+    url: '/business/device/getEditedScenes',
+    method: 'get',
+    params: query
+  })
+}
+export function getProtocols() {
+  return request({
+    url: '/business/plcDevice/getProtocols',
+    method: 'get'
+  })
+}
+
+// 查询监控单元树
+export function getMonitorTree(sceneId) {
+  return request({
+    url: '/business/device/monitorUnitTree/' + parseStrEmpty(sceneId),
+    method: 'get'
+  })
+}
+
+
+// 查询设备模型
+export function getDeviceModes(sceneId) {
+  return request({
+    url: '/business/plcDevice/getDeviceModes/' + parseStrEmpty(sceneId),
+    method: 'get'
+  })
+}
+
+// 查询网关设备
+export function getGatewayDevices(sceneId) {
+  return request({
+    url: '/business/device/getGatewayDevices/' + parseStrEmpty(sceneId),
+    method: 'get'
+  })
+}
+
+
+// 设备状态修改
+export function changeDeviceStatus(deviceId, deviceStatus) {
+  const data = {
+    deviceId,
+    deviceStatus
+  }
+  return request({
+    url: '/business/plcDevice/changeDeviceStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+export function publishControlCommand(deviceId, type) {
+  const data = {
+    deviceId,
+    type
+  }
+  return request({
+    url: '/business/device/publishControlCommand',
+    method: 'put',
+    data: data
+  })
+}
+
+// 重新生成tdengine所有表
+export function rebuildTdTables() {
+  return request({
+    url: '/business/device/rebuildTdTables',
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/api/plc/plcDeviceMode.js b/ruoyi-ui/src/api/plc/plcDeviceMode.js
new file mode 100644
index 0000000..e97c395
--- /dev/null
+++ b/ruoyi-ui/src/api/plc/plcDeviceMode.js
@@ -0,0 +1,89 @@
+import request from '@/utils/request'
+
+// 查询设备模型列表
+export function listDeviceMode(query) {
+  return request({
+    url: '/business/plcDeviceMode/list',
+    method: 'get',
+    params: query
+  })
+}
+export function addDeviceModeFunction(data) {
+  return request({
+    url: '/business/plcDeviceModeFunction',
+    method: 'post',
+    data: data
+  })
+}
+export function updateDeviceModeFunction(data) {
+  return request({
+    url: '/business/plcDeviceModeFunction',
+    method: 'put',
+    data: data
+  })
+}
+export function delDeviceModeFunction(modeFunctionId) {
+  return request({
+    url: '/business/plcDeviceModeFunction/' + modeFunctionId,
+    method: 'delete'
+  })
+}
+// 查询设备模型详细
+export function getDeviceMode(deviceModeId) {
+  return request({
+    url: '/business/plcDeviceMode/' + deviceModeId,
+    method: 'get'
+  })
+}
+
+// 新增设备模型
+export function addDeviceMode(data) {
+  return request({
+    url: '/business/plcDeviceMode',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备模型
+export function updateDeviceMode(data) {
+  return request({
+    url: '/business/plcDeviceMode',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备模型
+export function delDeviceMode(deviceModeId) {
+  return request({
+    url: '/business/plcDeviceMode/' + deviceModeId,
+    method: 'delete'
+  })
+}
+
+// 查询场景信息列表供插叙页面选择使用（例如下拉列表）
+export function getScenes(query) {
+  return request({
+    url: '/business/deviceMode/getScenes',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询场景信息列表供编辑页面选择使用（例如下拉列表）
+export function getEditedScenes(query) {
+  return request({
+    url: '/business/deviceMode/getEditedScenes',
+    method: 'get',
+    params: query
+  })
+}
+
+// 重新生成tdengine所有超级表
+export function rebuildTdSuperTables() {
+  return request({
+    url: '/business/deviceMode/rebuildTdSuperTables',
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 55e7f5e..d057a70 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -231,6 +231,20 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/plcDeviceMode/mode-add',
+    component: Layout,
+    hidden: true,
+    permissions: ['business:deviceMode:add'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/plc/plcModel/editDeviceMode'),
+        name: 'ModeAdd',
+        meta: { title: '添加设备模型', activeMenu: '/plc/plcModel' }
+      }
+    ]
+  },
   {
     path: '/deviceMode/mode-edit',
     component: Layout,
@@ -245,6 +259,20 @@ export const dynamicRoutes = [
       }
     ]
   },
+  {
+    path: '/plcDeviceMode/mode-edit',
+    component: Layout,
+    hidden: true,
+    permissions: ['business:deviceMode:edit'],
+    children: [
+      {
+        path: 'index/:deviceModeId(\\d+)',
+        component: () => import('@/views/plc/plcModel/editDeviceMode'),
+        name: 'ModeEdit',
+        meta: { title: '修改设备模型', activeMenu: '/plc/plcModel' }
+      }
+    ]
+  },
   {
     path: '/electronicFence/fence-add',
     component: Layout,
diff --git a/ruoyi-ui/src/views/plc/plcEquipment/index.vue b/ruoyi-ui/src/views/plc/plcEquipment/index.vue
new file mode 100644
index 0000000..ed00d37
--- /dev/null
+++ b/ruoyi-ui/src/views/plc/plcEquipment/index.vue
@@ -0,0 +1,1333 @@
+<template>
+  <div class="app-container"  style="width: 100%">
+    <el-row :gutter="20">
+
+      <el-col :span="0.1" :xs="24" v-if="toggleRightDisplay">
+        <div @click="toggleDeviceClick">
+          <!--          <img v-if="toggleMenuRightImg" :src="toggleMenuRightImg" class="hamburger"/>-->
+        </div>
+      </el-col>
+      <!--网关设备数据-->
+<!--      <el-col :span="4" :xs="24" v-if="toggleLeftDisplay">-->
+<!--        <div @click="toggleDeviceClick" style="display:flex;justify-content: space-between">-->
+<!--          <h6 class="form-header h6" style="margin: 10px 0 10px 0">网关设备,点击过滤显示子设备</h6>-->
+<!--          &lt;!&ndash;          <img v-if="toggleMenuLeftImg" :src="toggleMenuLeftImg" class="hamburger"/>&ndash;&gt;-->
+<!--        </div>-->
+<!--        <div class="head-container">-->
+<!--          <el-input-->
+<!--            v-model="gatewayDeviceName"-->
+<!--            placeholder="请输入网关设备名称"-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--            prefix-icon="el-icon-search"-->
+<!--            style="margin-bottom: 20px"-->
+<!--          />-->
+<!--        </div>-->
+<!--        <div class="head-container">-->
+<!--          <el-tree-->
+<!--            :data="gatewayDeviceList"-->
+<!--            :props="defaultProps"-->
+<!--            :expand-on-click-node="false"-->
+<!--            :filter-node-method="filterNode"-->
+<!--            ref="tree"-->
+<!--            node-key="deviceId"-->
+<!--            default-expand-all-->
+<!--            highlight-current-->
+<!--            @node-click="handleNodeClick"-->
+<!--          />-->
+<!--        </div>-->
+<!--      </el-col>-->
+      <!--设备数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+<!--          <el-form-item label="网关设备" prop="releatedDeviceId" v-if="false">-->
+<!--            <el-input-->
+<!--              v-model="queryParams.releatedDeviceId"-->
+<!--              placeholder="请输入设备编号"-->
+<!--              clearable-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
+
+<!--          <el-form-item label="设备编号" prop="deviceCode">-->
+<!--            <el-input-->
+<!--              v-model="queryParams.deviceCode"-->
+<!--              placeholder="请输入设备编号"-->
+<!--              clearable-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
+          <el-form-item label="设备名称" prop="deviceName">
+            <el-input
+              v-model="queryParams.deviceName"
+              placeholder="请输入设备名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+<!--          <el-form-item label="设备类型" prop="deviceType">-->
+<!--            <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable>-->
+<!--              <el-option-->
+<!--                v-for="dict in dict.type.hw_device_type"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+          <el-form-item label="所属场景" prop="sceneId">
+            <el-select v-model="queryParams.sceneId" placeholder="请选择" @input="sceneChange" clearable>
+              <el-option
+                v-for="(scene, index) in scenes"
+                :key="index"
+                :label="scene.sceneName"
+                :value="scene.sceneId"
+              ></el-option>
+            </el-select>
+
+          </el-form-item>
+<!--          <el-form-item label="监控单元" prop="monitorUnitId">-->
+<!--            <treeselect v-model="queryParams.monitorUnitId" :options="monitorUnits" :show-count="true"-->
+<!--                        placeholder="请选择所属监控单元" :normalizer="normalizer" :flat="true" clearable-->
+<!--                        style="width: 200px;"/>-->
+
+<!--          </el-form-item>-->
+
+          <el-form-item label="设备模型" prop="deviceModeId">
+            <el-select v-model="queryParams.deviceModeId" placeholder="请选择" clearable>
+              <el-option
+                v-for="(editedDeviceMode, index) in deviceModes"
+                :key="index"
+                :label="editedDeviceMode.deviceModeName"
+                :value="editedDeviceMode.deviceModeId"
+              ></el-option>
+            </el-select>
+
+          </el-form-item>
+
+
+          <el-form-item label="设备状态" prop="deviceStatus">
+            <el-select v-model="queryParams.deviceStatus" placeholder="请选择" clearable>
+              <el-option
+                v-for="dict in dict.type.hw_device_device_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+
+          <!--el-form-item label="在线状态" prop="onlineStatus">
+            <el-select v-model="queryParams.onlineStatus" placeholder="请选择" clearable>
+              <el-option
+                v-for="dict in dict.type.hw_device_online_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item-->
+
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['business:device:add']"
+            >新增
+            </el-button>
+          </el-col>
+
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="info"-->
+<!--              plain-->
+<!--              icon="el-icon-upload"-->
+<!--              size="mini"-->
+<!--              @click="handleImport"-->
+<!--              v-hasPermi="['business:device:import']"-->
+<!--            >导入-->
+<!--            </el-button>-->
+<!--          </el-col>-->
+
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="warning"-->
+<!--              plain-->
+<!--              icon="el-icon-download"-->
+<!--              size="mini"-->
+<!--              @click="handleExport"-->
+<!--              v-hasPermi="['business:device:export']"-->
+<!--            >导出-->
+<!--            </el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="primary"-->
+<!--              plain-->
+<!--              icon="el-icon-plus"-->
+<!--              size="mini"-->
+<!--              @click="handleRebuildTdTables"-->
+<!--              v-hasPermi="['business:device:rebuild']"-->
+<!--            >重建表-->
+<!--            </el-button>-->
+<!--          </el-col>-->
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="设备ID" width="100" align="center" prop="deviceId"/>
+<!--          <el-table-column label="设备编号" align="center" prop="deviceCode"/>-->
+          <el-table-column label="设备名称" width="100" align="center" prop="deviceName"/>
+<!--          <el-table-column label="设备类型" align="center" prop="deviceType">-->
+<!--            <template slot-scope="scope">-->
+<!--              <dict-tag :options="dict.type.hw_device_type" :value="scope.row.deviceType"/>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+          <el-table-column label="所属租户" align="center" prop="tenantName"/>
+          <el-table-column label="所属场景" align="center" prop="sceneName"/>
+<!--          <el-table-column label="监控单元" align="center" prop="monitorUnitName"/>-->
+          <el-table-column label="设备模型" align="center" prop="deviceModeName"/>
+          <el-table-column label="ip" align="center" prop="ip"/>
+          <el-table-column label="端口" align="center" prop="port1"/>
+          <el-table-column label="寄存器" align="center" prop="location"/>
+          <el-table-column label="站点" align="center" prop="station"/>
+          <el-table-column label="数据长度" align="center" prop="length"/>
+          <el-table-column label="协议" align="center" prop="accessProtocol">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.plc_device_protocol" :value="scope.row.accessProtocol"/>
+            </template>
+          </el-table-column>
+          <el-table-column prop="dataType" label="数据类型">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.hw_mode_function_data_type" :value="scope.row.dataType"/>
+            </template>
+          </el-table-column>
+          <!--el-table-column label="激活状态" align="center" prop="activeStatus">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.hw_device_active_status" :value="scope.row.activeStatus"/>
+            </template>
+          </el-table-column-->
+<!--          <el-table-column label="设备发布时间" align="center" prop="publishTime" width="180">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{ parseTime(scope.row.publishTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column label="设备状态" align="center" prop="deviceStatus">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.deviceStatus"
+                active-value="1"
+                inactive-value="0"
+                @change="handleDeviceStatusChange(scope.row)"
+              ></el-switch>
+            </template>
+          </el-table-column>
+
+          <!--el-table-column label="在线状态" align="center" prop="onlineStatus">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.hw_device_online_status" :value="scope.row.onlineStatus"/>
+            </template>
+          </el-table-column-->
+<!--          <el-table-column label="设备控制" align="center" class-name="small-padding fixed-width">-->
+<!--            <template slot-scope="scope" v-if="scope.row.deviceType=='1' || scope.row.deviceType=='3'">-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-time"-->
+<!--                @click="publishControlCommand(scope.row,'CMD_SYS_TIME_CHECK','设备对时')"-->
+<!--                v-hasPermi="['business:device:edit']"-->
+<!--              >校时-->
+<!--              </el-button>-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-camera"-->
+<!--                @click="publishControlCommand(scope.row,'CMD_SNAPSHOT','拍照')"-->
+<!--                v-hasPermi="['business:device:edit']"-->
+<!--              >拍照-->
+<!--              </el-button>-->
+
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-refresh-right"-->
+<!--                @click="publishControlCommand(scope.row,'CMD_SYS_REBOOT','重启')"-->
+<!--                v-hasPermi="['business:device:edit']"-->
+<!--              >重启-->
+<!--              </el-button>-->
+
+
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['business:device:edit']"
+              >修改
+              </el-button>
+
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['business:device:remove']"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.slimitnc="queryParams.pageSize"
+          @pagination="getList"
+        />
+
+      </el-col>
+    </el-row>
+
+
+    <!-- 添加或修改设备信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备编号" prop="deviceCode">
+          <el-input v-model="form.deviceCode" placeholder="请输入设备编号" maxlength="20"/>
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="form.deviceName" placeholder="请输入设备名称"/>
+        </el-form-item>
+        <el-form-item label="ip" prop="ip">
+          <el-input v-model="form.ip" placeholder="请输入ip" maxlength="20"/>
+        </el-form-item>
+        <el-form-item label="端口" prop="port1">
+          <el-input v-model="form.port1" placeholder="请输入端口" maxlength="20"/>
+        </el-form-item>
+        <el-form-item label="寄存器" prop="location">
+          <el-input v-model="form.location" placeholder="请输入寄存器" maxlength="50"/>
+        </el-form-item>
+        <el-form-item label="站点" prop="station">
+          <el-input v-model="form.station" placeholder="请输入站点" maxlength="50"/>
+        </el-form-item>
+        <el-form-item label="读取长度" prop="length">
+          <el-input v-model="form.length" placeholder="请输入读取长度" maxlength="20"/>
+        </el-form-item>
+        <el-form-item label="数据类型" prop="dataType">
+          <el-select v-model="form.dataType" placeholder="请选择数据类型">
+            <el-option
+              v-for="dict in dict.type.hw_mode_function_data_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="取值范围" prop="dataDefinition" v-show="false">-->
+<!--          <el-input v-model="form.minValue" placeholder="请输入最小值" style="width:150px;"/>-->
+<!--          ——-->
+<!--          <el-input v-model="form.maxValue" placeholder="请输入最大值" style="width:150px;"/>-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item label="布尔值" prop="dataDefinition" v-show="form.dataType == '8'">-->
+<!--          0——-->
+<!--          <el-input v-model="form.boolFalse" placeholder="请输入值" style="width:150px;"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="" prop="dataDefinition" v-show="form.dataType == '8'">-->
+<!--          1——-->
+<!--          <el-input v-model="form.boolTrue" placeholder="请输入值" style="width:150px;"/>-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item label="长度" prop="dataDefinition" v-show="form.dataType == '10'">-->
+<!--          <el-input-number v-model="form.dataDefinition" placeholder="请输入最大长度" :min="10" :max="1000"-->
+<!--                           style="width:150px;"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="设备类型" prop="deviceType">-->
+<!--          <el-select v-model="form.deviceType" placeholder="请选择设备类型" @input="deviceTypeChange"-->
+<!--                     :disabled="deviceTypeDisabled">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.hw_device_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+
+        <el-form-item label="所属场景" prop="sceneId">
+          <el-select v-model="form.sceneId" placeholder="请选择" @input="editedSceneChange" :disabled="sceneDisabled">
+            <el-option
+              v-for="(scene, index) in editedScenes"
+              :key="index"
+              :label="scene.sceneName"
+              :value="scene.sceneId"
+              :disabled="scene.selectedDisable && scene.selectedDisable == 1"
+            ></el-option>
+          </el-select>
+
+        </el-form-item>
+<!--        <el-form-item label="监控单元" prop="monitorUnitId">-->
+<!--          <treeselect v-model="form.monitorUnitId" :options="editedMonitorUnits" :show-count="true"-->
+<!--                      placeholder="请选择所属监控单元" :normalizer="normalizer" :flat="true"/>-->
+<!--        </el-form-item>-->
+
+
+<!--        <el-form-item label="联网方式" prop="networkingMode" v-if="deviceVisible">-->
+<!--          <el-select v-model="form.networkingMode" placeholder="请选择数据类型">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.hw_device_networking_mode"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="接入协议" prop="accessProtocol">
+          <el-select v-model="form.accessProtocol" placeholder="请选择接入协议">
+            <el-option
+              v-for="dict in dict.type.plc_device_protocol"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+<!--        <el-form-item label="数据格式" prop="dataFormat" v-if="deviceVisible">-->
+<!--          <el-select v-model="form.accessProtocol" placeholder="请选择数据格式">-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.hw_device_data_format"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="parseInt(dict.value)"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item label="关联网关" prop="releatedDeviceId" v-if="subDeviceVisible">-->
+<!--          <el-select v-model="form.releatedDeviceId" placeholder="请选择">-->
+<!--            <el-option-->
+<!--              v-for="(editedGatewayDevice, index) in editedGatewayDevices"-->
+<!--              :key="index"-->
+<!--              :label="editedGatewayDevice.deviceName"-->
+<!--              :value="editedGatewayDevice.deviceId"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="设备模型" prop="deviceModeId" v-if="deviceModeVisible">
+          <el-select v-model="form.deviceModeId" placeholder="请选择" :disabled="deviceModeDisabled">
+            <el-option
+              v-for="(editedDeviceMode, index) in editedDeviceModes"
+              :key="index"
+              :label="editedDeviceMode.deviceModeName"
+              :value="editedDeviceMode.deviceModeId"
+            ></el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="描述" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
+
+<!--        <el-form-item label="设备图片" prop="devicePic">-->
+<!--          <el-upload-->
+<!--            single-->
+<!--            :action="uploadImgUrl"-->
+<!--            list-type="picture-card"-->
+<!--            :limit="limit"-->
+<!--            :on-success="handleUploadSuccess"-->
+<!--            :before-upload="handleBeforeUpload"-->
+<!--            :on-error="handleUploadError"-->
+<!--            :on-exceed="handleExceed"-->
+<!--            ref="imageUpload"-->
+<!--            :on-remove="handleDeletePicture"-->
+<!--            :show-file-list="true"-->
+<!--            :headers="headers"-->
+<!--            :file-list="fileList"-->
+<!--            :on-preview="handlePictureCardPreview"-->
+<!--            :class="{hide: this.fileList.length >= 1}"-->
+<!--          >-->
+<!--            <i class="el-icon-plus"></i>-->
+<!--          </el-upload>-->
+
+<!--          &lt;!&ndash; 上传提示 &ndash;&gt;-->
+<!--          <div class="el-upload__tip" slot="tip" v-if="showTip">-->
+<!--            请上传-->
+<!--            <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>-->
+<!--            <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b></template>-->
+<!--            的文件-->
+<!--          </div>-->
+
+<!--          <el-dialog-->
+<!--            :visible.sync="dialogVisible"-->
+<!--            title="预览"-->
+<!--            width="800"-->
+<!--            append-to-body-->
+<!--          >-->
+<!--            <img-->
+<!--              :src="dialogImageUrl"-->
+<!--              style="display: block; max-width: 100%; margin: 0 auto"-->
+<!--            />-->
+<!--          </el-dialog>-->
+<!--        </el-form-item>-->
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" v-if="confirmBtnVisible">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+
+    <!--设备导入对话框-->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-form ref="uploadForm" :model="upload" :rules="uploadRules" label-width="80px">
+        <el-form-item label="所属场景" prop="sceneId">
+          <el-select v-model="upload.sceneId" placeholder="请选择" @input="uploadEditedSceneChange">
+            <el-option
+              v-for="(scene, index) in editedScenes"
+              :key="index"
+              :label="scene.sceneName"
+              :value="scene.sceneId"
+              :disabled="scene.selectedDisable && scene.selectedDisable == 1"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport+'&sceneId=' + upload.sceneId"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <!--div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport"/>
+            是否更新已经存在的设备数据
+          </div-->
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                   @click="importTemplate">下载模板
+          </el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  listDevice,
+  getDevice,
+  delDevice,
+  addDevice,
+  updateDevice,
+  getScenes,
+  getEditedScenes,
+  getMonitorTree,
+  getDeviceModes,
+  getGatewayDevices,
+  changeDeviceStatus,
+  publishControlCommand,
+  rebuildTdTables,
+  getProtocols,
+} from "@/api/plc/device";
+import {getToken} from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import dict from "@/store/modules/dict";
+// import toggleMenuLeftImg from '@/assets/images/togglemenu-left.png'
+// import toggleMenuRightImg from '@/assets/images/togglemenu-right.png'
+
+export default {
+  components: {Treeselect},
+  dicts: ['hw_mode_function_data_type','hw_device_type','plc_device_protocol', 'hw_device_access_protocol', 'hw_device_data_format', 'hw_device_active_status', 'hw_device_device_status', 'hw_device_online_status'],
+  name: "Device",
+  props: {
+    value: [String, Object, Array],
+    // 图片数量限制
+    limit: {
+      type: Number,
+      default: 1,
+    },
+    // 大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5,
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["png", "jpg", "jpeg"],
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    }
+  },
+
+  data() {
+    return {
+      // toggleMenuLeftImg: toggleMenuLeftImg,
+      // toggleMenuRightImg: toggleMenuRightImg,
+      toggleLeftDisplay: true,
+      toggleRightDisplay: false,
+      // 网关设备名称
+      gatewayDeviceName: undefined,
+
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备信息表格数据
+      deviceList: [],
+      // 网关设备信息表格数据
+      gatewayDeviceList: [],
+      //场景列表
+      scenes: [],
+      //查询页面监控单元树
+      monitorUnits: [],
+      //查询页面设备模型列表
+      deviceModes: [],
+
+      //编辑页面场景列表
+      editedScenes: [],
+      protocols: [],
+      //编辑页面监控单元树
+      editedMonitorUnits: [],
+      //编辑页面设备模型列表
+      editedDeviceModes: [],
+      //编辑页面网关设备列表
+      editedGatewayDevices: [],
+      deviceTypeDisabled: true,
+      sceneDisabled: true,
+      subDeviceVisible: false,//子设备字段是否显示
+      deviceVisible: false,//网关设备或直连设备字段是否显示
+      deviceModeVisible: false,//设备模型是否显示
+      deviceModeDisabled: true,
+
+      DEVICE_TYPE_GATEWAY_DEVICE: "1",//网关设备
+      DEVICE_TYPE_GATEWAY_SUB_EQUIPMENT: "2",//网关子设备
+      DEVICE_TYPE_DIRECT_CONNECT_DEVICE: "3",//直连设备
+
+      DEVICE_ACCESS_PROTOCOL_MQTT: 1,//网关接入协议,MQTT
+
+      DEVICE_NETWORKING_MODE_WIFI: "1",// 网关接入协议：WIFI
+
+      DEVICE_DATA_FORMAT_JSON: 1,// 数据格式：JSON
+
+      DEVICE_STATUS_PUBLISHED: "1",//设备状态:已发布
+      ACTIVE_STATUS_INACTIVE: "0",//激活状态：未激活
+
+      confirmBtnVisible: true,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+
+      defaultProps: {
+        children: "children",
+        label: "deviceName"
+      },
+
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        sceneId: "",//场景ID
+        sceneName: "",//场景名称
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/business/device/importData"
+      },
+
+
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceCode: null,
+        deviceName: null,
+        sceneId: null,
+        // monitorUnitId: null,
+        // deviceType: null,
+        // networkingMode: null,
+        accessProtocol: null,
+        // dataFormat: null,
+        // releatedDeviceId: null,
+        deviceModeId: null,
+        // accessGwProtocol: null,
+        // activeStatus: null,
+        deviceStatus: null,
+        // activeTime: null,
+        // devicePic: null,
+        // ipAddress: null,
+        // areaId: null,
+        // deviceLocation: null,
+        tenantId: null
+        // onlineStatus: null
+      },
+      // 表单参数
+      form: {},
+
+      uploadForm: {},
+
+      // 表单校验
+      rules: {
+        deviceCode: [
+          {required: true, message: "设备编号不能为空", trigger: "blur"},
+          // {
+          //   pattern: /^[a-z0-9_]+$/,
+          //   message: "2-20个字符，由小写字母、数字或下划线组成",
+          //   trigger: "blur"
+          // }
+        ],
+        deviceName: [
+          {required: true, message: "设备名称不能为空", trigger: "blur"}
+        ],
+        sceneId: [
+          {required: true, message: "所属场景不能为空", trigger: "change"}
+        ],
+        deviceType: [
+          {required: true, message: "设备类型不能为空", trigger: "change"}
+        ],
+        monitorUnitId: [
+          {required: true, message: "监控单元不能为空", trigger: "change"}
+        ],
+
+        releatedDeviceId: [
+          {required: true, message: "关联网关不能为空", trigger: "change"}
+        ],
+        deviceModeId: [
+          {required: true, message: "设备模型不能为空", trigger: "change"}
+        ],
+        networkingMode: [
+          {required: true, message: "联网方式不能为空", trigger: "change"}
+        ],
+        // accessProtocol: [
+        //   {required: true, message: "接入协议不能为空", trigger: "change"}
+        // ],
+        dataFormat: [
+          {required: true, message: "数据格式不能为空", trigger: "change"}
+        ],
+      },
+
+      // 导入表单校验
+      uploadRules: {
+        sceneId: [
+          {required: true, message: "所属场景不能为空", trigger: "change"}
+        ],
+      },
+
+      number: 0,
+      uploadList: [],
+      dialogImageUrl: "",
+      dialogVisible: false,
+      hideUpload: false,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      fileList: [],
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    gatewayDeviceName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getGatewayDeviceList();
+    getScenes().then(response => {
+      this.scenes = response.data;
+    });
+
+    //获取文件最大size
+    this.getConfigKey("hw.file.maxsize").then(response => {//获取经度标识符
+      this.fileSize = response.msg;
+    });
+  },
+  computed: {
+    // 是否显示提示
+    showTip() {
+      return this.isShowTip && (this.fileType || this.fileSize);
+    },
+    formatRow() {
+      return (row) => {
+        // let languages = this.languages;
+        // for (let i = 0; i < languages.length; i++) {
+        //   if (languages[i].languageCode === row.languageCode) {
+        //     return languages[i].languageName;
+        //   }
+        // }
+      };
+    },
+  },
+  methods: {
+    /** 查询设备信息列表 */
+    getList() {
+      this.loading = true;
+      listDevice(this.queryParams).then(response => {
+        this.deviceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    getGatewayDeviceList() {
+      this.loading = true;
+      listDevice({"deviceType": 1}).then(response => {
+        this.gatewayDeviceList = response.rows;
+        this.loading = false;
+      });
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.subDeviceVisible = true;
+      this.deviceModeVisible = true;
+      this.deviceVisible = false;
+      this.form = {
+        deviceId: null,
+        deviceCode: null,
+        deviceName: null,
+        sceneId: null,
+        monitorUnitId: null,
+        deviceType: "2",
+        networkingMode: null,
+        accessProtocol: null,
+        dataFormat: null,
+        releatedDeviceId: null,
+        deviceModeId: null,
+        accessGwProtocol: null,
+        activeStatus: null,
+        deviceStatus: null,
+        activeTime: null,
+        devicePic: null,
+        ipAddress: null,
+        areaId: null,
+        deviceLocation: null,
+        currentModuleVersion: null,
+        currentSinglechipVersion: null,
+        remark: null,
+        tenantId: null,
+        onlineStatus: null
+      };
+      this.resetForm("form");
+      this.fileList = [];
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.deviceType = null;
+      this.queryParams.releatedDeviceId = null;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.deviceId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    getEditedScenes() {
+      getEditedScenes().then(response => {
+        this.editedScenes = response.data;
+      });
+    },
+    getProtocols(){
+      getProtocols().then(response => {
+        this.protocols = response.data;
+      });
+    },
+
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.getEditedDeviceModes();
+      this.getEditedScenes();
+      this.deviceTypeDisabled = false;
+      this.sceneDisabled = false;
+      this.deviceModeDisabled = false;
+      this.confirmBtnVisible = true;
+      this.reset();
+      this.open = true;
+      this.title = "添加设备信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.deviceModeDisabled = true;
+      this.confirmBtnVisible = true;
+      this.getEditedScenes();
+      this.deviceTypeDisabled = true;
+      this.sceneDisabled = true;
+      this.reset();
+      const deviceId = row.deviceId || this.ids
+      getDevice(deviceId).then(response => {
+        // if (response.data.deviceStatus === this.DEVICE_STATUS_PUBLISHED) {
+        //   this.confirmBtnVisible = false;
+        // }
+
+        // if (response.data.devicePic != null) {
+        //   let previewFile = {};
+        //   previewFile.url = response.data.devicePic
+        //   this.fileList.push(previewFile);
+        // }
+
+        this.getEditedMonitorTree(response.data.sceneId);
+        if (response.data.deviceType === this.DEVICE_TYPE_GATEWAY_DEVICE) {
+          this.subDeviceVisible = false;
+          this.deviceVisible = true;
+          this.deviceModeVisible = false;
+        } else if (response.data.deviceType === this.DEVICE_TYPE_DIRECT_CONNECT_DEVICE) {
+          this.subDeviceVisible = false;
+          this.deviceVisible = true;
+          this.deviceModeVisible = true;
+          this.getEditedDeviceModes(response.data.sceneId);
+        } else {
+          this.subDeviceVisible = true;
+          this.deviceVisible = false;
+          this.deviceModeVisible = true;
+          this.getEditedDeviceModes(response.data.sceneId);
+          this.getGatewayDevices(response.data.sceneId);
+        }
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改设备信息";
+      });
+    },
+
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          // if (this.form.deviceType === this.DEVICE_TYPE_GATEWAY_DEVICE || this.form.deviceType === this.DEVICE_TYPE_DIRECT_CONNECT_DEVICE) {
+          //   // if(this.form.net)
+          //   // networkingMode: [
+          //   //   {required: true, message: "联网方式(1:Wi-Fi，2、蜂窝(2G/3G/4G/5G),3、以太网，4、其他)不能为空", trigger: "blur"}
+          //   // ],
+          //   //   accessProtocol: [
+          //   //   {required: true, message: "接入协议不能为空", trigger: "blur"}
+          //   // ],
+          //   //   dataFormat: [
+          //   //   {required: true, message: "数据格式不能为空", trigger: "blur"}
+          //   // ],
+          // } else {
+          //   if (this.form.releatedDeviceId === null || this.form.releatedDeviceId === undefined
+          //     || this.form.releatedDeviceId === '') {
+          //     this.$modal.msgWarning("请选择关联网关");
+          //     return;
+          //   }
+          //   if (this.form.deviceModeId === null || this.form.deviceModeId === undefined
+          //     || this.form.deviceModeId === '') {
+          //     this.$modal.msgWarning("请选择设备模型");
+          //     return;
+          //   }
+          // }
+
+
+          if (this.form.deviceId != null) {
+            updateDevice(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDevice(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceId = row.deviceId;
+      const deviceType = row.deviceType;
+      const deviceCode = row.deviceCode;
+      this.$modal.confirm('是否确认删除设备信息ID为"' + deviceId + '"的数据项？').then(function () {
+        return delDevice(deviceId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/device/export', {
+        ...this.queryParams
+      }, `device_${new Date().getTime()}.xlsx`)
+    },
+
+
+    /**上传图片处理*/
+    // 上传前loading加载
+    handleBeforeUpload(file) {
+      let isImg = false;
+      if (this.fileType.length) {
+        let fileExtension = "";
+        if (file.name.lastIndexOf(".") > -1) {
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+        }
+        isImg = this.fileType.some(type => {
+          if (file.type.indexOf(type) > -1) return true;
+          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+          return false;
+        });
+      } else {
+        isImg = file.type.indexOf("image") > -1;
+      }
+
+      if (!isImg) {
+        this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`);
+        return false;
+      }
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$modal.msgError(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      this.$modal.loading("正在上传图片，请稍候...");
+      this.number++;
+    },
+
+    checkPicture(file) {
+
+    },
+
+    // 文件个数超出
+    handleExceed() {
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} !`);
+    },
+    // 上传成功回调
+    handleUploadSuccess(res, file) {
+      if (res.code === 200) {
+        this.uploadList.push(res.data.url);
+        this.uploadedSuccessfully();
+      } else {
+        this.number--;
+        this.$modal.closeLoading();
+        this.$modal.msgError(res.msg);
+        this.$refs.imageUpload.handleRemove(file);
+        this.uploadedSuccessfully();
+      }
+    },
+    // 上传结束处理
+    uploadedSuccessfully() {
+      if (this.number > 0 && this.uploadList.length === this.number) {
+        this.fileList = this.fileList.concat(this.uploadList);
+        this.uploadList = [];
+        this.number = 0;
+        this.form.devicePic = this.fileList[0];
+        // this.$emit("input", this.listToString(this.fileList));
+        this.$modal.closeLoading();
+      }
+    },
+
+    // 删除图片
+    handleDeletePicture(file) {
+      const findex = this.fileList.map(f => f.name).indexOf(file.name);
+      if (findex > -1) {
+        this.fileList.splice(findex, 1);
+        // this.$emit("input", this.listToString(this.fileList));
+      }
+      this.form.devicePic = '';
+    },
+    // 上传失败
+    handleUploadError() {
+      this.$modal.msgError("上传图片失败，请重试");
+      this.$modal.closeLoading();
+    },
+
+    // 预览
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    // 对象转成指定字符串分隔
+    listToString(list, separator) {
+      let strs = "";
+      separator = separator || ",";
+      for (let i in list) {
+        if (list[i].url) {
+          strs += list[i].url.replace(this.baseUrl, "") + separator;
+        }
+      }
+      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+    },
+
+    getMonitorTree(sceneId) {
+      getMonitorTree(sceneId).then(response => {
+        this.monitorUnits = response.data;
+      });
+    },
+
+    getDeviceModes(sceneId) {
+      getDeviceModes(sceneId).then(response => {
+        this.deviceModes = response.data;
+      });
+    },
+
+    getEditedMonitorTree(sceneId) {
+      getMonitorTree(sceneId).then(response => {
+        this.editedMonitorUnits = response.data;
+      });
+    },
+
+    getEditedDeviceModes(sceneId) {
+      getDeviceModes(sceneId).then(response => {
+        console.log(sceneId)
+        this.editedDeviceModes = response.data;
+      });
+    },
+
+    getGatewayDevices(sceneId) {
+      getGatewayDevices(sceneId).then(response => {
+        this.editedGatewayDevices = response.data;
+      });
+    },
+
+    sceneChange(sceneId) {
+      this.queryParams.monitorUnitId = null;
+      this.queryParams.deviceModeId = null;
+      this.getMonitorTree(sceneId);
+      this.getDeviceModes(sceneId);
+    },
+
+    editedSceneChange(sceneId) {
+      this.editedMonitorUnits = [];
+      this.editedDeviceModes = [];
+      this.editedGatewayDevices = [];
+      this.form.monitorUnitId = null;
+      this.form.deviceModeId = null;
+      this.form.releatedDeviceId = null;
+      this.getEditedMonitorTree(sceneId);
+      this.getEditedDeviceModes(sceneId);
+      this.getGatewayDevices(sceneId);
+    },
+
+    deviceTypeChange(deviceType) {
+      if (deviceType === this.DEVICE_TYPE_GATEWAY_DEVICE || deviceType === this.DEVICE_TYPE_DIRECT_CONNECT_DEVICE) {
+        this.form.releatedDeviceId = null;
+        this.form.deviceModeId = null;
+        this.form.accessProtocol = this.DEVICE_ACCESS_PROTOCOL_MQTT;
+        this.form.networkingMode = this.DEVICE_NETWORKING_MODE_WIFI;
+        this.form.dataFormat = this.DEVICE_DATA_FORMAT_JSON;
+        this.deviceVisible = true;
+        this.subDeviceVisible = false;
+
+        this.deviceModeVisible = deviceType === this.DEVICE_TYPE_DIRECT_CONNECT_DEVICE;
+      } else {
+        this.form.networkingMode = null;
+        this.form.accessProtocol = null;
+        this.form.dataFormat = null;
+        this.subDeviceVisible = true;
+        this.deviceModeVisible = true;
+        this.deviceVisible = false;
+      }
+    },
+
+    monitorUnitSelect(node) {
+      if (node.children !== undefined) {
+        this.form.monitorUnitId = null;
+        this.$modal.msgWarning("请选择子级监控单元");
+      }
+    },
+
+    normalizer(node) {
+      return {
+        id: node.id,
+        label: node.label,
+        children: node.children,
+        isDisabled: node.children !== undefined
+      };
+
+      // if (!node.children) {
+      //   return {
+      //     id: node.monitorUnitId,
+      //     label: node.monitorUnitName
+      //   };
+      // }
+
+    },
+
+    // 设备状态修改
+    handleDeviceStatusChange(row) {
+      // if(row.deviceStatus==='1' && row.activeStatus === '0'){
+      //   this.$modal.msgSuccess("激活后才能修改为发布状态");
+      //   row.deviceStatus = row.deviceStatus === "0" ? "1" : "0";
+      //   return;
+      // }
+      let text = row.deviceStatus === "0" ? "测试" : "发布";
+      this.$modal.confirm('确认要改为' + text + '状态吗？').then(function () {
+        return changeDeviceStatus(row.deviceId, row.deviceStatus);
+      }).then(() => {
+        this.$modal.msgSuccess("修改状态成功");
+      }).catch(function () {
+        row.deviceStatus = row.deviceStatus === "0" ? "1" : "0";
+      });
+    },
+
+    publishControlCommand(row, type, typeName) {
+      this.$modal.confirm('确认要下发指令' + typeName + '么？').then(function () {
+        return publishControlCommand(row.deviceId, type);
+      }).then(() => {
+        this.$modal.msgSuccess("下发指令成功");
+      })
+    },
+    /** 重建表按钮操作 */
+    handleRebuildTdTables() {
+      this.$modal.confirm('是否确认重建所有设备监测数据表？').then(function () {
+        return rebuildTdTables();
+      }).then(() => {
+        this.$modal.msgSuccess("重建成功");
+      }).catch(() => {
+      });
+    },
+
+
+    uploadEditedSceneChange(sceneId) {
+      const selectedOption = this.editedScenes.find(option => option.sceneId === sceneId);
+      this.upload.sceneName = selectedOption.sceneName;
+    },
+
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "设备导入";
+      this.upload.open = true;
+      this.getEditedScenes();
+    },
+    // /** 下载模板操作 */
+    importTemplate() {
+      this.$refs["uploadForm"].validate(valid => {
+        if (valid) {
+          this.download('business/device/importTemplate', {"sceneId": this.upload.sceneId}, `device_template_` + this.upload.sceneName + `_${new Date().getTime()}.xlsx`)
+        }
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs["uploadForm"].validate(valid => {
+        if (valid) {
+          this.$refs.upload.submit();
+        }
+      });
+    },
+
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.deviceName.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deviceType = this.DEVICE_TYPE_GATEWAY_SUB_EQUIPMENT;
+      this.queryParams.releatedDeviceId = data.deviceId;
+      this.handleQuery();
+    },
+
+    toggleDeviceClick() {
+      if (this.toggleLeftDisplay) {
+        this.toggleRightDisplay = true;
+        this.toggleLeftDisplay = false;
+      } else if (this.toggleRightDisplay) {
+        this.toggleRightDisplay = false;
+        this.toggleLeftDisplay = true;
+      }
+    }
+
+  }
+};
+</script>
+<style scoped>
+/*.hamburger {*/
+/*  display: inline-block;*/
+/*  width: 20px;*/
+/*  height: 20px;*/
+/*  vertical-align: middle;*/
+/*  margin: 5px 5px 0 0;*/
+/*  cursor: pointer;*/
+/*}*/
+</style>
diff --git a/ruoyi-ui/src/views/plc/plcModel/editDeviceMode.vue b/ruoyi-ui/src/views/plc/plcModel/editDeviceMode.vue
new file mode 100644
index 0000000..0ef6783
--- /dev/null
+++ b/ruoyi-ui/src/views/plc/plcModel/editDeviceMode.vue
@@ -0,0 +1,885 @@
+<template>
+
+  <div class="app-container">
+    <el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="150px">
+      <el-form-item label="通用标识" prop="commonFlag" v-if="false">
+        <el-input placeholder="请选择通用标识" v-model="info.commonFlag"/>
+      </el-form-item>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="模型名称" prop="deviceModeName">
+            <el-input placeholder="请输入模型名称" v-model="info.deviceModeName"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属场景" prop="sceneId">
+            <el-select v-model="info.sceneId" placeholder="请选择" :disabled="disabled">
+              <el-option
+                v-for="(scene, index) in scenes"
+                :key="index"
+                :label="scene.sceneName"
+                :value="scene.sceneId"
+                :disabled="scene.selectedDisable && scene.selectedDisable == 1"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="定位标识" prop="gpsFlag">-->
+<!--            <el-radio-group v-model="info.gpsFlag" @input="gpsFlagRadioChange" :disabled="disabled">-->
+<!--              <el-radio-->
+<!--                v-for="dict in dict.type.hw_device_mode_gps_flag"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.value"-->
+<!--                v-model="gps_flag"-->
+<!--              >{{ dict.label }}-->
+<!--              </el-radio>-->
+<!--            </el-radio-group>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="模型分类" prop="modeClassfication">-->
+<!--            <el-select v-model="info.modeClassfication" placeholder="请选择数据类型">-->
+<!--              <el-option-->
+<!--                v-for="dict in dict.type.hw_mode_function_mode_classfication"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="parseInt(dict.value)"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+        <el-col :span="24">
+          <el-form-item label="语言" prop="language_code" v-if="false">
+            <el-select v-model="info.languageCode" placeholder="请选择">
+              <el-option
+                v-for="(language, index) in languages"
+                :key="index"
+                :label="language.languageName"
+                :value="language.languageCode"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="设备模型图片" prop="deviceModePic">
+            <el-upload
+              single
+              :action="uploadImgUrl"
+              list-type="picture-card"
+              :limit="limit"
+              :on-success="handleUploadSuccess"
+              :before-upload="handleBeforeUpload"
+              :on-error="handleUploadError"
+              :on-exceed="handleExceed"
+              ref="imageUpload"
+              :on-remove="handleDeletePicture"
+              :show-file-list="true"
+              :headers="headers"
+              :file-list="fileList"
+              :on-preview="handlePictureCardPreview"
+              :class="{hide: this.fileList.length >= 1}"
+            >
+              <i class="el-icon-plus"></i>
+            </el-upload>
+
+            <!-- 上传提示 -->
+            <div class="el-upload__tip" slot="tip" v-if="showTip">
+              请上传
+              <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
+              <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b></template>
+              的文件
+            </div>
+
+            <el-dialog
+              :visible.sync="dialogVisible"
+              title="预览"
+              width="800"
+              append-to-body
+            >
+              <img
+                :src="dialogImageUrl"
+                style="display: block; max-width: 100%; margin: 0 auto"
+              />
+            </el-dialog>
+          </el-form-item>
+        </el-col>
+
+
+      </el-row>
+    </el-form>
+
+    <el-card>
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="属性" name="attributesInfo">
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button
+                type="primary"
+                plain
+                icon="el-icon-plus"
+                size="mini"
+                @click="handleAdd"
+              >新增
+              </el-button>
+            </el-col>
+          </el-row>
+
+          <el-table ref="attributesTable" :data="attributesData" row-key="columnId">
+            <el-table-column label="序号" type="index" min-width="5%" class-name="allowDrag"/>
+<!--            <el-table-column-->
+<!--              label="功能模式"-->
+<!--              prop="functionMode"-->
+<!--              v-if="false"-->
+<!--            />-->
+<!--            <el-table-column-->
+<!--              label="定位坐标标识"-->
+<!--              prop="coordinate"-->
+<!--              v-if="false"-->
+<!--            />-->
+            <el-table-column
+              label="描述"
+              prop="remark"
+              v-if="false"
+            />
+
+<!--            <el-table-column-->
+<!--              label="功能类型"-->
+<!--              prop="functionType"-->
+<!--              min-width="10%">-->
+
+<!--              <template slot-scope="scope">-->
+<!--                <dict-tag :options="dict.type.hw_mode_function_function_type" :value="scope.row.functionType"/>-->
+<!--              </template>-->
+
+<!--            </el-table-column>-->
+
+            <el-table-column
+              label="功能名称"
+              prop="functionName"
+              min-width="10%"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="标识符"
+              prop="functionIdentifier"
+              min-width="10%"
+              :show-overflow-tooltip="true"
+            />
+
+            <el-table-column prop="dataType" label="数据类型" min-width="10%">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.hw_mode_function_data_type" :value="scope.row.dataType"/>
+              </template>
+            </el-table-column>
+
+
+            <el-table-column
+              label="数据定义"
+              prop="dataDefinition"
+              min-width="10%"
+              :show-overflow-tooltip="true"
+              v-if="false"
+            />
+
+            <el-table-column
+              label="单位"
+              prop="propertyUnit"
+              min-width="10%"
+              :show-overflow-tooltip="true"
+            />
+
+<!--            <el-table-column-->
+<!--              label="读写权限"-->
+<!--              prop="rwFlag"-->
+<!--              min-width="10%"-->
+<!--              :show-overflow-tooltip="true"-->
+<!--            >-->
+<!--              <template slot-scope="scope">-->
+<!--                <dict-tag :options="dict.type.hw_mode_function_rw_flag" :value="scope.row.rwFlag"/>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+
+<!--            <el-table-column-->
+<!--              label="显示"-->
+<!--              prop="displayFlag"-->
+<!--              min-width="10%"-->
+<!--              :show-overflow-tooltip="true"-->
+<!--            >-->
+<!--              <template slot-scope="scope">-->
+<!--                <dict-tag :options="dict.type.hw_mode_function_display_flag" :value="scope.row.displayFlag"/>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+
+            <el-table-column label="操作" align="center" min-width="10%">
+              <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  v-if="scope.row.coordinate==null"
+                  @click="handleUpdateAttribute(scope.row)"
+                >修改
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  v-if="scope.row.coordinate==null"
+                  @click="handleDeleteAttribute(scope.row)"
+                >删除
+                </el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
+
+
+          <!-- 添加或修改设备模型功能对话框 -->
+          <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+            <el-form ref="modeFunctionForm" :model="form" :rules="modeFunctionRules" label-width="80px">
+<!--              <el-form-item label="功能模式" prop="functionMode" v-show="false">-->
+<!--                <el-input v-model="form.functionMode" placeholder="请输入功能模式"/>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="功能类型" prop="functionType">-->
+<!--                <el-select v-model="form.functionType" placeholder="请选择功能类型">-->
+<!--                  <el-option-->
+<!--                    v-for="dict in dict.type.hw_mode_function_function_type"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.label"-->
+<!--                    :value="dict.value"-->
+<!--                  ></el-option>-->
+<!--                </el-select>-->
+
+<!--              </el-form-item>-->
+
+              <el-form-item label="功能名称" prop="functionName">
+                <el-input v-model="form.functionName" placeholder="请输入功能名称" maxlength="30"/>
+              </el-form-item>
+              <el-form-item label="标识符" prop="functionIdentifier">
+                <el-input v-model="form.functionIdentifier" placeholder="请输入标识符" maxlength="30"
+                          :disabled="editDisable"/>
+              </el-form-item>
+
+              <el-form-item label="数据类型" prop="dataType">
+                <el-select v-model="form.dataType" placeholder="请选择数据类型" :disabled="editDisable">
+                  <el-option
+                    v-for="dict in dict.type.hw_mode_function_data_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="取值范围" prop="dataDefinition" v-show="false">
+                <el-input v-model="form.minValue" placeholder="请输入最小值" style="width:150px;"/>
+                ——
+                <el-input v-model="form.maxValue" placeholder="请输入最大值" style="width:150px;"/>
+              </el-form-item>
+
+              <el-form-item label="布尔值" prop="dataDefinition" v-show="form.dataType == '8'">
+                0——
+                <el-input v-model="form.boolFalse" placeholder="请输入值" style="width:150px;"/>
+              </el-form-item>
+              <el-form-item label="" prop="dataDefinition" v-show="form.dataType == '8'">
+                1——
+                <el-input v-model="form.boolTrue" placeholder="请输入值" style="width:150px;"/>
+              </el-form-item>
+
+              <el-form-item label="长度" prop="dataDefinition" v-show="form.dataType == '10'">
+                <el-input-number v-model="form.dataDefinition" placeholder="请输入最大长度" :min="10" :max="1000"
+                                 style="width:150px;"/>
+              </el-form-item>
+
+
+              <el-form-item label="单位" prop="propertyUnit">
+                <el-input v-model="form.propertyUnit" placeholder="请输入单位"/>
+              </el-form-item>
+<!--              <el-form-item label="显示标识" prop="displayFlag">-->
+<!--                <el-radio-group v-model="form.displayFlag">-->
+<!--                  <el-radio-->
+<!--                    v-for="dict in dict.type.hw_mode_function_display_flag"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.value"-->
+<!--                  >{{ dict.label }}-->
+<!--                  </el-radio>-->
+<!--                </el-radio-group>-->
+
+<!--              </el-form-item>-->
+<!--              <el-form-item label="读写标识" prop="rwFlag">-->
+<!--                <el-radio-group v-model="form.rwFlag">-->
+<!--                  <el-radio-->
+<!--                    v-for="dict in dict.type.hw_mode_function_rw_flag"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.value"-->
+<!--                  >{{ dict.label }}-->
+<!--                  </el-radio>-->
+<!--                </el-radio-group>-->
+<!--              </el-form-item>-->
+              <el-form-item label="描述" prop="remark">
+                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitDeviceModeFunctionForm">确 定</el-button>
+              <el-button @click="cancel">取 消</el-button>
+            </div>
+          </el-dialog>
+
+
+        </el-tab-pane>
+<!--        <el-tab-pane label="服务" name="servicesInfo">-->
+<!--          <device-mode-service ref="servicesTable" :servicesData="servicesData" :deviceModeId="deviceModeId"/>-->
+<!--        </el-tab-pane>-->
+<!--        <el-tab-pane label="事件" name="eventsInfo">-->
+<!--          <device-mode-event ref="eventInfo" :eventsData="eventsData" :deviceModeId="deviceModeId"/>-->
+<!--        </el-tab-pane>-->
+      </el-tabs>
+      <el-form label-width="100px">
+        <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
+          <el-button type="primary" @click="submitForm()">提交</el-button>
+          <el-button @click="close()">返回</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {addDeviceMode, getDeviceMode, updateDeviceMode, getEditedScenes,addDeviceModeFunction,delDeviceModeFunction,
+  updateDeviceModeFunction} from "@/api/plc/plcDeviceMode";
+import {getToken} from "@/utils/auth";
+
+export default {
+  dicts: ['hw_device_mode_gps_flag', 'hw_mode_function_mode_classfication', 'hw_mode_function_function_type', 'hw_mode_function_function_type', 'hw_mode_function_data_type', 'hw_mode_function_display_flag', 'hw_mode_function_rw_flag'],
+  components: {
+  },
+  props: {
+    value: [String, Object, Array],
+    // 图片数量限制
+    limit: {
+      type: Number,
+      default: 1,
+    },
+    // 大小限制(MB)
+    fileSize: {
+      type: Number,
+      default: 5,
+    },
+    // 文件类型, 例如['png', 'jpg', 'jpeg']
+    fileType: {
+      type: Array,
+      default: () => ["png", "jpg", "jpeg"],
+    },
+    // 是否显示提示
+    isShowTip: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      info: {},
+      // 弹出层标题
+      title: "",
+      // 表单参数
+      form: {},
+
+      editedForm: {},
+
+      gps_flag: '',
+      // 是否显示弹出层
+      open: false,
+      disabled: true,
+      rules: {
+        deviceModeName: [{
+          required: true,
+          message: '请输入模型名称',
+          trigger: 'blur'
+        }],
+        sceneId: [
+          {required: true, message: "请选择场景", trigger: "change"}
+        ],
+        gpsFlag: [
+          {required: true, message: "请选择定位标识", trigger: "change"}
+        ],
+      },
+      modeFunctionRules: {
+        functionType: [
+          {required: true, message: "请选择功能类型", trigger: "blur"},
+
+        ],
+        functionName: [
+          {required: true, message: "请输入功能名称", trigger: "blur"}
+        ],
+        functionIdentifier: [
+          {required: true, message: "请输入标识符", trigger: "blur"},
+          {
+            pattern: /^[a-z][a-z0-9_]+$/,
+            message: "2-30个字符，由小写字母、数字或下划线组成，开头必须为小写字母",
+            trigger: "blur"
+          }
+        ],
+        dataType: [
+          {required: true, message: "请选择数据类型", trigger: "change"}
+        ],
+        displayFlag: [
+          {required: true, message: "请选择显示标识", trigger: "change"}
+        ],
+        rwFlag: [
+          {required: true, message: "请选择读写标识", trigger: "change"}
+        ],
+      },
+      // 选中选项卡的 name
+      activeName: "attributesInfo",
+
+      //场景列表
+      scenes: [],
+
+      //语言列表
+      languages: [],
+
+      //经度标识符
+      IDENTIFIER_LONGITUDE: 'longitude',
+
+      //纬度标识符
+      IDENTIFIER_LATITUDE: 'latitude',
+
+      editDisable: true,
+      //设备模型ID
+      deviceModeId: '',
+      //属性的列表值。数组
+      attributesData: [],
+      attributeDataIndex: -1,//待编辑的行的数组index
+      //服务的列表值。数组
+      servicesData: [],
+      //事件的列表值。数组
+      eventsData: [],
+
+      // 表格的高度
+      tableHeight: document.documentElement.scrollHeight - 245 + "px",
+
+
+      number: 0,
+      uploadList: [],
+      dialogImageUrl: "",
+      dialogVisible: false,
+      hideUpload: false,
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      fileList: [],
+
+    }
+  },
+  created() {
+    this.getConfigKey("hw.gps.longitude").then(response => {//获取经度标识符
+      this.IDENTIFIER_LONGITUDE = response.msg;
+    });
+    this.getConfigKey("hw.gps.latitude").then(response => {//获取纬度标识符
+      this.IDENTIFIER_LATITUDE = response.msg;
+    });
+
+    // getLanguages().then(response => {
+    //   this.languages = response.data;
+    // });
+
+    getEditedScenes().then(response => {
+      this.scenes = response.data;
+    });
+
+    this.eventsData = [];
+    this.servicesData = [];
+    this.attributesData = [];
+
+    const deviceModeId = this.$route.params && this.$route.params.deviceModeId;
+    if (deviceModeId) {
+      // 获取表详细信息
+      getDeviceMode(deviceModeId).then(res => {
+        console.log(deviceModeId)
+        this.info = res.data.deviceMode;
+        console.log(this.info)
+        this.attributesData = res.data.deviceModeFunctionMap;
+        const servicesData = (res.data.deviceModeFunctionMap)['2'];
+        const eventsData = (res.data.deviceModeFunctionMap)['3'];
+        if(servicesData != null && servicesData!==''){
+          this.servicesData =servicesData;
+        }
+        if(servicesData != null && eventsData!==''){
+          this.eventsData =eventsData;
+        }
+        this.deviceModeId = deviceModeId;
+        if (res.data.deviceMode.deviceModePic != null) {
+          let previewFile = {};
+          previewFile.url = res.data.deviceMode.deviceModePic
+          this.fileList.push(previewFile);
+        }
+
+        // this.columns = res.data.rows;
+      });
+      /** 查询字典下拉列表 */
+      // getDictOptionselect().then(response => {
+      //   this.dictOptions = response.data;
+      // });
+    } else {
+      //初始化设备模型的数据
+      this.info = {
+        gpsFlag: "0",
+        commonFlag: "0"
+      };
+      this.gps_flag = "0"
+      this.disabled = false;
+
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {
+  },
+  methods: {
+    // 定位标识单选按钮值变化时
+    gpsFlagRadioChange(value) {
+      if (parseInt(value) === 1) {//定位传感器
+        let attributesData = this.attributesData;
+        if (attributesData.length > 0) {
+          this.$modal.confirm('修改定位标识会删除所有属性，确定修改定位标识么？').then(function () {
+            attributesData.splice(0, attributesData.length);
+          }).then(() => {
+            this.addGpsAttribute();
+          });
+        } else {
+          this.addGpsAttribute();
+        }
+
+      } else {
+        let attributesData = this.attributesData;
+        if (attributesData.length > 0) {
+          this.$modal.confirm('修改定位标识会删除所有属性，确定修改定位标识么？').then(function () {
+            attributesData.splice(0, attributesData.length);
+          });
+        }
+      }
+    },
+
+    addGpsAttribute() {
+      this.reset();
+      this.form.coordinate = "1"
+      this.form.functionIdentifier = this.IDENTIFIER_LONGITUDE;
+      this.form.functionName = "经度";
+      this.form.dataType = 5;
+
+      this.attributesData.push(this.form);
+      this.reset();
+      this.form.coordinate = "2"
+      this.form.functionIdentifier = this.IDENTIFIER_LATITUDE;
+      this.form.functionName = "纬度";
+      this.form.dataType = 5;
+      this.attributesData.push(this.form);
+    },
+    /** 新增属性按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.editDisable = false;
+      this.open = true;
+      this.title = "添加设备模型属性";
+    },
+    // 设备属性表单重置
+    reset() {
+      this.form = {
+        functionMode: '1',
+        modeFunctionId: null,
+        deviceModeId: null,
+        coordinate: null,
+        functionName: null,
+        functionIdentifier: null,
+        functionType: "1",//默认直采变量
+        dataType: "2",//默认int类型
+        dataDefinition: null,
+        functionFormula: null,
+        propertyUnit: null,
+        displayFlag: "1",//默认显示
+        rwFlag: "2",//默认只读
+        boolFalse: '',
+        boolTrue: '',
+        minValue: '',
+        maxValue: '',
+        invokeMethod: null,
+        eventType: null,
+        remark: null,
+      };
+
+      //this.resetForm("modeFunctionForm");
+    },
+    handleUpdateAttribute(row) {
+      // this.reset();
+      this.editDisable = true;
+      this.attributeDataIndex = this.attributesData.indexOf(row);
+      this.convertParameterDefinition(row);
+      this.form = JSON.parse(JSON.stringify(row));//需要深拷贝。如果直接等于，则在编辑时，数组直接变化
+      this.open = true;
+      this.title = "修改设备模型属性";
+    },
+
+    convertParameterDefinition(row) {
+      let dataType = row.dataType;
+      if (parseInt(dataType) === 8) {
+        let dataDefinitionJson = JSON.parse(row.dataDefinition)
+        row.boolFalse = dataDefinitionJson["0"];
+        row.boolTrue = dataDefinitionJson["1"];
+      }
+      row.dataType = dataType.toString();
+    },
+
+    handleDeleteAttribute(row) {
+      console.log(row.modeFunctionId)
+      if (row.modeFunctionId !== null) {
+        if (this.attributesData.length <= 1) {
+          this.$modal.msgWarning("最少一个属性");
+          return;
+        }
+        this.$modal.confirm('删除属性之前上报此属性的数据会清除，确认要删除么？').then(() => {
+          delDeviceModeFunction(row.modeFunctionId).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            if (res.code === 200) {
+              this.attributesData.splice(this.attributesData.indexOf(row), 1);
+            }
+          });
+        })
+      } else {
+        console.log(row.modeFunctionId)
+        this.attributesData.splice(this.attributesData.indexOf(row), 1);
+      }
+
+    },
+
+    /** 关闭按钮 */
+    close() {
+//      alert(this.$route.query.pageNum);
+      const obj = {path: "/plc/model", query: {t: Date.now(), pageNum: this.$route.query.pageNum}};
+      this.$tab.closeOpenPage(obj);
+    },
+
+
+    submitDeviceModeFunctionForm() {
+      this.$refs['modeFunctionForm'].validate(valid => {
+        if (valid) {
+          /** 设备模型添加后在list中添加 */
+          //alert(this.minValue+"--"+this.maxValue)
+          if (this.form.dataType === "8") {
+            let boolFalse = this.form.boolFalse;
+            let boolTrue = this.form.boolTrue;
+            if (boolFalse === '' || boolTrue === '') {
+              this.$modal.msgError("请输入布尔值");
+              return;
+            } else {
+              this.form.dataDefinition = '{"0":"' + boolFalse + '","1":"' + boolTrue + '"}';
+            }
+          }
+
+          if (this.deviceModeId && this.deviceModeId !== '') {
+            let modeFunctionId = this.form.modeFunctionId;
+            this.form.deviceModeId = this.deviceModeId;
+            if (modeFunctionId !== undefined && modeFunctionId != null) {
+              let attributeDataIndex = this.attributeDataIndex;
+              let oldForm = this.attributesData[attributeDataIndex];
+              if (oldForm.functionIdentifier != this.form.functionIdentifier
+                || oldForm.dataType != this.form.dataType) {
+                this.$modal.confirm('修改标识符或数据类型，之前上报数据会清除，确认要修改么？').then(() => {
+                    return this.doUpdateDeviceModeFunction();
+                  }
+                )
+
+              } else {
+                // console.log(res)
+                this.doUpdateDeviceModeFunction();
+              }
+
+
+            } else {
+              console.log(1)
+              addDeviceModeFunction(this.form).then(res => {
+                console.log(res)
+                this.$modal.msgSuccess(res.msg);
+                if (res.code === 200) {
+                  this.open = false;
+                  this.form.modeFunctionId = res.data;
+                  this.pushData();
+                }
+              });
+            }
+          } else {
+            this.open = false;
+            this.pushData();
+          }
+        }
+      })
+    },
+
+    doUpdateDeviceModeFunction() {
+      updateDeviceModeFunction(this.form).then(res => {
+        this.$modal.msgSuccess(res.msg);
+        if (res.code === 200) {
+          this.open = false;
+          this.pushData();
+        }
+      });
+    },
+
+    pushData() {
+      let attributeDataIndex = this.attributeDataIndex;
+
+      if (attributeDataIndex > -1) {
+        this.attributeDataIndex = -1;
+        this.attributesData.splice(attributeDataIndex, 1, this.form);
+      } else {
+        this.attributesData.push(this.form)
+      }
+
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+
+    submitForm() {
+      this.$refs['basicInfoForm'].validate(valid => {
+        if (valid) {
+          if (this.info.deviceModeId != undefined) {
+            updateDeviceMode(this.info).then(res => {
+              this.$modal.msgSuccess(res.msg);
+              if (res.code === 200) {
+                this.close();
+              }
+            });
+          } else {
+            if (this.attributesData.length <= 0) {
+              this.$modal.msgError("请添加属性");
+              return;
+            }
+
+            let functionData = this.servicesData.concat(this.attributesData);
+            functionData = functionData.concat(this.eventsData)
+            console.log(functionData)
+            this.info.functionList = functionData;
+            addDeviceMode(this.info).then(res => {
+              this.$modal.msgSuccess(res.msg);
+              if (res.code === 200) {
+                this.close();
+              }
+            });
+          }
+        }
+      })
+    },
+
+    /**上传图片处理*/
+    // 上传前loading加载
+    handleBeforeUpload(file) {
+      let isImg = false;
+      if (this.fileType.length) {
+        let fileExtension = "";
+        if (file.name.lastIndexOf(".") > -1) {
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+        }
+        isImg = this.fileType.some(type => {
+          if (file.type.indexOf(type) > -1) return true;
+          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+          return false;
+        });
+      } else {
+        isImg = file.type.indexOf("image") > -1;
+      }
+
+      if (!isImg) {
+        this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`);
+        return false;
+      }
+      if (this.fileSize) {
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        if (!isLt) {
+          this.$modal.msgError(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
+          return false;
+        }
+      }
+      this.$modal.loading("正在上传图片，请稍候...");
+      this.number++;
+    },
+
+    checkPicture(file) {
+
+    },
+
+    // 文件个数超出
+    handleExceed() {
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} !`);
+    },
+    // 上传成功回调
+    handleUploadSuccess(res, file) {
+      if (res.code === 200) {
+        this.uploadList.push(res.data.url);
+        this.uploadedSuccessfully();
+      } else {
+        this.number--;
+        this.$modal.closeLoading();
+        this.$modal.msgError(res.msg);
+        this.$refs.imageUpload.handleRemove(file);
+        this.uploadedSuccessfully();
+      }
+    },
+    // 上传结束处理
+    uploadedSuccessfully() {
+      if (this.number > 0 && this.uploadList.length === this.number) {
+        this.fileList = this.fileList.concat(this.uploadList);
+        this.uploadList = [];
+        this.number = 0;
+        this.info.deviceModePic = this.fileList[0];
+        // this.$emit("input", this.listToString(this.fileList));
+        this.$modal.closeLoading();
+      }
+    },
+
+    // 删除图片
+    handleDeletePicture(file) {
+      const findex = this.fileList.map(f => f.name).indexOf(file.name);
+      if (findex > -1) {
+        this.fileList.splice(findex, 1);
+        // this.$emit("input", this.listToString(this.fileList));
+      }
+      this.info.deviceModePic = '';
+    },
+    // 上传失败
+    handleUploadError() {
+      this.$modal.msgError("上传图片失败，请重试");
+      this.$modal.closeLoading();
+    },
+
+    // 预览
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    // 对象转成指定字符串分隔
+    listToString(list, separator) {
+      let strs = "";
+      separator = separator || ",";
+      for (let i in list) {
+        if (list[i].url) {
+          strs += list[i].url.replace(this.baseUrl, "") + separator;
+        }
+      }
+      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+    },
+
+  },
+
+
+}
+
+</script>
diff --git a/ruoyi-ui/src/views/plc/plcModel/index.vue b/ruoyi-ui/src/views/plc/plcModel/index.vue
new file mode 100644
index 0000000..bb4f2a5
--- /dev/null
+++ b/ruoyi-ui/src/views/plc/plcModel/index.vue
@@ -0,0 +1,417 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="模型名称" prop="deviceModeName">
+        <el-input
+          v-model="queryParams.deviceModeName"
+          placeholder="请输入模型名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属场景" prop="sceneId">
+        <el-select v-model="queryParams.sceneId" placeholder="请选择所属场景">
+          <el-option
+            v-for="(scene, index) in scenes"
+            :key="index"
+            :label="scene.sceneName"
+            :value="scene.sceneId"
+          ></el-option>
+        </el-select>
+
+      </el-form-item>
+<!--      <el-form-item label="定位标识" prop="gpsFlag">-->
+<!--        <el-select v-model="queryParams.gpsFlag" placeholder="请选择定位标识" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.hw_device_mode_gps_flag"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          ></el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="模型分类" prop="modeClassfication">-->
+<!--        <el-select v-model="queryParams.modeClassfication" placeholder="请选择模型分类" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.hw_mode_function_mode_classfication"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          ></el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:deviceMode:add']"
+        >新增
+        </el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['business:deviceMode:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['business:deviceMode:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleRebuildTdSuperTables"-->
+<!--          v-hasPermi="['business:deviceMode:rebuild']"-->
+<!--        >重建超级表-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deviceModeList" @selection-change="handleSelectionChange">
+      <el-table-column label="模型ID" align="center" prop="deviceModeId"/>
+      <el-table-column label="模型名称" align="center" prop="deviceModeName"/>
+      <el-table-column label="所属租户" align="center" prop="tenantName"/>
+      <el-table-column label="所属场景" align="center" prop="sceneName"/>
+<!--      <el-table-column label="定位标识" align="center" prop="gpsFlag">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.hw_device_mode_gps_flag" :value="scope.row.gpsFlag"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="模型分类" align="center" prop="modeClassfication">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.hw_mode_function_mode_classfication" :value="scope.row.modeClassfication"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:deviceMode:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:deviceMode:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import {listDeviceMode, getDeviceMode, delDeviceMode, addDeviceMode, updateDeviceMode,getScenes,rebuildTdSuperTables} from "@/api/plc/plcDeviceMode";
+import {getLanguages} from "@/api/basic/language";
+
+export default {
+  dicts: ['hw_device_mode_gps_flag', 'hw_mode_function_mode_classfication'],
+  name: "DeviceMode",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 子表选中数据
+      checkedHwDeviceModeFunction: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备模型表格数据
+      deviceModeList: [],
+      // 设备模型功能表格数据
+      hwDeviceModeFunctionList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+
+      //场景列表
+      scenes: [],
+      //语言列表
+      languages: [],
+
+
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceModeName: null,
+        tenantId: null,
+        sceneId: null,
+        languageCode: null,
+        gpsFlag: null,
+        deviceModeStatus: null,
+        commonFlag: null,
+        modeClassfication: null,
+        deviceModePic: null,
+        dataVerifyLevel: null,
+        deviceModeField: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        deviceModeName: [
+          {required: true, message: "设备模型名称不能为空", trigger: "blur"}
+        ],
+        gpsFlag: [
+          {required: true, message: "定位标识不能为空", trigger: "blur"}
+        ],
+        deviceModeStatus: [
+          {required: true, message: "设备模型状态不能为空", trigger: "change"}
+        ],
+        commonFlag: [
+          {required: true, message: "是否通用物模型不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    getLanguages().then(response => {
+      this.languages = response.data;
+    });
+
+    getScenes().then(response => {
+      this.scenes = response.data;
+    });
+  },
+  computed: {
+    formatRow() {
+      return (row) => {
+        let languages = this.languages;
+        for (let i = 0; i < languages.length; i++) {
+          if (languages[i].languageCode === row.languageCode) {
+            return languages[i].languageName;
+          }
+        }
+      };
+    },
+  },
+
+  activated() {
+    const time = this.$route.query.t;
+    if (time != null && time != this.uniqueId) {
+      this.uniqueId = time;
+      this.queryParams.pageNum = Number(this.$route.query.pageNum);
+      this.getList();
+    }
+  },
+
+  methods: {
+    /** 查询设备模型列表 */
+    getList() {
+      this.loading = true;
+      listDeviceMode(this.queryParams).then(response => {
+        this.deviceModeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        deviceModeId: null,
+        deviceModeName: null,
+        tenantId: null,
+        sceneId: null,
+        languageCode: null,
+        gpsFlag: null,
+        deviceModeStatus: null,
+        commonFlag: null,
+        modeClassfication: null,
+        deviceModePic: null,
+        dataVerifyLevel: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        deviceModeField: null
+      };
+      this.hwDeviceModeFunctionList = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.deviceModeId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      const params = {pageNum: this.queryParams.pageNum};
+      this.$tab.openPage("添加设备模型", '/plcDeviceMode/mode-add/index', params);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const deviceModeId = row.deviceModeId || this.ids
+      const deviceModeName = row.deviceModeName || this.tableNames[0];
+      const params = {pageNum: this.queryParams.pageNum};
+      this.$tab.openPage("修改设备模型[" + deviceModeName + "]", '/plcDeviceMode/mode-edit/index/' + deviceModeId, params);
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.hwDeviceModeFunctionList = this.hwDeviceModeFunctionList;
+          if (this.form.deviceModeId != null) {
+            updateDeviceMode(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDeviceMode(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceModeIds = row.deviceModeId || this.ids;
+      this.$modal.confirm('是否确认删除设备模型ID为"' + deviceModeIds + '"的数据项？').then(function () {
+        return delDeviceMode(deviceModeIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 设备模型功能序号 */
+    rowHwDeviceModeFunctionIndex({row, rowIndex}) {
+      row.index = rowIndex + 1;
+    },
+    /** 设备模型功能添加按钮操作 */
+    handleAddHwDeviceModeFunction() {
+      let obj = {};
+      obj.functionMode = "";
+      obj.coordinate = "";
+      obj.functionName = "";
+      obj.functionIdentifier = "";
+      obj.functionType = "";
+      obj.dataType = "";
+      obj.dataDefinition = "";
+      obj.functionFormula = "";
+      obj.propertyUnit = "";
+      obj.displayFlag = "";
+      obj.rwFlag = "";
+      obj.invokeMethod = "";
+      obj.eventType = "";
+      obj.remark = "";
+      obj.acquisitionFormula = "";
+      obj.orderFlag = "";
+      obj.deviceRegister = "";
+      obj.propertyStep = "";
+      obj.propertyField = "";
+      this.hwDeviceModeFunctionList.push(obj);
+    },
+    /** 设备模型功能删除按钮操作 */
+    handleDeleteHwDeviceModeFunction() {
+      if (this.checkedHwDeviceModeFunction.length == 0) {
+        this.$modal.msgError("请先选择要删除的设备模型功能数据");
+      } else {
+        const hwDeviceModeFunctionList = this.hwDeviceModeFunctionList;
+        const checkedHwDeviceModeFunction = this.checkedHwDeviceModeFunction;
+        this.hwDeviceModeFunctionList = hwDeviceModeFunctionList.filter(function (item) {
+          return checkedHwDeviceModeFunction.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 复选框选中数据 */
+    handleHwDeviceModeFunctionSelectionChange(selection) {
+      this.checkedHwDeviceModeFunction = selection.map(item => item.index)
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/deviceMode/export', {
+        ...this.queryParams
+      }, `deviceMode_${new Date().getTime()}.xlsx`)
+
+      this.download('business/deviceMode/exportFunction', {
+      }, `deviceModeFunction_${new Date().getTime()}.xlsx`)
+    },
+    /** 重建超级表按钮操作 */
+    handleRebuildTdSuperTables() {
+      this.$modal.confirm('是否确认重建所有设备监测数据超级表？').then(function () {
+        return rebuildTdSuperTables();
+      }).then(() => {
+        this.$modal.msgSuccess("重建成功");
+      }).catch(() => {
+      });
+    },
+
+  }
+};
+</script>