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

src/xt_pages/management/home.vue

@@ -493,7 +493,7 @@
                                         </el-select>
                                      </el-form-item>
                                 </el-col>
-                                 <el-col :span="7">      
+                                 <el-col :span="7">
                                     <el-form-item label="使用年限(年):">
                                       <el-input style="width:150px" v-model="form.user_year" :disabled="disableFour"></el-input>
                                     </el-form-item>
@@ -2685,7 +2685,7 @@ export default {
                 this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
                 break
               }
-              
+
             }
             // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[this.tabIndex])
           }
@@ -3004,7 +3004,7 @@ export default {
                       //   this.$forceUpdate()
                     }
                   }
-  
+
                   this.tableDatatwo[i] = addmacher
                   // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
                 }
@@ -3061,7 +3061,7 @@ export default {
                       //   this.$forceUpdate()
                       }
                     }
-  
+
                     this.tableDatatwo[i] = addmacher
                   // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
                   }
@@ -3105,7 +3105,7 @@ export default {
                       //   this.$forceUpdate()
                     }
                   }
-  
+
                   this.tableDatatwo[i] = addmacher
                   // this.$refs.singleTable.setCurrentRow(this.tableDatatwo[i])
                 }
@@ -3459,7 +3459,7 @@ export default {
         var devicetype = this.machineform.device_type
         var devicetypes = parseInt(devicetype)
         this.machineform.device_type = devicetypes
-  
+
         if (this.machineform.disinfec_time === '') {
           this.machineform.disinfec_time = ''
         }
@@ -3468,7 +3468,7 @@ export default {
           var disinfectime = parseInt(disinfectimes)
           this.machineform.disinfec_time = disinfectime
         }
-  
+
         var times = this.machineform.time
         var time = parseInt(times)
         this.machineform.time = time
@@ -4388,7 +4388,7 @@ export default {
             }
 
             var timeDataThree = response.data.data.timeDataThree
-            console.log('timeDataThree', timeDataThree)
+            //console.log('timeDataThree', timeDataThree)
             if (timeDataThree.length === 0) {
               this.warnShowThree = true
             }
@@ -4412,7 +4412,7 @@ export default {
       getAllMode() {
         getAllMode().then(response => {
           var mode = response.data.data.mode
-  
+
           this.deviceMode = mode
         })
       },