Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/views/otamanagement/vehicleinformation/components/historicalrecord.vue

@@ -103,7 +103,9 @@
     margin-left: 60px;
   }
   .titlebox-text-text{
-    margin-left: 60px;
+    margin-top: 23px;
+    position: absolute;
+    left: 249px;
   }
   .bootom-button{
     position: relative;

jero-web/src/views/otamanagement/vehicleinformation/components/other.vue

@@ -56,14 +56,16 @@ export default {
         otaIdT=''
       }
         getAction('/ota/otaBaCxQt/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
-          console.log(res);
+          if(res.code==200){
+               this.queryParam=res.result
+            }
         })
       },
     save(){
       this.$refs.ruleForm.validate( valid =>{
         if (valid) {
           postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{
-            console.log(res);
+           console.log(res);
           })
         } else {
           return false;

jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue

@@ -871,13 +871,12 @@ export default {
         otaIdT=''
       }
         getAction('/ota/otaBaCxJsfzbacs/queryByOtaId',{otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
-          if(res == 200 ) {
             if(res.code==200){
               if(res.result.kzq.length == 0){
                 this.dataSourceList=[
-        {
-          bjmc:'车端OTA升级功能模块'
-        }
+                {
+                  bjmc:'车端OTA升级功能模块'
+                }
       ]
               }else{
                 res.result.kzq.forEach(item=>{
@@ -885,20 +884,24 @@ export default {
                 })
                 this.dataSourceList=res.result.kzq
               }
-           
-              
              
               this.dataSource.forEach(item=>{
                  for(let key in res.result.bj){
-                  if(item.val==key){
+                  if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0){
+                    res.result.bj[key]=Number(res.result.bj[key])
+                  }
+                  if(item.key==key){
                     item.val=res.result.bj[key]
                   }
                  }
               })
-            }
-            res.result.bj.forEach(item=>{
-                item=Number(item)
-              })
+              
+
+              // res.result.bj.forEach(item=>{
+              //   if(Number(item) !=NaN){
+              //     item=Number(item)
+              //   }
+              // })
               this.query=res.result.bj
           }
         })