diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/vehicleconfiguration/vehicleconfiguration.js b/anrui-buscenter/anrui-buscenter-ui/src/api/vehicleconfiguration/vehicleconfiguration.js new file mode 100644 index 0000000000..7945328586 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/vehicleconfiguration/vehicleconfiguration.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' + +// 车型配置详细信息 +export function selectExiCarConfig(data) { + return request({ + url: '/base/v1/basevehicle/selectExiCarConfig', + method: 'post', + params: { + modelSid:data.modelSid, + configSid:data.configSid, + vehModelConfigSid:data.vehModelConfigSid, + }, + }) +} diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/ButtonBar/index.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/ButtonBar/index.vue index 5e88180db8..2024ee73e5 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/ButtonBar/index.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/ButtonBar/index.vue @@ -112,8 +112,8 @@ export default { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/pagination/index.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/pagination/index.vue index 6458cc1d16..36f36b3ad6 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/pagination/index.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/pagination/index.vue @@ -99,8 +99,8 @@ export default { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue index 3a8363541e..3bded014c6 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue @@ -111,7 +111,7 @@ this.files.splice(0, 1); } } - console.log('aaaa2', this.files) + console.log('aaaa2this.files', this.files) }, }, }, diff --git a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/AppMain.vue b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/AppMain.vue index a8f3718274..966c6c40c9 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/AppMain.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/AppMain.vue @@ -29,9 +29,9 @@ export default { position: relative; background-color: #FFFFFF; /* margin-left:10px; */ - padding: 0 10px; + /*padding: 0 20px;*/ overflow-x: hidden; - overflow-y: auto; + overflow-y: hidden; } .fixed-header+.app-main { padding-top: 50px; diff --git a/anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss b/anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss index 727938ca3b..1e131f6f73 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss +++ b/anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss @@ -1,19 +1,30 @@ .el-table { - .el-table__header{ - tr th{ + .el-table__header { + tr th { background: #edf1f7; color: #333333; + padding: 8px 0; + font-size: 16px; } } } -.table-describe{ +.el-table { + .el-table__body { + tr td { + padding: 6px 0 !important; + } + } +} + +.table-describe { border: 1px solid #dfe4ed; - border-bottom: 0px solid #dfe4ed; - h4{ + border-bottom: 0 solid #dfe4ed; + + h4 { float: left; margin: 0; line-height: 34px; - padding:0 15px; + padding: 0 15px; } } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss b/anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss index 25c6d57783..6b850fed6c 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss +++ b/anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss @@ -86,54 +86,139 @@ div:focus { color: red !important; } -.pd-b10{ +.pd-b10 { padding-bottom: 10px; } -.pd-y40{ +.pd-y40 { padding: 40px 0; } -.pd-y20{ + +.pd-y20 { padding: 20px 0; } -.fs20{ +.fs20 { font-size: 20px; } +// 页面上的button按钮 +.app-container { + .el-button--medium { + padding: 10px 14px; + font-size: 16px; + } + + .el-button--small { + padding: 8px 12px; + font-size: 14px; + } + + .el-button--mini { + padding: 7px 10px; + font-size: 12px; + } +} + // 添加样式 -.app-container {margin: 5px; +.app-container { + margin: 5px 0 5px 0; background-color: #fff; } -.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);} -.webcon{height: calc(100vh - 220px);overflow-y: auto;overflow-x: hidden;} + +// 设置了列表页面滚动区域的样式 +.main-content { + overflow-x: hidden; + overflow-y: auto; + height: calc(100vh - 200px); + padding: 0 20px; +} +.webcon { + overflow-x: hidden; + overflow-y: auto; + height: calc(100vh - 200px); + padding: 0 20px; +} + // .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;} -.listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;} -.listconsubjxs{height: calc(100vh - 300px);overflow-y: auto;overflow-x: hidden;} -// 搜索的 +.listconadd { + height: calc(100vh - 200px); + overflow-y: auto; + overflow-x: hidden; +} + +.listconadd{ + .titwu { + font-size: 28px; + text-align: center; + padding: 30px 0 20px 0; + } +} + +.listconsubjxs { + height: calc(100vh - 300px); + overflow-y: auto; + overflow-x: hidden; +} + +// 搜索条件部分的样式 .webtop { // position: fixed;top: 110px;width: calc(100% - 240px);z-index: 6000; background-color: #fff; display: flex !important; flex-direction: row; justify-content: space-between !important; - align-items: center; margin-bottom: 0px !important; + align-items: center; + margin-bottom: 0px !important; + font-size: 20px; } + +.tab-header { + font-size: 20px; + font-weight: bold; +} + .filter-item { - padding: 0 10px; + padding-right: 10px; width: 220px; display: inline-block; } + +.search { + .tab-header { + .el-form-item { + margin-right: 30px; + + .el-form-item__label { + font-size: 16px; + font-weight: 500; + } + } + } +} + .listtop { display: flex; flex-direction: row; justify-content: space-between; align-items: center; - padding: 0px 0px 10px 15px; + padding: 0 0 0 15px; + margin-top: 0; + border: 1px solid #dfe4ed; + height: 42px; + line-height: 42px; +} + +.listtop .tit { + font-weight: bold; + font-size: 16px +} + +.listtop .pagination { margin: 0; + padding: 0; } -.listtop .tit{font-weight: bold;} -.listtop .pagination{margin: 0;padding: 0;} + .pages { display: flex; flex-direction: row; @@ -141,84 +226,169 @@ div:focus { align-items: flex-end; padding: 0px 0px 15px 15px; } -.pages .tit{font-weight: bold;} -.pages .pagination{margin: 0;} + +.pages .tit { + font-weight: bold; +} + +.pages .pagination { + margin: 0; +} // .formadd{padding: 20px ;} // .listeltable{overflow-y: auto;height: calc(100vh - 420px);} .formadd { - padding: 20px 0; + padding: 10px 40px 0 40px; + font-size: 16px; // height: calc(100vh - 200px);overflow-y: auto; - .tit{font-size: 32px;border-bottom: 1px solid #e0e3eb;text-align: center;margin: 0 0 20px 0;padding: 20px 0;} - .titwu{font-size: 32px;text-align: center;margin: 0 0 20px 0;padding: 20px 0;} - .title { - padding: 10px;font-weight: bold; - font-size: 20px; + .title { + padding: 12px; + font-weight: bold; + font-size: 16px; background-color: $header-bg; - text-align: center; + text-align: left; color: #ffffff; - } - .titleleft { - padding: 10px;font-weight: bold; + } + .tit { + font-size: 32px; + border-bottom: 1px solid #e0e3eb; + text-align: center; + margin: 0 0 20px 0; + padding: 20px 0; + } + .titleleft { + padding: 10px; + font-weight: bold; font-size: 20px; background-color: $header-bg; text-align: left; color: #ffffff; - } - .titlehui { - padding: 10px; + } + .titlehui { + padding: 10px; font-size: 18px; background-color: $table-border-color; text-align: left; - } + } .el-row { - display:flex; - flex-wrap: wrap; - border-left: 1px solid $table-border-color; - .el-col{ - border-right: 1px solid $table-border-color; - border-bottom: 1px solid $table-border-color; - padding: 5px 15px 5px 15px !important; - min-height: 50px; - line-height: 1; - .el-form-item{ - margin-bottom: 0; - // .addinputw{width: 400px;} - .addinputw{width: 80%;} + display: flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + .el-col { + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + padding: 0 15px; + min-height: 42px; + line-height: 1; + + .el-form-item { + margin-bottom: 0; + line-height: 42px; + // .addinputw{width: 400px;} + .addinputw { + width: 80%; + line-height: 42px; + } + .el-input__inner { + height: 36px; } } - - } - .footer{margin: 20px;} + } + } + .footer{margin: 20px;} } +.formaddcopy02 { + padding: 10px 40px 0 40px; + .title { + padding: 12px; + font-weight: bold; + font-size: 16px; + background-color: #0294d7; + color: #ffffff; + text-align: left; + } + + .el-row { + display: flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + + .el-col { + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + min-height: 42px; + padding: 0 15px; + line-height: 42px; + position: relative; + .span-sty { + position: absolute; + top: 0; + bottom: 0; + left: 0; + line-height: 42px; + text-align: right; + font-size: 14px; + color: #606266; + font-weight: 600; + width: 70px; + padding-right: 5px; + border-right: 1px solid #e0e3eb; + } + + .el-form-item { + margin-bottom: 0; + line-height: 42px; + .addinputw { + //padding: 5px 0; + width: 65%; + margin-left: 80px; + line-height: 42px; + } + + .addinputInfo { + margin-left: 80px; + line-height: 42px; + } + + .el-input__inner { + height: 36px; + } + } + } + + } + + .footer { + margin: 20px; + } +} .forminfo { - padding: 20px 0; - .title { - padding: 10px;font-weight: bold; + padding: 20px 0; + .title { + padding: 10px;font-weight: bold; font-size: 20px; background-color: $header-bg; text-align: center; color: #ffffff; - } + } .el-row { - display:flex; - flex-wrap: wrap; - border-left: 1px solid $table-border-color; - .trightb{ text-align: right;font-weight: bold;color: #606266; } - .tleft{ text-align: left; } - .el-col{ - border-right: 1px solid $table-border-color; - border-bottom: 1px solid $table-border-color; - padding: 0px 15px 0px 15px !important; - min-height: 50px; - line-height: 50px; - font-size: 14px; - - } + display:flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + .trightb{ text-align: right;font-weight: bold;color: #606266; } + .tleft{ text-align: left; } + .el-col{ + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + padding: 0 15px 0 15px !important; + min-height: 50px; + line-height: 50px; + font-size: 14px; + } - } - .footer{margin: 20px;} + } + .footer{margin: 20px;} } .el-form-item__error { @@ -238,10 +408,24 @@ div:focus { } .titcon .baocun{text-align: right;flex: 2;padding: 5px 20px;} .addinputwda{width: 600px;} -.searchcon{margin: 0px 0 10px 0;} -.searchcon .searchbtn{margin: 10px 0;} - - +//.searchcon{margin: 0px 0 10px 0;} +//.searchcon .searchbtn{margin: 10px 0;} +// 隐藏显示按钮 +.main-content { + .searchcon { + .searchbtn { + margin: 5px 0; + border: #2cab69 1px solid; + color: #2cab69; + } + } +} +.search .btn { + padding: 5px 0; + border: 1px solid #e0e3eb; + text-align: center; + margin-bottom: 5px; +} // 弹出窗口按钮 .btnCancel{ background: #e84026 !important;outline: none;border: none;color: #fff !important; @@ -265,7 +449,7 @@ div:focus { .lookimg img{width: 250px;margin: 10px;} .listimg{width: 80px;} // 搜索样式 -.searchlist{margin: 10px 0;} +//.searchlist{margin: 10px 0;} .searchbtns{margin: 10px 0;text-align: center;} .mw{margin: 0 10px;display: inline-block;} .widthxiao{width: 95%;margin: 0 auto;} diff --git a/anrui-buscenter/anrui-buscenter-ui/src/styles/sidebar.scss b/anrui-buscenter/anrui-buscenter-ui/src/styles/sidebar.scss index ef66650a63..336660e16d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/styles/sidebar.scss +++ b/anrui-buscenter/anrui-buscenter-ui/src/styles/sidebar.scss @@ -9,32 +9,32 @@ position: relative; overflow: hidden; } - .TagsView{ - height: 50px; - } + //.TagsView{ + // height: 50px; + //} .home-box{ - position: fixed; - top: 60px; - left: 0; - background-color: $menuBg; + position: fixed; + top: 60px; + left: 0; + background-color: $menuBg; border: 1px solid $menuHover; - line-height: 40px; - width: 210px; + line-height: 40px; + width: 210px; z-index: 1000; - a{ - display: inline-block; - line-height: 40px; - box-sizing: border-box; + a{ + display: inline-block; + line-height: 40px; + box-sizing: border-box; width: 50%; text-align: center; - font-size: 16px; - font-weight: 500; + font-size: 16px; + font-weight: 500; color: #FFFFFF; - } - a:last-child{ - border:0; + } + a:last-child{ + border:0; background-color: $menuHover; - } + } } .sidebar-container { transition: width 0.28s; @@ -56,6 +56,7 @@ } .scrollbar-wrapper { + height: calc(100% - 40px) ; //此高度是100%减去页面底部的栏高 overflow-x: hidden !important; } @@ -105,9 +106,9 @@ background-color: $menuHover !important; } } - .el-submenu__title i{ - color: #FFFFFF; - } + .el-submenu__title i{ + color: #FFFFFF; + } .is-active>.el-submenu__title { color: $subMenuActiveText !important; } @@ -121,9 +122,9 @@ background-color: $subMenuHover !important; } } - & .el-menu-item.is-active { - background-color: $subMenuHover !important; - } + & .el-menu-item.is-active { + background-color: $subMenuHover !important; + } } // .hideSidebar { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue index 3a6d79b4a0..c143ec00de 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue @@ -2,12 +2,12 @@