bug修改

src/page/index.vue

@@ -16,14 +16,14 @@
        </div>
      </div>
      <div class="toConfigure">
-       <span v-if="carConfigName">  车辆配置：<span class="span1">{{carConfigName}}> </span></span>
+       <span v-if="carConfigName">  车辆配置：<span >{{carConfigName}}> </span></span><!-- class="span1" style="cursor: pointer;" @click="carConfigtck"s -->
         车型: <span class="span1" v-if="!description">{{brand_name?brand_name:'--'}}</span>
              <span class="span1" @click="carCK" v-if="description" style="cursor: pointer;">{{description}}</span>
        <span class="s1"> {{navfName}}：<span class="">{{zzName}}></span></span>
        <span class="s2" v-if="navchildrenNameTitle">{{navchildrenNameTitle}}：<span class="">{{navchildrenName?navchildrenName:'--'}}</span></span>
        <span class="s3" v-if="restrainTitleTwo">{{restrainTitleTwo}}:<span class="">{{zkName2?zkName2:'--'}}></span></span>
        <span class="cs" v-if="lastName">子组：{{lastName | re}}</span>
-       <span class="goback" @click="goback" v-if="!firstShow">返回</span>
+       <span class="goback" @click="goback" v-if="!firstShow&&prevNextShow">返回</span>
      </div>
      <div class="main">
        <div class="firstBox" v-if="firstShow">
@@ -172,8 +172,8 @@
    <!-- 子组件详情-->
       <div class="childrenMain" v-if="childrenShow">
          <div class="childrenMainLeft" ref="childrenMainLeft">
-           <div class="prevBox" :class="{prevBoxNo:childrenIndex==0}" @click="prev"><上一组</div>
-           <div class="nextBox" @click="next" :class="{prevBoxNo:childrenIndex==this.childrenList.length-1}" >下一组></div>
+           <div class="prevBox" v-if="prevNextShow" :class="{prevBoxNo:childrenIndex==0}" @click="prev"><上一组</div>
+           <div class="nextBox" v-if="prevNextShow" @click="next" :class="{prevBoxNo:childrenIndex==this.childrenList.length-1}" >下一组></div>
            <div class="imgNumBox" v-if="image_info.length>1">
              <div class="imgNumLine" :class="{prevBoxNo:imgIndex==index}" @click="imgCk(index)" v-for="(item,index) in image_info">{{index+1}}</div>
            </div>
