diff --git a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/executor/PowerOnTriggerTaskExecutor.java b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/executor/PowerOnTriggerTaskExecutor.java
index 141611fe..f4cbc188 100644
--- a/fastbee-iot-data/src/main/java/com/fastbee/iot/data/executor/PowerOnTriggerTaskExecutor.java
+++ b/fastbee-iot-data/src/main/java/com/fastbee/iot/data/executor/PowerOnTriggerTaskExecutor.java
@@ -99,6 +99,12 @@ public class PowerOnTriggerTaskExecutor {
             log.warn("设备不存在，无法下发指令，设备编号：{}", serialNumber);
             return;
         }
+
+        if (StringUtils.isNotEmpty(device.getImei()) && StringUtils.isNotEmpty(device.getIccid()) && (device.getLongitude() != null && device.getLatitude() != null)) {
+            log.warn("设备IMEI/ICCID/位置信息不为空，无需下发指令，设备编号：{}", serialNumber);
+            return;
+        }
+
         if (!(device.getDeviceType() == DeviceType.DIRECT_DEVICE.getCode() || device.getDeviceType() == DeviceType.GATEWAY.getCode())) {
             log.warn("设备类型不为直连或网关，无需下发指令，设备编号：{}", serialNumber);
             return;
diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceAllShortOutput.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceAllShortOutput.java
index 44a1ecb2..b5e94a10 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceAllShortOutput.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/DeviceAllShortOutput.java
@@ -30,7 +30,7 @@ public class DeviceAllShortOutput {
     private String productName;
 
     /**
-     * 设备类型（1-直连设备、2-网关子设备、3-网关设备）
+     * 设备类型（1-直连设备、2-网关设备、3-监控设备 4-网关子设备）
      */
     private Integer deviceType;
 
diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
index c6fda496..e2711f38 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java
@@ -1647,7 +1647,7 @@ public class DeviceServiceImpl implements IDeviceService {
                 AddressInfo addressInfo = service.getAddressByCoordinate(platformCoordinate);
                 String networkAddress = StringUtils.isEmpty(addressInfo.getBuilding()) ? addressInfo.getFormattedAddress() : addressInfo.getBuilding();
                 device.setNetworkAddress(networkAddress);
-                log.info("{}- 设置地址：{}", device.getSerialNumber(), networkAddress);
+                log.info("{}- LBS设备设置地址：{}", device.getSerialNumber(), networkAddress);
             }
             return;
         }
@@ -1655,7 +1655,11 @@ public class DeviceServiceImpl implements IDeviceService {
             // 根据IP获取地址
             String address = ipAddressService.getAddressByIP(ip);
             device.setNetworkAddress(address);
-            log.info("{}- 设置地址：{}", device.getSerialNumber(), address);
+            // 地址获取失败 直接返回
+            if (StringUtils.isEmpty(address) || "内网IP".equals(address) || "未知地址".equals(address)) {
+                log.error("{}- IP获取地址失败：{}", device.getSerialNumber(), address);
+                return;
+            }
             // 查询经纬度
             Coordinate coordinate = service.getCoordinateByAddress(address);
             Coordinate wgs84Coordinate = service.convertToWgs84(coordinate);
diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
index f171f246..86885e1f 100644
--- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -48,6 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceType" column="device_type" />
         <result property="imei" column="imei" />
         <result property="iccid" column="iccid" />
+        <result property="longitude" column="longitude" />
+        <result property="latitude" column="latitude" />
     </resultMap>
 
     <resultMap type="com.fastbee.iot.model.DeviceShortOutput" id="DeviceShortResult">
@@ -463,7 +465,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             p.device_type as device_type,
             d.imei as imei,
-            d.iccid as iccid
+            d.iccid as iccid,
+            d.longitude,
+            d.latitude
         from iot_device d
         left join iot_product p on p.product_id = d.product_id
         where d.serial_number = #{serialNumber}
diff --git a/yack-web/src/lang/en-US/device.json b/yack-web/src/lang/en-US/device.json
index e5c3c8e6..f8a01da6 100644
--- a/yack-web/src/lang/en-US/device.json
+++ b/yack-web/src/lang/en-US/device.json
@@ -426,6 +426,8 @@
     "device.index.105953-3": "Please Enter DeviceNum",
     "device.index.105953-4": "Device Status",
     "device.index.105953-5": "Please Select The Device Status",
+    "device.index.105953-59": "Organization",
+    "device.index.105953-60": "Select organization (empty = current dept)",
     "device.index.105953-6": "My Group",
     "device.index.105953-7": "Please Select My Group",
     "device.index.105953-8": "Search",
diff --git a/yack-web/src/lang/zh-CN/device.json b/yack-web/src/lang/zh-CN/device.json
index 054c4dbf..11ab66a1 100644
--- a/yack-web/src/lang/zh-CN/device.json
+++ b/yack-web/src/lang/zh-CN/device.json
@@ -426,6 +426,8 @@
     "device.index.105953-3": "请输入设备编号",
     "device.index.105953-4": "设备状态",
     "device.index.105953-5": "请选择设备状态",
+    "device.index.105953-59": "机构",
+    "device.index.105953-60": "请选择机构（空则本部门）",
     "device.index.105953-6": "我的分组",
     "device.index.105953-7": "请选择我的分组",
     "device.index.105953-8": "搜索",
diff --git a/yack-web/src/views/iot/device/index.vue b/yack-web/src/views/iot/device/index.vue
index af4ff516..220c8de0 100644
--- a/yack-web/src/views/iot/device/index.vue
+++ b/yack-web/src/views/iot/device/index.vue
@@ -14,301 +14,389 @@
                     </el-select>
                 </el-form-item>
 
-                <template v-if="searchShow">
-                    <el-form-item :label="$t('device.index.105953-6')">
-                        <el-select v-model="queryParams.groupId" :placeholder="$t('device.index.105953-7')" clearable style="width: 150px">
-                            <el-option v-for="group in myGroupList" :key="group.groupId" :label="group.groupName" :value="group.groupId" />
-                        </el-select>
-                    </el-form-item>
-                </template>
+        <el-form-item :label="$t('device.index.105953-59')" prop="deptId" class="compact-dept">
+          <treeselect
+            v-model="queryParams.deptId"
+            :options="deptOptions"
+            :show-count="true"
+            :clearable="true"
+            :placeholder="$t('device.index.105953-60')"
+            append-to-body
+            class="treeselect-mini"
+            style="width: 150px"
+          />
+        </el-form-item>
 
-                <el-form-item style="float: right">
-                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('device.index.105953-8') }}</el-button>
-                    <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('device.index.105953-9') }}</el-button>
-                    <el-button type="text" @click="searchChange">
-                        {{ searchShow ? $t('template.index.891112-113') : $t('template.index.891112-112') }}
-                        <i :class="{ 'el-icon-arrow-down': !searchShow, 'el-icon-arrow-up': searchShow }"></i>
-                    </el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
+        <template v-if="searchShow">
+          <el-form-item :label="$t('device.index.105953-6')">
+            <el-select v-model="queryParams.groupId" :placeholder="$t('device.index.105953-7')" clearable
+                       style="width: 150px">
+              <el-option v-for="group in myGroupList" :key="group.groupId" :label="group.groupName"
+                         :value="group.groupId"/>
+            </el-select>
+          </el-form-item>
+        </template>
 
