From 12a980ba43c58cfbcfa0ca91fb45dbf74cd779a6 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: Thu, 12 Jun 2025 08:53:59 +0800
Subject: [PATCH] =?UTF-8?q?api=E4=B8=8B=E5=8F=91=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |   2 +-
 .env.staging                         |   2 +-
 .vscode/settings.json                |   3 +
 MQTT接口.md                          |  27 ++++
 src/views/iot/device/device-edit.vue | 193 +++++++++++++++++++--------
 5 files changed, 167 insertions(+), 60 deletions(-)

diff --git a/.env.development b/.env.development
index 52113e8..f70ac31 100644
--- a/.env.development
+++ b/.env.development
@@ -14,7 +14,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_SERVER_API_URL = 'http://localhost:8080/'
 
 # Mqtt消息服务器连接地址
-VUE_APP_MQTT_SERVER_URL = 'ws://localhost:8083/mqtt'
+VUE_APP_MQTT_SERVER_URL = 'ws://192.168.1.188:8083/mqtt'
 
 # 百度地图AK
 VUE_APP_BAI_DU_AK = 'nAtaBg9FYzav6c8P9rF9qzsWZfT8O0PD'
diff --git a/.env.staging b/.env.staging
index dc094e0..c2d42a8 100644
--- a/.env.staging
+++ b/.env.staging
@@ -10,7 +10,7 @@ ENV = 'staging'
 VUE_APP_BASE_API = '/stage-api'
 
 # Mqtt消息服务器连接地址
-VUE_APP_MQTT_SERVER_URL = 'ws://localhost:8083/mqtt'
+VUE_APP_MQTT_SERVER_URL = 'ws:///192.168.1.188:8083/mqtt'
 
 # 百度地图AK
 VUE_APP_BAI_DU_AK = 'nAtaBg9FYzav6c8P9rF9qzsWZXXXXXX'
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a2cfc6a..6042d82 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,5 +9,8 @@
     "i18n-ally.displayLanguage": "zh-CN",
     "[json]": {
         "editor.defaultFormatter": "vscode.json-language-features"
+    },
+    "[vue]": {
+        "editor.defaultFormatter": "Vue.volar"
     } // 显示文件
 }
diff --git a/MQTT接口.md b/MQTT接口.md
index 868e867..3714cfa 100644
--- a/MQTT接口.md
+++ b/MQTT接口.md
@@ -573,3 +573,30 @@ msgContext.logger.info("输出：" + msgContext.getTopic());
 // 执行Action动作参数(脚本由系统自动生成)
 msgContext.setData("mqttBridgeID", 7);
 // 执行Action动作参数(脚本由系统自动生成)
+
+
+
+
+
+
+
+accesskey 
+INMu6CDgMnaKH+wptmLtkhIxlPmVrjOTgfSyITqsC9A=
+
+
+
+用户
+
+dpx0z9T75vMN4ZbdreEEHdHLPDxm2S7gFnQqsIk2Sj+rYUbfSNIFCCSCYdsZFe9q
+
+
+
+
++q9aB+VvIIEGG2D8/psyhaYBn42AzV/ormU9bUPicNhHGz9SZPtNjjlvlnFXX2YvCrZSeq38VaxYw+Q3QyBMeg==
+
+主用户的accesskey
+
+
+
+token 
+version=2022-05-01&res=userid%2F275606&et=1907391331&method=sha1&sign=TxfzLFdfzIPwCSw6e1P9tYh1udQ%3D
\ No newline at end of file
diff --git a/src/views/iot/device/device-edit.vue b/src/views/iot/device/device-edit.vue
index e071bb5..7e73f71 100644
--- a/src/views/iot/device/device-edit.vue
+++ b/src/views/iot/device/device-edit.vue
@@ -23,100 +23,136 @@
         </el-card>
 
         <el-card style="padding-bottom: 100px">