@@ -321,6 +321,7 @@ export default {
        imgIndex:0,
        viewerimg:'',
        viewerimgArr:[],
+       prevNextShow:false,
     }
   },
   computed:{
@@ -336,11 +337,43 @@ export default {
   filters:{
     re(val){
        var reg_exp = new RegExp("<br/>", "g");
-       var res2 = val.replace(reg_exp, "");
+       if(val){
+          var res2 = val.replace(reg_exp, "");
+       }else{
+          var res2 = val
+       }
+
        return res2
+       //return val
     }
   },
   methods:{
+    carConfigtck(){
+      console.log(this.restrains)
+      this.restrainShow1=false
+      this.restrainShow2=false
+      this.restrainShow3=false
+      this.childrenCk1=false;
+      this.childrenShow=false;
+      this.childrenShow2=false;
+      this.restrainShow4=false;
+      this.groupShow=false;
+      this.lastShow=false;
+       this.firstShow=true;
+      this.carConfig=true;
+      this.navchildrenName=''
+      this.navchildrenNameTitle='';
+      this.restrainTitleTwo='';
+       this.lastName='';
+      this.zkName1=''
+      this.navfName='';
+      this.zzName='';
+      this.ckIndex1=-1;
+      this.ckIndex2=-1;
+      this.zzIndex=0;
+
+      this.description='';
+    },
     seeBigImg(url){
       this.viewerimg=url;
       this.viewerimgArr=[]
@@ -411,11 +444,14 @@ export default {
        this.firstShow=true;
        this.description='';
        console.log(this.vin.length)
-       if(this.vin==''||this.vin.length<17){
+       if(this.vin==''||this.vin.length!=17){
          this.$message({
                 message:'请输入正确的VIN',
                 type: 'warning'
           });
+          this.groupShow=false;
+           this.carConfig=false;
+           this.brand_name=''
           return false;
        }
       fetchGet('/advancedEpc/getVinGroupPc', {
@@ -552,6 +588,7 @@ export default {
                    this.zkName1=res.data.result.caption;
                    this.navchildrenNameTitle=res.data.result.caption
                  }else{
+                   console.log("直接子组")
                    this.restrainShow1=false;
                    this.lastShow=true;
                    this.zkName1=res.data.result.caption;
@@ -759,6 +796,7 @@ export default {
 
          if(res.data.number==200||res.data.number==5212){
             this.childrenShow=true;
+            this.prevNextShow=true;
              //this.childrenList=res.data.result.list;
              //this.access_time=res.data.result.access_time;
             //  console.log(res.data.result.list.image_info)
@@ -781,16 +819,18 @@ export default {
        this.childrenHeight = this.$refs.childrenMainLeft.offsetHeight // 高
       // console.log(this.childrenHeight)
       }, 500)
-      this.groupShow=false;
-      this.restrainShow1=false
-      this.restrainShow2=false
-      this.restrainShow3=false
-      this.childrenCk1=false;
-      this.carConfigName=''
-      this.childrenShow2=false;
-      this.restrainShow4=false;
-      this.lastShow=false;
-      this.carConfig=false;
+      this.prevNextShow=false;
+      // this.groupShow=false;
+      // this.restrainShow1=false
+      // this.restrainShow2=false
+      // this.restrainShow3=false
+      // this.childrenCk1=false;
+      // this.carConfigName=''
+      // this.childrenShow2=false;
+      // this.restrainShow4=false;
+      // this.lastShow=false;
+      // this.carConfig=false;
+       this.firstShow=false;
        this.childrenShow=true;
       fetchGet('/advancedEpc/getPartsPc', {
         vin:this.vin,
@@ -803,7 +843,7 @@ export default {
              //this.childrenList=res.data.result.list;
              //this.access_time=res.data.result.access_time;
             //  console.log(res.data.result.list.image_info)
-             this.image_info=res.data.result.list.image_info[0];
+             this.image_info=res.data.result.list.image_info;
 
              this.rows=res.data.result.list.rows
          }else{
@@ -1146,7 +1186,7 @@ color: #333333;padding-left: 10px;padding-right: 20px;
    width: 100%;
  }
  .childrenMainLeft{
-   height: calc(100vh - 250px );
+   height: calc(100vh - 220px );
       width: 55%;
       border-radius: 4px;
       border: 1px solid #EEEEEE;
@@ -1158,7 +1198,7 @@ color: #333333;padding-left: 10px;padding-right: 20px;
       padding-top: 50px;
  }
  .childrenMainRight{
-   height: calc(100vh - 200px );
+   height: calc(100vh - 170px );
      width: calc(45% - 15px );
    margin-left: 15px;
    border-radius: 4px;

src/page/oem.vue

@@ -152,6 +152,7 @@
                 <el-table-column prop="grade"  label="级别"></el-table-column>
                 <el-table-column prop="model_code"  label="模型代码"></el-table-column>
               </el-table>
+               <div style="padding-top: 10px;">
               <el-pagination
                   :current-page.sync="currentPage"
                    :page-size="50"
@@ -218,8 +219,8 @@ export default {
          carList:'',
          itemList:'',
          access_time:'',
-         token:'',
-         param:'',
+         tokenom:'',
+         paramom:'',
          threeTime:'',
          total_page:'',
          currentPage:1,
@@ -261,17 +262,17 @@ export default {
       this.oem='16400RZDH01';
     },
     threeSpan(item){
-      var token=item.token;
-      var param=item.param;
+      var tokenom=item.token;
+      var paramom=item.param;
       var data={
-        token:token,param:param,threeTime:this.threeTime
+        token:tokenom,param:paramom,threeTime:this.threeTime
       }
       this.$emit('update:show', false)
       this.$emit('done',data)
     },
     twoSpan(item){
-      this.token=item.token;
-      this.param=item.param;
+      this.tokenom=item.token;
+      this.paramom=item.param;
       this.getfindInModel()
     },
 
@@ -284,8 +285,8 @@ export default {
       fetchGet('/advancedEpc/findInModelPc', {
         partnum:this.partnum,
         epc_id: this.id,
-        token: this.token,
-        param: this.param,
+        token: this.tokenom,
+        param: this.paramom,
         access_time: this.access_time,
        }).then(res => {
          if(res.data.number==200||res.data.number==5212){
@@ -312,7 +313,7 @@ export default {
            this.tableTwoShow=true;
            this.access_time=res.data.result.access_time;
            this.carList=res.data.result.list
-           this.total_page=res.data.result.total_page;
+           this.total_page=res.data.result.total_count;
            //sthis.total_page=100;
            if(this.total_page>1){
              // this.getfindApplicableModelsPage()

src/page/part.vue

@@ -9,7 +9,7 @@
    <div class="partBox">
      <div class="partLeft" ref="partLeft">
        <div class="partLine" :class="{leftActive:leftIndex==1}" @click="tabck(1)">配件信息</div>
-       <div class="partLine" :class="{leftActive:leftIndex==2}" @click="tabck(2)">EPC车型（共999条）</div>
+       <div class="partLine" :class="{leftActive:leftIndex==2}" @click="tabck(2)">EPC车型（共{{total_count}}条）</div>
      </div>
      <div class="partRight" v-if="leftIndex==1">
        <div class="rightLine">
@@ -32,18 +32,7 @@
          <div class="rightTitle">备注</div>
          <div class="rightTxt">{{mesData.remark}}</div>
        </div>
-       <div class="rightLine">
-         <div class="rightTitle">英文名称</div>
-         <div class="rightTxt"></div>
-       </div>
-       <div class="rightLine">
-         <div class="rightTitle">适用车型代码</div>
-         <div class="rightTxt"></div>
-       </div>
-       <div class="rightLine">
-         <div class="rightTitle">是否颜色配件</div>
-         <div class="rightTxt"></div>
-       </div>
+
        <div class="rightLine">
          <div class="rightTitle">4S价格</div>
          <div class="rightTxt">¥{{threeData.price}}</div>
@@ -65,6 +54,16 @@
            <el-table-column prop="model_code"  label="模型代码"></el-table-column>
 
          </el-table>
+         <div style="padding-top: 10px;">
+         <el-pagination
+             :current-page.sync="currentPage"
+              :page-size="50"
+             layout="total,prev, pager, next"
+             :total="total_page"
+             background="background"
+             @current-change="handleCurrentChange"
+           />
+         </div>
      </div>
    </div>
 
@@ -84,6 +83,9 @@ export default {
        childrenHeight:'',
        mesData:'',
        modelsData:'',
+       total_count:'',
+       currentPage:1,
+       total_page:'',
     }
   },
   watch: {
@@ -108,18 +110,23 @@ export default {
               });
            }
          }).catch(err => {})
+
         setTimeout(() => {
                this.childrenHeight = this.$refs.partLeft.offsetHeight;
+               this.getfindApplicableModels()
              console.log(this.childrenHeight)
          }, 500)
      },
      getfindApplicableModels(){
        fetchGet('/advancedEpc/findApplicableModelsPc', {
          epc_id: this.epc_id,
-         partnum: this.partnum
+         partnum: this.partnum,
+          page:this.currentPage,
         }).then(res => {
           if(res.data.number==200||res.data.number==5212){
-              this.tableList=res.data.result.list
+              this.tableList=res.data.result.list;
+              this.total_count=res.data.result.total_count;
+               this.total_page=res.data.result.total_count;
           }else{
             this.$message({
                    message: res.data.message,
@@ -128,6 +135,9 @@ export default {
           }
         }).catch(err => {})
      },
+     handleCurrentChange(){
+       this.getfindApplicableModels()
+     },
      tabck(num){
        this.leftIndex=num;
 
@@ -154,7 +164,7 @@ export default {
  }
  .partBox{
    display: flex;
-   padding-bottom: 20px;
+   padding-bottom: 60px;
  }
  .partLeft{
    width: 258px;