-        <el-card>
-            <el-row :gutter="10" style="margin-bottom: 15px">
-                <el-col :span="1.5">
-                    <el-dropdown @command="(command) => handleCommand(command)" v-hasPermi="['iot:device:add']">
-                        <el-button size="mini" type="primary" plain>
-                            {{ $t('device.index.105953-10') }}
-                            <i class="el-icon-arrow-down el-icon--right"></i>
-                        </el-button>
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="handleEditDevice" v-hasPermi="['iot:device:add']">{{ $t('device.index.105953-11') }}</el-dropdown-item>
-                            <el-dropdown-item command="handleBatchImport" v-hasPermi="['iot:device:add']">{{ $t('device.index.105953-12') }}</el-dropdown-item>
-                        </el-dropdown-menu>
-                    </el-dropdown>
-                </el-col>
-                <el-col :span="1.5">
-                    <el-dropdown @command="(command) => handleCommand1(command)" v-hasPermi="['iot:device:assignment']">
-                        <el-button size="mini" type="primary" plain>
-                            {{ $t('device.index.105953-13') }}
-                            <i class="el-icon-arrow-down el-icon--right"></i>
-                        </el-button>
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="handleSelectAllot" v-hasPermi="['iot:device:assignment']">{{ $t('device.index.105953-14') }}</el-dropdown-item>
-                            <el-dropdown-item command="handleImportAllot" v-hasPermi="['iot:device:assignment']">{{ $t('device.index.105953-15') }}</el-dropdown-item>
-                        </el-dropdown-menu>
-                    </el-dropdown>
-                </el-col>
-                <el-col :span="1.5">
-                    <el-button size="mini" type="primary" plain @click="recycleDevice" v-hasPermi="['iot:device:recovery']">{{ $t('device.index.105953-16') }}</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                    <el-dropdown @command="(command) => handleCommandMore(command)" v-hasPermi="['iot:device:record:list', 'iot:device:batchGenerator']">
-                        <el-button size="mini" type="primary" plain>
-                            {{ $t('device.index.105953-48') }}
-                            <i class="el-icon-arrow-down el-icon--right"></i>
-                        </el-button>
-                        <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item command="importRecord" v-hasPermi="['iot:device:record:list']">{{ $t('device.index.105953-49') }}</el-dropdown-item>
-                            <el-dropdown-item command="generateSerialNumber" v-hasPermi="['iot:device:batchGenerator']">{{ $t('device.index.105953-50') }}</el-dropdown-item>
-                            <el-dropdown-item command="recycleRecord" v-hasPermi="['iot:device:record:list']">{{ $t('device.index.105953-51') }}</el-dropdown-item>
-                            <el-dropdown-item command="allotRecord" v-hasPermi="['iot:device:record:list']">{{ $t('device.index.105953-52') }}</el-dropdown-item>
-                        </el-dropdown-menu>
-                    </el-dropdown>
-                </el-col>
-                <el-col :span="1.5" style="line-height: 28px">
-                    <el-checkbox v-model="queryParams.showChild" style="margin: 0px 10px" @change="handleQuery">{{ $t('device.index.105953-18') }}</el-checkbox>
-                    <el-tooltip :content="$t('device.index.105953-19')" placement="top"><i class="el-icon-question"></i></el-tooltip>
-                </el-col>
-                <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">
-                    <template>
-                        <el-tooltip effect="dark" content="切换卡片/列表" placement="top">
-                            <el-button size="mini" circle icon="el-icon-s-grid" @click="handleChangeShowType" />
-                        </el-tooltip>
-                    </template>
-                </right-toolbar>
-            </el-row>
+        <el-form-item style="float: right">
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">
+            {{ $t('device.index.105953-8') }}
+          </el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{
+              $t('device.index.105953-9')
+            }}
+          </el-button>
+          <el-button type="text" @click="searchChange">
+            {{ searchShow ? $t('template.index.891112-113') : $t('template.index.891112-112') }}
+            <i :class="{ 'el-icon-arrow-down': !searchShow, 'el-icon-arrow-up': searchShow }"></i>
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
 
