设备管理新增网络监测设备tab页

src/views/iot/deviceInfo/detailDialog.vue

@@ -13,13 +13,14 @@
           <el-descriptions-item labelClassName="gx_info_label" label="设备类型" >
             {{formData.deviceTypeName}}
           </el-descriptions-item>
-          <el-descriptions-item v-if="formData.deviceType === '1' || formData.deviceType === '4' || formData.deviceType === '5'" labelClassName="gx_info_label" label="设备IP" >
+          <el-descriptions-item v-if="['1', '4', '5', '23', '24'].includes(formData.deviceType)"
+                                labelClassName="gx_info_label" label="设备IP" >
             {{formData.deviceAddress}}
           </el-descriptions-item>
-          <el-descriptions-item v-if="formData.deviceType === '1' || formData.deviceType === '4' || formData.deviceType === '5'" labelClassName="gx_info_label" label="设备端口" >
+          <el-descriptions-item v-if="['1', '4', '5'].includes(formData.deviceType)" labelClassName="gx_info_label" label="设备端口" >
             {{formData.devicePort}}
           </el-descriptions-item>
-          <el-descriptions-item v-if="formData.deviceType === '1' || formData.deviceType === '4'" labelClassName="gx_info_label" label="网络状态" >
+          <el-descriptions-item v-if="['1', '4', '23', '24'].includes(formData.deviceType)" labelClassName="gx_info_label" label="网络状态" >
             {{ getNetStatusDesc(formData.netStatus)}}
           </el-descriptions-item>
           <el-descriptions-item v-if="formData.parentName" labelClassName="gx_info_label" label="所属主机" >
@@ -28,7 +29,7 @@
             }}
           </el-descriptions-item>
         </el-descriptions>
-        <div class="extend_mod" v-if="formData.deviceType === '1' || formData.deviceType === '5'" style="max-height: 500px;">
+        <div class="extend_mod" v-if="['1', '5'].includes(formData.deviceType)" style="max-height: 500px;">
           <el-table :data="childrenInfos" border style="width: 100%;max-height: 500px;overflow-y: auto;">
             <el-table-column
               type="index"

src/views/iot/deviceInfo/index.vue

@@ -6,6 +6,7 @@
             <el-tab-pane label="监控主机" name="dvs"></el-tab-pane>
             <el-tab-pane label="报警主机" name="alarmHost"></el-tab-pane>
             <el-tab-pane label="动环主机" name="fsu"></el-tab-pane>
+            <el-tab-pane label="网络监测设备" name="networkDevice"></el-tab-pane>
           </el-tabs>
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
             <el-form-item label="组织机构">
@@ -90,7 +91,7 @@
             label="网络状态"
             align="center"
             prop="netStatus"
-            v-if="activeName != 'fsu'"
+            v-if="activeName !== 'fsu'"
           >
             <template slot-scope="scope">
               {{ getNetStatusDesc(scope.row)}}
@@ -179,6 +180,11 @@ export default {
         { label: "盗情传感器", value: "18"},
         { label: "DO8小时采集", value: "21"},
       ],
+      //动环主机下拉查询
+      NetworkDeviceTypeList: [
+        { label: "对讲主机", value: "23"},
+        { label: "门禁主机", value: "24"},
+      ],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -270,6 +276,9 @@ export default {
       }else if ("fsu" === this.activeName){
         this.queryParams.deviceTypeList = ["5","6","7","8","9","10","11","12","13","14","15","16","17","18","21"];
         this.deviceTypeSelectList = this.FsuDeviceTypeList;
+      }else if ("networkDevice" === this.activeName){
+        this.queryParams.deviceTypeList = ["23","24"];
+        this.deviceTypeSelectList = this.NetworkDeviceTypeList;
       }
       this.getList();
     },