diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index a6b8c906..d4ec78b8 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -1,242 +1,224 @@
 <template>
-  <el-card style="margin: 6px; padding-bottom: 100px">
-    <el-tabs v-model="activeName" tab-position="left" @tab-click="tabChange" style="padding: 10px; min-height: 400px">
-      <el-tab-pane name="basic">
-        <span slot="label">* 基本信息</span>
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-          <el-row :gutter="100">
-            <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
-              <el-form-item label="设备名称" prop="deviceName">
-                <el-input v-model="form.deviceName" placeholder="请输入设备名称">
-                  <el-button slot="append" @click="openSummaryDialog" v-if="form.deviceId != 0">摘要</el-button>
-                </el-input>
-              </el-form-item>
-              <el-form-item label="" prop="productName">
-                <template slot="label">
-                  <span style="color: red">*</span>
-                  所属产品
-                </template>
-                <el-input readonly v-model="form.productName" placeholder="请选择产品" :disabled="form.status != 1">
-                  <el-button slot="append" @click="selectProduct()" :disabled="form.status != 1">选择</el-button>
-                </el-input>
-              </el-form-item>
-              <el-form-item label="" prop="serialNumber">
-                <template slot="label">
-                  <span style="color: red">*</span>
-                  设备编号
-                </template>
-                <el-input v-model="form.serialNumber" placeholder="请输入设备编号" :disabled="form.status !== 1" maxlength="32">
-                  <!-- <el-button slot="append" @click="generateNum" :loading="genDisabled"
+    <el-card style="margin: 6px; padding-bottom: 100px">
+        <el-tabs v-model="activeName" tab-position="left" @tab-click="tabChange" style="padding: 10px; min-height: 400px">
+            <el-tab-pane name="basic">
+                <span slot="label">* 基本信息</span>
+                <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+                    <el-row :gutter="100">
+                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+                            <el-form-item label="设备名称" prop="deviceName">
+                                <el-input v-model="form.deviceName" placeholder="请输入设备名称">
+                                    <el-button slot="append" @click="openSummaryDialog" v-if="form.deviceId != 0">摘要</el-button>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="" prop="productName">
+                                <template slot="label">
+                                    <span style="color: red">*</span>
+                                    所属产品
+                                </template>
+                                <el-input readonly v-model="form.productName" placeholder="请选择产品" :disabled="form.status != 1">
+                                    <el-button slot="append" @click="selectProduct()" :disabled="form.status != 1">选择</el-button>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="" prop="serialNumber">
+                                <template slot="label">
+                                    <span style="color: red">*</span>
+                                    设备编号
+                                </template>
+                                <el-input v-model="form.serialNumber" placeholder="请输入设备编号" :disabled="form.status !== 1" maxlength="32">
+                                    <!-- <el-button slot="append" @click="generateNum" :loading="genDisabled"
                     :disabled="form.status !== 1">生成</el-button> -->
-                    <el-button v-if="form.deviceType !== 3" slot="append" @click="generateNum"
-                                        :loading="genDisabled" :disabled="form.status != 1"
-                                        v-hasPermi="['iot:device:add']">生成</el-button>
-                                    <el-button v-if="form.deviceType === 3" slot="append" @click="genSipID()"
-                                        :disabled="form.status != 1" v-hasPermi="['iot:device:add']">生成</el-button>
-                </el-input>
-              </el-form-item>
-              <el-form-item v-if="openServerTip">
-                <template>
-                  <el-alert type="info" show-icon description="当前选择TCP协议,设备编号生成为HEX格式"></el-alert>
-                </template>
-              </el-form-item>
-              <el-form-item v-if="openTip">
-                <template>
-                  <el-alert type="success" show-icon description="当前选择的产品属于modbus协议,将在网关设备创建后根据采集点模板生成子设备"></el-alert>
-                </template>
-              </el-form-item>
-              <el-form-item label="固件版本" prop="firmwareVersion">
-                <el-input v-model="form.firmwareVersion" placeholder="请输入固件版本" type="number" step="0.1"
-                  :disabled="form.status != 1 || form.deviceType === 3">
-                  <template slot="prepend">Version</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item label="模拟设备" prop="isSimulate">
-                <el-switch v-model="form.isSimulate" active-text="" inactive-text="" :active-value="1" :inactive-value="0"
-                  :disabled="form.deviceType === 3"></el-switch>
-              </el-form-item>
-              <el-form-item label="设备影子" prop="isShadow">
-                <el-switch v-model="form.isShadow" active-text="" inactive-text="" :active-value="1" :inactive-value="0"
-                  :disabled="form.deviceType === 3"></el-switch>
-              </el-form-item>
-              <el-form-item label="禁用设备" prop="deviceStatus">
-                <el-switch v-model="deviceStatus" active-text="" inactive-text=""
-                           :disabled="form.status === 1 || form.deviceType === 3" :active-value="1" :inactive-value="0"
-                           active-color="#F56C6C"></el-switch>
-              </el-form-item>
-              <el-form-item label="备注信息" prop="remark">
-                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="1" />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
-              <el-form-item label="定位方式" prop="locationWay">
-                <el-select v-model="form.locationWay" placeholder="请选择设备状态" clearable size="small" style="width: 100%"
-                  :disabled="form.deviceType === 3">
-                  <el-option v-for="dict in dict.type.iot_location_way" :key="dict.value" :label="dict.label"
-                    :value="Number(dict.value)" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="设备经度" prop="longitude">
-                <el-input v-model="form.longitude" placeholder="请输入设备经度" type="number" :disabled="form.locationWay != 3">
-                  <el-link slot="append" :underline="false" href="https://api.map.baidu.com/lbsapi/getpoint/index.html"
-                    target="_blank" :disabled="form.locationWay != 3">坐标拾取</el-link>
-                </el-input>
-              </el-form-item>
-              <el-form-item label="设备纬度" prop="latitude">
-                <el-input v-model="form.latitude" placeholder="请输入设备纬度" type="number" :disabled="form.locationWay != 3">
-                  <el-link slot="append" :underline="false" href="https://api.map.baidu.com/lbsapi/getpoint/index.html"
-                    target="_blank" :disabled="form.locationWay != 3">坐标拾取</el-link>
-                </el-input>
-              </el-form-item>
-              <el-form-item label="所在地址" prop="networkAddress">
-                <el-input v-model="form.networkAddress" placeholder="请输入设备所在地址" :disabled="form.locationWay != 3" />
-              </el-form-item>
-              <el-form-item label="入网地址" prop="networkIp">
-                <el-input v-model="form.networkIp" placeholder="设备入网IP" disabled />
-              </el-form-item>
-              <el-form-item label="激活时间" prop="activeTime">
-                <el-date-picker clearable v-model="form.activeTime" type="date" value-format="yyyy-MM-dd"
-                  placeholder="设备激活时间" disabled style="width: 100%"></el-date-picker>
-              </el-form-item>
-              <el-form-item label="设备信号" prop="rssi">
-                <el-input v-model="form.rssi" placeholder="设备信号强度" disabled />
-              </el-form-item>
-              <el-form-item label="其他信息" prop="remark" v-if="form.deviceId != 0">
-                <dict-tag :options="dict.type.iot_device_status" :value="form.status"
-                  style="display: inline-block; margin-right: 8px" />
-                <el-button size="small" @click="handleViewMqtt()">认证信息</el-button>
-                <el-button size="small" @click="openCodeDialog()">二维码</el-button>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8" v-if="form.deviceId != 0">
-              <div
-                style="border: 1px solid #dfe4ed; border-radius: 5px; padding: 5px; text-align: center; line-height: 400px">
-                <div id="map" style="height: 435px; width: 100%">地图展示区域，新增后显示</div>
-              </div>
-            </el-col>
-          </el-row>
-        </el-form>
+                                    <el-button v-if="form.deviceType !== 3" slot="append" @click="generateNum" :loading="genDisabled" :disabled="form.status != 1" v-hasPermi="['iot:device:add']">生成</el-button>
+                                    <el-button v-if="form.deviceType === 3" slot="append" @click="genSipID()" :disabled="form.status != 1" v-hasPermi="['iot:device:add']">生成</el-button>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item v-if="openServerTip">
+                                <template>
+                                    <el-alert type="info" show-icon description="当前选择TCP协议,设备编号生成为HEX格式"></el-alert>
+                                </template>
+                            </el-form-item>
+                            <el-form-item v-if="openTip">
+                                <template>
+                                    <el-alert type="success" show-icon description="当前选择的产品属于modbus协议,将在网关设备创建后根据采集点模板生成子设备"></el-alert>
+                                </template>
+                            </el-form-item>
+                            <el-form-item label="固件版本" prop="firmwareVersion">
+                                <el-input v-model="form.firmwareVersion" placeholder="请输入固件版本" type="number" step="0.1" :disabled="form.status != 1 || form.deviceType === 3">
+                                    <template slot="prepend">Version</template>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="模拟设备" prop="isSimulate">
+                                <el-switch v-model="form.isSimulate" active-text="" inactive-text="" :active-value="1" :inactive-value="0" :disabled="form.deviceType === 3"></el-switch>
+                            </el-form-item>
+                            <el-form-item label="设备影子" prop="isShadow">
+                                <el-switch v-model="form.isShadow" active-text="" inactive-text="" :active-value="1" :inactive-value="0" :disabled="form.deviceType === 3"></el-switch>
+                            </el-form-item>
+                            <el-form-item label="禁用设备" prop="deviceStatus">
+                                <el-switch
+                                    v-model="deviceStatus"
+                                    active-text=""
+                                    inactive-text=""
+                                    :disabled="form.status === 1 || form.deviceType === 3"
+                                    :active-value="1"
+                                    :inactive-value="0"
+                                    active-color="#F56C6C"
+                                ></el-switch>
+                            </el-form-item>
+                            <el-form-item label="备注信息" prop="remark">
+                                <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="1" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
+                            <el-form-item label="定位方式" prop="locationWay">
+                                <el-select v-model="form.locationWay" placeholder="请选择设备状态" clearable size="small" style="width: 100%" :disabled="form.deviceType === 3">
+                                    <el-option v-for="dict in dict.type.iot_location_way" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="设备经度" prop="longitude">
+                                <el-input v-model="form.longitude" placeholder="请输入设备经度" type="number" :disabled="form.locationWay != 3">
+                                    <el-link slot="append" :underline="false" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank" :disabled="form.locationWay != 3">坐标拾取</el-link>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="设备纬度" prop="latitude">
+                                <el-input v-model="form.latitude" placeholder="请输入设备纬度" type="number" :disabled="form.locationWay != 3">
+                                    <el-link slot="append" :underline="false" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank" :disabled="form.locationWay != 3">坐标拾取</el-link>
+                                </el-input>
+                            </el-form-item>
+                            <el-form-item label="所在地址" prop="networkAddress">
+                                <el-input v-model="form.networkAddress" placeholder="请输入设备所在地址" :disabled="form.locationWay != 3" />
+                            </el-form-item>
+                            <el-form-item label="入网地址" prop="networkIp">
+                                <el-input v-model="form.networkIp" placeholder="设备入网IP" disabled />
+                            </el-form-item>
+                            <el-form-item label="激活时间" prop="activeTime">
+                                <el-date-picker clearable v-model="form.activeTime" type="date" value-format="yyyy-MM-dd" placeholder="设备激活时间" disabled style="width: 100%"></el-date-picker>
+                            </el-form-item>
+                            <el-form-item label="设备信号" prop="rssi">
+                                <el-input v-model="form.rssi" placeholder="设备信号强度" disabled />
+                            </el-form-item>
+                            <el-form-item label="其他信息" prop="remark" v-if="form.deviceId != 0">
+                                <dict-tag :options="dict.type.iot_device_status" :value="form.status" style="display: inline-block; margin-right: 8px" />
+                                <el-button size="small" @click="handleViewMqtt()">认证信息</el-button>
+                                <el-button size="small" @click="openCodeDialog()">二维码</el-button>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8" v-if="form.deviceId != 0">
+                            <div style="border: 1px solid #dfe4ed; border-radius: 5px; padding: 5px; text-align: center; line-height: 400px">
+                                <div id="map" style="height: 435px; width: 100%">地图展示区域，新增后显示</div>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </el-form>
 