-            <div v-if="showType == 'list'">
-                <el-table v-loading="loading" :data="deviceList" :border="false">
-                    <el-table-column :label="$t('device.index.105953-20')" align="center" header-align="center" prop="deviceId" width="50" />
-                    <el-table-column :label="$t('device.index.105953-0')" align="center" header-align="center" prop="deviceName" min-width="180" />
-                    <el-table-column :label="$t('device.index.105953-2')" align="center" prop="serialNumber" min-width="180" />
-                    <el-table-column :label="$t('device.index.105953-21')" align="center" prop="productName" min-width="180" />
-                    <el-table-column :label="$t('device.index.105953-22')" align="center" prop="transport" min-width="90" />
-                    <el-table-column :label="$t('device.index.105953-23')" align="center" prop="protocolCode" min-width="150" />
-                    <el-table-column :label="$t('device.index.105953-24')" align="center" prop="subDeviceCount" width="80">
-                        <template slot-scope="scope">
-                            {{ scope.row.subDeviceCount }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column :label="$t('device.index.105953-25')" align="center" prop="isShadow" width="80">
-                        <template slot-scope="scope">
-                            <el-tag type="success" size="small" v-if="scope.row.isShadow == 1">{{ $t('device.index.105953-26') }}</el-tag>
-                            <el-tag type="info" size="small" v-else>{{ $t('device.index.105953-27') }}</el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column :label="$t('device.index.105953-28')" align="center" prop="status" width="80">
-                        <template slot-scope="scope">
-                            <dict-tag :options="dict.type.iot_device_status" :value="scope.row.status" size="small" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column :label="$t('device.index.105953-29')" align="center" prop="rssi" width="60">
-                        <template slot-scope="scope">
-                            <svg-icon v-if="scope.row.status == 3 && scope.row.rssi >= '-55'" icon-class="wifi_4" />
-                            <svg-icon v-else-if="scope.row.status == 3 && scope.row.rssi >= '-70' && scope.row.rssi < '-55'" icon-class="wifi_3" />
-                            <svg-icon v-else-if="scope.row.status == 3 && scope.row.rssi >= '-85' && scope.row.rssi < '-70'" icon-class="wifi_2" />
-                            <svg-icon v-else-if="scope.row.status == 3 && scope.row.rssi >= '-100' && scope.row.rssi < '-85'" icon-class="wifi_1" />
-                            <svg-icon v-else icon-class="wifi_0" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column :label="$t('device.index.105953-30')" align="center" prop="locationWay" width="100">
-                        <template slot-scope="scope">
-                            <dict-tag :options="dict.type.iot_location_way" :value="scope.row.locationWay" size="small" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column :label="$t('device.index.105953-31')" align="center" prop="firmwareVersion" width="80">
-                        <template slot-scope="scope">
-                            <el-tag size="mini" type="info">Ver {{ scope.row.firmwareVersion }}</el-tag>
-                        </template>
-                    </el-table-column>
-                    <el-table-column :label="$t('device.index.105953-32')" align="center" prop="activeTime" width="120">
-                        <template slot-scope="scope">
-                            <span>{{ parseTime(scope.row.activeTime, '{y}-{m}-{d}') }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column :label="$t('device.index.105953-33')" align="center" prop="createTime" width="120">
-                        <template slot-scope="scope">
-                            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-                        </template>
-                    </el-table-column>
+    <el-card>
+      <el-row :gutter="10" style="margin-bottom: 15px">
+        <el-col :span="1.5">
+          <el-dropdown @command="(command) => handleCommand(command)" v-hasPermi="['iot:device:add']">
+            <el-button size="mini" type="primary" plain>
+              {{ $t('device.index.105953-10') }}
+              <i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleEditDevice" v-hasPermi="['iot:device:add']">
+                {{ $t('device.index.105953-11') }}
+              </el-dropdown-item>
+              <el-dropdown-item command="handleBatchImport" v-hasPermi="['iot:device:add']">
+                {{ $t('device.index.105953-12') }}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-col>
+        <el-col :span="1.5">
+          <el-dropdown @command="(command) => handleCommand1(command)" v-hasPermi="['iot:device:assignment']">
+            <el-button size="mini" type="primary" plain>
+              {{ $t('device.index.105953-13') }}
+              <i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleSelectAllot" v-hasPermi="['iot:device:assignment']">
+                {{ $t('device.index.105953-14') }}
+              </el-dropdown-item>
+              <el-dropdown-item command="handleImportAllot" v-hasPermi="['iot:device:assignment']">
+                {{ $t('device.index.105953-15') }}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button size="mini" type="primary" plain @click="recycleDevice" v-hasPermi="['iot:device:recovery']">
+            {{ $t('device.index.105953-16') }}
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-dropdown @command="(command) => handleCommandMore(command)"
+                       v-hasPermi="['iot:device:record:list', 'iot:device:batchGenerator']">
+            <el-button size="mini" type="primary" plain>
+              {{ $t('device.index.105953-48') }}
+              <i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="importRecord" v-hasPermi="['iot:device:record:list']">
+                {{ $t('device.index.105953-49') }}
+              </el-dropdown-item>
+              <el-dropdown-item command="generateSerialNumber" v-hasPermi="['iot:device:batchGenerator']">
+                {{ $t('device.index.105953-50') }}
+              </el-dropdown-item>
+              <el-dropdown-item command="recycleRecord" v-hasPermi="['iot:device:record:list']">
+                {{ $t('device.index.105953-51') }}
+              </el-dropdown-item>
+              <el-dropdown-item command="allotRecord" v-hasPermi="['iot:device:record:list']">
+                {{ $t('device.index.105953-52') }}
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-col>
+        <el-col :span="1.5" style="line-height: 28px">
+          <el-checkbox v-model="queryParams.showChild" style="margin: 0px 10px" @change="handleQuery">
+            {{ $t('device.index.105953-18') }}
+          </el-checkbox>
+          <el-tooltip :content="$t('device.index.105953-19')" placement="top"><i class="el-icon-question"></i>
+          </el-tooltip>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList">
+          <template>
+            <el-tooltip effect="dark" content="切换卡片/列表" placement="top">
+              <el-button size="mini" circle icon="el-icon-s-grid" @click="handleChangeShowType"/>
+            </el-tooltip>
+          </template>
+        </right-toolbar>
+      </el-row>
 
-                    <el-table-column fixed="right" :label="$t('device.index.105953-34')" align="center" class-name="small-padding fixed-width" width="183">
-                        <template slot-scope="scope">
-                            <el-button type="text" size="small" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:device:remove']">
-                                {{ $t('device.index.105953-35') }}
-                            </el-button>
-                            <el-button type="text" size="small" icon="el-icon-view" @click="handleEditDevice(scope.row)" v-hasPermi="['iot:device:query']">
-                                {{ $t('device.index.105953-36') }}
-                            </el-button>
-                            <el-button type="text" size="small" @click="openSummaryDialog(scope.row)" v-if="form.deviceId != 0" v-hasPermi="['iot:device:query']">
-                                {{ $t('device.index.105953-37') }}
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
+      <div v-if="showType == 'list'">
+        <el-table v-loading="loading" :data="deviceList" :border="false">
+          <el-table-column :label="$t('device.index.105953-20')" align="center" header-align="center" prop="deviceId"
+                           width="50"/>
+          <el-table-column :label="$t('device.index.105953-0')" align="center" header-align="center" prop="deviceName"
+                           min-width="180"/>
+          <el-table-column :label="$t('device.index.105953-2')" align="center" prop="serialNumber" min-width="180"/>
+          <el-table-column :label="$t('device.index.105953-21')" align="center" prop="productName" min-width="180"/>
+          <el-table-column :label="$t('device.index.105953-22')" align="center" prop="transport" min-width="90"/>
+          <el-table-column :label="$t('device.index.105953-23')" align="center" prop="protocolCode" min-width="150"/>
+          <el-table-column :label="$t('device.index.105953-24')" align="center" prop="subDeviceCount" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.subDeviceCount }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('device.index.105953-25')" align="center" prop="isShadow" width="80">
+            <template slot-scope="scope">
+              <el-tag type="success" size="small" v-if="scope.row.isShadow == 1">{{
+                  $t('device.index.105953-26')
+                }}
+              </el-tag>
+              <el-tag type="info" size="small" v-else>{{ $t('device.index.105953-27') }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('device.index.105953-28')" align="center" prop="status" width="80">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.iot_device_status" :value="scope.row.status" size="small"/>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('device.index.105953-29')" align="center" prop="rssi" width="60">
+            <template slot-scope="scope">
+              <svg-icon v-if="scope.row.status == 3 && scope.row.rssi >= '-55'" icon-class="wifi_4"/>
+              <svg-icon v-else-if="scope.row.status == 3 && scope.row.rssi >= '-70' && scope.row.rssi < '-55'"
+                        icon-class="wifi_3"/>
+              <svg-icon v-else-if="scope.row.status == 3 && scope.row.rssi >= '-85' && scope.row.rssi < '-70'"
+                        icon-class="wifi_2"/>
+              <svg-icon v-else-if="scope.row.status == 3 && scope.row.rssi >= '-100' && scope.row.rssi < '-85'"
+                        icon-class="wifi_1"/>
+              <svg-icon v-else icon-class="wifi_0"/>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('device.index.105953-30')" align="center" prop="locationWay" width="100">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.iot_location_way" :value="scope.row.locationWay" size="small"/>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('device.index.105953-31')" align="center" prop="firmwareVersion" width="80">
+            <template slot-scope="scope">
+              <el-tag size="mini" type="info">Ver {{ scope.row.firmwareVersion }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('device.index.105953-32')" align="center" prop="activeTime" width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.activeTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('device.index.105953-33')" align="center" prop="createTime" width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
 
-                <pagination style="margin-bottom: 20px" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" :pageSizes="[12, 24, 36, 60]" @pagination="getList" />
-            </div>
-            <div v-if="showType == 'card'">
-                <el-row :gutter="20" v-loading="loading" style="display: flex; flex-wrap: wrap;">
-                    <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6" v-for="(item, index) in deviceList" :key="index" style="margin-bottom: 20px; text-align: center; display: flex;">
-                        <el-card :body-style="{ padding: '20px', display: 'flex', flexDirection: 'column', height: '100%' }" shadow="always" style="width: 100%; display: flex; flex-direction: column;">
-                            <el-row type="flex" :gutter="10" justify="space-between">
-                                <el-col :span="20" style="text-align: left">
-                                    <el-link type="" :underline="false" @click="handleDeviceDetail(item)" style="font-weight: bold; font-size: 16px; line-height: 32px; display: flex; align-items: center; width: 100%;">
-                                        <el-tooltip class="item" effect="dark" :content="$t('device.index.105953-38')" placement="top-start">
-                                            <svg-icon icon-class="share" style="font-size: 20px; flex-shrink: 0;" v-if="item.isOwner != 1" />
-                                        </el-tooltip>
-                                        <svg-icon icon-class="device" style="flex-shrink: 0;" v-if="item.isOwner == 1" />
-                                        <el-tooltip :content="item.deviceName" placement="top" :disabled="!item.deviceName || item.deviceName.length <= 20">
-                                            <span style="margin: 0 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 1; min-width: 0;">{{ item.deviceName }}</span>
-                                        </el-tooltip>
-                                        <!-- <el-tag size="mini" type="info">Ver {{item.firmwareVersion}}</el-tag>-->
-                                        <!-- <el-text v-if="item.protocolCode" type="info" size="mini" style="font-size: 14px; color: #ccc">{{ item.protocolCode }}</el-text> -->
-                                    </el-link>
-                                </el-col>
-                                <el-col :span="1.5" style="font-size: 20px; padding-top: 5px; cursor: pointer">
-                                    <svg-icon icon-class="qrcode" @click="openSummaryDialog(item)" v-hasPermi="['iot:device:query']" />
-                                </el-col>
-                                <el-col :span="3">
-                                    <div style="font-size: 28px; color: #ccc">
-                                        <svg-icon v-if="item.status == 3 && item.rssi >= '-55'" icon-class="wifi_4" />
-                                        <svg-icon v-else-if="item.status == 3 && item.rssi >= '-70' && item.rssi < '-55'" icon-class="wifi_3" />
-                                        <svg-icon v-else-if="item.status == 3 && item.rssi >= '-85' && item.rssi < '-70'" icon-class="wifi_2" />
-                                        <svg-icon v-else-if="item.status == 3 && item.rssi >= '-100' && item.rssi < '-85'" icon-class="wifi_1" />
-                                        <svg-icon v-else icon-class="wifi_0" />
-                                    </div>
-                                </el-col>
-                            </el-row>
-                            <el-row :gutter="10" style="flex: 1; min-height: 0;">
-                                <el-col :span="17" style="display: flex; flex-direction: column;">
-                                    <div style="text-align: left; line-height: 28px; min-height: 28px; word-wrap: break-word; overflow-wrap: break-word; flex-shrink: 0;">
-                                        <dict-tag :options="dict.type.iot_device_status" :value="item.status" size="mini" style="display: inline-block; margin-bottom: 4px; vertical-align: middle;" />
-                                        <span style="display: inline-block; margin: 0 5px 4px 5px; vertical-align: middle;">
-                                            <el-tag type="primary" size="mini" v-if="item.protocolCode" style="margin-bottom: 4px;">{{ item.protocolCode }}</el-tag>
+          <el-table-column fixed="right" :label="$t('device.index.105953-34')" align="center"
+                           class-name="small-padding fixed-width" width="183">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['iot:device:remove']">
+                {{ $t('device.index.105953-35') }}
+              </el-button>
+              <el-button type="text" size="small" icon="el-icon-view" @click="handleEditDevice(scope.row)"
+                         v-hasPermi="['iot:device:query']">
+                {{ $t('device.index.105953-36') }}
+              </el-button>
+              <el-button type="text" size="small" @click="openSummaryDialog(scope.row)" v-if="form.deviceId != 0"
+                         v-hasPermi="['iot:device:query']">
+                {{ $t('device.index.105953-37') }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination style="margin-bottom: 20px" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize" :pageSizes="[12, 24, 36, 60]" @pagination="getList"/>
+      </div>
+      <div v-if="showType == 'card'">
+        <el-row :gutter="20" v-loading="loading" style="display: flex; flex-wrap: wrap;">
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6" v-for="(item, index) in deviceList" :key="index"
+                  style="margin-bottom: 20px; text-align: center; display: flex;">
+            <el-card :body-style="{ padding: '20px', display: 'flex', flexDirection: 'column', height: '100%' }"
+                     shadow="always" style="width: 100%; display: flex; flex-direction: column;">
+              <el-row type="flex" :gutter="10" justify="space-between">
+                <el-col :span="20" style="text-align: left">
+                  <el-link type="" :underline="false" @click="handleDeviceDetail(item)"
+                           style="font-weight: bold; font-size: 16px; line-height: 32px; display: flex; align-items: center; width: 100%;">
+                    <el-tooltip class="item" effect="dark" :content="$t('device.index.105953-38')"
+                                placement="top-start">
+                      <svg-icon icon-class="share" style="font-size: 20px; flex-shrink: 0;" v-if="item.isOwner != 1"/>
+                    </el-tooltip>
+                    <svg-icon icon-class="device" style="flex-shrink: 0;" v-if="item.isOwner == 1"/>
+                    <el-tooltip :content="item.deviceName" placement="top"
+                                :disabled="!item.deviceName || item.deviceName.length <= 20">
+                      <span
+                        style="margin: 0 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; flex: 1; min-width: 0;">{{
+                          item.deviceName
+                        }}</span>
+                    </el-tooltip>
+                    <!-- <el-tag size="mini" type="info">Ver {{item.firmwareVersion}}</el-tag>-->
+                    <!-- <el-text v-if="item.protocolCode" type="info" size="mini" style="font-size: 14px; color: #ccc">{{ item.protocolCode }}</el-text> -->
+                  </el-link>
+                </el-col>
+                <el-col :span="1.5" style="font-size: 20px; padding-top: 5px; cursor: pointer">
+                  <svg-icon icon-class="qrcode" @click="openSummaryDialog(item)" v-hasPermi="['iot:device:query']"/>
+                </el-col>
+                <el-col :span="3">
+                  <div style="font-size: 28px; color: #ccc">
+                    <svg-icon v-if="item.status == 3 && item.rssi >= '-55'" icon-class="wifi_4"/>
+                    <svg-icon v-else-if="item.status == 3 && item.rssi >= '-70' && item.rssi < '-55'"
+                              icon-class="wifi_3"/>
+                    <svg-icon v-else-if="item.status == 3 && item.rssi >= '-85' && item.rssi < '-70'"
+                              icon-class="wifi_2"/>
+                    <svg-icon v-else-if="item.status == 3 && item.rssi >= '-100' && item.rssi < '-85'"
+                              icon-class="wifi_1"/>
+                    <svg-icon v-else icon-class="wifi_0"/>
+                  </div>
+                </el-col>
+              </el-row>
+              <el-row :gutter="10" style="flex: 1; min-height: 0;">
+                <el-col :span="17" style="display: flex; flex-direction: column;">
+                  <div
+                    style="text-align: left; line-height: 28px; min-height: 28px; word-wrap: break-word; overflow-wrap: break-word; flex-shrink: 0;">
+                    <dict-tag :options="dict.type.iot_device_status" :value="item.status" size="mini"
+                              style="display: inline-block; margin-bottom: 4px; vertical-align: middle;"/>
+                    <span style="display: inline-block; margin: 0 5px 4px 5px; vertical-align: middle;">
+                                            <el-tag type="primary" size="mini" v-if="item.protocolCode"
+                                                    style="margin-bottom: 4px;">{{ item.protocolCode }}</el-tag>
                                         </span>
-                                        <el-tag type="primary" size="mini" v-if="item.transport" style="margin-bottom: 4px;">{{ item.transport }}</el-tag>
-                                        <el-tag type="danger" size="mini" style="display: inline-block; margin: 0 0 4px 5px;" v-if="item.alertCount">
-                                            {{ $t('device.index.105953-53') }}{{ item.alertCount.unprocessedCount }}
-                                        </el-tag>
-                                    </div>
-                                    <el-descriptions :column="1" size="mini" style="margin-top: 8px; flex: 1;">
-                                        <el-descriptions-item :label="$t('device.index.105953-20')">
-                                            <el-tooltip :content="item.serialNumber" placement="top" :disabled="!item.serialNumber || item.serialNumber.length <= 15">
-                                                <span style="display: inline-block; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{{ item.serialNumber }}</span>
-                                            </el-tooltip>
-                                        </el-descriptions-item>
-                                        <el-descriptions-item :label="$t('device.index.105953-39')">
-                                            <el-tooltip :content="item.productName" placement="top" :disabled="!item.productName || item.productName.length <= 20">
-                                                <span style="display: inline-block; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{{ item.productName }}</span>
-                                            </el-tooltip>
-                                        </el-descriptions-item>
-                                        <el-descriptions-item :label="$t('device.index.105953-32')">
-                                            {{ parseTime(item.activeTime, '{y}-{m}-{d}') }}
-                                        </el-descriptions-item>
-                                    </el-descriptions>
-                                </el-col>
-                                <el-col :span="7" style="flex-shrink: 0;">
-                                    <div style="margin-top: 10px">
-                                        <el-image
-                                            style="width: 100%; height: 100px; border-radius: 10px; object-fit: cover;"
-                                            lazy
-                                            :preview-src-list="[baseUrl + item.imgUrl]"
-                                            :src="baseUrl + item.imgUrl"
-                                            fit="cover"
-                                            v-if="item.imgUrl != null && item.imgUrl != ''"
-                                        ></el-image>
-                                        <el-image
-                                            style="width: 100%; height: 100px; border-radius: 10px; object-fit: cover;"
-                                            :preview-src-list="[require('@/assets/images/gateway.png')]"
-                                            :src="require('@/assets/images/gateway.png')"
-                                            fit="cover"
-                                            v-else-if="item.deviceType == 2"
-                                        ></el-image>
-                                        <el-image
-                                            style="width: 100%; height: 100px; border-radius: 10px; object-fit: cover;"
-                                            :preview-src-list="[require('@/assets/images/video.png')]"
-                                            :src="require('@/assets/images/video.png')"
-                                            fit="cover"
-                                            v-else-if="item.deviceType == 3"
-                                        ></el-image>
-                                        <el-image
-                                            style="width: 100%; height: 100px; border-radius: 10px; object-fit: cover;"
-                                            :preview-src-list="[require('@/assets/images/product.png')]"
-                                            :src="require('@/assets/images/product.png')"
-                                            fit="cover"
-                                            v-else
-                                        ></el-image>
-                                    </div>
-                                </el-col>
-                            </el-row>
-                            <el-button-group style="margin-top: 15px; width: 100%; display: flex; justify-content: center;">
-                                <el-button type="danger" size="mini" style="padding: 5px 10px; flex: 1;" icon="el-icon-delete" @click="handleDelete(item)" v-hasPermi="['iot:device:remove']">
-                                    {{ $t('device.index.105953-35') }}
-                                </el-button>
-                                <el-button type="primary" size="mini" style="padding: 5px 15px; flex: 1;" icon="el-icon-view" @click="handleEditDevice(item, 'basic')" v-hasPermi="['iot:device:query']">
-                                    {{ $t('device.index.105953-36') }}
-                                </el-button>
-                                <el-button type="success" size="mini" style="padding: 5px 15px; flex: 1;" icon="el-icon-odometer" @click="handleRunDevice(item)" v-hasPermi="['iot:device:query']">
-                                    {{ $t('device.index.105953-40') }}
-                                </el-button>
-                            </el-button-group>
-                        </el-card>
-                    </el-col>
-                </el-row>
-                <el-empty :description="$t('device.index.105953-41')" v-if="total == 0"></el-empty>
-                <pagination style="margin: 0 0 20px 0" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" :pageSizes="[12, 24, 36, 60]" @pagination="getList" />
-            </div>
-        </el-card>
+                    <el-tag type="primary" size="mini" v-if="item.transport" style="margin-bottom: 4px;">
+                      {{ item.transport }}
+                    </el-tag>
+                    <el-tag type="danger" size="mini" style="display: inline-block; margin: 0 0 4px 5px;"
+                            v-if="item.alertCount">
+                      {{ $t('device.index.105953-53') }}{{ item.alertCount.unprocessedCount }}
+                    </el-tag>
+                  </div>
+                  <el-descriptions :column="1" size="mini" style="margin-top: 8px; flex: 1;">
+                    <el-descriptions-item :label="$t('device.index.105953-20')">
+                      <el-tooltip :content="item.serialNumber" placement="top"
+                                  :disabled="!item.serialNumber || item.serialNumber.length <= 15">
+                        <span
+                          style="display: inline-block; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{{
+                            item.serialNumber
+                          }}</span>
+                      </el-tooltip>
+                    </el-descriptions-item>
+                    <el-descriptions-item :label="$t('device.index.105953-39')">
+                      <el-tooltip :content="item.productName" placement="top"
+                                  :disabled="!item.productName || item.productName.length <= 20">
+                        <span
+                          style="display: inline-block; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{{
+                            item.productName
+                          }}</span>
+                      </el-tooltip>
+                    </el-descriptions-item>
+                    <el-descriptions-item :label="$t('device.index.105953-32')">
+                      {{ parseTime(item.activeTime, '{y}-{m}-{d}') }}
+                    </el-descriptions-item>
+                  </el-descriptions>
+                </el-col>
+                <el-col :span="7" style="flex-shrink: 0;">
+                  <div style="margin-top: 10px">
+                    <el-image
+                      style="width: 100%; height: 100px; border-radius: 10px; object-fit: cover;"
+                      lazy
+                      :preview-src-list="[baseUrl + item.imgUrl]"
+                      :src="baseUrl + item.imgUrl"
+                      fit="cover"
+                      v-if="item.imgUrl != null && item.imgUrl != ''"
+                    ></el-image>
+                    <el-image
+                      style="width: 100%; height: 100px; border-radius: 10px; object-fit: cover;"
+                      :preview-src-list="[require('@/assets/images/gateway.png')]"
+                      :src="require('@/assets/images/gateway.png')"
+                      fit="cover"
+                      v-else-if="item.deviceType == 2"
+                    ></el-image>
+                    <el-image
+                      style="width: 100%; height: 100px; border-radius: 10px; object-fit: cover;"
+                      :preview-src-list="[require('@/assets/images/video.png')]"
+                      :src="require('@/assets/images/video.png')"
+                      fit="cover"
+                      v-else-if="item.deviceType == 3"
+                    ></el-image>
+                    <el-image
+                      style="width: 100%; height: 100px; border-radius: 10px; object-fit: cover;"
+                      :preview-src-list="[require('@/assets/images/product.png')]"
+                      :src="require('@/assets/images/product.png')"
+                      fit="cover"
+                      v-else
+                    ></el-image>
+                  </div>
+                </el-col>
+              </el-row>
+              <el-button-group style="margin-top: 15px; width: 100%; display: flex; justify-content: center;">
+                <el-button type="danger" size="mini" style="padding: 5px 10px; flex: 1;" icon="el-icon-delete"
+                           @click="handleDelete(item)" v-hasPermi="['iot:device:remove']">
+                  {{ $t('device.index.105953-35') }}
+                </el-button>
+                <el-button type="primary" size="mini" style="padding: 5px 15px; flex: 1;" icon="el-icon-view"
+                           @click="handleEditDevice(item, 'basic')" v-hasPermi="['iot:device:query']">
+                  {{ $t('device.index.105953-36') }}
+                </el-button>
+                <el-button type="success" size="mini" style="padding: 5px 15px; flex: 1;" icon="el-icon-odometer"
+                           @click="handleRunDevice(item)" v-hasPermi="['iot:device:query']">
+                  {{ $t('device.index.105953-40') }}
+                </el-button>
+              </el-button-group>
+            </el-card>
+          </el-col>
+        </el-row>
+        <el-empty :description="$t('device.index.105953-41')" v-if="total == 0"></el-empty>
+        <pagination style="margin: 0 0 20px 0" v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize" :pageSizes="[12, 24, 36, 60]" @pagination="getList"/>
+      </div>
+    </el-card>
 
