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

src/xt_pages/upload/fast/Two.vue

@@ -761,23 +761,41 @@
                   }
                   break
                 case 2:
-                  if(response.data.data.inspections != null){
-                    if(response.data.data.inspections.length > 0){
-                      this.xzg = response.data.data.inspections[16].inspect_value
-                      this.ylg = response.data.data.inspections[11].inspect_value
-                      this.xl = response.data.data.inspections[18].inspect_value
-                      this.ipth = response.data.data.inspections[20].inspect_value
-                      this.akp = response.data.data.inspections[4].inspect_value
 
+                  if(response.data.data.inspections_one != null) {
+                    if(response.data.data.inspections_one.length > 0){
+                      this.akp = response.data.data.inspections_one[4].inspect_value
                     }
                   }else{
+                    this.akp = ''
+
+                  }
+
+                  if(response.data.data.inspections_two != null) {
+                    if(response.data.data.inspections_two.length > 0){
+                      this.xzg = response.data.data.inspections_two[7].inspect_value
+                      this.ylg = response.data.data.inspections_two[2].inspect_value
+                      this.xl = response.data.data.inspections_two[9].inspect_value
+
+                    }
+                  }else{
+
                     this.xzg =''
                     this.ylg =''
                     this.xl = ''
+
+                  }
+
+
+                  if(response.data.data.inspections_three != null) {
+                    if(response.data.data.inspections_three.length > 0){
+                      this.ipth = response.data.data.inspections_three[1].inspect_value
+                    }
+                  }else{
                     this.ipth = ''
-                    this.akp = ''
 
                   }
+
                   break
                 case 3:
                   if(response.data.data.inspections != null){
@@ -799,40 +817,42 @@
                   }
                   break
                 case 4:
-                  if(response.data.data.inspections != null){
-                    if(response.data.data.inspections.length > 0){
-                      this.ns = response.data.data.inspections[19].inspect_value
-                      this.jg = response.data.data.inspections[22].inspect_value
-                      this.xns = response.data.data.inspections[20].inspect_value
-                      this.xzdb = response.data.data.inspections[3].inspect_value
-                      this.xbdb = response.data.data.inspections[5].inspect_value
-                      this.alt = response.data.data.inspections[0].inspect_value
-                      this.zdhs = response.data.data.inspections[6].inspect_value
-                      this.gysz = response.data.data.inspections[24].inspect_value
-                      this.dmdzdb = response.data.data.inspections[27].inspect_value
-                      this.gmdzdb = response.data.data.inspections[26].inspect_value
-                      this.xt = response.data.data.inspections[29].inspect_value
-                      this.xj = response.data.data.inspections[13].inspect_value
-                      this.xn = response.data.data.inspections[14].inspect_value
-                      this.xc = response.data.data.inspections[15].inspect_value
-                      this.xm = response.data.data.inspections[9].inspect_value
-                      this.xchen = response.data.data.inspections[10].inspect_value
-                      this.xe = response.data.data.inspections[12].inspect_value
+
+                  if(response.data.data.inspections_one != null) {
+                    if(response.data.data.inspections_one.length > 0){
+
+                      this.xzdb = response.data.data.inspections_one[3].inspect_value
+                      this.xbdb = response.data.data.inspections_one[5].inspect_value
+                      this.alt = response.data.data.inspections_one[0].inspect_value
+                      this.zdhs =response.data.data.inspections_one[6].inspect_value
 
                     }
                   }else{
-
-                    this.ns = ''
-                    this.jg = ''
-                    this.xns =''
                     this.xzdb = ''
                     this.xbdb = ''
                     this.alt = ''
-                    this.zdhs =''
-                    this.gysz = ''
-                    this.dmdzdb =''
-                    this.gmdzdb = ''
-                    this.xt = ''
+                    this.zdhs = ''
+
+
+                  }
+
+
+
+
+
+                  if(response.data.data.inspections_two != null) {
+                    if(response.data.data.inspections_two.length > 0){
+                      this.xj = response.data.data.inspections_two[4].inspect_value
+                      this.xn = response.data.data.inspections_two[5].inspect_value
+                      this.xc = response.data.data.inspections_two[6].inspect_value
+                      this.xm = response.data.data.inspections_two[0].inspect_value
+                      this.xchen = response.data.data.inspections_two[1].inspect_value
+                      this.xe = response.data.data.inspections_two[3].inspect_value
+
+
+                    }
+                  }else{
+
                     this.xj = ''
                     this.xn = ''
                     this.xc = ''
@@ -842,23 +862,78 @@
 
 
                   }
+
+
+                  if(response.data.data.inspections_three != null) {
+                    if(response.data.data.inspections_three.length > 0){
+                      this.ns = response.data.data.inspections_three[0].inspect_value
+                      this.jg = response.data.data.inspections_three[3].inspect_value
+                      this.xns =response.data.data.inspections_three[1].inspect_value
+
+
+                    }
+                  }else{
+                    this.ns = ''
+                    this.jg = ''
+                    this.xns = ''
+
+                  }
+
+                  if(response.data.data.inspections_four != null) {
+                    if(response.data.data.inspections_four.length > 0){
+                      this.gysz = response.data.data.inspections_four[0].inspect_value
+                      this.dmdzdb = response.data.data.inspections_four[3].inspect_value
+                      this.gmdzdb =response.data.data.inspections_four[2].inspect_value
+
+
+                    }
+                  }else{
+                    this.gysz  = ''
+                    this.gmdzdb = ''
+                    this.dmdzdb = ''
+
+                  }
+
+
+
+                  if(response.data.data.inspections_five != null){
+                    if(response.data.data.inspections_five.length > 0){
+                      this.xt = response.data.data.inspections_five[0].inspect_value
+
+                    }
+                  }else{
+                    this.xt = ''
+
+
+
+                  }
+
+
                   break
                 case 5:
-                  if(response.data.data.inspections != null){
-                    if(response.data.data.inspections.length > 0){
-                      this.cfydb = response.data.data.inspections[5].inspect_value
-                      this.qbdb = response.data.data.inspections[6].inspect_value
-                      this.b2wdb = response.data.data.inspections[2].inspect_value
-
+                  if(response.data.data.inspections_one != null){
+                    if(response.data.data.inspections_one.length > 0){
+                      this.b2wdb = response.data.data.inspections_one[2].inspect_value
                     }
                   }else{
+                    this.b2wdb = ''
 
+                  }
+
+                  if(response.data.data.inspections_two != null){
+                    if(response.data.data.inspections_two.length > 0){
+                      this.cfydb = response.data.data.inspections_two[0].inspect_value
+                      this.qbdb = response.data.data.inspections_two[1].inspect_value
+
+                    }
+                  }else{
                     this.cfydb =''
                     this.qbdb = ''
-                    this.b2wdb = ''
+                  }
+
+
 
 
-                  }
                   break
                 case 6:
                   if(response.data.data.inspections != null){