-            <el-tabs id="deviceDetailTab" class="custom-tabs" v-model="activeName" tab-position="top" @tab-click="tabChange" style="min-height: 400px" lazy>
+            <el-tabs id="deviceDetailTab" class="custom-tabs" v-model="activeName" tab-position="top"
+                @tab-click="tabChange" style="min-height: 400px" lazy>
                 <el-tab-pane name="basic">
                     <span slot="label">{{ $t('device.device-edit.148398-0') }}</span>
                     <el-form class="basic-span" 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="$t('device.device-edit.148398-1')" prop="deviceName">
-                                    <el-input v-model="form.deviceName" :placeholder="$t('device.device-edit.148398-2')">
-                                        <el-button slot="append" @click="openSummaryDialog" v-if="form.deviceId != 0">{{ $t('device.device-edit.148398-3') }}</el-button>
+                                    <el-input v-model="form.deviceName"
+                                        :placeholder="$t('device.device-edit.148398-2')">
+                                        <el-button slot="append" @click="openSummaryDialog" v-if="form.deviceId != 0">{{
+                                            $t('device.device-edit.148398-3') }}</el-button>
                                     </el-input>
                                 </el-form-item>
                                 <el-form-item :label="$t('device.device-edit.148398-4')" prop="productName">
-                                    <el-input readonly v-model="form.productName" :placeholder="$t('device.device-edit.148398-5')" :disabled="form.status != 1">
-                                        <el-button slot="append" @click="selectProduct()" :disabled="form.status != 1">{{ $t('device.device-edit.148398-6') }}</el-button>
+                                    <el-input readonly v-model="form.productName"
+                                        :placeholder="$t('device.device-edit.148398-5')" :disabled="form.status != 1">
+                                        <el-button slot="append" @click="selectProduct()"
+                                            :disabled="form.status != 1">{{ $t('device.device-edit.148398-6')
+                                            }}</el-button>
                                     </el-input>
                                 </el-form-item>
                                 <el-form-item :label="$t('device.device-edit.148398-7')" prop="serialNumber">
-                                    <el-input v-model="form.serialNumber" :placeholder="$t('device.device-edit.148398-8')" maxlength="32" :disabled="form.status != 1" :readonly="form.deviceType === 3">
-                                        <el-button v-if="form.deviceType !== 3" slot="append" @click="generateNum" :loading="genDisabled" :disabled="form.status != 1" v-hasPermi="['iot:device:add']">
+                                    <el-input v-model="form.serialNumber"
+                                        :placeholder="$t('device.device-edit.148398-8')" maxlength="32"
+                                        :disabled="form.status != 1" :readonly="form.deviceType === 3">
+                                        <el-button v-if="form.deviceType !== 3" slot="append" @click="generateNum"
+                                            :loading="genDisabled" :disabled="form.status != 1"
+                                            v-hasPermi="['iot:device:add']">
                                             {{ $t('device.device-edit.148398-9') }}
                                         </el-button>
-                                        <el-button v-if="form.deviceType === 3" slot="append" @click="genSipID()" :disabled="form.status != 1" v-hasPermi="['iot:device:add']">
+                                        <el-button v-if="form.deviceType === 3" slot="append" @click="genSipID()"
+                                            :disabled="form.status != 1" v-hasPermi="['iot:device:add']">
                                             {{ $t('device.device-edit.148398-9') }}
                                         </el-button>
                                     </el-input>
-                                    <el-alert v-if="openServerTip" class="alert-wrap" type="info" show-icon :description="$t('device.device-edit.148398-10')"></el-alert>
+                                    <el-alert v-if="openServerTip" class="alert-wrap" type="info" show-icon
+                                        :description="$t('device.device-edit.148398-10')"></el-alert>
                                 </el-form-item>
                                 <el-form-item :label="$t('device.device-edit.148398-12')" prop="firmwareVersion">
-                                    <el-input v-model="form.firmwareVersion" :placeholder="$t('device.device-edit.148398-13')" type="number" step="0.1" :readonly="form.status != 1 || form.deviceType === 3">
+                                    <el-input v-model="form.firmwareVersion"
+                                        :placeholder="$t('device.device-edit.148398-13')" type="number" step="0.1"
+                                        :readonly="form.status != 1 || form.deviceType === 3">
                                         <template slot="prepend">Version</template>