-        <!-- 二维码 -->
-        <el-dialog :visible.sync="openSummary" width="300px" append-to-body>
-            <div style="border: 1px solid #ccc; width: 220px; text-align: center; margin: 0 auto; margin-top: -15px">
-                <vue-qr :text="qrText" :size="200"></vue-qr>
-                <div style="padding-bottom: 10px">{{ $t('device.index.105953-42') }}</div>
-            </div>
-        </el-dialog>
+    <!-- 二维码 -->
+    <el-dialog :visible.sync="openSummary" width="300px" append-to-body>
+      <div style="border: 1px solid #ccc; width: 220px; text-align: center; margin: 0 auto; margin-top: -15px">
+        <vue-qr :text="qrText" :size="200"></vue-qr>
+        <div style="padding-bottom: 10px">{{ $t('device.index.105953-42') }}</div>
+      </div>
+    </el-dialog>
 
-        <el-dialog :title="$t('device.index.105953-54')" :visible.sync="openGenerate" width="500px" append-to-body>
-            <el-form v-model="elForm" style="height: 100%; padding: 0 20px">
-                <el-form-item label-width="80px" :label="$t('device.index.105953-55')">
-                    <el-input v-model="elForm.count" type="number" style="width: 240px" :max="200" oninput="if(value>200)value=200;if(value<0)value=0"></el-input>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm" v-hasPermi="['iot:device:batchGenerator']">{{ $t('device.index.105953-56') }}</el-button>
-                <el-button @click="openGenerate = false">{{ $t('device.index.105953-57') }}</el-button>
-            </div>
-        </el-dialog>
-        <!-- 批量导入设备 -->
-        <batchImport ref="batchImport" @save="saveDialog"></batchImport>
-        <!-- 导入分配 -->
-        <allotImport ref="allotImport" @save="saveAllotDialog"></allotImport>
-        <!-- 导入记录 -->
-        <importRecord ref="importRecord"></importRecord>
-        <!-- 设备回收记录 -->
-        <recycleRecord ref="recycleRecord"></recycleRecord>
-        <!-- 设备分配记录 -->
-        <allotRecord ref="allotRecord"></allotRecord>
-    </div>
+    <el-dialog :title="$t('device.index.105953-54')" :visible.sync="openGenerate" width="500px" append-to-body>
+      <el-form v-model="elForm" style="height: 100%; padding: 0 20px">
+        <el-form-item label-width="80px" :label="$t('device.index.105953-55')">
+          <el-input v-model="elForm.count" type="number" style="width: 240px" :max="200"
+                    oninput="if(value>200)value=200;if(value<0)value=0"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" v-hasPermi="['iot:device:batchGenerator']">
+          {{ $t('device.index.105953-56') }}
+        </el-button>
+        <el-button @click="openGenerate = false">{{ $t('device.index.105953-57') }}</el-button>
+      </div>
+    </el-dialog>
+    <!-- 批量导入设备 -->
+    <batchImport ref="batchImport" @save="saveDialog"></batchImport>
+    <!-- 导入分配 -->
+    <allotImport ref="allotImport" @save="saveAllotDialog"></allotImport>
+    <!-- 导入记录 -->
+    <importRecord ref="importRecord"></importRecord>
+    <!-- 设备回收记录 -->
+    <recycleRecord ref="recycleRecord"></recycleRecord>
+    <!-- 设备分配记录 -->
+    <allotRecord ref="allotRecord"></allotRecord>
+  </div>
 </template>
 
 <script>
 import vueQr from 'vue-qr';