-        <el-form label-width="100px" style="margin-top: 50px">
-          <el-form-item style="text-align: center; margin-left: -100px; margin-top: 10px">
-            <el-button type="primary" @click="submitForm" v-hasPermi="['iot:device:edit']" v-show="form.deviceId != 0">修
-              改</el-button>
-            <el-button type="primary" @click="submitForm" v-hasPermi="['iot:device:add']" v-show="form.deviceId == 0">新
-              增</el-button>
-          </el-form-item>
-        </el-form>
+                <el-form label-width="100px" style="margin-top: 50px">
+                    <el-form-item style="text-align: center; margin-left: -100px; margin-top: 10px">
+                        <el-button type="primary" @click="submitForm" v-hasPermi="['iot:device:edit']" v-show="form.deviceId != 0">修 改</el-button>
+                        <el-button type="primary" @click="submitForm" v-hasPermi="['iot:device:add']" v-show="form.deviceId == 0">新 增</el-button>
+                    </el-form-item>
+                </el-form>
 
-        <!-- 选择产品 -->
-        <product-list ref="productList" :productId="form.productId" @productEvent="getProductData($event)" />
+                <!-- 选择产品 -->
+                <product-list ref="productList" :productId="form.productId" @productEvent="getProductData($event)" />
 
-        <sipid ref="sipidGen" :product="form" @addGenEvent="getSipIDData($event)" />
-      </el-tab-pane>
-      <!-- <el-tab-pane :disabled="form.deviceId === 0" v-if="form.deviceType === 3" name="sipPlayer">
+                <sipid ref="sipidGen" :product="form" @addGenEvent="getSipIDData($event)" />
+            </el-tab-pane>
+            <!-- <el-tab-pane :disabled="form.deviceId === 0" v-if="form.deviceType === 3" name="sipPlayer">
         <span slot="label"><span style="color:red;">￥ </span>设备直播</span>
         <business ref="business"/>
       </el-tab-pane> -->
-      <el-tab-pane name="videoLive" :disabled="form.deviceId == 0" v-if="form.deviceType === 3" >
-        <span slot="label">设备直播</span>
-        <device-live-stream ref="deviceLiveStream" :device="form" />
-    </el-tab-pane>
+            <el-tab-pane name="videoLive" :disabled="form.deviceId == 0" v-if="form.deviceType === 3">
+                <span slot="label">设备直播</span>
+                <device-live-stream ref="deviceLiveStream" :device="form" />
+            </el-tab-pane>
 
-      <el-tab-pane name="deviceTimer" :disabled="form.deviceId === 0"
-        v-if="form.deviceType !== 3 && hasShrarePerm('timer')">
-        <span slot="label">设备定时</span>
-        <device-timer ref="deviceTimer" :device="form" />
-      </el-tab-pane>
+            <el-tab-pane name="deviceTimer" :disabled="form.deviceId === 0" v-if="form.deviceType !== 3 && hasShrarePerm('timer')">
+                <span slot="label">设备定时</span>
+                <device-timer ref="deviceTimer" :device="form" />
+            </el-tab-pane>
 
-      <el-tab-pane name="deviceUser" :disabled="form.deviceId == 0">
-        <span slot="label">设备用户</span>
-        <device-user ref="deviceUser" :device="form" @userEvent="getUserData($event)" />
-      </el-tab-pane>
+            <el-tab-pane name="deviceUser" :disabled="form.deviceId == 0">
+                <span slot="label">设备用户</span>
+                <device-user ref="deviceUser" :device="form" @userEvent="getUserData($event)" />
+            </el-tab-pane>
 
-      <el-tab-pane name="deviceLog" :disabled="form.deviceId == 0 && hasShrarePerm('log')" lazy>
-        <span slot="label">事件日志</span>
-        <device-log ref="deviceLog" :device="form" />
-      </el-tab-pane>
+            <el-tab-pane name="deviceLog" :disabled="form.deviceId == 0 && hasShrarePerm('log')" lazy>
+                <span slot="label">事件日志</span>
+                <device-log ref="deviceLog" :device="form" />
+            </el-tab-pane>
 
-      <el-tab-pane name="deviceFuncLog" :disabled="form.deviceId == 0"
-        v-if="form.deviceType !== 3 && hasShrarePerm('log')" lazy>
-        <span slot="label">指令日志</span>
-        <device-func ref="deviceFuncLog" :device="form" />
-      </el-tab-pane>
+            <el-tab-pane name="deviceFuncLog" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3 && hasShrarePerm('log')" lazy>
+                <span slot="label">指令日志</span>
+                <device-func ref="deviceFuncLog" :device="form" />
+            </el-tab-pane>
 
-      <el-tab-pane name="deviceMonitor" :disabled="form.deviceId == 0 "
-        v-if="form.deviceType !== 3 && hasShrarePerm('monitor')">
-        <span slot="label">实时监测</span>
-        <device-monitor ref="deviceMonitor" :device="form" />
-      </el-tab-pane>
+            <el-tab-pane name="deviceMonitor" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3 && hasShrarePerm('monitor')">
+                <span slot="label">实时监测</span>
+                <device-monitor ref="deviceMonitor" :device="form" />
+            </el-tab-pane>
 
-      <el-tab-pane name="deviceStastic" :disabled="form.deviceId == 0"
-        v-if="form.deviceType !== 3 && hasShrarePerm('statistic')">
-        <span slot="label">监测统计</span>
-        <device-statistic ref="deviceStatistic" :device="form" />
-      </el-tab-pane>
+            <!-- 用于设置间距 -->
+            <el-tab-pane disabled>
+                <span slot="label">
+                    <div style="margin-top: 350px"></div>
+                </span>
+            </el-tab-pane>
 
-      <!-- 用于设置间距 -->
-      <el-tab-pane disabled>
-        <span slot="label">
-          <div style="margin-top: 350px"></div>
-        </span>
-      </el-tab-pane>
+            <el-tab-pane name="deviceReturn" disabled>
+                <span slot="label">
+                    <el-button type="info" size="mini" @click="goBack()">返回列表</el-button>
+                </span>
+            </el-tab-pane>
+        </el-tabs>
 
-      <el-tab-pane name="deviceReturn" disabled>
-        <span slot="label">
-          <el-button type="info" size="mini" @click="goBack()">返回列表</el-button>
-        </span>
-      </el-tab-pane>
-    </el-tabs>
-
-    <!-- 设备配置JSON -->
-    <el-dialog title="摘要（设备上传的只读数据）" :visible.sync="openSummary" width="700px" append-to-body>
-      <el-row :gutter="20">
-        <el-col :span="14">
-          <div style="border: 1px solid #ccc; margin-top: -15px; height: 350px; width: 360px; overflow: scroll">
-            <json-viewer :value="summary" :expand-depth="10" copyable>
-              <template v-slot:copy>复制</template>
-            </json-viewer>
-          </div>
-        </el-col>
-        <el-col :span="10">
-          <div style="border: 1px solid #ccc; width: 200px; text-align: center; margin-left: 20px; margin-top: -10px">
-            <vue-qr :text="qrText" :size="200"></vue-qr>
-            <div style="padding-bottom: 10px">设备二维码</div>
-          </div>
-        </el-col>
-      </el-row>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="info" @click="closeSummaryDialog">关 闭</el-button>
-      </div>
-    </el-dialog>
-    <!-- 二维码 -->
-    <el-dialog :visible.sync="openCode" 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">设备二维码</div>
-      </div>
-    </el-dialog>
-    <el-dialog title="Mqtt连接参数" :visible.sync="openViewMqtt" width="600px" append-to-body>
-      <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="150px">
-        <el-form-item label="clientId" prop="clientId">
-          <el-input v-model="listQuery.clientId" disabled style="width: 80%" />
-        </el-form-item>
-        <el-form-item label="username" prop="username">
-          <el-input v-model="listQuery.username" disabled style="width: 80%" />
-        </el-form-item>
-        <el-form-item label="passwd" prop="passwd">
-          <el-input clearable v-model="listQuery.passwd" disabled style="width: 80%"></el-input>
-        </el-form-item>
-        <el-form-item label="port" prop="port">
-          <el-input clearable v-model="listQuery.port" disabled style="width: 80%"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button class="btns" type="primary" @click="doCopy(2)">一键复制</el-button>
-        <el-button @click="closeSummaryDialog">关 闭</el-button>
-      </div>
-    </el-dialog>
-  </el-card>
+        <!-- 设备配置JSON -->
+        <el-dialog title="摘要（设备上传的只读数据）" :visible.sync="openSummary" width="700px" append-to-body>
+            <el-row :gutter="20">
+                <el-col :span="14">
+                    <div style="border: 1px solid #ccc; margin-top: -15px; height: 350px; width: 360px; overflow: scroll">
+                        <json-viewer :value="summary" :expand-depth="10" copyable>
+                            <template v-slot:copy>复制</template>
+                        </json-viewer>
+                    </div>
+                </el-col>
+                <el-col :span="10">
+                    <div style="border: 1px solid #ccc; width: 200px; text-align: center; margin-left: 20px; margin-top: -10px">
+                        <vue-qr :text="qrText" :size="200"></vue-qr>
+                        <div style="padding-bottom: 10px">设备二维码</div>
+                    </div>
+                </el-col>
+            </el-row>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="info" @click="closeSummaryDialog">关 闭</el-button>
+            </div>
+        </el-dialog>
+        <!-- 二维码 -->
+        <el-dialog :visible.sync="openCode" 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">设备二维码</div>
+            </div>
+        </el-dialog>
+        <el-dialog title="Mqtt连接参数" :visible.sync="openViewMqtt" width="600px" append-to-body>
+            <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="150px">
+                <el-form-item label="clientId" prop="clientId">
+                    <el-input v-model="listQuery.clientId" disabled style="width: 80%" />
+                </el-form-item>
+                <el-form-item label="username" prop="username">
+                    <el-input v-model="listQuery.username" disabled style="width: 80%" />
+                </el-form-item>
+                <el-form-item label="passwd" prop="passwd">
+                    <el-input clearable v-model="listQuery.passwd" disabled style="width: 80%"></el-input>
+                </el-form-item>
+                <el-form-item label="port" prop="port">
+                    <el-input clearable v-model="listQuery.port" disabled style="width: 80%"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button class="btns" type="primary" @click="doCopy(2)">一键复制</el-button>
+                <el-button @click="closeSummaryDialog">关 闭</el-button>
+            </div>
+        </el-dialog>
+    </el-card>
 </template>
 
 <script>
@@ -247,10 +229,10 @@ import deviceLog from './device-log';
 import deviceUser from './device-user';
 import runningStatus from './running-status';
 import deviceMonitor from './device-monitor';
-import deviceStatistic from './device-statistic';
+
 import deviceTimer from './device-timer';
 import DeviceFunc from './device-functionlog';
-import business from "@/views/iot/business/index.vue";
+import business from '@/views/iot/business/index.vue';
 import vueQr from 'vue-qr';
 import { loadBMap } from '@/utils/map.js';
 import { deviceSynchronization, getDevice, addDevice, updateDevice, generatorDeviceNum, listDevice, getMqttConnect } from '@/api/iot/device';
@@ -262,260 +244,258 @@ import sipid from '../sip/sipidGen.vue';
 import player from '@/views/components/player/player.vue';
 import channel from '../sip/channel';
 