-                                        <template slot="append">{{ form.firmwareType === 1 ? $t('firmware.index.222541-52') : $t('firmware.index.222541-53') }}</template>
+                                        <template slot="append">{{ form.firmwareType === 1 ?
+                                            $t('firmware.index.222541-52') : $t('firmware.index.222541-53')
+                                            }}</template>
                                     </el-input>
                                 </el-form-item>
                                 <!-- 设备影子 -->
-                                <el-form-item v-if="form.deviceType !== 3" :label="$t('device.device-edit.148398-15')" prop="isShadow">
+                                <el-form-item v-if="form.deviceType !== 3" :label="$t('device.device-edit.148398-15')"
+                                    prop="isShadow">
                                     <el-radio-group v-model="form.isShadow">
                                         <el-radio :label="1">{{ $t('device.device-edit.148398-85') }}</el-radio>
                                         <el-radio :label="0">{{ $t('device.device-edit.148398-86') }}</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item :label="$t('device.device-edit.148398-32')" prop="rssi">
-                                    <el-input v-model="form.rssi" :placeholder="$t('device.device-edit.148398-33')" readonly />
+                                    <el-input v-model="form.rssi" :placeholder="$t('device.device-edit.148398-33')"
+                                        readonly />
                                 </el-form-item>
 
                                 <el-form-item :label="$t('device.device-edit.148398-17')" prop="remark">
-                                    <el-input v-model="form.remark" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" :placeholder="$t('device.device-edit.148398-18')" />
+                                    <el-input v-model="form.remark" type="textarea"
+                                        :autosize="{ minRows: 3, maxRows: 5 }"
+                                        :placeholder="$t('device.device-edit.148398-18')" />
                                 </el-form-item>
                             </el-col>
                             <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
                                 <el-form-item :label="$t('device.device-edit.148398-19')" prop="locationWay">
-                                    <el-select v-model="form.locationWay" :placeholder="$t('device.device-edit.148398-20')" clearable style="width: 100%">
-                                        <el-option v-for="dict in dict.type.iot_location_way" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
+                                    <el-select v-model="form.locationWay"
+                                        :placeholder="$t('device.device-edit.148398-20')" clearable style="width: 100%">
+                                        <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="$t('device.device-edit.148398-21')" prop="longitude">
-                                    <el-input v-model="form.longitude" :placeholder="$t('device.device-edit.148398-22')" 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-input v-model="form.longitude" :placeholder="$t('device.device-edit.148398-22')"
+                                        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">
                                             {{ $t('device.device-edit.148398-23') }}
                                         </el-link>
                                     </el-input>
                                 </el-form-item>
                                 <el-form-item :label="$t('device.device-edit.148398-24')" prop="latitude">
-                                    <el-input v-model="form.latitude" :placeholder="$t('device.device-edit.148398-25')" 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-input v-model="form.latitude" :placeholder="$t('device.device-edit.148398-25')"
+                                        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">
                                             {{ $t('device.device-edit.148398-23') }}
                                         </el-link>
                                     </el-input>
                                 </el-form-item>
                                 <el-form-item :label="$t('device.device-edit.148398-26')" prop="networkAddress">
-                                    <el-input v-model="form.networkAddress" :placeholder="$t('device.device-edit.148398-27')" :disabled="form.locationWay !== 3" />
+                                    <el-input v-model="form.networkAddress"
+                                        :placeholder="$t('device.device-edit.148398-27')"
+                                        :disabled="form.locationWay !== 3" />
                                 </el-form-item>
                                 <el-form-item :label="$t('device.device-edit.148398-28')" prop="networkIp">
-                                    <el-input v-model="form.networkIp" :placeholder="$t('device.device-edit.148398-29')" readonly />
+                                    <el-input v-model="form.networkIp" :placeholder="$t('device.device-edit.148398-29')"
+                                        readonly />
                                 </el-form-item>
                                 <el-form-item :label="$t('device.device-edit.148398-30')" prop="activeTime">
-                                    <el-date-picker v-model="form.activeTime" type="date" value-format="yyyy-MM-dd" :placeholder="$t('device.device-edit.148398-31')" readonly style="width: 100%"></el-date-picker>
+                                    <el-date-picker v-model="form.activeTime" type="date" value-format="yyyy-MM-dd"
+                                        :placeholder="$t('device.device-edit.148398-31')" readonly
+                                        style="width: 100%"></el-date-picker>
                                 </el-form-item>
