@tang_weiteng %!s(int64=2) %!d(string=hai) anos
pai
achega
d8ad456859
Modificáronse 3 ficheiros con 29 adicións e 9 borrados
  1. 1 1
      config/index.js
  2. 14 1
      src/page/carCk.vue
  3. 14 7
      src/page/index.vue

+ 1 - 1
config/index.js

@@ -13,7 +13,7 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: '192.168.0.215', // can be overwritten by process.env.HOST http://localhost/
+    host: '192.168.2.165', // can be overwritten by process.env.HOST http://localhost/
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

+ 14 - 1
src/page/carCk.vue

@@ -205,6 +205,7 @@ export default {
        captionlist:[],
        bshow:false,
        carzm:'A',
+       carTname:[],
     }
   },
   watch: {
@@ -236,6 +237,9 @@ export default {
       this.bshow=false;
     },
     morez(item,index,time){
+      if(index==0){
+        this.$emit('ckzzname',item.caption)
+      }
       this.captionlist[index]=item.token;
       this.captionlist=this.captionlist.splice(0,index+1)
       if(item.next_restrain==1||index==0){
@@ -388,9 +392,18 @@ export default {
     goNextX(item,time,index){  //点击车辆配置
 
        console.log(time + '时间---index'+index +'宽度===')
-
+       this.carTname[index]=item.combine_cp;
        this.combineCplist[index]=item.token;
        this.combineCplist=this.combineCplist.splice(0,index+1)
+       console.log(this.carTname.join(','))
+       //console.log(item.model_name)
+       var name=this.modelname+ this.carTname.join(',')
+       var e={
+         brandName:this.brandName,
+         epc_id:this.epc_id,
+         description:name,
+       }
+        this.$emit('brandCk',e)
        console.log( this.combineCplist)
       if(item.next_restrain==1){
         fetchGet('/advancedEpc/getRestrainPc', {

+ 14 - 7
src/page/index.vue

@@ -257,7 +257,7 @@
      <oem  ref="childoem" :show.sync="oemFlag" @done="getOemDetail" :param='param' :token='token' :vin='vin' :id.sync="epc_id"></oem>
      <part ref="childrenPart" :show.sync="partFlag" :epc_id='epc_id' :partnum="partnum" :threeData='threeData'></part>
      <carInfo  ref="childrencar" :show.sync="carFlag" :carInfoData="carInfoData"></carInfo>
-     <carCk :show.sync="carCkShow" ref="childrencarCk" @done="carckhl" @brandCk="brandCkFn" @cxpart="cxpartFn"></carCk>
+     <carCk :show.sync="carCkShow" ref="childrencarCk" @ckzzname="ckzznameFn" @done="carckhl" @brandCk="brandCkFn" @cxpart="cxpartFn"></carCk>
   </div>
 </template>
 
@@ -370,6 +370,9 @@ export default {
     }
   },
   methods:{
+    ckzznameFn(e){
+      this.zzName=e
+    },
     brandCkFn(e){
       this.brand_name=e.brandName;
       this.epc_id=e.epc_id;
@@ -526,7 +529,7 @@ export default {
     gobackCxdx(){
       this.backCxdxShow=false;
       this.carCkShow=true;
-     
+
       this.childrenShow=false;
     },
     oemClick(){
@@ -989,6 +992,7 @@ export default {
           this.childrentoken=this.childrenList[this.childrenIndex].token;
             this.lastName=this.childrenList[this.childrenIndex].caption
           this.getPartsPc();
+
         }
 
 
@@ -1005,6 +1009,7 @@ export default {
 
     },
     getPartsPc(){
+
       fetchGet('/advancedEpc/getPartsPc', {
         vin:this.vin,
         access_time:this.access_time,
@@ -1034,10 +1039,7 @@ export default {
          })
     },
     getPartsPc2(){
-      setTimeout(() => {
-       this.childrenHeight = this.$refs.childrenMainLeft.offsetHeight // 高
-      // console.log(this.childrenHeight)
-      }, 500)
+      console.log("getPartsPc2")
       this.prevNextShow=false;
       // this.groupShow=false;
       // this.restrainShow1=false
@@ -1051,6 +1053,7 @@ export default {
       // this.carConfig=false;
        this.firstShow=false;
        this.childrenShow=true;
+
       fetchGet('/advancedEpc/getPartsPc', {
         vin:this.vin,
         access_time:this.oemData.threeTime,
@@ -1065,7 +1068,11 @@ export default {
             //  console.log(res.data.result.list.image_info)
              this.image_info=res.data.result.list.image_info;
 
-             this.rows=res.data.result.list.rows
+             this.rows=res.data.result.list.rows;
+             setTimeout(() => {
+              this.childrenHeight = this.$refs.childrenMainLeft.offsetHeight // 高
+              console.log("childrenHeight==="+this.childrenHeight)
+             }, 500)
          }else{
            this.$message({
                   message: res.data.message,