-
-
 export default {
-  name: 'DeviceEdit',
-  dicts: ['iot_device_status', 'iot_location_way'],
-  components: {
-    business,
-    DeviceFunc,
-    deviceLog,
-    deviceUser,
-    deviceMonitor,
-    deviceStatistic,
-    runningStatus,
-    productList,
-    deviceTimer,
-    JsonViewer,
-    vueQr,
-    deviceLiveStream,
-    player,
-    channel,
-    sipid,
-  },
-  watch: {
-    activeName(val) {
-      if (val == 'deviceStastic') {
-        this.$nextTick(() => {
-          // TODO 重置统计表格的尺寸
-        });
-      }
+    name: 'DeviceEdit',
+    dicts: ['iot_device_status', 'iot_location_way'],
+    components: {
+        business,
+        DeviceFunc,
+        deviceLog,
+        deviceUser,
+        deviceMonitor,
+
+        runningStatus,
+        productList,
+        deviceTimer,
+        JsonViewer,
+        vueQr,
+        deviceLiveStream,
+        player,
+        channel,
+        sipid,
     },
-  },
-  computed: {
-    deviceStatus: {
-      set(val) {
-        if (val == 1) {
-          // 1-未激活，2-禁用，3-在线，4-离线
-          this.form.status = 2;
-        } else if (val == 0) {
-          this.form.status = 4;
-        } else {
-          this.form.status = this.oldDeviceStatus;
-        }
-      },
-      get() {
-        if (this.form.status == 2) {
-          return 1;
-        }
-        return 0;
-      },
+    watch: {
+        activeName(val) {
+            if (val == 'deviceStastic') {
+                this.$nextTick(() => {
+                    // TODO 重置统计表格的尺寸
+                });
+            }
+        },
     },
-  },
-  data() {
-    return {
-      // 二维码内容
-      qrText: 'fastbee',
-      // 打开设备配置对话框
-      openSummary: false,
-      //二维码
-      openCode: false,
-      openViewMqtt: false,
-      // 生成设备编码是否禁用
-      genDisabled: false,
-      // 选中选项卡
-      activeName: 'basic',
-      //查看mqtt参数
-      mqttList: [],
-      // 遮罩层
-      loading: true,
-      // 设备开始状态
-      oldDeviceStatus: null,
-      deviceId: '',
-      channelId: '',
-      // 表单参数
-      form: {
-        productId: 0,
-        status: 1,
-        locationWay: 1,
-        firmwareVersion: 1.0,
-        serialNumber: '',
-        deviceType: 1,
-        isSimulate: 0,
-      },
-      //mqtt参数查看
-      listQuery: {
-        clientId: 0,
-        username: '',
-        passwd: '',
-        port: '',
-      },
-      openTip: false,
-      openServerTip: false,
-      serverType: 1,
-      //用于判断是否是设备组(modbus)
-      isSubDev: false,
-      // 设备摘要
-      summary: [],
-      // 地址
-      baseUrl: process.env.VUE_APP_BASE_API,
-      // 地图相关
-      map: null,
-      mk: null,
-      latitude: '',
-      longitude: '',
-      // 表单校验
-      rules: {
-        deviceName: [
-          {
-            required: true,
-            message: '设备名称不能为空',
-            trigger: 'blur',
-          },
-          {
-            min: 2,
-            max: 32,
-            message: '设备名称长度在 2 到 32 个字符',
-            trigger: 'blur',
-          },
-        ],
-        firmwareVersion: [
-          {
-            required: true,
-            message: '固件版本不能为空',
-            trigger: 'blur',
-          },
-        ],
-      },
-      isMediaDevice: false,
-    };
-  },
-  created() {
-    let activeName = this.$route.query.activeName;
-    if (activeName != null && activeName != '') {
-      this.activeName = activeName;
-    }
-    // 获取设备信息
-    this.form.deviceId = this.$route.query && this.$route.query.deviceId;
-    if (this.form.deviceId != 0) {
-      this.connectMqtt();
-      this.getDevice(this.form.deviceId);
-    }
-    this.isSubDev = this.$route.query.isSubDev === 1;
-  },
-  activated() {
-    // 跳转选项卡
-    let activeName = this.$route.query.activeName;
-    if (activeName != null && activeName != '') {
-      this.activeName = activeName;
-    }
-  },
-  destroyed() {
-    // 取消订阅主题
-    this.mqttUnSubscribe(this.form);
-  },
-  methods: {
-    /* 连接Mqtt消息服务器 */
-    async connectMqtt() {
-      if (this.$mqttTool.client == null) {
-        await this.$mqttTool.connect(this.vuex_token);
-      }
-      this.mqttCallback();
+    computed: {
+        deviceStatus: {
+            set(val) {
+                if (val == 1) {
+                    // 1-未激活，2-禁用，3-在线，4-离线
+                    this.form.status = 2;
+                } else if (val == 0) {
+                    this.form.status = 4;
+                } else {
+                    this.form.status = this.oldDeviceStatus;
+                }
+            },
+            get() {
+                if (this.form.status == 2) {
+                    return 1;
+                }
+                return 0;
+            },
+        },
     },
-    /* 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;
+    data() {
+        return {
+            // 二维码内容
+            qrText: 'fastbee',
+            // 打开设备配置对话框
+            openSummary: false,
+            //二维码
+            openCode: false,
+            openViewMqtt: false,
+            // 生成设备编码是否禁用
+            genDisabled: false,
+            // 选中选项卡
+            activeName: 'basic',
+            //查看mqtt参数
+            mqttList: [],
+            // 遮罩层
+            loading: true,
+            // 设备开始状态
+            oldDeviceStatus: null,
+            deviceId: '',
+            channelId: '',
+            // 表单参数
+            form: {
+                productId: 0,
+                status: 1,
+                locationWay: 1,
+                firmwareVersion: 1.0,
+                serialNumber: '',
+                deviceType: 1,
+                isSimulate: 0,
+            },
+            //mqtt参数查看
+            listQuery: {
+                clientId: 0,
+                username: '',
+                passwd: '',
+                port: '',
+            },
+            openTip: false,
+            openServerTip: false,
+            serverType: 1,
+            //用于判断是否是设备组(modbus)
+            isSubDev: false,
+            // 设备摘要
+            summary: [],
+            // 地址
+            baseUrl: process.env.VUE_APP_BASE_API,
+            // 地图相关
+            map: null,
+            mk: null,
+            latitude: '',
+            longitude: '',
+            // 表单校验
+            rules: {
+                deviceName: [
+                    {
+                        required: true,
+                        message: '设备名称不能为空',
+                        trigger: 'blur',
+                    },
+                    {
+                        min: 2,
+                        max: 32,
+                        message: '设备名称长度在 2 到 32 个字符',
+                        trigger: 'blur',
+                    },
+                ],
+                firmwareVersion: [
+                    {
+                        required: true,
+                        message: '固件版本不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+            isMediaDevice: false,
+        };
+    },
+    created() {
+        let activeName = this.$route.query.activeName;
+        if (activeName != null && activeName != '') {
+            this.activeName = activeName;
         }
-        if (topics[3] == 'status' || topics[2] == 'status') {
-          console.log('接收到【设备状态-详情】主题：', topic);
-          console.log('接收到【设备状态-详情】内容：', message);
-          // 更新列表中设备的状态
-          if (this.form.serialNumber == deviceNum) {
-            this.oldDeviceStatus = message.status;
-            this.form.status = message.status;
-            this.form.isShadow = message.isShadow;
-            this.form.rssid = message.rssid;
-          }
+        // 获取设备信息
+        this.form.deviceId = this.$route.query && this.$route.query.deviceId;
+        if (this.form.deviceId != 0) {
+            this.connectMqtt();
+            this.getDevice(this.form.deviceId);
         }
-        //不是modbus不转发到子页面，其他设备的页面有回调方法
-        if (this.isSubDev) {
-          /*发送设备上报到子模块*/
-          if (topic.endsWith('ws/service')) {
-            this.$busEvent.$emit('updateData', {
-              serialNumber: topics[2],
-              productId: this.form.productId,
-              data: message,
+        this.isSubDev = this.$route.query.isSubDev === 1;
+    },
+    activated() {
+        // 跳转选项卡
+        let activeName = this.$route.query.activeName;
+        if (activeName != null && activeName != '') {
+            this.activeName = activeName;
+        }
+    },
+    destroyed() {
+        // 取消订阅主题
+        this.mqttUnSubscribe(this.form);
+    },
+    methods: {
+        /* 连接Mqtt消息服务器 */
+        async connectMqtt() {
+            if (this.$mqttTool.client == null) {
+                await this.$mqttTool.connect(this.vuex_token);
+            }
+            this.mqttCallback();
+        },
+        /* 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' || topics[2] == 'status') {
+                    console.log('接收到【设备状态-详情】主题：', topic);
+                    console.log('接收到【设备状态-详情】内容：', message);
+                    // 更新列表中设备的状态
+                    if (this.form.serialNumber == deviceNum) {
+                        this.oldDeviceStatus = message.status;
+                        this.form.status = message.status;
+                        this.form.isShadow = message.isShadow;
+                        this.form.rssid = message.rssid;
+                    }
+                }
+                //不是modbus不转发到子页面，其他设备的页面有回调方法
+                if (this.isSubDev) {
+                    /*发送设备上报到子模块*/
+                    if (topic.endsWith('ws/service')) {
+                        this.$busEvent.$emit('updateData', {
+                            serialNumber: topics[2],
+                            productId: this.form.productId,
+                            data: message,
+                        });
+                    }
+                }
+                /*发送设备上报到子模块*/
+                if (topic.endsWith('ws/post/simulate')) {
+                    this.$busEvent.$emit('logData', {
+                        serialNumber: topics[1],
+                        productId: this.form.productId,
+                        data: message,
+                    });
+                }
             });
-          }
-        }
-        /*发送设备上报到子模块*/
-        if (topic.endsWith('ws/post/simulate')) {
-          this.$busEvent.$emit('logData', {
-            serialNumber: topics[1],
-            productId: this.form.productId,
-            data: message,
-          });
-        }
-      });
-    },
-    /** Mqtt订阅主题 */
-    mqttSubscribe(device) {
-      // 订阅当前设备状态和实时监测
-      let topicStatus = '/' + device.productId + '/' + device.serialNumber + '/status/post';
-      let topicProperty = '/' + device.productId + '/' + device.serialNumber + '/property/post';
-      let topicFunction = '/' + device.productId + '/' + device.serialNumber + '/function/post';
-      let topicMonitor = '/' + device.productId + '/' + device.serialNumber + '/monitor/post';
-      let topicReply = '/' + device.productId + '/' + device.serialNumber + '/service/reply';
-      let topics = [];
-      let serviceTop = '/' + device.productId + '/' + device.serialNumber + '/ws/service';
-      topics.push(serviceTop);
+        },
+        /** Mqtt订阅主题 */
+        mqttSubscribe(device) {
+            // 订阅当前设备状态和实时监测
+            let topicStatus = '/' + device.productId + '/' + device.serialNumber + '/status/post';
+            let topicProperty = '/' + device.productId + '/' + device.serialNumber + '/property/post';
+            let topicFunction = '/' + device.productId + '/' + device.serialNumber + '/function/post';
+            let topicMonitor = '/' + device.productId + '/' + device.serialNumber + '/monitor/post';
+            let topicReply = '/' + device.productId + '/' + device.serialNumber + '/service/reply';
+            let topics = [];
+            let serviceTop = '/' + device.productId + '/' + device.serialNumber + '/ws/service';
+            topics.push(serviceTop);
 
-      topics.push(topicStatus);
-      topics.push(topicFunction);
-      topics.push(topicMonitor);
-      topics.push(topicReply);
-      /*modbus设备不订阅此topic*/
-      if (!this.isSubDev) {
-        // topics.push(topicProperty);
-      }
-      this.$mqttTool.subscribe(topics);
-    },
-    /** Mqtt取消订阅主题 */
-    mqttUnSubscribe(device) {
-      // 订阅当前设备状态和实时监测
-      let topicStatus = '/' + device.productId + '/' + device.serialNumber + '/status/post';
-      let topicProperty = '/' + device.productId + '/' + device.serialNumber + '/property/post';
-      let topicFunction = '/' + device.productId + '/' + device.serialNumber + '/function/post';
-      let topicMonitor = '/' + device.productId + '/' + device.serialNumber + '/monitor/post';
-      let topicReply = '/' + device.productId + '/' + device.serialNumber + '/service/reply';
-      let topics = [];
-      let serviceTop = '/' + device.productId + '/' + device.serialNumber + '/ws/service';
-      topics.push(serviceTop);
+            topics.push(topicStatus);
+            topics.push(topicFunction);
+            topics.push(topicMonitor);
+            topics.push(topicReply);
+            /*modbus设备不订阅此topic*/
+            if (!this.isSubDev) {
+                // topics.push(topicProperty);
+            }
+            this.$mqttTool.subscribe(topics);
+        },
+        /** Mqtt取消订阅主题 */
+        mqttUnSubscribe(device) {
+            // 订阅当前设备状态和实时监测
+            let topicStatus = '/' + device.productId + '/' + device.serialNumber + '/status/post';
+            let topicProperty = '/' + device.productId + '/' + device.serialNumber + '/property/post';
+            let topicFunction = '/' + device.productId + '/' + device.serialNumber + '/function/post';
+            let topicMonitor = '/' + device.productId + '/' + device.serialNumber + '/monitor/post';
+            let topicReply = '/' + device.productId + '/' + device.serialNumber + '/service/reply';
+            let topics = [];
+            let serviceTop = '/' + device.productId + '/' + device.serialNumber + '/ws/service';
+            topics.push(serviceTop);
 
-      topics.push(topicStatus);
-      topics.push(topicFunction);
-      topics.push(topicMonitor);
-      topics.push(topicReply);
-      /*modbus设备不订阅此topic*/
-      if (!this.isSubDev) {
-        /*通过网关再转发*/
-        // topics.push(topicProperty);
-      }
-      this.$mqttTool.unsubscribe(topics);
-    },
+            topics.push(topicStatus);
+            topics.push(topicFunction);
+            topics.push(topicMonitor);
+            topics.push(topicReply);
+            /*modbus设备不订阅此topic*/
+            if (!this.isSubDev) {
+                /*通过网关再转发*/
+                // topics.push(topicProperty);
+            }
+            this.$mqttTool.unsubscribe(topics);
+        },
 