-                                <el-form-item v-if="form.transport === 'MQTT'" :label="$t('device.device-edit.148398-16')" prop="deviceStatus">
-                                    <el-switch v-model="deviceStatus" active-text="" inactive-text="" :disabled="form.status === 1" :active-value="1" :inactive-value="0"></el-switch>
+                                <el-form-item v-if="form.transport === 'MQTT'"
+                                    :label="$t('device.device-edit.148398-16')" prop="deviceStatus">
+                                    <el-switch v-model="deviceStatus" active-text="" inactive-text=""
+                                        :disabled="form.status === 1" :active-value="1" :inactive-value="0"></el-switch>
                                 </el-form-item>
-                                <el-form-item :label="$t('device.device-edit.148398-34')" prop="remark" v-if="form.deviceId != 0">
-                                    <el-button
-                                        size="mini"
-                                        @click="handleViewMqtt()"
-                                        :disabled="this.form.transport !== 'MQTT' && this.form.transport !== 'TCP' && this.form.transport !== 'HTTP' && this.form.transport !== 'GB28181'"
-                                    >
+                                <el-form-item :label="$t('device.device-edit.148398-34')" prop="remark"
+                                    v-if="form.deviceId != 0">
+                                    <el-button size="mini" @click="handleViewMqtt()"
+                                        :disabled="this.form.transport !== 'MQTT' && this.form.transport !== 'TCP' && this.form.transport !== 'HTTP' && this.form.transport !== 'GB28181'">
                                         {{ $t('device.device-edit.148398-35') }}
                                     </el-button>
-                                    <el-button size="mini" @click="openCodeDialog()">{{ $t('device.device-edit.148398-36') }}</el-button>
+                                    <el-button size="mini" @click="openCodeDialog()">{{
+                                        $t('device.device-edit.148398-36') }}</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; margin-left: 20px">
-                                    <div id="map" style="height: 435px; width: 100%">{{ $t('device.device-edit.148398-37') }}</div>
+                                <div
+                                    style="border: 1px solid #dfe4ed; border-radius: 5px; padding: 5px; margin-left: 20px">
+                                    <div id="map" style="height: 435px; width: 100%">{{
+                                        $t('device.device-edit.148398-37') }}</div>
                                 </div>
                             </el-col>
                         </el-row>
@@ -124,24 +160,55 @@
 
                     <el-form label-width="100px" style="margin-top: 70px">
                         <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 type="primary" @click="submitForm" v-hasPermi="['iot:device:edit']"
+                                v-show="form.deviceId != 0">
                                 {{ $t('update') }}
                             </el-button>
-                            <el-button type="primary" @click="submitForm" v-hasPermi="['iot:device:add']" v-show="form.deviceId == 0">
+                            <el-button type="primary" @click="submitForm" v-hasPermi="['iot:device:add']"
+                                v-show="form.deviceId == 0">
                                 {{ $t('add') }}
                             </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 name="runningStatus" v-if="form.deviceType !== 3">
+
+
+
                     <span slot="label">{{ $t('device.device-edit.148398-42') }}</span>
                     <!-- <real-time-status ref="realTimeStatus" :device="form" @statusEvent="getDeviceStatusData($event)" /> -->
-                    <running-status ref="runningStatus" :device="form" @statusEvent="getDeviceStatusData($event)" />
+                    <fire v-if="form.productName && form.productName.toLowerCase().includes('灭火器')" ref="fire"
+                        :device="form" @statusEvent="getDeviceStatusData($event)" />
+                    <running-status v-else ref="runningStatus" :device="form"
+                        @statusEvent="getDeviceStatusData($event)" />
+
+
+
+
+
+
                 </el-tab-pane>
+
+
+
+
+
+
+
+
+
+
+
                 <el-tab-pane name="variable" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-74') }}</span>
                     <device-variable ref="deviceVariable" :device="form" />
