diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java index d7e2d7e1..692f5b13 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java @@ -35,14 +35,11 @@ import org.springframework.web.bind.annotation.RestController; @EnableTransactionManagement @MapperScan("org.nl.**.mapper") public class AppRun implements CommandLineRunner { - - public static void main(String[] args) { SpringApplication.run(AppRun.class, args); } - @Override public void run(String... args) throws Exception { System.out.println(111); diff --git a/wms_pro/qd/public/favicon.ico b/wms_pro/qd/public/favicon.ico index fcb69992..63a15850 100644 Binary files a/wms_pro/qd/public/favicon.ico and b/wms_pro/qd/public/favicon.ico differ diff --git a/wms_pro/qd/src/assets/images/logo.png b/wms_pro/qd/src/assets/images/logo.png index f7577109..a1ca19b2 100644 Binary files a/wms_pro/qd/src/assets/images/logo.png and b/wms_pro/qd/src/assets/images/logo.png differ diff --git a/wms_pro/qd/src/assets/styles/eladmin.scss b/wms_pro/qd/src/assets/styles/eladmin.scss index 57a62e5d..9eed7c59 100644 --- a/wms_pro/qd/src/assets/styles/eladmin.scss +++ b/wms_pro/qd/src/assets/styles/eladmin.scss @@ -1,5 +1,8 @@ .head-container { - padding-bottom: 10px; + padding-top: 4px; + padding-bottom: 6px; + background-color: #ffffff; + border-radius: 4px; .filter-item { display: inline-block; @@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button { .el-table__fixed-header-wrapper { th { word-break: break-word; - background-color: #f8f8f9; + background-color: #f5f5f5; color: #515a6e; height: 35px; font-size: 13px; @@ -215,4 +218,13 @@ input[type="number"]::-webkit-outer-spin-button { .el-table--scrollable-y .el-table__body-wrapper { overflow-y: overlay !important; } +//左侧边框不显示start https://blog.csdn.net/m0_37922443/article/details/126487240 +.el-table__row td:not(.is-hidden):last-child { + right: -1px; +} + +thead th:not(.is-hidden):last-child { + right: -1px; +} +//左侧边框不显示end diff --git a/wms_pro/qd/src/assets/styles/index.scss b/wms_pro/qd/src/assets/styles/index.scss index 21fbda18..35a5c8e9 100644 --- a/wms_pro/qd/src/assets/styles/index.scss +++ b/wms_pro/qd/src/assets/styles/index.scss @@ -21,6 +21,7 @@ label { html { height: 100%; box-sizing: border-box; + background-color: #eeeeee; } #app { @@ -98,7 +99,7 @@ div:focus { } aside { - background: #eef1f6; + background: #d40c70; padding: 8px 24px; margin-bottom: 20px; border-radius: 2px; @@ -122,7 +123,7 @@ aside { //main-container全局样式 .app-container { - padding: 20px 20px 45px 20px; + padding: 10px 20px 45px 10px; } .components-container { diff --git a/wms_pro/qd/src/assets/styles/variables.scss b/wms_pro/qd/src/assets/styles/variables.scss index 384517bb..1d1c7bff 100644 --- a/wms_pro/qd/src/assets/styles/variables.scss +++ b/wms_pro/qd/src/assets/styles/variables.scss @@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529; $base-menu-light-background:#ffffff; // sidebar -$menuText:#bfcbd9; +$menuText: #ffffff; $menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 +$subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773 -$menuHover:#263445; +$menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773 +$menuHover:#4e5465; $base-menu-light-color:rgba(0,0,0,.70); -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg:#000c17; +$subMenuHover:#4e5465; $sideBarWidth: 205px; @@ -45,4 +45,4 @@ $sideBarWidth: 205px; logoLightTitleColor: $base-logo-light-title-color } -$base-sidebar-width: 200px; +$base-sidebar-width: 2010px; diff --git a/wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue b/wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue index ecb31fbe..a5cec544 100644 --- a/wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue +++ b/wms_pro/qd/src/views/wms/decision_manage/strategy/index.vue @@ -60,11 +60,11 @@ - + @@ -154,5 +154,7 @@ export default { diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue index 68dc0e82..9c763036 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue @@ -108,16 +108,16 @@ v-permission="['admin','actDeModel:edit','actDeModel:del']" fixed="right" label="操作" - width="300px" + width="160px" align="center" > diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue index 2a94f0c0..0fdff333 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue @@ -75,7 +75,7 @@ - + - - - + + - + + diff --git a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue index 91725487..dd3f71ad 100644 --- a/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue +++ b/wms_pro/qd/src/views/wms/sync_manage/form_mapping/index.vue @@ -229,19 +229,23 @@ - +