-    // 获取子组件订阅的设备状态
-    // getDeviceStatusData(status) {
-    //   this.form.status = status;
-    // },
-    getPlayerData(data) {
+        // 获取子组件订阅的设备状态
+        // getDeviceStatusData(status) {
+        //   this.form.status = status;
+        // },
+        getPlayerData(data) {
             this.activeName = data.tabName;
             this.channelId = data.channelId;
             // this.$set(this.form, 'channelId', this.channelId);
@@ -525,18 +505,18 @@ export default {
             }
         },
 
-    /** 选项卡改变事件*/
-    // tabChange(panel) {
-    //   this.$nextTick(() => {
-    //     // 获取监测统计数据
-    //     if (panel.name === 'deviceStastic' && !this.isSubDev) {
-    //       this.$refs.deviceStatistic.getListHistory();
-    //     } else if (panel.name === 'deviceTimer'&& !this.isSubDev) {
-    //       this.$refs.deviceTimer.getList();
-    //     }
-    //   });
-    // },
-    tabChange(panel) {
+        /** 选项卡改变事件*/
+        // tabChange(panel) {
+        //   this.$nextTick(() => {
+        //     // 获取监测统计数据
+        //     if (panel.name === 'deviceStastic' && !this.isSubDev) {
+        //       this.$refs.deviceStatistic.getListHistory();
+        //     } else if (panel.name === 'deviceTimer'&& !this.isSubDev) {
+        //       this.$refs.deviceTimer.getList();
+        //     }
+        //   });
+        // },
+        tabChange(panel) {
             if (this.form.deviceType == 3 && panel.name != 'deviceReturn') {
                 if (panel.name === 'videoLive') {
                     if (this.channelId) {
@@ -547,20 +527,17 @@ export default {
                         this.$refs.deviceLiveStream.changeChannel();
                     }
                 } else if (panel.name === 'sipChannel') {
-                  this.$refs.deviceChannel.getList();
+                    this.$refs.deviceChannel.getList();
                 }
                 //关闭直播流
                 if (panel.name !== 'sipVideo') {
-                  if(this.$refs.deviceLiveStream.playing) {
-                    this.$refs.deviceLiveStream.closeDestroy(false);
-                  }
+                    if (this.$refs.deviceLiveStream.playing) {
+                        this.$refs.deviceLiveStream.closeDestroy(false);
+                    }
                 }
             }
             this.$nextTick(() => {
-                // 获取监测统计数据
-                if (panel.name === 'deviceStastic') {
-                    this.$refs.deviceStatistic.getListHistory();
-                } else if (panel.name === 'deviceTimer') {
+                if (panel.name === 'deviceTimer') {
                     this.$refs.deviceTimer.getList();
                 } else if (panel.name === 'deviceSub') {
                     if (this.form.serialNumber) {
@@ -570,409 +547,400 @@ export default {
                 }
             });
         },
-    /** 数据同步*/
-    deviceSynchronization() {
-      deviceSynchronization(this.form.serialNumber).then(async (response) => {
-        // 获取缓存物模型
-        response.data.cacheThingsModel = await this.getCacheThingsModdel(response.data.productId);
-        // 获取设备运行状态
-        response.data.thingsModels = await this.getDeviceStatus(this.form);
-        // 格式化物模型，拆分出监测值,数组添加前缀
-        this.formatThingsModel(response.data);
-        this.form = response.data;
-        // 选项卡切换
-        this.activeName = 'runningStatus';
-        this.oldDeviceStatus = this.form.status;
-        this.loadMap();
-      });
-    },
-    /**获取设备详情*/
-    getDevice(deviceId) {
-      getDevice(deviceId).then(async (response) => {
-        // 分享设备获取用户权限
-        response.data.userPerms = [];
-        if (response.data.isOwner == 0) {
-          getDeviceUser(deviceId, this.$store.state.user.userId).then((permResponse) => {
-            response.data.userPerms = permResponse.data.perms.split(',');
-            // 获取设备状态和物模型
-            this.getDeviceStatusWitchThingsModel(response);
-          });
-        } else {
-          // 获取设备状态和物模型
-          this.getDeviceStatusWitchThingsModel(response);
-        }
-      });
-    },
-    /**用户是否拥有分享设备权限*/
-    hasShrarePerm(permission) {
-      if (this.form.isOwner == 0) {
-        // 分享设备权限
-        if (this.form.userPerms.indexOf(permission) == -1) {
-          return false;
-        }
-      }
-      return true;
-    },
-    /** 获取缓存物模型*/
-    getCacheThingsModdel(productId) {
-      return new Promise((resolve, reject) => {
-        cacheJsonThingsModel(productId)
-          .then((response) => {
-            resolve(JSON.parse(response.data));
-          })
-          .catch((error) => {
-            reject(error);
-          });
-      });
-    },
-    /**获取设备运行状态*/
-    getDeviceStatus(data) {
-      const params = {
-        deviceId: data.deviceId,
-      };
-      return new Promise((resolve, reject) => {
-        getDeviceRunningStatus(params)
-          .then((response) => {
-            resolve(response.data.thingsModels);
-          })
-          .catch((error) => {
-            reject(error);
-          });
-      });
-    },
-    formatThingsModel(data) {
-      data.chartList = [];
-      data.monitorList = [];
-      data.staticList = [];
-      // 物模型格式化
-      for (let i = 0; i < data.thingsModels.length; i++) {
-        // 数字类型设置默认值并转换未数值
-        if (data.thingsModels[i].datatype.type == 'integer' || data.thingsModels[i].datatype.type == 'decimal') {
-          if (data.thingsModels[i].shadow == '') {
-            data.thingsModels[i].shadow = Number(data.thingsModels[i].datatype.min);
-          } else {
-            data.thingsModels[i].shadow = Number(data.thingsModels[i].shadow);
-          }
-        }
-
-        // 物模型分类放置
-        if (data.thingsModels[i].datatype.type == 'array') {
-          if (data.thingsModels[i].datatype.arrayType == 'object') {
-            for (let k = 0; k < data.thingsModels[i].datatype.arrayParams.length; k++) {
-              for (let j = 0; j < data.thingsModels[i].datatype.arrayParams[k].length; j++) {
-                // 数组元素中参数ID添加前缀，例如：array_00_
-                let index = k > 9 ? String(k) : '0' + k;
-                let prefix = 'array_' + index + '_';
-                data.thingsModels[i].datatype.arrayParams[k][j].id = prefix + data.thingsModels[i].datatype.arrayParams[k][j].id;
-                // 图表、实时监测、监测统计分类放置
-                if (data.thingsModels[i].datatype.arrayParams[k][j].isChart == 1) {
-                  // 图表
-                  data.thingsModels[i].datatype.arrayParams[k][j].name = '[' + data.thingsModels[i].name + (k + 1) + '] ' + data.thingsModels[i].datatype.arrayParams[k][j].name;
-                  data.thingsModels[i].datatype.arrayParams[k][j].datatype.arrayType = 'object';
-                  data.chartList.push(data.thingsModels[i].datatype.arrayParams[k][j]);
-                  if (data.thingsModels[i].datatype.arrayParams[k][j].isHistory == 1) {
-                    // 监测统计
-                    data.staticList.push(data.thingsModels[i].datatype.arrayParams[k][j]);
-                  }
-                  if (data.thingsModels[i].datatype.arrayParams[k][j].isMonitor == 1) {
-                    // 实时监测
-                    data.monitorList.push(data.thingsModels[i].datatype.arrayParams[k][j]);
-                  }
-                  data.thingsModels[i].datatype.arrayParams[k].splice(j--, 1);
-                }
-              }
-            }
-          } else {
-            // 字符串拆分为物模型数组 model=id/name/type/isReadonly/value/shadow
-            let values = data.thingsModels[i].value != '' ? data.thingsModels[i].value.split(',') : [];
-            let shadows = data.thingsModels[i].shadow != '' ? data.thingsModels[i].shadow.split(',') : [];
-            for (let j = 0; j < data.thingsModels[i].datatype.arrayCount; j++) {
-              if (!data.thingsModels[i].datatype.arrayModel) {
-                data.thingsModels[i].datatype.arrayModel = [];
-              }
-              // 数组里面的ID需要添加前缀和索引，例如：array_00_temperature
-              let index = j > 9 ? String(j) : '0' + j;
-              let prefix = 'array_' + index + '_';
-              data.thingsModels[i].datatype.arrayModel[j] = {
-                id: prefix + data.thingsModels[i].id,
-                name: data.thingsModels[i].name,
-                type: data.thingsModels[i].type,
-                isReadonly: data.thingsModels[i].isReadonly,
-                value: values[j] ? values[j] : '',
-                shadow: shadows[j] ? shadows[j] : '',
-              };
-            }
-          }
-        } else if (data.thingsModels[i].datatype.type == 'object') {
-          for (let j = 0; j < data.thingsModels[i].datatype.params.length; j++) {
-            // 图表、实时监测、监测统计分类放置
-            if (data.thingsModels[i].datatype.params[j].isChart == 1) {
-              // 图表
-              data.thingsModels[i].datatype.params[j].name = '[' + data.thingsModels[i].name + '] ' + data.thingsModels[i].datatype.params[j].name;
-              data.chartList.push(data.thingsModels[i].datatype.params[j]);
-              if (data.thingsModels[i].datatype.params[j].isHistory == 1) {
-                // 监测统计
-                data.staticList.push(data.thingsModels[i].datatype.params[j]);
-              }
-              if (data.thingsModels[i].datatype.params[j].isMonitor == 1) {
-                // 实时监测
-                data.monitorList.push(data.thingsModels[i].datatype.params[j]);
-              }
-              data.thingsModels[i].datatype.params.splice(j--, 1);
-            }
-          }
-        } else if (data.thingsModels[i].isChart == 1) {
-          // // 图表、实时监测、监测统计分类放置
-          data.chartList.push(data.thingsModels[i]);
-          if (data.thingsModels[i].isHistory == 1) {
-            // 监测统计
-            data.staticList.push(data.thingsModels[i]);
-          }
-          if (data.thingsModels[i].isMonitor == 1) {
-            // 实时监测
-            data.monitorList.push(data.thingsModels[i]);
-          }
-          // 使用i--解决索引变更问题
-          data.thingsModels.splice(i--, 1);
-        }
-      }
-    },
-    /**加载地图*/
-    loadMap() {
-      this.$nextTick(() => {
-        loadBMap().then(() => {
-          this.getmap();
-        });
-      });
-    },
-    /** 返回按钮 */
-    goBack() {
-      const obj = {
-        path: '/iot/device',
-        query: {
-          t: Date.now(),
-          pageNum: this.$route.query.pageNum,
+        /** 数据同步*/
+        deviceSynchronization() {
+            deviceSynchronization(this.form.serialNumber).then(async (response) => {
+                // 获取缓存物模型
+                response.data.cacheThingsModel = await this.getCacheThingsModdel(response.data.productId);
+                // 获取设备运行状态
+                response.data.thingsModels = await this.getDeviceStatus(this.form);
+                // 格式化物模型，拆分出监测值,数组添加前缀
+                this.formatThingsModel(response.data);
+                this.form = response.data;
+                // 选项卡切换
+                this.activeName = 'runningStatus';
+                this.oldDeviceStatus = this.form.status;
+                this.loadMap();
+            });
         },
-      };
-      this.$tab.closeOpenPage(obj);
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        deviceId: 0,
-        deviceName: null,
-        productId: null,
-        productName: null,
-        userId: null,
-        userName: null,
-        tenantId: null,
-        tenantName: null,
-        serialNumber: '',
-        firmwareVersion: 1.0,
-        status: 1,
-        rssi: null,
-        networkAddress: null,
-        networkIp: null,
-        longitude: null,
-        latitude: null,
-        activeTime: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null,
-        locationWay: 1,
-        clientId: 0,
-      };
-      this.deviceStatus = 0;
-      this.resetForm('form');
-    },
-    /** 提交按钮 */
-    async submitForm() {
-      if (this.form.serialNumber == null || this.form.serialNumber == 0) {
-        this.$modal.alertError('设备编号不能为空');
-        return;
-      }
-      let reg = /^[0-9a-zA-Z]+$/;
-      if (!reg.test(this.form.serialNumber)) {
-        this.$modal.alertError('设备编号只能是字母和数字');
-        return;
-      }
-      if (this.form.productId == null || this.form.productId == 0) {
-        this.$modal.alertError('所属产品不能为空');
-        return;
-      }
-
-      this.$refs['form'].validate((valid) => {
-        if (valid) {
-          if (this.form.deviceId != 0) {
-            updateDevice(this.form).then((response) => {
-              if (response.data == 0) {
-                this.$modal.alertError(response.msg);
-              } else {
-                this.$modal.alertSuccess('修改成功');
-                this.form = JSON.parse(JSON.stringify(this.form));
-                this.loadMap();
-              }
+        /**获取设备详情*/
+        getDevice(deviceId) {
+            getDevice(deviceId).then(async (response) => {
+                // 分享设备获取用户权限
+                response.data.userPerms = [];
+                if (response.data.isOwner == 0) {
+                    getDeviceUser(deviceId, this.$store.state.user.userId).then((permResponse) => {
+                        response.data.userPerms = permResponse.data.perms.split(',');
+                        // 获取设备状态和物模型
+                        this.getDeviceStatusWitchThingsModel(response);
+                    });
+                } else {
+                    // 获取设备状态和物模型
+                    this.getDeviceStatusWitchThingsModel(response);
+                }
             });
-          } else {
-            addDevice(this.form).then(async (response) => {
-              // 获取设备状态
-              await this.getDeviceStatusWitchThingsModel(response);
-              if (this.form.deviceId == null || this.form.deviceId == 0) {
-                this.$modal.alertError('设备编号已经存在，添加设备失败');
-              } else {
-                if (this.form.status == 2) {
-                  this.deviceStatus = 1;
+        },
+        /**用户是否拥有分享设备权限*/
+        hasShrarePerm(permission) {
+            if (this.form.isOwner == 0) {
+                // 分享设备权限
+                if (this.form.userPerms.indexOf(permission) == -1) {
+                    return false;
+                }
+            }
+            return true;
+        },
+        /** 获取缓存物模型*/
+        getCacheThingsModdel(productId) {
+            return new Promise((resolve, reject) => {
+                cacheJsonThingsModel(productId)
+                    .then((response) => {
+                        resolve(JSON.parse(response.data));
+                    })
+                    .catch((error) => {
+                        reject(error);
+                    });
+            });
+        },
+        /**获取设备运行状态*/
+        getDeviceStatus(data) {
+            const params = {
+                deviceId: data.deviceId,
+            };
+            return new Promise((resolve, reject) => {
+                getDeviceRunningStatus(params)
+                    .then((response) => {
+                        resolve(response.data.thingsModels);
+                    })
+                    .catch((error) => {
+                        reject(error);
+                    });
+            });
+        },
+        formatThingsModel(data) {
+            data.chartList = [];
+            data.monitorList = [];
+            data.staticList = [];
+            // 物模型格式化
+            for (let i = 0; i < data.thingsModels.length; i++) {
+                // 数字类型设置默认值并转换未数值
+                if (data.thingsModels[i].datatype.type == 'integer' || data.thingsModels[i].datatype.type == 'decimal') {
+                    if (data.thingsModels[i].shadow == '') {
+                        data.thingsModels[i].shadow = Number(data.thingsModels[i].datatype.min);
+                    } else {
+                        data.thingsModels[i].shadow = Number(data.thingsModels[i].shadow);
+                    }
                 }
 
-                this.$modal.alertSuccess('添加设备成功');
-                this.loadMap();
-              }
+                // 物模型分类放置
+                if (data.thingsModels[i].datatype.type == 'array') {
+                    if (data.thingsModels[i].datatype.arrayType == 'object') {
+                        for (let k = 0; k < data.thingsModels[i].datatype.arrayParams.length; k++) {
+                            for (let j = 0; j < data.thingsModels[i].datatype.arrayParams[k].length; j++) {
+                                // 数组元素中参数ID添加前缀，例如：array_00_
+                                let index = k > 9 ? String(k) : '0' + k;
+                                let prefix = 'array_' + index + '_';
+                                data.thingsModels[i].datatype.arrayParams[k][j].id = prefix + data.thingsModels[i].datatype.arrayParams[k][j].id;
+                                // 图表、实时监测、监测统计分类放置
+                                if (data.thingsModels[i].datatype.arrayParams[k][j].isChart == 1) {
+                                    // 图表
+                                    data.thingsModels[i].datatype.arrayParams[k][j].name = '[' + data.thingsModels[i].name + (k + 1) + '] ' + data.thingsModels[i].datatype.arrayParams[k][j].name;
+                                    data.thingsModels[i].datatype.arrayParams[k][j].datatype.arrayType = 'object';
+                                    data.chartList.push(data.thingsModels[i].datatype.arrayParams[k][j]);
+
+                                    if (data.thingsModels[i].datatype.arrayParams[k][j].isMonitor == 1) {
+                                        // 实时监测
+                                        data.monitorList.push(data.thingsModels[i].datatype.arrayParams[k][j]);
+                                    }
+                                    data.thingsModels[i].datatype.arrayParams[k].splice(j--, 1);
+                                }
+                            }
+                        }
+                    } else {
+                        // 字符串拆分为物模型数组 model=id/name/type/isReadonly/value/shadow
+                        let values = data.thingsModels[i].value != '' ? data.thingsModels[i].value.split(',') : [];
+                        let shadows = data.thingsModels[i].shadow != '' ? data.thingsModels[i].shadow.split(',') : [];
+                        for (let j = 0; j < data.thingsModels[i].datatype.arrayCount; j++) {
+                            if (!data.thingsModels[i].datatype.arrayModel) {
+                                data.thingsModels[i].datatype.arrayModel = [];
+                            }
+                            // 数组里面的ID需要添加前缀和索引，例如：array_00_temperature
+                            let index = j > 9 ? String(j) : '0' + j;
+                            let prefix = 'array_' + index + '_';
+                            data.thingsModels[i].datatype.arrayModel[j] = {
+                                id: prefix + data.thingsModels[i].id,
+                                name: data.thingsModels[i].name,
+                                type: data.thingsModels[i].type,
+                                isReadonly: data.thingsModels[i].isReadonly,
+                                value: values[j] ? values[j] : '',
+                                shadow: shadows[j] ? shadows[j] : '',
+                            };
+                        }
+                    }
+                } else if (data.thingsModels[i].datatype.type == 'object') {
+                    for (let j = 0; j < data.thingsModels[i].datatype.params.length; j++) {
+                        // 图表、实时监测、监测统计分类放置
+                        if (data.thingsModels[i].datatype.params[j].isChart == 1) {
+                            // 图表
+                            data.thingsModels[i].datatype.params[j].name = '[' + data.thingsModels[i].name + '] ' + data.thingsModels[i].datatype.params[j].name;
+                            data.chartList.push(data.thingsModels[i].datatype.params[j]);
+
+                            if (data.thingsModels[i].datatype.params[j].isMonitor == 1) {
+                                // 实时监测
+                                data.monitorList.push(data.thingsModels[i].datatype.params[j]);
+                            }
+                            data.thingsModels[i].datatype.params.splice(j--, 1);
+                        }
+                    }
+                } else if (data.thingsModels[i].isChart == 1) {
+                    // // 图表、实时监测、监测统计分类放置
+                    data.chartList.push(data.thingsModels[i]);
+
+                    if (data.thingsModels[i].isMonitor == 1) {
+                        // 实时监测
+                        data.monitorList.push(data.thingsModels[i]);
+                    }
+                    // 使用i--解决索引变更问题
+                    data.thingsModels.splice(i--, 1);
+                }
+            }
+        },
+        /**加载地图*/
+        loadMap() {
+            this.$nextTick(() => {
+                loadBMap().then(() => {
+                    this.getmap();
+                });
             });
-          }
-        }
-      });
-    },
-    /** 获取设备状态和物模型 **/
-    async getDeviceStatusWitchThingsModel(response) {
-      // 获取缓存物模型
-      response.data.cacheThingsModel = await this.getCacheThingsModdel(response.data.productId);
-      // 获取设备运行状态
-      response.data.thingsModels = await this.getDeviceStatus(response.data);
-      //分享设备过滤没有权限的物模型
-      if (response.data.isOwner == 0) {
-        for (let i = 0; i < response.data.thingsModels.length; i++) {
-          if (response.data.userPerms.indexOf(response.data.thingsModels[i].id) == -1) {
-            response.data.thingsModels.splice(i--, 1);
-          }
-        }
-      }
-      // 格式化物模型，拆分出监测值,数组添加前缀
-      this.formatThingsModel(response.data);
-      this.form = response.data;
-      // 解析设备摘要
-      if (this.form.summary != null && this.form.summary != '') {
-        this.summary = JSON.parse(this.form.summary);
-      }
-      this.isSubDev = this.form.subDeviceList && this.form.subDeviceList.length > 0;
-      this.oldDeviceStatus = this.form.status;
-      this.loadMap();
-      //Mqtt订阅
-      this.connectMqtt();
-      this.mqttSubscribe(this.form);
-    },
-    /**选择产品 */
-    selectProduct() {
-      this.$refs.productList.open = true;
-      this.$refs.productList.getList();
-    },
-    genSipID() {
-      this.$refs.sipidGen.open = true;
-    },
-    /**获取选中的产品 */
-    getProductData(product) {
-      this.form.productId = product.productId;
-      this.form.productName = product.productName;
-      this.form.deviceType = product.deviceType;
-      this.form.tenantId = product.tenantId;
-      this.form.tenantName = product.tenantName;
-      if (product.transport === 'TCP') {
-        this.openServerTip = true;
-        this.serverType = 3;
-      } else {
-        this.openServerTip = false;
-        this.serverType = 1;
-      }
-    },
-    getSipIDData(devsipid) {
+        },
+        /** 返回按钮 */
+        goBack() {
+            const obj = {
+                path: '/iot/device',
+                query: {
+                    t: Date.now(),
+                    pageNum: this.$route.query.pageNum,
+                },
+            };
+            this.$tab.closeOpenPage(obj);
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                deviceId: 0,
+                deviceName: null,
+                productId: null,
+                productName: null,
+                userId: null,
+                userName: null,
+                tenantId: null,
+                tenantName: null,
+                serialNumber: '',
+                firmwareVersion: 1.0,
+                status: 1,
+                rssi: null,
+                networkAddress: null,
+                networkIp: null,
+                longitude: null,
+                latitude: null,
+                activeTime: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                remark: null,
+                locationWay: 1,
+                clientId: 0,
+            };
+            this.deviceStatus = 0;
+            this.resetForm('form');
+        },
+        /** 提交按钮 */
+        async submitForm() {
+            if (this.form.serialNumber == null || this.form.serialNumber == 0) {
+                this.$modal.alertError('设备编号不能为空');
+                return;
+            }
+            let reg = /^[0-9a-zA-Z]+$/;
+            if (!reg.test(this.form.serialNumber)) {
+                this.$modal.alertError('设备编号只能是字母和数字');
+                return;
+            }
+            if (this.form.productId == null || this.form.productId == 0) {
+                this.$modal.alertError('所属产品不能为空');
+                return;
+            }
+
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (this.form.deviceId != 0) {
+                        updateDevice(this.form).then((response) => {
+                            if (response.data == 0) {
+                                this.$modal.alertError(response.msg);
+                            } else {
+                                this.$modal.alertSuccess('修改成功');
+                                this.form = JSON.parse(JSON.stringify(this.form));
+                                this.loadMap();
+                            }
+                        });
+                    } else {
+                        addDevice(this.form).then(async (response) => {
+                            // 获取设备状态
+                            await this.getDeviceStatusWitchThingsModel(response);
+                            if (this.form.deviceId == null || this.form.deviceId == 0) {
+                                this.$modal.alertError('设备编号已经存在，添加设备失败');
+                            } else {
+                                if (this.form.status == 2) {
+                                    this.deviceStatus = 1;
+                                }
+
+                                this.$modal.alertSuccess('添加设备成功');
+                                this.loadMap();
+                            }
+                        });
+                    }
+                }
+            });
+        },
+        /** 获取设备状态和物模型 **/
+        async getDeviceStatusWitchThingsModel(response) {
+            // 获取缓存物模型
+            response.data.cacheThingsModel = await this.getCacheThingsModdel(response.data.productId);
+            // 获取设备运行状态
+            response.data.thingsModels = await this.getDeviceStatus(response.data);
+            //分享设备过滤没有权限的物模型
+            if (response.data.isOwner == 0) {
+                for (let i = 0; i < response.data.thingsModels.length; i++) {
+                    if (response.data.userPerms.indexOf(response.data.thingsModels[i].id) == -1) {
+                        response.data.thingsModels.splice(i--, 1);
+                    }
+                }
+            }
+            // 格式化物模型，拆分出监测值,数组添加前缀
+            this.formatThingsModel(response.data);
+            this.form = response.data;
+            // 解析设备摘要
+            if (this.form.summary != null && this.form.summary != '') {
+                this.summary = JSON.parse(this.form.summary);
+            }
+            this.isSubDev = this.form.subDeviceList && this.form.subDeviceList.length > 0;
+            this.oldDeviceStatus = this.form.status;
+            this.loadMap();
+            //Mqtt订阅
+            this.connectMqtt();
+            this.mqttSubscribe(this.form);
+        },
+        /**选择产品 */
+        selectProduct() {
+            this.$refs.productList.open = true;
+            this.$refs.productList.getList();
+        },
+        genSipID() {
+            this.$refs.sipidGen.open = true;
+        },
+        /**获取选中的产品 */
+        getProductData(product) {
+            this.form.productId = product.productId;
+            this.form.productName = product.productName;
+            this.form.deviceType = product.deviceType;
+            this.form.tenantId = product.tenantId;
+            this.form.tenantName = product.tenantName;
+            if (product.transport === 'TCP') {
+                this.openServerTip = true;
+                this.serverType = 3;
+            } else {
+                this.openServerTip = false;
+                this.serverType = 1;
+            }
+        },
+        getSipIDData(devsipid) {
             this.form.serialNumber = devsipid;
         },
-    // 获取选中的用户
-    getUserData(user) { },
-    /**关闭物模型 */
-    openSummaryDialog() {
-      let json = {
-        type: 1, // 1=扫码关联设备
-        deviceNumber: this.form.serialNumber,
-        productId: this.form.productId,
-        // productName: this.form.productName,
-      };
-      this.qrText = JSON.stringify(json);
-      this.openSummary = true;
-    },
-    /**关闭物模型 */
-    closeSummaryDialog() {
-      this.openSummary = false;
-      this.openViewMqtt = false;
-    },
-    doCopy(type) {
-      if (type == 2) {
-        const input = document.createElement('input');
-        input.value = '{clientId:' + this.listQuery.clientId + ',username:' + this.listQuery.username + ',passwd:' + this.listQuery.passwd + ',port:' + this.listQuery.port + '}';
-        document.body.appendChild(input);
-        input.select(); //选中输入框
-        document.execCommand('Copy'); //复制当前选中文本到前切板
-        document.body.removeChild(input);
-        this.$message.success('复制成功');
-      }
-    },
-    openCodeDialog() {
-      let json = {
-        type: 1, // 1=扫码关联设备
-        deviceNumber: this.form.serialNumber,
-        productId: this.form.productId,
-        productName: this.form.productName,
-      };
-      this.qrText = JSON.stringify(json);
-      this.openCode = true;
-    },
-    // 地图定位
-    getmap() {
-      this.map = new BMap.Map('map');
-      let point = null;
-      if (this.form.longitude != null && this.form.longitude != '' && this.form.latitude != null && this.form.latitude != '') {
-        point = new BMap.Point(this.form.longitude, this.form.latitude);
-      } else {
-        point = new BMap.Point(116.404, 39.915);
-      }
-      this.map.centerAndZoom(point, 19);
-      this.map.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放
-      this.map.addControl(new BMap.NavigationControl());
+        // 获取选中的用户
+        getUserData(user) {},
+        /**关闭物模型 */
+        openSummaryDialog() {
+            let json = {
+                type: 1, // 1=扫码关联设备
+                deviceNumber: this.form.serialNumber,
+                productId: this.form.productId,
+                // productName: this.form.productName,
+            };
+            this.qrText = JSON.stringify(json);
+            this.openSummary = true;
+        },
+        /**关闭物模型 */
+        closeSummaryDialog() {
+            this.openSummary = false;
+            this.openViewMqtt = false;
+        },
+        doCopy(type) {
+            if (type == 2) {
+                const input = document.createElement('input');
+                input.value = '{clientId:' + this.listQuery.clientId + ',username:' + this.listQuery.username + ',passwd:' + this.listQuery.passwd + ',port:' + this.listQuery.port + '}';
+                document.body.appendChild(input);
+                input.select(); //选中输入框
+                document.execCommand('Copy'); //复制当前选中文本到前切板
+                document.body.removeChild(input);
+                this.$message.success('复制成功');
+            }
+        },
+        openCodeDialog() {
+            let json = {
+                type: 1, // 1=扫码关联设备
+                deviceNumber: this.form.serialNumber,
+                productId: this.form.productId,
+                productName: this.form.productName,
+            };
+            this.qrText = JSON.stringify(json);
+            this.openCode = true;
+        },
+        // 地图定位
+        getmap() {
+            this.map = new BMap.Map('map');
+            let point = null;
+            if (this.form.longitude != null && this.form.longitude != '' && this.form.latitude != null && this.form.latitude != '') {
+                point = new BMap.Point(this.form.longitude, this.form.latitude);
+            } else {
+                point = new BMap.Point(116.404, 39.915);
+            }
+            this.map.centerAndZoom(point, 19);
+            this.map.enableScrollWheelZoom(true); // 开启鼠标滚轮缩放
+            this.map.addControl(new BMap.NavigationControl());
 
-      // 标注设备位置
-      this.mk = new BMap.Marker(point);
-      this.map.addOverlay(this.mk);
-      this.map.panTo(point);
+            // 标注设备位置
+            this.mk = new BMap.Marker(point);
+            this.map.addOverlay(this.mk);
+            this.map.panTo(point);
+        },
+        // 生成随机字母和数字
+        generateNum() {
+            if (!this.form.productId || this.form.productId == 0) {
+                this.$modal.alertError('请先选择产品');
+                return;
+            }
+            this.genDisabled = true;
+            const params = { type: this.serverType };
+            generatorDeviceNum(params).then((response) => {
+                this.form.serialNumber = response.data;
+                this.genDisabled = false;
+            });
+        },
+        //mqtt参数查看
+        handleViewMqtt() {
+            this.openViewMqtt = true;
+            this.loading = true;
+            const params = {
+                deviceId: this.form.deviceId,
+            };
+            getMqttConnect(params).then((response) => {
+                if (response.code == 200) {
+                    this.listQuery = response.data;
+                    this.loading = false;
+                }
+            });
+        },
     },
-    // 生成随机字母和数字
-    generateNum() {
-      if (!this.form.productId || this.form.productId == 0) {
-        this.$modal.alertError('请先选择产品');
-        return;
-      }
-      this.genDisabled = true;
-      const params = { type: this.serverType };
-      generatorDeviceNum(params).then((response) => {
-        this.form.serialNumber = response.data;
-        this.genDisabled = false;
-      });
-    },
-    //mqtt参数查看
-    handleViewMqtt() {
-      this.openViewMqtt = true;
-      this.loading = true;
-      const params = {
-        deviceId: this.form.deviceId,
-      };
-      getMqttConnect(params).then((response) => {
-        if (response.code == 200) {
-          this.listQuery = response.data;
-          this.loading = false;
-        }
-      });
-    },
-  },
 };
 </script>
diff --git a/vue/src/views/iot/device/device-statistic.vue b/vue/src/views/iot/device/device-statistic.vue
deleted file mode 100644
index 446c8c90..00000000
--- a/vue/src/views/iot/device/device-statistic.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<template>
-  <div style="padding-left: 20px">
-    <el-row>
-      <el-col :span="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="75px">
-          <el-form-item label="请选择设备从机:" label-width="120px" v-if="isSubDev">
-            <el-select v-model="queryParams.slaveId" placeholder="请选择设备从机" @change="selectSlave">
-              <el-option v-for="slave in slaveList" :key="slave.slaveId" :label="`${slave.deviceName} (${slave.slaveId})`"
-                :value="slave.slaveId"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="时间范围">
-            <el-date-picker v-model="daterangeTime" size="small" style="width: 240px" value-format="yyyy-MM-dd"
-              type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="getListHistory">查询</el-button>
-          </el-form-item>
-        </el-form>
-      </el-col>
-      <el-col :span="23">
-        <div v-for="(item, index) in staticList" :key="index" style="margin-bottom: 30px">
-          <el-card shadow="hover" :body-style="{ padding: '10px 0px', overflow: 'auto' }" v-loading="loading">
-            <div ref="statisticMap" style="height: 300px; width: 1080px"></div>
-          </el-card>
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { listHistory } from '@/api/iot/deviceLog';
-
-export default {
-  name: 'device-statistic',
-  props: {
-    device: {
-      type: Object,
-      default: null,
-    },
-  },
-  watch: {
-    // 获取到父组件传递的device后
-    device: function (newVal, oldVal) {
-      this.deviceInfo = newVal;
-      if (this.deviceInfo && this.deviceInfo.deviceId != 0) {
-        this.isSubDev = this.deviceInfo.subDeviceList && this.deviceInfo.subDeviceList.length > 0;
-        this.queryParams.slaveId = this.deviceInfo.slaveId;
-        this.queryParams.serialNumber = this.deviceInfo.serialNumber;
-        this.slaveList = newVal.subDeviceList;
-        // 监测数据
-        if (this.isSubDev) {
-          this.staticList = this.deviceInfo.cacheThingsModel['properties'].filter((item) => {
-            return item.tempSlaveId == this.queryParams.slaveId;
-          });
-        } else {
-          this.staticList = this.deviceInfo.staticList;
-        }
-        // 加载图表
-        this.$nextTick(function () {
-          // 绘制图表
-          this.getStatistic();
-        });
-      }
-    },
-  },
-  data() {
-    return {
-      loading: true,
-      // 设备信息
-      deviceInfo: {},
-      // 统计物模型
-      staticList: [],
-      // 图表集合
-      chart: [],
-      // 激活时间范围
-      daterangeTime: [this.getTime(), this.getTime()],
-      // 查询参数
-      queryParams: {
-        serialNumber: null,
-        identity: '',
-        slaveId: undefined,
-      },
-      // 对象数组类型物模型暂存数据
-      arrayData: [],
-      // 子设备列表
-      slaveList: [],
-      isSubDev: false,
-    };
-  },
-  mounted() {
-    // 获取统计数据
-    // this.getListHistory();
-  },
-  methods: {
-    /** 获取当前日期 **/
-    getTime() {
-      let date = new Date();
-      let y = date.getFullYear();
-      let m = date.getMonth() + 1;
-      let d = date.getDate();
-      m = m < 10 ? '0' + m : m;
-      d = d < 10 ? '0' + d : d;
-      return y + '-' + m + '-' + d;
-    },
-    /* 获取监测历史数据*/
-    getListHistory() {
-      this.loading = true;
-      this.queryParams.serialNumber = this.queryParams.slaveId ? this.deviceInfo.serialNumber + '_' + this.queryParams.slaveId : this.deviceInfo.serialNumber;
-      if (null != this.daterangeTime && '' != this.daterangeTime) {
-        this.queryParams.beginTime = this.daterangeTime[0];
-        this.queryParams.endTime = this.daterangeTime[1] + ' 23:59';
-      }
-      listHistory(this.queryParams).then((res) => {
-        for (let key in res.data) {
-          for (let i = 0; i < this.staticList.length; i++) {
-            if (key == this.staticList[i].id) {
-              // 对象转数组
-              let dataList = [];
-              for (let j = 0; j < res.data[key].length; j++) {
-                let item = [];
-                item[0] = res.data[key][j].time;
-                item[1] = res.data[key][j].value;
-                dataList.push(item);
-              }
-              // 图表显示数据
-              this.chart[i].setOption({
-                series: [
-                  {
-                    data: dataList,
-                  },
-                ],
-              });
-            }
-          }
-        }
-        this.loading = false;
-      });
-    },
-
-    /**监测统计数据 */
-    getStatistic() {
-      let color = ['#1890FF', '#91CB74', '#FAC858', '#EE6666', '#73C0DE', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'];
-      for (let i = 0; i < this.staticList.length; i++) {
-        // 设置宽度
-        this.$refs.statisticMap[i].style.width = document.documentElement.clientWidth - 510 + 'px';
-        this.chart[i] = this.$echarts.init(this.$refs.statisticMap[i]);
-        var option;
-        option = {
-          animationDurationUpdate: 3000,
-          tooltip: {
-            trigger: 'axis',
-          },
-          title: {
-            left: 'center',
-            text: this.staticList[i].name + '统计 （单位 ' + (this.staticList[i].datatype && this.staticList[i].datatype.unit != undefined ? this.staticList[i].datatype.unit : '无') + '）',
-          },
-          grid: {
-            top: '80px',
-            left: '50px',
-            right: '20px',
-            bottom: '80px',
-            // containLabel: true,
-          },
-          toolbox: {
-            feature: {
-              dataZoom: {
-                yAxisIndex: 'none',
-              },
-              restore: {},
-              saveAsImage: {},
-            },
-          },
-          xAxis: {
-            type: 'time',
-          },
-          yAxis: {
-            type: 'value',
-          },
-          dataZoom: [
-            {
-              type: 'inside',
-              start: 0,
-              end: 100,
-            },
-            {
-              start: 0,
-              end: 100,
-            },
-          ],
-          series: [
-            {
-              name: this.staticList[i].name,
-              type: 'line',
-              symbol: 'none',
-              sampling: 'lttb',
-              itemStyle: {
-                color: i > 9 ? color[0] : color[i],
-              },
-              areaStyle: {},
-              data: [],
-            },
-          ],
-        };
-        option && this.chart[i].setOption(option);
-      }
-    },
-
-    /*选择从机*/
-    selectSlave() {
-      this.staticList = this.deviceInfo.cacheThingsModel['properties'].filter((item) => {
-        return item.tempSlaveId == this.queryParams.slaveId;
-      });
-      // 加载图表
-      this.$nextTick(function () {
-        // 绘制图表
-        this.getStatistic();
-        // 获取统计数据
-        this.getListHistory();
-      });
-    },
-  },
-};
-</script>
diff --git a/vue/src/views/iot/device/index.vue b/vue/src/views/iot/device/index.vue
index 827bb9ad..2b6c26a8 100644
--- a/vue/src/views/iot/device/index.vue
+++ b/vue/src/views/iot/device/index.vue
@@ -1,211 +1,206 @@
 <template>
-  <div style="padding: 6px">
-    <el-card style="margin-bottom: 6px">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="75px" style="margin-bottom: -20px">
-        <el-form-item label="设备名称" prop="deviceName">
-          <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable size="small"
-            @keyup.enter.native="handleQuery" style="width: 150px" />
-        </el-form-item>
-        <el-form-item label="设备编号" prop="serialNumber">
-          <el-input v-model="queryParams.serialNumber" placeholder="请输入设备编号" clearable size="small"
-            @keyup.enter.native="handleQuery" style="width: 150px" />
-        </el-form-item>
-        <el-form-item label="设备状态" prop="status">
-          <el-select v-model="queryParams.status" placeholder="请选择设备状态" clearable size="small" style="width: 150px">
-            <el-option v-for="dict in dict.type.iot_device_status" :key="dict.value" :label="dict.label"
-              :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="我的分组">
-          <el-select v-model="queryParams.groupId" placeholder="请选择我的分组" clearable size="small" style="width: 150px">
-            <el-option v-for="group in myGroupList" :key="group.groupId" :label="group.groupName"
-              :value="group.groupId" />
-          </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-item style="float: right">
-          <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleEditDevice(0)"
-            v-hasPermi="['iot:device:add']">新增</el-button>
-          <el-button type="primary" plain icon="el-icon-s-grid" size="mini" @click="handleChangeShowType"
-            v-hasPermi="['iot:device:add']">切换</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
+    <div style="padding: 6px">
+        <el-card style="margin-bottom: 6px">
+            <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="75px" style="margin-bottom: -20px">
+                <el-form-item label="设备名称" prop="deviceName">
+                    <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable size="small" @keyup.enter.native="handleQuery" style="width: 150px" />
+                </el-form-item>
+                <el-form-item label="设备编号" prop="serialNumber">
+                    <el-input v-model="queryParams.serialNumber" placeholder="请输入设备编号" clearable size="small" @keyup.enter.native="handleQuery" style="width: 150px" />
+                </el-form-item>
+                <el-form-item label="设备状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择设备状态" clearable size="small" style="width: 150px">
+                        <el-option v-for="dict in dict.type.iot_device_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="我的分组">
+                    <el-select v-model="queryParams.groupId" placeholder="请选择我的分组" clearable size="small" style="width: 150px">
+                        <el-option v-for="group in myGroupList" :key="group.groupId" :label="group.groupName" :value="group.groupId" />
+                    </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-item style="float: right">
+                    <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleEditDevice(0)" v-hasPermi="['iot:device:add']">新增</el-button>
+                    <el-button type="primary" plain icon="el-icon-s-grid" size="mini" @click="handleChangeShowType" v-hasPermi="['iot:device:add']">切换</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
 
-    <el-card style="padding-bottom: 100px" v-if="showType == 'list'">
-      <el-table v-loading="loading" :data="deviceList" border>
-        <el-table-column label="编号" align="center" header-align="center" prop="deviceId" width="50" />
-        <el-table-column label="设备名称" align="center" header-align="center" prop="deviceName" min-width="120" />
-        <el-table-column label="设备编号" align="center" prop="serialNumber" min-width="130" />
-        <el-table-column label="所属产品" align="center" prop="productName" min-width="120" />
-        <el-table-column label="协议" align="center" prop="transport" min-width="50" />
-        <el-table-column label="通讯协议" align="center" prop="protocolCode" min-width="100" />
-        <el-table-column label="子设备数" align="center" prop="subDeviceCount" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.subDeviceCount }}
-          </template>
-        </el-table-column>
-        <el-table-column label="设备影子" align="center" prop="isShadow" width="80">
-          <template slot-scope="scope">
-            <el-tag type="success" size="small" v-if="scope.row.isShadow == 1">启用</el-tag>
-            <el-tag type="info" size="small" v-else>禁用</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" 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="信号" 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="定位方式" align="center" prop="locationWay">
-          <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="固件版本" align="center" prop="firmwareVersion">
-          <template slot-scope="scope">
-            <el-tag size="mini" type="info">Ver {{ scope.row.firmwareVersion }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="激活时间" align="center" prop="activeTime">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.activeTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
+        <el-card style="padding-bottom: 100px" v-if="showType == 'list'">
+            <el-table v-loading="loading" :data="deviceList" border>
+                <el-table-column label="编号" align="center" header-align="center" prop="deviceId" width="50" />
+                <el-table-column label="设备名称" align="center" header-align="center" prop="deviceName" min-width="120" />
+                <el-table-column label="设备编号" align="center" prop="serialNumber" min-width="130" />
+                <el-table-column label="所属产品" align="center" prop="productName" min-width="120" />
+                <el-table-column label="协议" align="center" prop="transport" min-width="50" />
+                <el-table-column label="通讯协议" align="center" prop="protocolCode" min-width="100" />
+                <el-table-column label="子设备数" align="center" prop="subDeviceCount" width="80">
+                    <template slot-scope="scope">
+                        {{ scope.row.subDeviceCount }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="设备影子" align="center" prop="isShadow" width="80">
+                    <template slot-scope="scope">
+                        <el-tag type="success" size="small" v-if="scope.row.isShadow == 1">启用</el-tag>
+                        <el-tag type="info" size="small" v-else>禁用</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="状态" 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="信号" 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="定位方式" align="center" prop="locationWay">
+                    <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="固件版本" align="center" prop="firmwareVersion">
+                    <template slot-scope="scope">
+                        <el-tag size="mini" type="info">Ver {{ scope.row.firmwareVersion }}</el-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="激活时间" align="center" prop="activeTime">
+                    <template slot-scope="scope">
+                        <span>{{ parseTime(scope.row.activeTime, '{y}-{m}-{d}') }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="创建时间" align="center" prop="createTime">
+                    <template slot-scope="scope">
+                        <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+                    </template>
+                </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
-          <template slot-scope="scope">
-            <el-button type="danger" size="small" style="padding: 5px" icon="el-icon-delete"
-              @click="handleDelete(scope.row)" v-hasPermi="['iot:device:remove']">删除</el-button>
-            <el-button type="primary" size="small" style="padding: 5px" icon="el-icon-view"
-              @click="handleEditDevice(scope.row)" v-hasPermi="['iot:device:add']">查看</el-button>
-            <el-button type="primary" size="small" style="padding: 5px" @click="openSummaryDialog(scope.row)"
-              v-if="form.deviceId != 0">二维码</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        :pageSizes="[12, 24, 36, 60]" @pagination="getList" />
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+                    <template slot-scope="scope">
+                        <el-button type="danger" size="small" style="padding: 5px" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['iot:device:remove']">删除</el-button>
+                        <el-button type="primary" size="small" style="padding: 5px" icon="el-icon-view" @click="handleEditDevice(scope.row)" v-hasPermi="['iot:device:add']">查看</el-button>
+                        <el-button type="primary" size="small" style="padding: 5px" @click="openSummaryDialog(scope.row)" v-if="form.deviceId != 0">二维码</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" :pageSizes="[12, 24, 36, 60]" @pagination="getList" />
+        </el-card>
 
-    </el-card>
-
-    <el-card style="padding-bottom: 100px" v-if="showType == 'card'">
-      <el-row :gutter="30" v-loading="loading">
-        <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6" v-for="(item, index) in deviceList" :key="index"
-          style="margin-bottom: 30px; text-align: center">
-          <el-card :body-style="{ padding: '20px' }" shadow="always" class="card-item">
-            <el-row type="flex" :gutter="10" justify="space-between">
-              <el-col :span="20" style="text-align: left">
-                <el-link type="" :underline="false" @click="handleEditDevice(item)"
-                  style="font-weight: bold; font-size: 16px; line-height: 32px">
-                  <el-tooltip class="item" effect="dark" content="分享的设备" placement="top-start">
-                    <svg-icon icon-class="share" style="font-size: 20px" v-if="item.isOwner != 1" />
-                  </el-tooltip>
-                  <svg-icon icon-class="device" v-if="item.isOwner == 1" />
-                  <span style="margin: 0 5px">{{ item.deviceName }}</span>
-                  <!-- <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)" />
-              </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">
-              <el-col :span="17">
-                <div style="text-align: left; line-height: 40px; white-space: nowrap">
-                  <dict-tag :options="dict.type.iot_device_status" :value="item.status" size="small"
-                    style="display: inline-block" />
-                  <span style="display: inline-block; margin: 0 10px">
-                    <!-- <el-tag type="success" size="small" v-if="item.isShadow == 1">影子</el-tag>
+        <el-card style="padding-bottom: 100px" v-if="showType == 'card'">
+            <el-row :gutter="30" v-loading="loading">
+                <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="6" v-for="(item, index) in deviceList" :key="index" style="margin-bottom: 30px; text-align: center">
+                    <el-card :body-style="{ padding: '20px' }" shadow="always" class="card-item">
+                        <el-row type="flex" :gutter="10" justify="space-between">
+                            <el-col :span="20" style="text-align: left">
+                                <el-link type="" :underline="false" @click="handleEditDevice(item)" style="font-weight: bold; font-size: 16px; line-height: 32px">
+                                    <el-tooltip class="item" effect="dark" content="分享的设备" placement="top-start">
+                                        <svg-icon icon-class="share" style="font-size: 20px" v-if="item.isOwner != 1" />
+                                    </el-tooltip>
+                                    <svg-icon icon-class="device" v-if="item.isOwner == 1" />
+                                    <span style="margin: 0 5px">{{ item.deviceName }}</span>
+                                    <!-- <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)" />
+                            </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">
+                            <el-col :span="17">
+                                <div style="text-align: left; line-height: 40px; white-space: nowrap">
+                                    <dict-tag :options="dict.type.iot_device_status" :value="item.status" size="small" style="display: inline-block" />
+                                    <span style="display: inline-block; margin: 0 10px">
+                                        <!-- <el-tag type="success" size="small" v-if="item.isShadow == 1">影子</el-tag>
                     <el-tag type="info" size="small" v-else>影子</el-tag> -->
-                    <el-tag type="primary" size="small" v-if="item.protocolCode">{{ item.protocolCode }}</el-tag>
-                  </span>
-                  <el-tag type="primary" size="small" v-if="item.transport">{{ item.transport }}</el-tag>
-                  <!-- <dict-tag :options="dict.type.iot_location_way" :value="item.locationWay" size="small" style="display:inline-block;" /> -->
-                  <!-- <dict-tag :options="dict.type.iot_transport_type" :value="item.transport" size="small" style="display: inline-block" /> -->
-                </div>
-                <el-descriptions :column="1" size="mini" style="white-space: nowrap">
-                  <el-descriptions-item label="编号">
-                    {{ item.serialNumber }}
-                  </el-descriptions-item>
-                  <el-descriptions-item label="产品">
-                    {{ item.productName }}
-                  </el-descriptions-item>
-                  <el-descriptions-item label="激活时间">
-                    {{ parseTime(item.activeTime, '{y}-{m}-{d}') }}
-                  </el-descriptions-item>
-                </el-descriptions>
-              </el-col>
-              <el-col :span="7">
-                <div style="margin-top: 10px">
-                  <el-image style="width: 100%; height: 100px; border-radius: 10px" 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"
-                    :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"
-                    :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"
-                    :preview-src-list="[require('@/assets/images/product.png')]"
-                    :src="require('@/assets/images/product.png')" fit="cover" v-else></el-image>
-                </div>
-              </el-col>
+                                        <el-tag type="primary" size="small" v-if="item.protocolCode">{{ item.protocolCode }}</el-tag>
+                                    </span>
+                                    <el-tag type="primary" size="small" v-if="item.transport">{{ item.transport }}</el-tag>
+                                    <!-- <dict-tag :options="dict.type.iot_location_way" :value="item.locationWay" size="small" style="display:inline-block;" /> -->
+                                    <!-- <dict-tag :options="dict.type.iot_transport_type" :value="item.transport" size="small" style="display: inline-block" /> -->
+                                </div>
+                                <el-descriptions :column="1" size="mini" style="white-space: nowrap">
+                                    <el-descriptions-item label="编号">
+                                        {{ item.serialNumber }}
+                                    </el-descriptions-item>
+                                    <el-descriptions-item label="产品">
+                                        {{ item.productName }}
+                                    </el-descriptions-item>
+                                    <el-descriptions-item label="激活时间">
+                                        {{ parseTime(item.activeTime, '{y}-{m}-{d}') }}
+                                    </el-descriptions-item>
+                                </el-descriptions>
+                            </el-col>
+                            <el-col :span="7">
+                                <div style="margin-top: 10px">
+                                    <el-image
+                                        style="width: 100%; height: 100px; border-radius: 10px"
+                                        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"
+                                        :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"
+                                        :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"
+                                        :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">
+                            <el-button type="danger" size="mini" style="padding: 5px 10px" icon="el-icon-delete" @click="handleDelete(item)" v-hasPermi="['iot:device:remove']">删除</el-button>
+                            <el-button type="primary" size="mini" style="padding: 5px 15px" icon="el-icon-view" @click="handleEditDevice(item, 'basic')" v-hasPermi="['iot:device:add']">查看</el-button>
+                            <el-button type="success" size="mini" style="padding: 5px 15px" icon="el-icon-odometer" @click="handleRunDevice(item)" v-hasPermi="['iot:device:add']">运行状态</el-button>
+                        </el-button-group>
+                    </el-card>
+                </el-col>
             </el-row>
-            <el-button-group style="margin-top: 15px">
-              <el-button type="danger" size="mini" style="padding: 5px 10px" icon="el-icon-delete"
-                @click="handleDelete(item)" v-hasPermi="['iot:device:remove']">删除</el-button>
-              <el-button type="primary" size="mini" style="padding: 5px 15px" icon="el-icon-view"
-                @click="handleEditDevice(item, 'basic')" v-hasPermi="['iot:device:add']">查看</el-button>
-              <el-button type="success" size="mini" style="padding: 5px 15px" icon="el-icon-odometer"
-                @click="handleRunDevice(item)" v-hasPermi="['iot:device:add']">运行状态</el-button>
-            </el-button-group>
-          </el-card>
-        </el-col>
-      </el-row>
-      <el-empty description="暂无数据，请添加设备" v-if="total == 0"></el-empty>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        :pageSizes="[12, 24, 36, 60]" @pagination="getList" />
-    </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">设备二维码</div>
-      </div>
-    </el-dialog>
-  </div>
+            <el-empty description="暂无数据，请添加设备" v-if="total == 0"></el-empty>
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" :pageSizes="[12, 24, 36, 60]" @pagination="getList" />
+        </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">设备二维码</div>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -215,296 +210,297 @@ import { listGroup } from '@/api/iot/group';
 import { delSipDeviceBySipId } from '@/api/iot/sipdevice';
 
 export default {
-  name: 'Device',
-  dicts: ['iot_device_status', 'iot_is_enable', 'iot_location_way', 'iot_transport_type'],
-  components: {
-    vueQr,
-  },
-  data() {
-    return {
-      // 二维码内容
-      qrText: 'fastbee',
-      // 打开设备配置对话框
-      openSummary: false,
-      // 展示方式
-      showType: 'card',
-      // 遮罩层
-      loading: true,
-      // 总条数
-      total: 0,
-      // 设备列表数据
-      deviceList: [],
-      // 我的分组列表数据
-      myGroupList: [],
-      // 根路径
-      baseUrl: process.env.VUE_APP_BASE_API,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 12,
-        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,
-      },
-      isSubDev: false,
-    };
-  },
-  created() {
-    // 产品筛选
-    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() {
-    const time = this.$route.query.t;
-    if (time != null && time != this.uniqueId) {
-      this.uniqueId = time;
-      // 页码筛选
-      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.getList();
-    }
-  },
-  methods: {
-    /* 连接Mqtt消息服务器 */
-    async connectMqtt() {
-      if (this.$mqttTool.client == null) {
-        await this.$mqttTool.connect();
-      }
-      this.mqttCallback();
-      this.getList();
+    name: 'Device',
+    dicts: ['iot_device_status', 'iot_is_enable', 'iot_location_way', 'iot_transport_type'],
+    components: {
+        vueQr,
     },
-    /* 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;
+    data() {
+        return {
+            // 二维码内容
+            qrText: 'fastbee',
+            // 打开设备配置对话框
+            openSummary: false,
+            // 展示方式
+            showType: 'card',
+            // 遮罩层
+            loading: true,
+            // 总条数
+            total: 0,
+            // 设备列表数据
+            deviceList: [],
+            // 我的分组列表数据
+            myGroupList: [],
+            // 根路径
+            baseUrl: process.env.VUE_APP_BASE_API,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 12,
+                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,
+            },
+            isSubDev: false,
+        };
+    },
+    created() {
+        // 产品筛选
+        let productId = this.$route.query.productId;
+        if (productId != null) {
+            this.queryParams.productId = Number(productId);
+            this.queryParams.groupId = null;
+            this.queryParams.serialNumber = null;
         }
-        if (topics[3] == 'status') {
-          console.log('接收到【设备状态】主题：', topic);
-          console.log('接收到【设备状态】内容：', 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;
+        // 分组筛选
+        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() {
+        const time = this.$route.query.t;
+        if (time != null && time != this.uniqueId) {
+            this.uniqueId = time;
+            // 页码筛选
+            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.getList();
         }
-      });
     },
-    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();
-      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;
-      });
-    },
-    /** 搜索按钮操作 */
-    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';
-    },
-    /** 修改按钮操作 */
-    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,
+    methods: {
+        /* 连接Mqtt消息服务器 */
+        async connectMqtt() {
+            if (this.$mqttTool.client == null) {
+                await this.$mqttTool.connect();
+            }
+            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('接收到【设备状态】主题：', topic);
+                    console.log('接收到【设备状态】内容：', 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;
+                        }
+                    }
+                }
+            });
+        },
+        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();
+            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.deviceList = this.deviceList.filter((device) => device.deviceId !== 118);
+                this.loading = false;
+            });
+        },
+        /** 搜索按钮操作 */
+        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';
+        },
+        /** 修改按钮操作 */
+        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('是否确认删除设备编号为"' + deviceIds + '"的数据项？')
+                .then(function () {
+                    if (row.deviceType === 3) {
+                        delSipDeviceBySipId(row.serialNumber);
+                    }
+                    return delDevice(deviceIds);
+                })
+                .then(() => {
+                    this.getList();
+                    this.$modal.msgSuccess('删除成功');
+                })
+                .catch(() => {});
+        },
+        /** 未启用设备影子*/
+        shadowUnEnable(device, thingsModel) {
+            // 1-未激活，2-禁用，3-在线，4-离线
+            if (device.status != 3 && device.isShadow == 0) {
+                return true;
+            }
+            if (thingsModel.isReadonly) {
+                return true;
+            }
+            return false;
         },
-      });
     },
-    /** 运行状态按钮操作 */
-    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('是否确认删除设备编号为"' + deviceIds + '"的数据项？')
-        .then(function () {
-          if (row.deviceType === 3) {
-            delSipDeviceBySipId(row.serialNumber);
-          }
-          return delDevice(deviceIds);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess('删除成功');
-        })
-        .catch(() => { });
-    },
-    /** 未启用设备影子*/
-    shadowUnEnable(device, thingsModel) {
-      // 1-未激活，2-禁用，3-在线，4-离线
-      if (device.status != 3 && device.isShadow == 0) {
-        return true;
-      }
-      if (thingsModel.isReadonly) {
-        return true;
-      }
-      return false;
-    },
-  },
 };
 </script>
 
 <style scoped>
 .card-item {
-  border-radius: 15px;
+    border-radius: 15px;
 }
 </style>