-import { listDeviceShort, delDevice } from '@/api/iot/device';
-import { listGroup } from '@/api/iot/group';
-import { delSipDeviceBySipId } from '@/api/iot/sipdevice';
+import {listDeviceShort, delDevice} from '@/api/iot/device';
+import {listGroup} from '@/api/iot/group';
+import {deptsTreeSelect} from '@/api/system/user';
+import {delSipDeviceBySipId} from '@/api/iot/sipdevice';
 import auth from '@/plugins/auth';
 import Treeselect from '@riophae/vue-treeselect';
 import '@riophae/vue-treeselect/dist/vue-treeselect.css';
@@ -317,452 +405,467 @@ import allotImport from './allot-import-dialog';
 import importRecord from './import-record';
 import recycleRecord from './recycle-record';
 import allotRecord from './allot-record';
-export default {
-    name: 'Device',
-    dicts: ['iot_device_status', 'iot_is_enable', 'iot_location_way', 'iot_transport_type'],
-    components: {
-        vueQr,
-        Treeselect,
-        batchImport,
-        allotImport,
-        importRecord,
-        recycleRecord,
-        allotRecord,
-    },
-    data() {
-        return {
-            // 二维码内容
-            qrText: 'fastbee',
-            // 打开设备配置对话框
-            openSummary: false,
-            openGenerate: false,
-            // 显示搜索条件
-            showSearch: true,
-            searchShow: false, //搜索展开
-            // 展示方式
-            showType: 'card',
-            // 遮罩层
-            loading: true,
-            // 总条数
-            total: 0,
-            // 设备列表数据
-            deviceList: [],
-            // 我的分组列表数据
-            myGroupList: [],
-            // 根路径
-            baseUrl: process.env.VUE_APP_BASE_API,
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 12,
-                showChild: true,
-                entrance: 1,
-                deviceName: null,
-                productId: null,
-                groupId: null,
-                productName: null,
-                userId: null,
-                userName: null,
-                tenantId: null,
-                tenantName: null,
-                serialNumber: null,
-                status: null,
-                networkAddress: null,
-                activeTime: null,
-            },
-            // 表单参数
-            form: {
-                productId: 0,
-                status: 1,
-                locationWay: 1,
-                firmwareVersion: 1.0,
-                serialNumber: '',
-                deviceType: 1,
-                isSimulate: 0,
-                productName: '',
-            },
-            productList: [],
-            elForm: {
-                count: 1,
-            },
-            // 批量导入参数
-            isSubDev: false,
-        };
-    },
-    created() {
-        // 页码筛选
-        let pageNum = this.$route.query.pageNum;
-        if (pageNum != null) {
-            this.queryParams.pageNum = Number(pageNum);
-        }
-        // 产品筛选
-        let productId = this.$route.query.productId;
-        if (productId != null) {
-            this.queryParams.productId = Number(productId);
-            this.queryParams.groupId = null;
-            this.queryParams.serialNumber = null;
-        }
-        // 分组筛选
-        let groupId = this.$route.query.groupId;
-        if (groupId != null) {
-            this.queryParams.groupId = Number(groupId);
-            this.queryParams.productId = null;
-            this.queryParams.serialNumber = null;
-        }
-        // 设备编号筛选
-        let sn = this.$route.query.sn;
-        if (sn != null) {
-            this.queryParams.serialNumber = sn;
-            this.queryParams.productId = null;
-            this.queryParams.groupId = null;
-        }
-        this.connectMqtt();
-    },
-    activated() {
-        // 页码筛选（优先恢复页码，无论是否有其他参数变化）
-        let pageNum = this.$route.query.pageNum;
-        if (pageNum != null) {
-            this.queryParams.pageNum = Number(pageNum);
-        }
 
-        const time = this.$route.query.t;
-        if (time != null && time != this.uniqueId) {
-            this.uniqueId = time;
-            // 产品筛选
-            let productId = this.$route.query.productId;
-            if (productId != null) {
-                this.queryParams.productId = Number(productId);
-                this.queryParams.groupId = null;
-                this.queryParams.serialNumber = null;
-            }
-            // 分组筛选
-            let groupId = this.$route.query.groupId;
-            if (groupId != null) {
-                this.queryParams.groupId = Number(groupId);
-                this.queryParams.productId = null;
-                this.queryParams.serialNumber = null;
-            }
-            // 设备编号筛选
-            let sn = this.$route.query.sn;
-            if (sn != null) {
-                this.queryParams.serialNumber = sn;
-                this.queryParams.productId = null;
-                this.queryParams.groupId = null;
-            }
-            this.getList();
-        } else if (pageNum != null) {
-            // 浏览器回退时，即使没有 t 参数也要刷新列表
-            this.getList();
+export default {
+  name: 'Device',
+  dicts: ['iot_device_status', 'iot_is_enable', 'iot_location_way', 'iot_transport_type'],
+  components: {
+    vueQr,
+    Treeselect,
+    batchImport,
+    allotImport,
+    importRecord,
+    recycleRecord,
+    allotRecord,
+  },
+  data() {
+    return {
+      // 二维码内容
+      qrText: 'fastbee',
+      // 打开设备配置对话框
+      openSummary: false,
+      openGenerate: false,
+      // 显示搜索条件
+      showSearch: true,
+      searchShow: false, //搜索展开
+      // 展示方式
+      showType: 'card',
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      // 设备列表数据
+      deviceList: [],
+      // 我的分组列表数据
+      myGroupList: [],
+      // 机构树
+      deptOptions: [],
+      // 根路径
+      baseUrl: process.env.VUE_APP_BASE_API,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 12,
+        showChild: false,
+        entrance: 1,
+        deviceName: null,
+        productId: null,
+        groupId: null,
+        deptId: null,
+        productName: null,
+        userId: null,
+        userName: null,
+        tenantId: null,
+        tenantName: null,
+        serialNumber: null,
+        status: null,
+        networkAddress: null,
+        activeTime: null,
+      },
+      // 表单参数
+      form: {
+        productId: 0,
+        status: 1,
+        locationWay: 1,
+        firmwareVersion: 1.0,
+        serialNumber: '',
+        deviceType: 1,
+        isSimulate: 0,
+        productName: '',
+      },
+      productList: [],
+      elForm: {
+        count: 1,
+      },
+      // 批量导入参数
+      isSubDev: false,
+    };
+  },
+  created() {
+    // 页码筛选
+    let pageNum = this.$route.query.pageNum;
+    if (pageNum != null) {
+      this.queryParams.pageNum = Number(pageNum);
+    }
+    // 产品筛选
+    let productId = this.$route.query.productId;
+    if (productId != null) {
+      this.queryParams.productId = Number(productId);
+      this.queryParams.groupId = null;
+      this.queryParams.serialNumber = null;
+    }
+    // 分组筛选
+    let groupId = this.$route.query.groupId;
+    if (groupId != null) {
+      this.queryParams.groupId = Number(groupId);
+      this.queryParams.productId = null;
+      this.queryParams.serialNumber = null;
+    }
+    // 设备编号筛选
+    let sn = this.$route.query.sn;
+    if (sn != null) {
+      this.queryParams.serialNumber = sn;
+      this.queryParams.productId = null;
+      this.queryParams.groupId = null;
+    }
+    this.getDeptTree();
+    this.connectMqtt();
+  },
+  activated() {
+    // 页码筛选（优先恢复页码，无论是否有其他参数变化）
+    let pageNum = this.$route.query.pageNum;
+    if (pageNum != null) {
+      this.queryParams.pageNum = Number(pageNum);
+    }
+
+    const time = this.$route.query.t;
+    if (time != null && time != this.uniqueId) {
+      this.uniqueId = time;
+      // 产品筛选
+      let productId = this.$route.query.productId;
+      if (productId != null) {
+        this.queryParams.productId = Number(productId);
+        this.queryParams.groupId = null;
+        this.queryParams.serialNumber = null;
+      }
+      // 分组筛选
+      let groupId = this.$route.query.groupId;
+      if (groupId != null) {
+        this.queryParams.groupId = Number(groupId);
+        this.queryParams.productId = null;
+        this.queryParams.serialNumber = null;
+      }
+      // 设备编号筛选
+      let sn = this.$route.query.sn;
+      if (sn != null) {
+        this.queryParams.serialNumber = sn;
+        this.queryParams.productId = null;
+        this.queryParams.groupId = null;
+      }
+      this.getList();
+    } else if (pageNum != null) {
+      // 浏览器回退时，即使没有 t 参数也要刷新列表
+      this.getList();
+    }
+  },
+  methods: {
+    /* 连接Mqtt消息服务器 */
+    async connectMqtt() {
+      if (this.$mqttTool.client == null) {
+        await this.$mqttTool.connect();
+      }
+      // 删除所有message事件监听器
+      this.$mqttTool.client.removeAllListeners('message');
+      // 添加message事件监听器
+      this.mqttCallback();
+      this.getList();
+    },
+    /* Mqtt回调处理  */
+    mqttCallback() {
+      this.$mqttTool.client.on('message', (topic, message, buffer) => {
+        let topics = topic.split('/');
+        let productId = topics[1];
+        let deviceNum = topics[2];
+        message = JSON.parse(message.toString());
+        if (!message) {
+          return;
         }
+        if (topics[3] == 'status') {
+          console.log(this.$t('device.index.105953-43'), topic);
+          console.log(this.$t('device.index.105953-44'), message);
+          // 更新列表中设备的状态
+          for (let i = 0; i < this.deviceList.length; i++) {
+            if (this.deviceList[i].serialNumber == deviceNum) {
+              this.deviceList[i].status = message.status;
+              this.deviceList[i].isShadow = message.isShadow;
+              this.deviceList[i].rssi = message.rssi;
+              return;
+            }
+          }
+        }
+      });
     },
-    methods: {
-        /* 连接Mqtt消息服务器 */
-        async connectMqtt() {
-            if (this.$mqttTool.client == null) {
-                await this.$mqttTool.connect();
-            }
-            // 删除所有message事件监听器
-            this.$mqttTool.client.removeAllListeners('message');
-            // 添加message事件监听器
-            this.mqttCallback();
-            this.getList();
-        },
-        /* Mqtt回调处理  */
-        mqttCallback() {
-            this.$mqttTool.client.on('message', (topic, message, buffer) => {
-                let topics = topic.split('/');
-                let productId = topics[1];
-                let deviceNum = topics[2];
-                message = JSON.parse(message.toString());
-                if (!message) {
-                    return;
-                }
-                if (topics[3] == 'status') {
-                    console.log(this.$t('device.index.105953-43'), topic);
-                    console.log(this.$t('device.index.105953-44'), message);
-                    // 更新列表中设备的状态
-                    for (let i = 0; i < this.deviceList.length; i++) {
-                        if (this.deviceList[i].serialNumber == deviceNum) {
-                            this.deviceList[i].status = message.status;
-                            this.deviceList[i].isShadow = message.isShadow;
-                            this.deviceList[i].rssi = message.rssi;
-                            return;
-                        }
-                    }
-                }
-            });
-        },
-        // 新增设备更多操作触发
-        handleCommand(command) {
-            switch (command) {
-                case 'handleEditDevice':
-                    this.handleEditDevice(0);
-                    break;
-                case 'handleBatchImport':
-                    this.handleBatchImport();
-                    break;
-                default:
-                    break;
-            }
-        },
-        //批量导入设备
-        handleBatchImport() {
-            this.$refs.batchImport.upload.importDeviceDialog = true;
-            this.$refs.batchImport.importForm.productName = null;
-        },
-        //导入分配设备
-        handleImportAllot() {
-            this.$refs.allotImport.upload.importAllotDialog = true;
-            this.$refs.allotImport.allotForm.productName = null;
-            this.$refs.allotImport.allotForm.deptId = null;
-        },
-        // dialog 保存响应
-        saveDialog() {
-            this.getList();
-        },
-        // dialog 保存响应
-        saveAllotDialog() {
-            this.getList();
-        },
-        // 分配设备更多操作触发
-        handleCommand1(command) {
-            switch (command) {
-                case 'handleSelectAllot':
-                    this.handleSelectAllot();
-                    break;
-                case 'handleImportAllot':
-                    this.handleImportAllot();
-                    break;
-                default:
-                    break;
-            }
-        },
-        // 跳转选择分配设备页面
-        handleSelectAllot() {
-            this.$router.push({
-                path: '/iot/device-select-allot',
-            });
-        },
-        // 跳转回收设备页面
-        recycleDevice() {
-            this.$router.push({
-                path: '/iot/device-recycle',
-            });
-        },
-        // 更多操作
-        handleCommandMore(command) {
-            switch (command) {
-                case 'importRecord':
-                    this.handleImportRecord();
-                    break;
-                case 'generateSerialNumber':
-                    this.generateSerialNumber();
-                    break;
-                case 'recycleRecord':
-                    this.handleRecycleRecord();
-                    break;
-                case 'allotRecord':
-                    this.handleAllotRecord();
-                    break;
-                default:
-                    break;
-            }
-        },
-        //导入记录
-        handleImportRecord() {
-            this.$refs.importRecord.open = true;
-            this.$refs.importRecord.getList();
-        },
-        //设备回收记录
-        handleRecycleRecord() {
-            this.$refs.recycleRecord.open = true;
-            this.$refs.recycleRecord.getList();
-        },
-        //设备分配记录
-        handleAllotRecord() {
-            this.$refs.allotRecord.open = true;
-            this.$refs.allotRecord.getList();
-        },
-        //生成设备编号
-        generateSerialNumber() {
-            this.openGenerate = true;
-        },
-        //生成设备编号确定操作
-        submitForm() {
-            this.download(
-                'iot/device/batchGenerator',
-                {
-                    ...this.elForm,
-                },
-                `batchGenerator_${new Date().getTime()}.xlsx`
-            );
-            this.openGenerate = false;
-        },
-        openSummaryDialog(row) {
-            let json = {
-                type: 1, // 1=扫码关联设备
-                deviceNumber: row.serialNumber,
-                productId: row.productId,
-                productName: row.productName,
-            };
-            this.qrText = JSON.stringify(json);
-            this.openSummary = true;
-        },
-        /* 订阅消息 */
-        mqttSubscribe(list) {
-            // 订阅当前页面设备状态和实时监测
-            let topics = [];
-            for (let i = 0; i < list.length; i++) {
-                let topicStatus = '/' + '+' + '/' + list[i].serialNumber + '/status/post';
-                topics.push(topicStatus);
-            }
-            this.$mqttTool.subscribe(topics);
-        },
-        /** 查询设备分组列表 */
-        getGroupList() {
-            this.loading = true;
-            let queryParams = {
-                pageSize: 30,
-                pageNum: 1,
-                userId: this.$store.state.user.userId,
-            };
-            listGroup(queryParams).then((response) => {
-                this.myGroupList = response.rows;
-            });
-        },
-        /** 查询所有简短设备列表 */
-        getList() {
-            this.loading = true;
-            this.queryParams.params = {};
-            this.getGroupList();
-            // 同步更新 URL 中的页码参数（用于浏览器回退时恢复页码）
-            this.updateUrlPageNum();
-            listDeviceShort(this.queryParams).then((response) => {
-                this.deviceList = response.rows;
-                this.total = response.total;
-                // 订阅消息
-                if (this.deviceList && this.deviceList.length > 0) {
-                    this.mqttSubscribe(this.deviceList);
-                }
-                this.loading = false;
-            });
-        },
-        /** 更新 URL 中的页码参数 */
-        updateUrlPageNum() {
-            const currentPageNum = this.$route.query.pageNum;
-            if (Number(currentPageNum) !== this.queryParams.pageNum) {
-                this.$router.replace({
-                    query: {
-                        ...this.$route.query,
-                        pageNum: this.queryParams.pageNum,
-                    },
-                }).catch(() => {});
-            }
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.queryParams.productId = null;
-            this.queryParams.groupId = null;
-            this.queryParams.serialNumber = null;
-            this.resetForm('queryForm');
-            this.handleQuery();
-        },
-        /** 切换显示方式 */
-        handleChangeShowType() {
-            this.showType = this.showType == 'card' ? 'list' : 'card';
-        },
-        // 点击名称查看
-        handleDeviceDetail(item) {
-            if (auth.hasPermi('iot:device:query')) {
-                this.handleEditDevice(item);
-            }
-        },
-        /** 修改按钮操作 */
-        handleEditDevice(row, activeName) {
-            let deviceId = 0;
-            let isSubDev = 0;
-            if (row != 0) {
-                deviceId = row.deviceId || this.ids;
-                isSubDev = row.subDeviceCount > 0 ? 1 : 0;
-            }
-            this.$router.push({
-                path: '/iot/device-edit',
-                query: {
-                    deviceId: deviceId,
-                    isSubDev: isSubDev,
-                    pageNum: this.queryParams.pageNum,
-                    activeName: activeName,
-                },
-            });
-        },
-        /** 运行状态按钮操作 */
-        handleRunDevice(row) {
-            let deviceId = 0;
-            let isSubDev = 0;
-            if (row != 0) {
-                deviceId = row.deviceId || this.ids;
-                isSubDev = row.subDeviceCount > 0 ? 1 : 0;
-            }
-            if (row.deviceType === 3) {
-                this.$router.push({
-                    path: '/iot/device-edit',
-                    query: {
-                        deviceId: deviceId,
-                        isSubDev: isSubDev,
-                        pageNum: this.queryParams.pageNum,
-                        activeName: 'sipChannel',
-                    },
-                });
-            } else {
-                this.$router.push({
-                    path: '/iot/device-edit',
-                    query: {
-                        deviceId: deviceId,
-                        isSubDev: isSubDev,
-                        pageNum: this.queryParams.pageNum,
-                        activeName: 'runningStatus',
-                    },
-                });
-            }
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            const deviceIds = row.deviceId || this.ids;
-            this.$modal
-                .confirm(this.$t('device.index.105953-45', [deviceIds]))
-                .then(function () {
-                    if (row.deviceType === 3) {
-                        delSipDeviceBySipId(row.serialNumber);
-                    }
-                    return delDevice(deviceIds);
-                })
-                .then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess(this.$t('device.index.105953-47'));
-                })
-                .catch(() => {});
-        },
-        /** 未启用设备影子*/
-        shadowUnEnable(device, thingsModel) {
-            // 1-未激活，2-禁用，3-在线，4-离线
-            if (device.status != 3 && device.isShadow == 0) {
-                return true;
-            }
-            if (thingsModel.isReadonly) {
-                return true;
-            }
-            return false;
-        },
-        // 搜索展开隐藏
-        searchChange() {
-            this.searchShow = !this.searchShow;
-        },
+    // 新增设备更多操作触发
+    handleCommand(command) {
+      switch (command) {
+        case 'handleEditDevice':
+          this.handleEditDevice(0);
+          break;
+        case 'handleBatchImport':
+          this.handleBatchImport();
+          break;
+        default:
+          break;
+      }
     },
+    //批量导入设备
+    handleBatchImport() {
+      this.$refs.batchImport.upload.importDeviceDialog = true;
+      this.$refs.batchImport.importForm.productName = null;
+    },
+    //导入分配设备
+    handleImportAllot() {
+      this.$refs.allotImport.upload.importAllotDialog = true;
+      this.$refs.allotImport.allotForm.productName = null;
+      this.$refs.allotImport.allotForm.deptId = null;
+    },
+    // dialog 保存响应
+    saveDialog() {
+      this.getList();
+    },
+    // dialog 保存响应
+    saveAllotDialog() {
+      this.getList();
+    },
+    // 分配设备更多操作触发
+    handleCommand1(command) {
+      switch (command) {
+        case 'handleSelectAllot':
+          this.handleSelectAllot();
+          break;
+        case 'handleImportAllot':
+          this.handleImportAllot();
+          break;
+        default:
+          break;
+      }
+    },
+    // 跳转选择分配设备页面
+    handleSelectAllot() {
+      this.$router.push({
+        path: '/iot/device-select-allot',
+      });
+    },
+    // 跳转回收设备页面
+    recycleDevice() {
+      this.$router.push({
+        path: '/iot/device-recycle',
+      });
+    },
+    // 更多操作
+    handleCommandMore(command) {
+      switch (command) {
+        case 'importRecord':
+          this.handleImportRecord();
+          break;
+        case 'generateSerialNumber':
+          this.generateSerialNumber();
+          break;
+        case 'recycleRecord':
+          this.handleRecycleRecord();
+          break;
+        case 'allotRecord':
+          this.handleAllotRecord();
+          break;
+        default:
+          break;
+      }
+    },
+    //导入记录
+    handleImportRecord() {
+      this.$refs.importRecord.open = true;
+      this.$refs.importRecord.getList();
+    },
+    //设备回收记录
+    handleRecycleRecord() {
+      this.$refs.recycleRecord.open = true;
+      this.$refs.recycleRecord.getList();
+    },
+    //设备分配记录
+    handleAllotRecord() {
+      this.$refs.allotRecord.open = true;
+      this.$refs.allotRecord.getList();
+    },
+    //生成设备编号
+    generateSerialNumber() {
+      this.openGenerate = true;
+    },
+    //生成设备编号确定操作
+    submitForm() {
+      this.download(
+        'iot/device/batchGenerator',
+        {
+          ...this.elForm,
+        },
+        `batchGenerator_${new Date().getTime()}.xlsx`
+      );
+      this.openGenerate = false;
+    },
+    openSummaryDialog(row) {
+      let json = {
+        type: 1, // 1=扫码关联设备
+        deviceNumber: row.serialNumber,
+        productId: row.productId,
+        productName: row.productName,
+      };
+      this.qrText = JSON.stringify(json);
+      this.openSummary = true;
+    },
+    /* 订阅消息 */
+    mqttSubscribe(list) {
+      // 订阅当前页面设备状态和实时监测
+      let topics = [];
+      for (let i = 0; i < list.length; i++) {
+        let topicStatus = '/' + '+' + '/' + list[i].serialNumber + '/status/post';
+        topics.push(topicStatus);
+      }
+      this.$mqttTool.subscribe(topics);
+    },
+    /** 查询机构下拉树 */
+    getDeptTree() {
+      deptsTreeSelect().then((response) => {
+        this.deptOptions = response.data || [];
+      });
+    },
+    /** 查询设备分组列表 */
+    getGroupList() {
+      this.loading = true;
+      let queryParams = {
+        pageSize: 30,
+        pageNum: 1,
+        userId: this.$store.state.user.userId,
+      };
+      listGroup(queryParams).then((response) => {
+        this.myGroupList = response.rows;
+      });
+    },
+    /** 查询所有简短设备列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      this.getGroupList();
+      // 同步更新 URL 中的页码参数（用于浏览器回退时恢复页码）
+      this.updateUrlPageNum();
+      listDeviceShort(this.queryParams).then((response) => {
+        this.deviceList = response.rows;
+        this.total = response.total;
+        // 订阅消息
+        if (this.deviceList && this.deviceList.length > 0) {
+          this.mqttSubscribe(this.deviceList);
+        }
+        this.loading = false;
+      });
+    },
+    /** 更新 URL 中的页码参数 */
+    updateUrlPageNum() {
+      const currentPageNum = this.$route.query.pageNum;
+      if (Number(currentPageNum) !== this.queryParams.pageNum) {
+        this.$router.replace({
+          query: {
+            ...this.$route.query,
+            pageNum: this.queryParams.pageNum,
+          },
+        }).catch(() => {
+        });
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.productId = null;
+      this.queryParams.groupId = null;
+      this.queryParams.serialNumber = null;
+      this.queryParams.deptId = null;
+      this.queryParams.showChild = false;
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    /** 切换显示方式 */
+    handleChangeShowType() {
+      this.showType = this.showType == 'card' ? 'list' : 'card';
+    },
+    // 点击名称查看
+    handleDeviceDetail(item) {
+      if (auth.hasPermi('iot:device:query')) {
+        this.handleEditDevice(item);
+      }
+    },
+    /** 修改按钮操作 */
+    handleEditDevice(row, activeName) {
+      let deviceId = 0;
+      let isSubDev = 0;
+      if (row != 0) {
+        deviceId = row.deviceId || this.ids;
+        isSubDev = row.subDeviceCount > 0 ? 1 : 0;
+      }
+      this.$router.push({
+        path: '/iot/device-edit',
+        query: {
+          deviceId: deviceId,
+          isSubDev: isSubDev,
+          pageNum: this.queryParams.pageNum,
+          activeName: activeName,
+        },
+      });
+    },
+    /** 运行状态按钮操作 */
+    handleRunDevice(row) {
+      let deviceId = 0;
+      let isSubDev = 0;
+      if (row != 0) {
+        deviceId = row.deviceId || this.ids;
+        isSubDev = row.subDeviceCount > 0 ? 1 : 0;
+      }
+      if (row.deviceType === 3) {
+        this.$router.push({
+          path: '/iot/device-edit',
+          query: {
+            deviceId: deviceId,
+            isSubDev: isSubDev,
+            pageNum: this.queryParams.pageNum,
+            activeName: 'sipChannel',
+          },
+        });
+      } else {
+        this.$router.push({
+          path: '/iot/device-edit',
+          query: {
+            deviceId: deviceId,
+            isSubDev: isSubDev,
+            pageNum: this.queryParams.pageNum,
+            activeName: 'runningStatus',
+          },
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const deviceIds = row.deviceId || this.ids;
+      this.$modal
+        .confirm(this.$t('device.index.105953-45', [deviceIds]))
+        .then(function () {
+          if (row.deviceType === 3) {
+            delSipDeviceBySipId(row.serialNumber);
+          }
+          return delDevice(deviceIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess(this.$t('device.index.105953-47'));
+        })
+        .catch(() => {
+        });
+    },
+    /** 未启用设备影子*/
+    shadowUnEnable(device, thingsModel) {
+      // 1-未激活，2-禁用，3-在线，4-离线
+      if (device.status != 3 && device.isShadow == 0) {
+        return true;
+      }
+      if (thingsModel.isReadonly) {
+        return true;
+      }
+      return false;
+    },
+    // 搜索展开隐藏
+    searchChange() {
+      this.searchShow = !this.searchShow;
+    },
+  },
 };
 </script>
 
@@ -770,12 +873,44 @@ export default {
 .iot-device {
     padding: 20px;
 
-    ::v-deep .el-upload-dragger {
-        width: 510px;
-    }
+  ::v-deep .compact-dept {
+    margin-left: -28px;
+  }
+
+  ::v-deep .el-upload-dragger {
+    width: 510px;
+  }
 
     ::v-deep .el-dropdown-menu__item {
         font-size: 12px;
     }
 }
+
+::v-deep .treeselect-mini {
+  .vue-treeselect__control {
+    min-height: 28px;
+    height: 28px;
+    border-radius: 4px;
+  }
+
+  .vue-treeselect__placeholder,
+  .vue-treeselect__single-value {
+    font-size: 12px;
+    line-height: 26px;
+  }
+
+  .vue-treeselect__value-remove {
+    line-height: 24px;
+  }
+
+  .vue-treeselect__arrow {
+    top: 6px;
+  }
+
+  // 如果下拉菜单也需要迷你风格
+  .vue-treeselect__option {
+    font-size: 12px;
+    padding: 4px 8px;
+  }
+}
 </style>