Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/management/home.vue

@@ -2664,10 +2664,17 @@ export default {
         getAllMachine(this.forms.zone_id, this.forms.device_type).then(response => {
           if (response.data.state === 1) {
             var addmahcer = response.data.data.addmahcer
-            console.log('addmacher是', addmahcer)
+      
             this.tableDatatwo = addmahcer
             this.tabIndex = this.$route.query.index
-            this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
+            var id = this.$route.query.id
+            for(let i = 0;i < this.tableDatatwo.length;i++) {
+              if(this.tableDatatwo[i].id == id) {  
+                this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                break
+              }
+            }
+            // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
           }
         })
       },
@@ -2676,7 +2683,7 @@ export default {
       },
       handleCurrentChange(val) {
         this.unitType = val.unit_type
-        // console.log('val是什么', val)
+        console.log('val是什么', val)
         this.currentRow = val
         this.$forceUpdate()
         this.getMachineDetailById(val.id)
@@ -2969,7 +2976,7 @@ export default {
         var bed_numberss = parseInt(bed_numbers)
         this.form.bed_number = bed_numberss
         this.$refs[formName].validate(valid => {
-          UpdateMachineInfo(this.form).then(response => {
+          UpdateMachineInfo(this.form).then(response => {debugger
             // console.log('form', this.form)
             if (response.data.state === 1) {
               var addmacher = response.data.data.addmacher
@@ -2977,9 +2984,16 @@ export default {
 
               this.$message.success('修改成功')
               // this.$router.push({ path: '/device/home?index=' + this.tabIndex })
+              for(let i = 0;i < this.tableDatatwo.length;i++) {
+                if(this.tableDatatwo[i].id == addmacher.id) {
+                  this.tableDatatwo[i] = addmacher
+                  // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
+                  // this.$forceUpdate
+                }
+              }
               // this.getAllMachine()
-              this.getAllSubregion()
-              // this.$refs.singleTable.setCurrentRow(addmacher)
+              // this.getAllSubregion()
+              this.$refs.singleTable.setCurrentRow(addmacher)
               this.$forceUpdate()
             }
           })
@@ -3018,9 +3032,19 @@ export default {
               if (response.data.state === 1) {
                 // eslint-disable-next-line no-unused-vars
                 var addmacher = response.data.data.addmacher
+
                 this.$message.success('修改成功')
-                this.getAllMachine()
+                for(let i = 0;i < this.tableDatatwo.length;i++) {
+                  if(this.tableDatatwo[i].id == addmacher.id) {
+                    this.tableDatatwo[i] = addmacher
+                
+                  }
+                }
+                // this.getAllMachine()
+                this.$forceUpdate
                 this.getAllSubregion()
+                // this.$refs.singleTable.setCurrentRow(addmacher)
+                
               }
             })
           }
@@ -3046,9 +3070,17 @@ export default {
         this.$refs[formName].validate(valid => {
           UpdateMacheineTwo(this.form).then(response => {
             if (response.data.state === 1) {
-              var add = response.data.data.addmacher
+              var addmacher = response.data.data.addmacher
               this.$message.success('修改成功')
-              this.getAllMachine()
+              for(let i = 0;i < this.tableDatatwo.length;i++) {
+                  if(this.tableDatatwo[i].id == addmacher.id) {
+                    this.tableDatatwo[i] = addmacher
+
+                  }
+                }
+                // this.getAllMachine()
+                this.$forceUpdate
+              // this.getAllMachine()
               this.getAllSubregion()
             }
           })