@@ -150,23 +217,22 @@
                     <span slot="label">{{ $t('device.device-edit.148398-76') }}</span>
                     <instruction-parsing ref="instructionParsing" :device="form" />
                 </el-tab-pane>
-                <el-tab-pane
-                    name="deviceSub"
-                    :disabled="form.deviceId == 0"
+                <el-tab-pane name="deviceSub" :disabled="form.deviceId == 0"
                     v-if="form.deviceType == 2 && (form.protocolCode == 'MODBUS-RTU' || form.protocolCode == 'MODBUS-TCP' || form.protocolCode == 'MODBUS-JSON-HP' || form.protocolCode == 'MODBUS-JSON-ZQWL')"
-                    lazy
-                >
+                    lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-43') }}</span>
                     <device-sub ref="deviceSub" :device="form" />
                 </el-tab-pane>
 
                 <!-- 轮询任务 -->
-                <el-tab-pane name="deviceModbusTask" :disabled="form.deviceId == 0" v-if="form.canConfigPoll === true" lazy>
+                <el-tab-pane name="deviceModbusTask" :disabled="form.deviceId == 0" v-if="form.canConfigPoll === true"
+                    lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-77') }}</span>
                     <device-modbus-task ref="deviceModbusTask" :device="form" />
                 </el-tab-pane>
 
-                <el-tab-pane name="scada" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3 && isShowScada == true" lazy>
+                <el-tab-pane name="scada" :disabled="form.deviceId == 0"
+                    v-if="form.deviceType !== 3 && isShowScada == true" lazy>
                     <span slot="label">{{ $t('device.device-edit.148398-73') }}</span>
                     <device-scada ref="deviceScada" :device="form" />
                 </el-tab-pane>
@@ -221,7 +287,8 @@
                     <device-func ref="deviceFuncLog" :device="form" />
                 </el-tab-pane>
 
-                <el-tab-pane name="alertUser" v-hasPermi="['iot:device:alert:user:list']" :disabled="form.deviceId == 0" v-if="form.deviceType !== 3">
+                <el-tab-pane name="alertUser" v-hasPermi="['iot:device:alert:user:list']" :disabled="form.deviceId == 0"
+                    v-if="form.deviceType !== 3">
                     <span slot="label">{{ $t('device.device-edit.148398-80') }}</span>
                     <alert-user ref="alertUser" :device="form" />
                 </el-tab-pane>
@@ -251,11 +318,13 @@
             </el-tabs>
 
             <!-- 设备配置JSON -->
-            <el-dialog :title="$t('device.device-edit.148398-54')" :visible.sync="openSummary" width="700px" append-to-body>
+            <el-dialog :title="$t('device.device-edit.148398-54')" :visible.sync="openSummary" width="700px"
+                append-to-body>
                 <el-row :gutter="20">
                     <el-col :span="14">
                         <div style="border: 1px solid #ccc; height: 234px; width: 360px; overflow: scroll">
-                            <json-viewer :value="summary" :expand-depth="10" copyable style="margin-top: 5px; cursor: pointer">
+                            <json-viewer :value="summary" :expand-depth="10" copyable
+                                style="margin-top: 5px; cursor: pointer">
                                 <template v-slot:copy>{{ $t('device.device-edit.148398-55') }}</template>
                             </json-viewer>
                         </div>
@@ -272,14 +341,17 @@
                 </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">
+                <div
+                    style="border: 1px solid #ccc; width: 220px; text-align: center; margin: 0 auto; margin-top: -15px">
                     <vue-qr :text="qrText" :size="200"></vue-qr>
                     <div style="padding-bottom: 10px">{{ $t('device.device-edit.148398-56') }}</div>
                 </div>
             </el-dialog>
 
-            <el-dialog :title="$t('device.device-edit.148398-58')" :visible.sync="openViewMqtt" width="600px" append-to-body>
-                <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="120px" v-if="this.form.transport == 'MQTT'">
+            <el-dialog :title="$t('device.device-edit.148398-58')" :visible.sync="openViewMqtt" width="600px"
+                append-to-body>
+                <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="120px"
+                    v-if="this.form.transport == 'MQTT'">
                     <el-form-item label="clientId" prop="clientId">
                         <el-input v-model="listQuery.clientId" disabled style="width: 400px" />
                     </el-form-item>
