twt 2 年 前
コミット
de075b4524
共有2 個のファイルを変更した18 個の追加12 個の削除を含む
  1. 13 10
      src/page/index.vue
  2. 5 2
      src/page/oem.vue

+ 13 - 10
src/page/index.vue

@@ -399,7 +399,10 @@ export default {
     },
     getOemDetail(e){
       console.log(e);
-      this.oemData=e
+      this.oemData=e;
+      this.lastName=e.childrengroup;
+      this.navfName='总组'
+      this.zzName=e.group
       this.getPartsPc2()
     },
     oemClick(){
@@ -934,7 +937,7 @@ export default {
    position: relative;
  }
  .hello{
-   padding: 10px 0 0 10px;
+   padding: 0 0 0 5px;
  }
  .barndBox{
    display: flex;
@@ -994,7 +997,7 @@ export default {
    color: #333333;
    line-height: 17px;
    font-size: 12px;
-   padding-top: 25px;
+   padding-top: 20px;
  }
  .span1{
    color: #3F90F7;
@@ -1003,13 +1006,13 @@ export default {
    display: flex;padding-top: 20px;
  }
  .mainLeft{
-   height: calc(100vh - 180px );
+   height: calc(100vh - 150px );
    width: 298px;
    border-radius: 4px;
    border: 1px solid #EEEEEE;
  }
  .mainLeftLineBox{
-   max-height: calc(100vh - 250px );
+   max-height: calc(100vh - 220px );
    overflow: auto;
  }
  .mainLeftTop{
@@ -1035,7 +1038,7 @@ export default {
    cursor: pointer;
  }
  .mainRight1{
-   height: calc(100vh - 180px );
+   height: calc(100vh - 150px );
    width: calc(100vw - 340px );
    border-radius: 4px;
    border: 1px solid #EEEEEE;
@@ -1105,7 +1108,7 @@ color: #333333;padding-left: 10px;padding-right: 20px;
   cursor: pointer;
  }
  .mainRight2{
-   height: calc(100vh - 180px );
+   height: calc(100vh - 150px );
    width: calc(100% - 900px );
    border-radius: 4px;
    border: 1px solid #EEEEEE;
@@ -1121,7 +1124,7 @@ color: #333333;padding-left: 10px;padding-right: 20px;
   cursor: pointer;
  }
  .mainRight3{
-   height: calc(100vh - 180px );
+   height: calc(100vh - 150px );
    width: calc(100% - 600px );
    border-radius: 4px;
    border: 1px solid #EEEEEE;
@@ -1186,7 +1189,7 @@ color: #333333;padding-left: 10px;padding-right: 20px;
    width: 100%;
  }
  .childrenMainLeft{
-   height: calc(100vh - 220px );
+   height: calc(100vh - 200px );
       width: 55%;
       border-radius: 4px;
       border: 1px solid #EEEEEE;
@@ -1198,7 +1201,7 @@ color: #333333;padding-left: 10px;padding-right: 20px;
       padding-top: 50px;
  }
  .childrenMainRight{
-   height: calc(100vh - 170px );
+   height: calc(100vh - 150px );
      width: calc(45% - 15px );
    margin-left: 15px;
    border-radius: 4px;

+ 5 - 2
src/page/oem.vue

@@ -265,7 +265,9 @@ export default {
       var tokenom=item.token;
       var paramom=item.param;
       var data={
-        token:tokenom,param:paramom,threeTime:this.threeTime
+        token:tokenom,param:paramom,threeTime:this.threeTime,
+        group:item.group,childrengroup:item.caption
+
       }
       this.$emit('update:show', false)
       this.$emit('done',data)
@@ -420,7 +422,7 @@ export default {
    width: 72px;
    height: 38px;
    background: #FF4F00;
-  border-radius: 0px 4px 4px 0px;
+   border-radius: 0px 4px 4px 0px;
    font-weight: 400;
    color: #FFFFFF;
    font-size: 14px;
@@ -428,6 +430,7 @@ export default {
    text-align: center;
    margin-left: -2px;
    position: relative;
+   cursor: pointer;
  }
  .oemTopdiv{
    display: flex;