Jelajahi Sumber

carsim优化

zhangliang2 2 tahun lalu
induk
melakukan
1d10a6ec88

+ 6 - 0
src/assets/common/css/theme.less

@@ -89,6 +89,11 @@
 
 .el-dialog {
 
+    .el-dialog__title {
+        font-size: 20px;
+        font-weight: bold;
+    }
+
     .el-input,
     .el-select {
         width: 100%;
@@ -102,6 +107,7 @@
 .titlePanelBor {
     padding-left: 9px;
     border-left: 6px solid @themeColor;
+    font-size: 20px;
     font-weight: bold;
     line-height: 1.08;
     color: @themeColor;

+ 3 - 2
src/components/echarts/common/tool.js

@@ -27,6 +27,7 @@ export default {
                     name: this.xName,
                     type: "value",
                     // type: "category",
+                    nameLocation: "center",
                     boundaryGap: false,
                     data: [],
                     axisTick: { inside: true },
@@ -56,8 +57,8 @@ export default {
                 }, ],
                 grid: {
                     top: "30px",
-                    left: "60px",
-                    right: "108px",
+                    left: "30px",
+                    right: "30px",
                     bottom: "10%",
                     containLabel: true,
                 },

+ 4 - 3
src/components/echarts/lineChartCarsim.vue

@@ -145,7 +145,8 @@ export default {
                 },
                 xAxis: {
                     name: this.xName,
-                    nameLocation: "end",
+                    nameLocation: "center",
+                    nameGap: 30,
                     type: "value",
                     axisTick: { inside: true },
                     // boundaryGap: false,
@@ -160,8 +161,8 @@ export default {
                 series,
                 grid: {
                     top: "75px",
-                    left: "60px",
-                    right: "108px",
+                    left: "30px",
+                    right: "30px",
                     bottom: "10%",
                     containLabel: true,
                 },

+ 4 - 2
src/components/echarts/lineChartCarsimA.vue

@@ -205,6 +205,8 @@ export default {
                     // type: "category",
                     // boundaryGap: false,
                     // data: xData,
+                    nameLocation: "center",
+                    nameGap: 30,
                     min: 0,
                     max: 1,
                     axisTick: { inside: true },
@@ -220,8 +222,8 @@ export default {
                 series,
                 grid: {
                     top: "60px",
-                    left: "60px",
-                    right: "108px",
+                    left: "30px",
+                    right: "30px",
                     bottom: "10%",
                     containLabel: true,
                 },

+ 4 - 2
src/components/echarts/lineChartCarsimB.vue

@@ -167,6 +167,8 @@ export default {
                     type: "value",
                     boundaryGap: false,
                     axisTick: { inside: true },
+                    nameLocation: "center",
+                    nameGap: 30,
                     // data: xData,
                 },
                 yAxis: {
@@ -179,8 +181,8 @@ export default {
                 series,
                 grid: {
                     top: "60px",
-                    left: "60px",
-                    right: "108px",
+                    left: "30px",
+                    right: "30px",
                     bottom: "10%",
                     containLabel: true,
                 },

+ 180 - 172
src/views/modelLibrary/components/vehicleModelCarsim.vue

@@ -1,6 +1,6 @@
 <template>
-    <div>
-        <el-form ref="form" :model="form" :rules="rules" label-width="160px">
+    <div class="vehicleModelCarsimPanel">
+        <el-form ref="form" :model="form" :rules="rules" label-width="210px">
             <div class="titlePanel">
                 <div class="titlePanelBor">几何参数</div>
             </div>
@@ -942,6 +942,7 @@
                             :slot="column.prop"
                             :label="column.label"
                             align="center"
+                            min-width="120"
                         >
                             <template v-slot="scope">
                                 <el-input
@@ -1022,7 +1023,7 @@
                     </line-chart-a>
                 </div>
                 <div class="diaContent tableBox">
-                    <div class="tipName">up-shifting</div>
+                    <div class="tipName">升挡</div>
                     <tableList
                         :columns="columns2"
                         :getDataWay="getDataWay2"
@@ -1078,7 +1079,7 @@
                         ></upload>
                     </div>
 
-                    <div class="tipName">down-shifting</div>
+                    <div class="tipName">降挡</div>
                     <tableList
                         :columns="columns2A"
                         :getDataWay="getDataWay2A"
@@ -2280,6 +2281,7 @@ export default {
                 const element = array[index];
 
                 let flag = Object.values(element).some((i) => i === "");
+                // let flag = Object.values(element).some((i) => i === "" || i == undefined);
 
                 if (flag) {
                     this.$message.error("数据不全,请填写完整");
@@ -3122,224 +3124,230 @@ export default {
 </script>
 
 <style lang='less' scoped>
-.titlePanel {
-    padding: 22px 0;
-}
-
-.titlePanelA {
-    padding-top: 22px;
-    padding-bottom: 22px;
-}
-
-.padTop15 {
-    padding-top: 15px;
-}
+.vehicleModelCarsimPanel {
+    .titlePanel {
+        padding: 22px 0;
+    }
 
-.padTop22 {
-    padding-top: 22px;
-}
+    .titlePanelA {
+        padding-top: 22px;
+        padding-bottom: 22px;
+    }
 
-.padTop0 {
-    padding-top: 0;
-}
+    .padTop15 {
+        padding-top: 15px;
+    }
 
-.marBot20 {
-    margin-bottom: 20px;
-}
+    .padTop22 {
+        padding-top: 22px;
+    }
 
-.titlePanelABor {
-    padding-left: 9px;
-    font-weight: bold;
-    line-height: 1.08;
-
-    b {
-        display: inline-block;
-        width: 15px;
-        height: 13px;
-        margin-right: 6px;
-        vertical-align: middle;
-        background: url("../../../assets/common/image/others/car.png") center
-            no-repeat;
-        background-size: contain;
+    .padTop0 {
+        padding-top: 0;
     }
 
-    i {
-        margin-right: 6px;
-        font-size: 16px;
+    .marBot20 {
+        margin-bottom: 20px;
     }
-}
 
-.carTipBox {
-    width: 807px;
-    padding-right: 30px;
-    // margin: 0 auto;
+    .titlePanelABor {
+        padding-left: 9px;
+        font-weight: bold;
+        line-height: 1.08;
+        font-size: 18px;
+
+        b {
+            display: inline-block;
+            width: 18px;
+            height: 15px;
+            margin-top: -2px;
+            margin-right: 6px;
+            vertical-align: middle;
+            background: url("../../../assets/common/image/others/car.png")
+                center no-repeat;
+            background-size: contain;
+        }
 
-    .searchLayoutBox {
-        position: relative;
-        padding: 18px;
-        text-align: center;
+        i {
+            margin-right: 6px;
+            font-size: 18px;
+        }
     }
 
-    /deep/ .el-input {
-        width: 100%;
-        max-width: 231px;
-    }
+    .carTipBox {
+        width: 84%;
+        min-width: 807px;
+        padding-right: 30px;
+        // margin: 0 auto;
 
-    /deep/ .el-form-item {
-        position: absolute;
-        z-index: 6;
-        margin: 0;
-        width: 12%;
-    }
+        .searchLayoutBox {
+            position: relative;
+            padding: 18px;
+            text-align: center;
+        }
 
-    /deep/ .el-form-item__content {
-        margin: 0 !important;
-    }
+        /deep/ .el-form-item {
+            position: absolute;
+            z-index: 6;
+            margin: 0;
+            width: 12%;
 
-    .p1 {
-        top: 33.6%;
-        left: 4.2%;
-    }
+            .el-input {
+                width: 100%;
+                max-width: 180px;
+            }
+        }
 
-    .p2 {
-        top: 76.2%;
-        left: 9%;
-    }
+        /deep/ .el-form-item__content {
+            margin: 0 !important;
+        }
 
-    .p3 {
-        top: 65.1%;
-        left: 36%;
-    }
+        .p1 {
+            top: 33.6%;
+            left: 4.2%;
+        }
 
-    .p4 {
-        top: 62.1%;
-        left: 54%;
-    }
+        .p2 {
+            top: 79.2%;
+            left: 9%;
+        }
 
-    .p6 {
-        top: 81%;
-        left: 42%;
-    }
-}
+        .p3 {
+            top: 65.1%;
+            left: 36%;
+        }
 
-.myTabsBox {
-    margin-right: 30px;
+        .p4 {
+            top: 62.1%;
+            left: 54%;
+        }
 
-    /deep/ .el-tabs__nav-scroll {
-        &:after {
-            width: 100%;
+        .p6 {
+            top: 81%;
+            left: 42%;
         }
     }
 
-    &.myTabsBoxFourTabs {
-        /deep/ .el-tabs {
-            width: auto;
-            margin: 0;
+    .myTabsBox {
+        margin-right: 30px;
+
+        /deep/ .el-tabs__nav-scroll {
+            &:after {
+                width: 100%;
+            }
         }
 
-        /deep/ .el-tabs__item {
-            width: 90px;
+        &.myTabsBoxFourTabs {
+            /deep/ .el-tabs {
+                width: auto;
+                margin: 0;
+            }
+
+            /deep/ .el-tabs__item {
+                width: 90px;
+            }
         }
-    }
 
-    /deep/
-        .el-tabs--top.el-tabs--card
-        > .el-tabs__header
-        .el-tabs__item:nth-child(2) {
-        padding-left: 0;
-        border-left-color: @gray;
+        /deep/
+            .el-tabs--top.el-tabs--card
+            > .el-tabs__header
+            .el-tabs__item:nth-child(2) {
+            padding-left: 0;
+            border-left-color: @gray;
 
-        &.is-active {
-            border-left-color: @themeColor;
+            &.is-active {
+                border-left-color: @themeColor;
+            }
         }
-    }
 
-    /deep/
-        .el-tabs--top.el-tabs--card
-        > .el-tabs__header
-        .el-tabs__item:last-child {
-        padding-right: 0;
+        /deep/
+            .el-tabs--top.el-tabs--card
+            > .el-tabs__header
+            .el-tabs__item:last-child {
+            padding-right: 0;
+        }
     }
-}
 
-.dialogBtnBox {
-    // justify-content: space-between;
-    padding-bottom: 12px;
-    margin-right: 30px;
-
-    .dia {
-        padding: 10px 6px;
-        margin-right: 10px;
-        margin-bottom: 10px;
-        border: 1px solid @gray;
-        border-radius: 4px;
-        background: rgba(51, 151, 255, 0.06);
-        cursor: pointer;
-
-        &:last-child {
-            margin-right: 0;
+    .dialogBtnBox {
+        // justify-content: space-between;
+        padding-bottom: 12px;
+        margin-right: 30px;
+
+        .dia {
+            padding: 10px 6px;
+            margin-right: 10px;
+            margin-bottom: 10px;
+            border: 1px solid @gray;
+            border-radius: 4px;
+            background: rgba(51, 151, 255, 0.06);
+            cursor: pointer;
+
+            &:last-child {
+                margin-right: 0;
+            }
+
+            &:hover,
+            &.isCur {
+                border-color: @themeColor;
+                color: @themeColor;
+            }
         }
 
-        &:hover,
-        &.isCur {
-            border-color: @themeColor;
-            color: @themeColor;
+        .dia2 {
+            display: inline-block;
         }
     }
 
-    .dia2 {
-        display: inline-block;
+    .wrapBox {
+        .labelName {
+            padding-right: 10px;
+            margin-top: 10px;
+        }
     }
-}
 
-.wrapBox {
-    .labelName {
-        padding-right: 10px;
-        margin-top: 10px;
-    }
-}
+    .diaContentBox {
+        display: flex;
+        justify-content: space-between;
 
-.diaContentBox {
-    display: flex;
-    justify-content: space-between;
+        .diaContent {
+            width: 48%;
+        }
 
-    .diaContent {
-        width: 48%;
-    }
+        .chartBox {
+            // height: 60vh;
+            height: calc(85vh - 294px);
+        }
 
-    .chartBox {
-        // height: 60vh;
-        height: calc(85vh - 294px);
-    }
+        .chartBox1 {
+            // height: 66vh;
+            height: calc(85vh - 201px);
+        }
 
-    .chartBox1 {
-        // height: 66vh;
-        height: calc(85vh - 201px);
-    }
+        .diaLineTitle {
+            padding: 0 10px 10px;
+            font-weight: bold;
+        }
 
-    .diaLineTitle {
-        padding: 0 10px 10px;
-        font-weight: bold;
-    }
+        .handleForm {
+            .el-form-item {
+                margin-right: 30px;
+            }
 
-    .handleForm {
-        .el-form-item {
-            margin-right: 30px;
+            .el-input {
+                width: 180px;
+            }
         }
 
-        .el-input {
-            width: 180px;
+        .tipName {
+            padding-bottom: 10px;
+            font-size: 18px;
+            font-weight: bold;
         }
     }
 
-    .tipName {
-        padding-bottom: 10px;
+    .el-table .el-input {
+        width: 100%;
+        max-width: 180px;
     }
 }
-
-.el-table .el-input {
-    width: 100%;
-    // min-width: 90px;
-    max-width: 229px;
-}
 </style>

+ 1 - 1
src/views/modelLibrary/components/vehicleModelVTD.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-form ref="form" :model="form" :rules="rules" label-width="160px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="210px">
         <div class="titlePanel">
             <div class="titlePanelBor">控制参数</div>
         </div>

+ 6 - 5
src/views/modelLibrary/vehicleModel.vue

@@ -16,7 +16,7 @@
                 ref="form"
                 :model="form"
                 :rules="rules"
-                label-width="160px"
+                label-width="210px"
             >
                 <div class="flexBox">
                     <el-form-item label="车辆设置方式:" prop="parameterType">
@@ -116,7 +116,6 @@
                 </div>
 
                 <div class="modelBox">
-                    <!-- <img v-show="modelImgSrc" :src="modelImgSrc" width="100%" /> -->
                     <three-show
                         ref="threeShow"
                         :carModel="carModel"
@@ -837,10 +836,9 @@ export default {
     }
 
     .inputBox.flexBox {
-        // margin-bottom: 22px;
 
         .label {
-            width: 138px;
+            width: 190px;
         }
 
         div {
@@ -858,8 +856,11 @@ export default {
     }
 
     .modelBox {
-        // width: 60%;
         min-width: 810px;
     }
+
+    /deep/ .el-input {
+        width: 180px;
+    }
 }
 </style>