@@ -299,7 +371,8 @@
                         <el-input clearable v-model="listQuery.port" disabled style="width: 400px"></el-input>
                     </el-form-item>
                 </el-form>
-                <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="120px" v-if="this.form.transport == 'TCP'">
+                <el-form ref="listQuery" :model="listQuery" :rules="rules" label-width="120px"
+                    v-if="this.form.transport == 'TCP'">
                     <!-- 注册包 -->
                     <el-form-item label="enrollPackage" prop="enrollPackage">
                         <el-input clearable v-model="listQuery.enrollPackage" disabled style="width: 400px"></el-input>
@@ -308,7 +381,8 @@
                         <el-input clearable v-model="listQuery.port" disabled style="width: 400px"></el-input>
                     </el-form-item>
                 </el-form>
-                <el-form ref="httpForm" :model="httpForm" :rules="rules" label-width="120px" v-if="this.form.transport == 'HTTP'">
+                <el-form ref="httpForm" :model="httpForm" :rules="rules" label-width="120px"
+                    v-if="this.form.transport == 'HTTP'">
                     <!-- 认证类型 -->
                     <el-form-item :label="$t('device.device-edit.148398-91')">
                         <el-input clearable v-model="httpForm.type" disabled style="width: 400px"></el-input>
@@ -320,7 +394,8 @@
                         <el-input clearable v-model="httpForm.password" disabled style="width: 400px"></el-input>
                     </el-form-item>
                 </el-form>
-                <el-form ref="GBform" :model="GBform" :rules="rules" label-width="120px" v-if="this.form.transport == 'GB28181'">
+                <el-form ref="GBform" :model="GBform" :rules="rules" label-width="120px"
+                    v-if="this.form.transport == 'GB28181'">
                     <!-- 服务器域 -->
                     <el-form-item :label="$t('device.device-edit.148398-87')">
                         <el-input clearable v-model="GBform.domainAlias" disabled style="width: 400px"></el-input>
@@ -339,7 +414,8 @@
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                    <el-button class="btns" type="primary" @click="doCopy(2)">{{ $t('device.device-edit.148398-59') }}</el-button>
+                    <el-button class="btns" type="primary" @click="doCopy(2)">{{ $t('device.device-edit.148398-59')
+                        }}</el-button>
                     <el-button @click="closeSummaryDialog">{{ $t('device.device-edit.148398-57') }}</el-button>
                 </div>
             </el-dialog>
@@ -356,6 +432,7 @@ import deviceAlert from './device-alert';
 import alertUser from './alert-user';
 import deviceUser from './device-user';
 import runningStatus from './running-status';
+import fire from './fire-extinguisher.vue';
 import deviceMonitor from './device-monitor';
 import deviceStatistic from './device-statistic';
 import instructionParsing from './instruction-parsing';
@@ -382,7 +459,6 @@ import DeviceFunc from '@/views/iot/device/device-functionlog';
 import RealTimeStatus from '@/views/iot/device/realTime-status';
 import { clientOut } from '@/api/iot/netty';
 import defaultSettings from '@/settings';
-
 export default {
     name: 'DeviceEdit',
     dicts: ['iot_device_status', 'iot_location_way'],
@@ -414,6 +490,7 @@ export default {
         instructionParsing,
         deviceModbusTask,
         deviceInlineVideo,
+        fire
     },
     watch: {
         activeName(val) {
@@ -1012,7 +1089,7 @@ export default {
                                 //是否设备设置为禁用状态，则踢出设备
                                 if (this.form.status === 2) {
                                     const params = { clientId: this.form.serialNumber };
-                                    clientOut(params).then((res) => {});
+                                    clientOut(params).then((res) => { });
                                 }
                             }
                         });
@@ -1090,7 +1167,7 @@ export default {
             this.form.serialNumber = devsipid;
         },
         // 获取选中的用户
-        getUserData(user) {},
+        getUserData(user) { },
         /**关闭物模型 */
         openSummaryDialog() {
             let json = {