bug修改

src/views/iot/deviceInfo/dialog.addDvrHost.vue

@@ -127,7 +127,7 @@
                   <el-input v-model="r.row.channelName" maxlength="50" placeholder=""/>
                 </template>
               </el-table-column>
-              <el-table-column label="网络模块" align="center">
+              <el-table-column label="是否启用" align="center">
                 <template slot-scope="r">
                   <el-radio-group v-model="r.row.enable">
                     <el-radio :label="0">启用</el-radio>

src/views/iot/deviceInfo/index.vue

@@ -101,6 +101,7 @@
         <el-table-column label="行社" align="center" width="150" prop="secondOrgName"/>
         <el-table-column label="所属机构" align="center" prop="orgName"/>
         <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
+        <el-table-column v-if="activeName != 'fsu' && activeName != 'dvs'" label="设备品牌" align="center" prop="deviceBrand"/>
         <el-table-column label="设备名称" align="center" prop="deviceName"/>
         <el-table-column v-if="activeName != 'fsu'" label="ip地址" align="center" prop="ip"/>
         <el-table-column
@@ -128,6 +129,17 @@
             />
           </template>
         </el-table-column>
+        <el-table-column
+          label="是否启用"
+          align="center"
+          prop="enableStatus"
+          width="110"
+          v-if="activeName !== 'fsu'"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.enableStatus == 0 ? '启用' : '禁用' }}
+          </template>
+        </el-table-column>
         <el-table-column label="更新时间" align="center" prop="updateTime"/>
         <el-table-column
           label="操作"