Merge branch 'V1.0.11' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V1.0.11

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

@@ -400,7 +400,7 @@ export default {
         inputSensorNums: 1,
         inputSensorList: [{
           inputSensorIndex: 0,
-          inputSensorName: '',
+          inputSensorName: '报警输入1',
           moduleAddress: '0',
           subSystemIndex: '0',
           sensorType: 'Other',
@@ -444,7 +444,6 @@ export default {
     },
     async onSubmit() {
       this.$refs["form"].validate((valid) => {
-        debugger
         if (valid) {
           editAlarmHostDevice(this.formData).then(r => {
             if (!this.formData.id) {
@@ -452,11 +451,17 @@ export default {
             } else {
               this.$modal.msgSuccess("修改成功");
             }
+            this.flushList();
             this.onHide();
           })
         }
       });
     },
+    flushList(){
+      setTimeout(() => {
+        this.$emit("reload", this.formData);
+      },2000);
+    },
     getDefaultOrg(org) {
       this.orgName = org.name;
       this.formData.orgId = org.id;
@@ -610,11 +615,13 @@ export default {
       while (this.formData.subSystemList.length < nums) {
         let end = this.formData.subSystemList[this.formData.subSystemList.length - 1];
 
-        this.formData.subSystemList.push({
+        let data={
           subSystemIndex: Number(end.subSystemIndex) + 1,
           subSystemName: '',
           enable: 0
-        });
+        };
+        data.subSystemName =`子系统${data.subSystemIndex+1}`
+        this.formData.subSystemList.push(data);
       }
 
       while (this.formData.subSystemList.length > nums) {
@@ -639,14 +646,16 @@ export default {
       while (this.formData.inputSensorList.length < nums) {
         let end = this.formData.inputSensorList[this.formData.inputSensorList.length - 1];
 
-        this.formData.inputSensorList.push({
+        let data={
           inputSensorIndex: Number(end.inputSensorIndex) + 1,
           inputSensorName: '',
           moduleAddress: '0',
           subSystemIndex: '0',
           sensorType: 'Other',
           enable: 0
-        });
+        }
+        data.inputSensorName=`报警输入${data.inputSensorIndex+1}`
+        this.formData.inputSensorList.push(data);
       }
 
       while (this.formData.inputSensorList.length > nums) {

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

@@ -223,11 +223,17 @@ export default {
             } else {
               this.$modal.msgSuccess("修改成功");
             }
+            this.flushList();
             this.onHide();
           })
         }
       });
     },
+    flushList(){
+      setTimeout(() => {
+        this.$emit("reload", this.formData);
+      },200);
+    },
     getDefaultOrg(org) {
       this.orgName = org.name;
       this.formData.orgId = org.id;

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

@@ -277,12 +277,17 @@ export default {
             } else {
               this.$modal.msgSuccess("修改成功");
             }
+            this.flushList();
             this.onHide();
           })
-
         }
       });
     },
+    flushList(){
+      setTimeout(() => {
+        this.$emit("reload", this.formData);
+      },200);
+    },
     getDefaultOrg(org) {
       this.orgName = org.name;
       this.formData.orgId = org.id;

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

@@ -223,11 +223,17 @@ export default {
             } else {
               this.$modal.msgSuccess("修改成功");
             }
+            this.flushList();
             this.onHide();
           })
         }
       });
     },
+    flushList(){
+      setTimeout(() => {
+        this.$emit("reload", this.formData);
+      },200);
+    },
     getDefaultOrg(org) {
       this.orgName = org.name;
       this.formData.orgId = org.id;

src/views/iot/deviceInfo/index.vue

@@ -102,6 +102,7 @@
         <el-table-column label="所属机构" align="center" prop="orgName"/>
         <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
         <el-table-column label="设备名称" align="center" prop="deviceName"/>
+        <el-table-column v-if="activeName != 'fsu'" label="ip地址" align="center" prop="ip"/>
         <el-table-column
           label="网络状态"
           align="center"
@@ -185,10 +186,10 @@
       />
     </div>
     <detail-info-page ref="detailInfo"></detail-info-page>
-    <add-dvr-host ref="addDvrHostDialog"></add-dvr-host>
-    <add-alarm-host ref="addAlarmHostDialog"></add-alarm-host>
-    <add-talk-host ref="addTalkHostDialog"></add-talk-host>
-    <add-door-host ref="addDoorHostDialog"></add-door-host>
+    <add-dvr-host ref="addDvrHostDialog" @reload="this.getList"></add-dvr-host>
+    <add-alarm-host ref="addAlarmHostDialog" @reload="this.getList"></add-alarm-host>
+    <add-talk-host ref="addTalkHostDialog" @reload="this.getList"></add-talk-host>
+    <add-door-host ref="addDoorHostDialog" @reload="this.getList"></add-door-host>
   </div>
 </template>